From 060bc0d74128050bed93a52016f1cdebcc28c5e2 Mon Sep 17 00:00:00 2001
From: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Date: Fri, 5 May 2023 16:48:52 -0400
Subject: [PATCH] Fixed Jestosterone removing clown waddles (#21035)

* Update misc_reagents.dm

* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
---
 .../reagents/chemistry/reagents/misc_reagents.dm      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
index 2edebe6450a..822c6890cce 100644
--- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
@@ -489,9 +489,10 @@
 		else
 			to_chat(C, "<span class='warning'>Something doesn't feel right...</span>")
 			C.AdjustDizzy(volume STATUS_EFFECT_CONSTANT)
-	ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
+	if(C.mind.assigned_role != "Clown")
+		ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
+		C.AddElement(/datum/element/waddling)
 	C.AddComponent(/datum/component/squeak, null, null, null, null, null, TRUE, falloff_exponent = 20)
-	C.AddElement(/datum/element/waddling)
 
 /datum/reagent/jestosterone/on_mob_life(mob/living/carbon/M)
 	var/update_flags = STATUS_UPDATE_NONE
@@ -525,9 +526,11 @@
 
 /datum/reagent/jestosterone/on_mob_delete(mob/living/M)
 	..()
-	REMOVE_TRAIT(M, TRAIT_COMIC_SANS, id)
+	if(M.mind.assigned_role != "Clown")
+		REMOVE_TRAIT(M, TRAIT_COMIC_SANS, id)
+		M.RemoveElement(/datum/element/waddling)
 	qdel(M.GetComponent(/datum/component/squeak))
-	M.RemoveElement(/datum/element/waddling)
+
 
 /datum/reagent/royal_bee_jelly
 	name = "Royal bee jelly"