From a958de3d96d14dece4a8ba562b87ccf2e582f201 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Sat, 30 Dec 2017 12:10:41 +1300
Subject: [PATCH] Fixes assistants spawning naked

---
 code/modules/clothing/gloves/color.dm |  9 +++++++++
 code/modules/clothing/under/color.dm  | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 4f108a505f..83e8f817c5 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -205,9 +205,18 @@
 		/obj/item/clothing/gloves/color/brown = 1)
 
 	var/obj/item/clothing/gloves/color/selected = pick(gloves)
+<<<<<<< HEAD
 
 	name = initial(selected.name)
 	desc = initial(selected.desc)
 	icon_state = initial(selected.icon_state)
 	item_state = initial(selected.item_state)
 	item_color = initial(selected.item_color)
+=======
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		H.equip_to_slot_or_del(new selected(H), slot_gloves)
+	else
+		new selected(loc)
+	return INITIALIZE_HINT_QDEL
+>>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 2ff546a6eb..975ca26061 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -6,11 +6,21 @@
 
 /obj/item/clothing/under/color/random/New()
 	..()
+<<<<<<< HEAD
 	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
 	name = initial(C.name)
 	icon_state = initial(C.icon_state)
 	item_state = initial(C.item_state)
 	item_color = initial(C.item_color)
+=======
+	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		H.equip_to_slot_or_del(new C(H), slot_w_uniform) //or else you end up with naked assistants running around everywhere...
+	else
+		new C(loc)
+	return INITIALIZE_HINT_QDEL
+>>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix
 
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"