From 348b3502957bcd66050fecee7b692933557eb198 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:47 -0500 Subject: [PATCH] Update alcohol_reagents.dm --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 413cd8649b..3134226543 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1613,8 +1613,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "mojito" glass_name = "Mojito" glass_desc = "A drink that looks as refreshing as it tastes." -<<<<<<< HEAD -======= /datum/reagent/consumable/ethanol/fernet name = "Fernet" @@ -1703,4 +1701,3 @@ All effects don't start immediately, but rather get worse over time; the rate is M.adjustStaminaLoss(35) . = TRUE ..() ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)