From fb5195aa4e97a01f657953e0d810ace08c2737d4 Mon Sep 17 00:00:00 2001 From: Robustin Date: Sun, 21 Jan 2018 02:45:23 -0500 Subject: [PATCH 1/2] New Cocktail: The Nar'Sour --- .../chemistry/reagents/alcohol_reagents.dm | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 6b47b99a32..4e3af9d284 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1281,3 +1281,23 @@ 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" + id = "narsour" + description = "Side effects include self-mutilation and hoarding plasteel." + color = RUNE_COLOR_DARKRED + boozepwr = 10 + taste_description = "bloody" + glass_icon_state = "narsour" + glass_name = "Nar'Sour" + glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!" + +/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/M) + M.cultslurring = min(M.cultslurring + 3, 3) + M.stuttering = min(M.stuttering + 3, 3) + ..() +>>>>>>> b7c5747... Adds stutter to narsour From 646aa3f2f8eb292c7b62c88a29c9e929930e27ed Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 24 Jan 2018 13:58:47 -0600 Subject: [PATCH 2/2] 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