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

Adds grenadine.

Browse Source
This commit is contained in:
Hyacinth-OR
2018-05-02 11:12:37 -07:00
committed by CitadelStationBot
parent e42cce26da
commit 4a7f656823
7 changed files with 90 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/boozeomat.dm
+10
View File
@@ -19,6 +19,11 @@
/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,
<<<<<<< HEAD
=======
/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
>>>>>>> b0b7f2d... Adds grenadine. (#37598)
/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 +42,10 @@
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
<<<<<<< HEAD
charges = list(58, 4, 0)//of 174 standard, 12 contraband
init_charges = list(58, 4, 0)
=======
charges = list(61, 4, 0)//of 182 standard, 12 contraband
init_charges = list(61, 4, 0)
>>>>>>> b0b7f2d... Adds grenadine. (#37598)