Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589

[MIRROR] Adds 5 new drinks
This commit is contained in:
LetterJay
2018-05-13 11:52:12 -05:00
committed by GitHub
7 changed files with 132 additions and 15 deletions
+3 -2
View File
@@ -19,6 +19,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
@@ -37,5 +38,5 @@
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
charges = list(58, 4, 0)//of 174 standard, 12 contraband
init_charges = list(58, 4, 0)
charges = list(59, 4, 0)//of 178 standard, 12 contraband
init_charges = list(59, 4, 0)