diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 04a4be6eea91..c80f23c68206 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -124,7 +124,8 @@
 		/obj/item/clothing/suit/space/void/atmos = /obj/item/clothing/suit/space/void/atmos/himeo,
 		/obj/item/clothing/head/helmet/space/void/atmos = /obj/item/clothing/head/helmet/space/void/atmos/himeo,
 
-		/obj/item/rig_assembly/industrial = /obj/item/rig_assembly/industrial/himeo
+		/obj/item/rig_assembly/industrial = /obj/item/rig_assembly/industrial/himeo,
+		/obj/item/rig/industrial = /obj/item/rig/industrial/himeo/dequipped
 
 	)
 	var/parts = MODKIT_FULL
@@ -157,45 +158,75 @@
 		if(istype(W, /obj/item/clothing/suit/space/void) && W.contents.len)
 			to_chat(user, SPAN_NOTICE("Remove any accessories, helmets, magboots, or oxygen tanks before attempting to convert this voidsuit."))
 			return
+		else if(istype(W, /obj/item/rig)) // hardsuit kitting
+			//reconverting = FALSE
+			var/obj/item/rig/rigVar = W
+			if(!isturf(W.loc))
+				to_chat(user, SPAN_NOTICE("You'll need to set this down to work on it."))
+				return
+			else if (rigVar.cell)
+				to_chat(user, SPAN_NOTICE("You'll need to remove the cell before you convert this hardsuit."))
+				return
+			else if (rigVar.air_supply)
+				to_chat(user, SPAN_NOTICE("You'll need to remove the air tank before you convert this hardsuit."))
+				return
+			else if (rigVar.open)
+				to_chat(user, SPAN_NOTICE("You'll need to close up the hardsuit to work properly."))
+				return
+			else
+				var/list/possible_removals = list()
+				for(var/obj/item/rig_module/module in rigVar.installed_modules)
+					if(module.permanent)
+						continue
+					possible_removals[module.name] = module
+
+					if(possible_removals.len)
+						to_chat(user, SPAN_NOTICE("You'll need to remove any modules before you convert this hardsuit."))
+						return
 
 		playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
 		var/obj/item/P = new voidsuit_product(get_turf(W))
 
 		if(!reconverting)
 			to_chat(user, SPAN_NOTICE("Your permit for [P] has been processed. Enjoy!"))
+		else if(reconverting && istype(P, /obj/item/rig))
+			var/obj/item/rig/rigVarBack = P
+			rigVarBack.cell = null
+			rigVarBack.air_supply = null
 		else
-			to_chat(user, SPAN_NOTICE("Your voidsuit part has been reconverted into [P]."))
+			to_chat(user, SPAN_NOTICE("Your part has been reconverted into [P]."))
+
+		qdel(W)
 
 		if (istype(W, /obj/item/clothing/head/helmet))
 			parts &= ~MODKIT_HELMET
 		if (istype(W, /obj/item/clothing/suit))
 			parts &= ~MODKIT_SUIT
-		if (istype(W, /obj/item/rig_assembly/industrial/himeo))
+		if (istype(W, /obj/item/rig))
 			parts &= ~MODKIT_RIG
 
-		qdel(W)
 
-		if(!parts)
+		/*if(!parts)
 			user.drop_from_inventory(src)
-			qdel(src)
+			qdel(src)*/
 
 /obj/item/voidsuit_modkit/himeo
-	name = "himeo voidsuit kit"
+	name = "himean EVA suit modkit"
 	contained_sprite = TRUE
 	icon = 'icons/obj/mining_contained.dmi'
 	icon_state = "himeo_kit"
 	item_state = "himeo_kit"
-	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit."
+	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for Himean EVA equipment."
 	desc_extended = "Despite the vast amounts of supplementary paperwork involved, the Stellar Corporate Conglomerate continues to import specialty industrialwear through an Orion Express subsidiary to \
 	boost morale among Himean staff. With success in the previous Type-76 'Fish Fur' program, the Chainlink has also authorized a number of Type-86 'Cicada' industrial hardsuits for use \
 	on a number of installations, such as the Horizon."
 
 /obj/item/voidsuit_modkit/himeo/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
-	. += "This modkit can be used to convert an industrial hardsuit assembly into a Himean variant."
+	. += "This modkit can be used to convert an industrial hardsuit, or hardsuit assembly, into a Himean variant."
 
 /obj/item/voidsuit_modkit/himeo/tajara
-	name = "tajaran himeo voidsuit kit"
+	name = "tajaran himean EVA suit modkit"
 	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit fitted for Tajara."
 	suit_options = list(
 		/obj/item/clothing/suit/space/void/mining = /obj/item/clothing/suit/space/void/mining/himeo/tajara,
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index ab362a173402..2fd6c0a16b1a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -116,6 +116,10 @@
 		/obj/item/rig_module/actuators
 		)
 
+/obj/item/rig/industrial/dequipped
+	cell_type = null
+	air_type = null
+
 /obj/item/rig/industrial/syndicate
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig
@@ -143,6 +147,11 @@
 		/obj/item/rig_module/actuators,
 		/obj/item/rig_module/maneuvering_jets
 	)
+
+/obj/item/rig/industrial/himeo/dequipped
+	cell_type = null
+	air_type = null
+
 /obj/item/rig/eva
 	name = "EVA suit control module"
 	suit_type = "EVA hardsuit"
diff --git a/html/changelogs/crunchypretzels-himeoparity.yml b/html/changelogs/crunchypretzels-himeoparity.yml
new file mode 100644
index 000000000000..66f36c26c0c1
--- /dev/null
+++ b/html/changelogs/crunchypretzels-himeoparity.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: crunchypretzels
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - qol: "You can now use the Himeo voidsuit modkit on industrial rigs, as well as rig assemblies."
+  - imageadd: "Changed the rest of the Himean suits to match the new palette."
diff --git a/icons/obj/clothing/voidsuit/coalition.dmi b/icons/obj/clothing/voidsuit/coalition.dmi
index 6526e013c30d..0aa2b502d3e0 100644
Binary files a/icons/obj/clothing/voidsuit/coalition.dmi and b/icons/obj/clothing/voidsuit/coalition.dmi differ
diff --git a/icons/obj/item/clothing/rig/himeo_industrial.dmi b/icons/obj/item/clothing/rig/himeo_industrial.dmi
index 102f655de7f1..6402eb55dd37 100644
Binary files a/icons/obj/item/clothing/rig/himeo_industrial.dmi and b/icons/obj/item/clothing/rig/himeo_industrial.dmi differ