From 34bf8d11aa079cd035b013b3b68ee29cc2e9e689 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:15:47 -0500 Subject: [PATCH] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 367feb3cbc..6fb8f2cac4 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -623,9 +623,6 @@ id = "crevice_spike" results = list("crevice_spike" = 6) required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy) -<<<<<<< HEAD - mix_message = "The mixture stings your eyes as it settles." -======= mix_message = "The mixture stings your eyes as it settles." /datum/chemical_reaction/sake @@ -665,5 +662,3 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) - ->>>>>>> b0b7f2d... Adds grenadine. (#37598)