Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265

[MIRROR]  Good Clean Fun: A vending machine for games!
This commit is contained in:
deathride58
2017-12-10 23:50:05 +00:00
committed by GitHub
6 changed files with 34 additions and 67 deletions

View File

@@ -1175,6 +1175,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
/obj/machinery/vending/games
name = "\improper Good Clean Fun"
desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..."
product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
icon_state = "games"
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)
#undef STANDARD_CHARGE
#undef CONTRABAND_CHARGE
#undef COIN_CHARGE