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

Update bottle.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-17 23:44:27 -05:00
committed by GitHub
parent e2bcf82341
commit eb96fe9d02
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+1 -4
View File
@@ -298,8 +298,6 @@
icon_state = "grappabottle"
list_reagents = list("grappa" = 100)
<<<<<<< HEAD
=======
/obj/item/reagent_containers/food/drinks/bottle/sake
name = "Ryo's traditional sake"
desc = "Sweet as can be, and burns like fire going down."
@@ -322,8 +320,7 @@
desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
icon_state = "fernetbottle"
list_reagents = list("fernet" = 100)
>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)
//////////////////////////JUICES AND STUFF ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/orangejuice