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

Update boozeomat.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-17 23:45:11 -05:00
committed by GitHub
parent 204043bc26
commit 047fc2a858
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/boozeomat.dm
-8
View File
@@ -15,11 +15,8 @@
/obj/item/reagent_containers/food/drinks/bottle/hcider = 5, /obj/item/reagent_containers/food/drinks/bottle/hcider = 5,
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/grappa = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
<<<<<<< HEAD
=======
/obj/item/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/reagent_containers/food/drinks/bottle/sake = 5,
/obj/item/reagent_containers/food/drinks/bottle/fernet = 5, /obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)
/obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/ale = 6,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /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/tomatojuice = 4,
@@ -43,10 +40,5 @@
/obj/item/vending_refill/boozeomat /obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat" machine_name = "Booze-O-Mat"
icon_state = "refill_booze" icon_state = "refill_booze"
<<<<<<< HEAD
charges = list(59, 4, 0)//of 178 standard, 12 contraband
init_charges = list(59, 4, 0)
=======
charges = list(61, 4, 0)//of 182 standard, 12 contraband charges = list(61, 4, 0)//of 182 standard, 12 contraband
init_charges = list(61, 4, 0) init_charges = list(61, 4, 0)
>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)