From 646aa3f2f8eb292c7b62c88a29c9e929930e27ed Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 24 Jan 2018 13:58:47 -0600 Subject: [PATCH] Update alcohol_reagents.dm --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4e3af9d284..68770490e9 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1281,9 +1281,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "glass_yellow" glass_name = "eggnog" glass_desc = "For enjoying the most wonderful time of the year." -<<<<<<< HEAD -======= - /datum/reagent/consumable/ethanol/narsour name = "Nar'Sour" @@ -1300,4 +1297,3 @@ All effects don't start immediately, but rather get worse over time; the rate is M.cultslurring = min(M.cultslurring + 3, 3) M.stuttering = min(M.stuttering + 3, 3) ..() ->>>>>>> b7c5747... Adds stutter to narsour