From eb96fe9d02d774b03a655bbf75e8051ea4405451 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:27 -0500 Subject: [PATCH] Update bottle.dm --- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0108b8d2f6..8972ceba12 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -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