More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -121,8 +121,10 @@
 
 	New()
 		..()
-		new /obj/item/clothing/head/helmet/space/fluff/aronai(src)
-		new /obj/item/clothing/suit/space/fluff/aronai(src)
+		//new /obj/item/clothing/head/helmet/space/fluff/aronai(src)
+		//new /obj/item/clothing/suit/space/fluff/aronai(src)
+		new /obj/item/clothing/head/helmet/space/void/medical/emt/fluff/aronai(src)
+		new /obj/item/clothing/suit/space/void/medical/emt/fluff/aronai(src)
 		new /obj/item/device/suit_cooling_unit(src)
 		new /obj/item/weapon/material/hatchet/tacknife/combatknife(src)
 		new /obj/item/weapon/card/id/centcom/fluff/aro(src)

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -599,7 +599,7 @@
 	action_button_name = "Toggle pom-pom"
 
 // arokha : Aronai Kadigan
-/obj/item/clothing/head/helmet/space/fluff/aronai
+/obj/item/clothing/head/helmet/space/void/medical/emt/fluff/aronai
 	name = "Aronai's Helmet"
 	desc = "This spacesuit helmet appears to be custom-made for someone with pointed ears and a muzzle. \
 		It is form-fitting enough that it's unlikely to fit anyone but the person it was intended for. \
@@ -622,7 +622,7 @@
 		else
 			return 1
 
-/obj/item/clothing/suit/space/fluff/aronai
+/obj/item/clothing/suit/space/void/medical/emt/fluff/aronai
 	name = "Aronai's Spacesuit"
 	desc = "This spacesuit appears to be custom-made for someone with digitigrade legs and a tail. \
 		It is form-fitting enough that it's unlikely to fit anyone but the person it was intended for. \
@@ -716,7 +716,7 @@
 /obj/item/clothing/under/rank/khi
 	name = "Delete Me"
 	desc = "Why did you spawn this one? Dork."
-	rolled_down = 0
+	sensor_mode = 3
 
 	icon = 'icons/vore/custom_clothes_vr.dmi'
 	icon_state = "khi_uniform_i"
@@ -729,6 +729,7 @@
 		desc = "Kitsuhana Industrial Navy uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
 		icon_state = "khi_uniform_cmd_i"
 		item_state = "khi_uniform_cmd"
+		worn_state = "khi_uniform_cmd"
 		armor = list(melee = 5, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 	sec //Security version
@@ -736,6 +737,7 @@
 		desc = "Kitsuhana Industrial Navy uniform. This one has angry red security stripes. Keepin' the peace in style."
 		icon_state = "khi_uniform_sec_i"
 		item_state = "khi_uniform_sec"
+		worn_state = "khi_uniform_sec"
 		armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 	med //Medical version
@@ -743,6 +745,7 @@
 		desc = "Kitsuhana Industrial Navy uniform. The medical version. Why not just get a new body, anyway?"
 		icon_state = "khi_uniform_med_i"
 		item_state = "khi_uniform_med"
+		worn_state = "khi_uniform_med"
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 5)
 
 	eng //Engineering version
@@ -750,6 +753,7 @@
 		desc = "Kitsuhana Industrial Navy uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
 		icon_state = "khi_uniform_eng_i"
 		item_state = "khi_uniform_eng"
+		worn_state = "khi_uniform_eng"
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
 
 	sci //Science version
@@ -757,6 +761,7 @@
 		desc = "Kitsuhana Industrial Navy uniform. For performing science in, based on the color! Only SCIENCE can save us now."
 		icon_state = "khi_uniform_sci_i"
 		item_state = "khi_uniform_sci"
+		worn_state = "khi_uniform_sci"
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5)
 
 	fluff/aro //Aro fluff version
@@ -764,4 +769,5 @@
 		desc = "Kitsuhana Industrial Navy uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
 		icon_state = "khi_uniform_aro_i"
 		item_state = "khi_uniform_aro"
+		worn_state = "khi_uniform_aro"
 		armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)