diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm
index d67f691c..16dc8ba9 100644
--- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm
+++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm
@@ -6,27 +6,36 @@
 	item_color = "chef"
 	alt_covers_chest = TRUE
 
+	var/mob/living/carbon/U
+
+/obj/item/clothing/under/rank/chef/modular/equipped(mob/user, slot)
+	if(slot == SLOT_W_UNIFORM)
+		U = user
+	else
+		U = null
+
+/obj/item/clothing/under/rank/chef/modular/dropped()
+	U = null
+
 /obj/item/clothing/under/rank/chef/modular/worn_overlays(isinhands = FALSE)
 	. = list()
-	if(!isinhands)
-		var/mob/living/carbon/U = usr
-		var/obj/item/organ/O
-		var/obj/item/organ/genital/G
-		for(O in U.internal_organs)
-			if(istype(O, /obj/item/organ/genital/belly))
-				G = O
-				. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbelly.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER)
-			if(istype(O, /obj/item/organ/genital/anus))
-				G = O
-				. += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER)
-				. += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER)
-			if(istype(O, /obj/item/organ/genital/breasts))
-				G = O
-				. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER)	//nearest
-				. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER)	//farthest
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
-		if(accessory_overlay)
-			. += accessory_overlay
+	var/obj/item/organ/O
+	var/obj/item/organ/genital/G
+	for(O in U.internal_organs)
+		if(istype(O, /obj/item/organ/genital/belly))
+			G = O
+			. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbelly.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER)
+		if(istype(O, /obj/item/organ/genital/anus))
+			G = O
+			. += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER)
+			. += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER)
+		if(istype(O, /obj/item/organ/genital/breasts))
+			G = O
+			. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER)	//nearest
+			. += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER)	//farthest
+	if(damaged_clothes)
+		. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
+	if(blood_DNA)
+		. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
+	if(accessory_overlay)
+		. += accessory_overlay