Skip to content

Commit

Permalink
add: Customat (#5849) [testmerge][12b1f39]
Browse files Browse the repository at this point in the history
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
  • Loading branch information
Bizzonium committed Oct 1, 2024
1 parent 412327c commit deb2a85
Show file tree
Hide file tree
Showing 30 changed files with 1,124 additions and 108 deletions.
7 changes: 7 additions & 0 deletions code/datums/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2961,6 +2961,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
cost = 15
containername = "chinese supply crate"

/datum/supply_packs/vending/customat
name = "Customat Resupply Canister Crate"
contains = list(/obj/item/vending_refill/custom,
/obj/item/vending_refill/custom)
cost = 30
containername = "customat canister supply crate"

//////////////////////////////////////////////////////////////////////////////
//////////////////////////// CONTRABAND SUPPLY ///////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/constructable_frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ to destroy them and players will be able to make replacements.
"Departament Law ClothesMate" = /obj/machinery/vending/clothing/departament/law,
"Service Departament ClothesMate Botanical" = /obj/machinery/vending/clothing/departament/service/botanical,
"Service Departament ClothesMate Chaplain" = /obj/machinery/vending/clothing/departament/service/chaplain,
"RoboFriends" = /obj/machinery/vending/pai,)
"RoboFriends" = /obj/machinery/vending/pai,
"Customat" = /obj/machinery/customat,)

var/static/list/unique_vendors = list(
"ShadyCigs Ultra" = /obj/machinery/vending/cigarette/beach,
Expand Down
Loading

0 comments on commit deb2a85

Please sign in to comment.