From c1e9137fa3d12e100fbcb749afdb7ee389e7bdc5 Mon Sep 17 00:00:00 2001
From: Citinited <kendo123@hotmail.co.uk>
Date: Wed, 1 Aug 2018 21:22:24 +0100
Subject: [PATCH] Jestosterone plays a honk when mixed; better way of handling
 job check

---
 code/modules/reagents/chemistry/reagents/misc.dm  | 10 ++++++----
 code/modules/reagents/chemistry/recipes/others.dm |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index a5d665b1d0a..f83cf0022be 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -427,24 +427,26 @@
 	taste_message = "a funny flavour"
 
 /datum/reagent/jestosterone/reaction_mob(mob/living/M, method, volume)
-	if(ishuman(M) && M.job in list("Clown"))
+	..()
+	if(M.reagents.has_reagent("jestosterone"))
+		return
+	if(M.mind && (M.mind.assigned_role == "Clown" || M.mind.assigned_role == SPECIAL_ROLE_HONKSQUAD))
 		to_chat(M, "<span class='notice'>Whatever that was, it feels great!</span>")
 	else
 		to_chat(M, "<span class='warning'>Something doesn't feel right...</span>")
 		M.AdjustDizzy(volume)
-	..()
 
 /datum/reagent/jestosterone/on_mob_life(mob/living/M)
 	if(prob(10))
 		M.emote("giggle")
-	if(ishuman(M) && M.job in list("Clown"))
+	if(M.mind && (M.mind.assigned_role == "Clown" || M.mind.assigned_role == SPECIAL_ROLE_HONKSQUAD))
 		M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER) //Screw those pesky clown beatings!
 	else
 		M.AdjustDizzy(10, 0, 500)
 		M.Druggy(15)
 		if(prob(10))
 			M.EyeBlurry(5)
-		else if(prob(5))
+		if(prob(6))
 			var/list/clown_message = list("You feel light-headed.",
 			"You can't see straight.",
 			"You feel about as funny as the station clown.",
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index ae04f1320d0..0259ed89e86 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -299,6 +299,9 @@
 	result_amount = 5
 	mix_message = "The substance quickly shifts colour, cycling from red, to yellow, to green, to blue, and finally settles at a vibrant fuchsia."
 
+/datum/chemical_reaction/jestosterone/on_reaction(datum/reagents/holder, created_volume)
+	playsound(get_turf(holder.my_atom), 'sound/items/bikehorn.ogg', 50, 1)
+
 /datum/chemical_reaction/royal_bee_jelly
 	name = "royal bee jelly"
 	id = "royal_bee_jelly"