From aee0160a25bb750baf543a761ba923f7db4f0a49 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:15:57 -0500 Subject: [PATCH] Update drink_reagents.dm --- code/modules/reagents/chemistry/reagents/drink_reagents.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 18cb7469a5..c8b90026e4 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -721,8 +721,7 @@ description = "Milk for cool kids." color = "#7D4E29" taste_description = "chocolate milk" -<<<<<<< HEAD -======= + /datum/reagent/consumable/menthol name = "Menthol" id = "menthol" @@ -741,4 +740,3 @@ taste_description = "sweet pomegranates" glass_name = "glass of grenadine" glass_desc = "Delicious flavored syrup." ->>>>>>> b0b7f2d... Adds grenadine. (#37598)