shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316

Browse Source 
[MIRROR] Adds games vendor resupply crate
This commit is contained in:
deathride58
2017-12-11 00:46:00 +00:00
committed by GitHub
parent 8901b7dc22 ccd370328c
commit 051b45c680
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending.dm
+5 -3
View File
@@ -1183,9 +1183,11 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
products = list(
/obj/item/toy/cards/deck = 5,
/obj/item/storage/pill_bottle/dice = 10,
/obj/item/toy/cards/deck/cas = 2,
/obj/item/toy/cards/deck/cas/black = 2)
contraband = list(/obj/item/dice/fudge = 10)
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3)
contraband = list(/obj/item/dice/fudge = 9)
refill_canister = /obj/item/vending_refill/games
#undef STANDARD_CHARGE
#undef CONTRABAND_CHARGE
code/game/objects/items/circuitboards/machine_circuitboards.dm
+1
View File
@@ -223,6 +223,7 @@
/obj/machinery/vending/snack = "Getmore Chocolate Corp",
/obj/machinery/vending/cola = "Robust Softdrinks",
/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
/obj/machinery/vending/games = "\improper Good Clean Fun",
/obj/machinery/vending/autodrobe = "AutoDrobe",
/obj/machinery/vending/clothing = "ClothesMate",
/obj/machinery/vending/medical = "NanoMed Plus",
code/game/objects/items/vending_items.dm
+6
View File
@@ -86,3 +86,9 @@
icon_state = "refill_donksoft"
charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium
init_charges = list(32,28,0)
/obj/item/vending_refill/games
machine_name = "\improper Good Clean Fun"
icon_state = "refill_games"
charges = list(7, 3, 0) //of 21 standard, 9 contraband
init_charges = list(7, 3, 0)
code/modules/cargo/packs.dm
+8
View File
@@ -1221,6 +1221,14 @@
/obj/item/vending_refill/cigarette)
crate_name = "cigarette supply crate"
/datum/supply_pack/organic/vending/games
name = "Games Supply Crate"
cost = 1000
contains = list(/obj/item/vending_refill/games,
/obj/item/vending_refill/games,
/obj/item/vending_refill/games)
crate_name = "games supply crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Materials ///////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////