From 2b0a4f67375e0ce75106b9a176a8ffdd32a15d16 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:36 -0500 Subject: [PATCH] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 965433113f..0ee01ae9e2 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -662,8 +662,6 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) -<<<<<<< HEAD -======= /datum/chemical_reaction/fernet_cola name = "Fernet Cola" @@ -683,4 +681,3 @@ id = "branca_menta" results = list("branca_menta" = 3) required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1) ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)