From 45433edc738e7cc2f366f07f8844588176abd5ce Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 25 Jan 2016 19:06:27 -0500
Subject: [PATCH] Fixes Kahlua, Silencer, and BananaHonk

---
 .../reagents/drink/reagents_alcohol.dm        | 50 ++++++-------------
 .../oldchem/reagents/drink/reagents_drink.dm  | 40 +++++++++++----
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
index 81ed8f644ac..ee5b8ac050a 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
@@ -663,40 +663,6 @@
 	..()
 	return
 
-/datum/reagent/ethanol/bananahonk
-	name = "Banana Mama"
-	id = "bananahonk"
-	description = "A drink from Clown Heaven."
-	nutriment_factor = 1 * FOOD_METABOLISM
-	color = "#664300" // rgb: 102, 67, 0
-
-/datum/reagent/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob)
-	M.nutrition += nutriment_factor
-	if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
-		if(!M) M = holder.my_atom
-		M.heal_organ_damage(1,1)
-		M.nutrition += nutriment_factor
-		..()
-		return
-	..()
-
-/datum/reagent/ethanol/silencer
-	name = "Silencer"
-	id = "silencer"
-	description = "A drink from Mime Heaven."
-	nutriment_factor = 1 * FOOD_METABOLISM
-	color = "#664300" // rgb: 102, 67, 0
-
-/datum/reagent/ethanol/silencer/on_mob_life(var/mob/living/M as mob)
-	M.nutrition += nutriment_factor
-	if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
-		if(!M) M = holder.my_atom
-		M.heal_organ_damage(1,1)
-		M.nutrition += nutriment_factor
-		..()
-		return
-	..()
-
 /datum/reagent/ethanol/changelingsting
 	name = "Changeling Sting"
 	id = "changelingsting"
@@ -753,4 +719,18 @@
 		M.confused = max(M.confused+15,15)
 	..()
 
-	return
\ No newline at end of file
+	return
+
+/datum/reagent/ethanol/kahlua
+	name = "Kahlua"
+	id = "kahlua"
+	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
+	color = "#664300" // rgb: 102, 67, 0
+
+/datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
+	M.dizziness = max(0,M.dizziness-5)
+	M.drowsyness = max(0,M.drowsyness-3)
+	M.sleeping = max(0,M.sleeping-2)
+	M.Jitter(5)
+	..()
+	return
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
index 2e26dd2ce83..dc43ffb54b4 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
@@ -264,16 +264,36 @@
 	color = "#104038" // rgb: 16, 64, 56
 	adj_temp = -5
 
-/datum/reagent/drink/kahlua
-	name = "Kahlua"
-	id = "kahlua"
-	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
+/datum/reagent/drink/bananahonk
+	name = "Banana Mama"
+	id = "bananahonk"
+	description = "A drink from Clown Heaven."
+	nutriment_factor = 1 * FOOD_METABOLISM
 	color = "#664300" // rgb: 102, 67, 0
-	adj_dizzy = -5
-	adj_drowsy = -3
-	adj_sleepy = -2
 
-/datum/reagent/drink/kahlua/on_mob_life(var/mob/living/M as mob)
+/datum/reagent/drink/bananahonk/on_mob_life(var/mob/living/M as mob)
+	M.nutrition += nutriment_factor
+	if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
+		if(!M) M = holder.my_atom
+		M.heal_organ_damage(1,1)
+		M.nutrition += nutriment_factor
+		..()
+		return
 	..()
-	M.Jitter(5)
-	return
\ No newline at end of file
+
+/datum/reagent/drink/silencer
+	name = "Silencer"
+	id = "silencer"
+	description = "A drink from Mime Heaven."
+	nutriment_factor = 1 * FOOD_METABOLISM
+	color = "#664300" // rgb: 102, 67, 0
+
+/datum/reagent/drink/silencer/on_mob_life(var/mob/living/M as mob)
+	M.nutrition += nutriment_factor
+	if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
+		if(!M) M = holder.my_atom
+		M.heal_organ_damage(1,1)
+		M.nutrition += nutriment_factor
+		..()
+		return
+	..()
\ No newline at end of file