Minor edits + cleanup

code/modules/clothing/spacesuits/void/atmos.dm

@@ -18,10 +18,7 @@
 	name = "atmos voidsuit"
 	desc = "A durable voidsuit with advanced temperature-regulation systems as well as minor radiation protection. Well worth the price."
 	icon_state = "rig-atmos"
-	item_state_slots = list(
-		slot_l_hand_str = "atmos_voidsuit",
-		slot_r_hand_str = "atmos_voidsuit",
-	)
+	item_state = "atmos_voidsuit"
 	armor = list(melee = 50, bullet = 45, laser = 70, energy = 45, bomb = 35, bio = 100)
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/construction/rcd)

code/modules/clothing/spacesuits/void/engineering.dm

@@ -17,10 +17,7 @@
 	name = "engineering voidsuit"
 	desc = "A run-of-the-mill service voidsuit with all the plating and radiation protection required for industrial work in vacuum."
 	icon_state = "rig-engineering"
-	item_state_slots = list(
-		slot_l_hand_str = "eng_voidsuit",
-		slot_r_hand_str = "eng_voidsuit",
-	)
+	item_state = "eng_voidsuit"
 	siemens_coefficient = 0.3
 	armor = list(melee = 60, bullet = 50, laser = 60, energy = 45, bomb = 35, bio = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/construction/rcd)

code/modules/clothing/spacesuits/void/medical.dm

@@ -16,10 +16,7 @@
 	icon_state = "rig-medical"
 	name = "medical voidsuit"
 	desc = "A sterile voidsuit with minor radiation shielding and a suite of self-cleaning technology. Standard issue in NanoTrasen medical facilities."
-	item_state_slots = list(
-		slot_l_hand_str = "medical_voidsuit",
-		slot_r_hand_str = "medical_voidsuit",
-	)
+	item_state = "medical_voidsuit"
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/device/antibody_scanner)
 	armor = list(melee = 40, bullet = 20, laser = 40, energy = 15, bomb = 0, bio = 100)
 	rad_resist_type = /datum/rad_resist/void_med

code/modules/clothing/spacesuits/void/mining.dm

@@ -17,10 +17,7 @@
 	icon_state = "rig-mining"
 	name = "mining voidsuit"
 	desc = "A grimy, decently armored voidsuit with purple blazes and extra insulation."
-	item_state_slots = list(
-		slot_l_hand_str = "mining_voidsuit",
-		slot_r_hand_str = "mining_voidsuit",
-	)
+	item_state = "mining_voidsuit"
 	armor = list(melee = 110, bullet = 75, laser = 45, energy = 5, bomb = 55, bio = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/stack/flag,/obj/item/device/suit_cooling_unit,/obj/item/storage/ore,/obj/item/device/t_scanner,/obj/item/pickaxe, /obj/item/construction/rcd)
 	rad_resist_type = /datum/rad_resist/deathsquad

code/modules/clothing/spacesuits/void/misc.dm

@@ -4,6 +4,7 @@
 	name = "\improper SWAT suit"
 	desc = "A heavily armored suit that protects against moderate damage. Used in special operations."
 	icon_state = "deathsquad"
+	item_state = "deathsquad"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	allowed = list(/obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/tank)
 	armor = list(melee = 120, bullet = 150, laser = 150, energy = 65, bomb = 90, bio = 100)
@@ -19,9 +20,10 @@
 	name = "deathsquad helmet"
 	desc = "That's not red paint. That's real blood."
 	icon_state = "deathsquad"
+	item_state = "deathsquad"
 	item_state_slots = list(
-		slot_l_hand_str = "syndicate-helm-black-red",
-		slot_r_hand_str = "syndicate-helm-black-red",
+		slot_l_hand_str = "deathsquad",
+		slot_r_hand_str = "deathsquad",
 		)
 	armor = list(melee = 120, bullet = 150, laser = 150, energy = 65, bomb = 90, bio = 100)
 	item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE | ITEM_FLAG_THICKMATERIAL

code/modules/clothing/spacesuits/void/security.dm

@@ -16,10 +16,7 @@
 	icon_state = "rig-sec"
 	name = "security voidsuit"
 	desc = "A heavily armored voidsuit, designed to intimidate people who find black intimidating. Surprisingly slimming."
-	item_state_slots = list(
-		slot_l_hand_str = "sec_voidsuit",
-		slot_r_hand_str = "sec_voidsuit",
-	)
+	item_state = "sec_voidsuit"
 	armor = list(melee = 70, bullet = 100, laser = 70, energy = 5, bomb = 45, bio = 100)
 	allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton)
 	siemens_coefficient = 0.7

code/modules/clothing/spacesuits/void/syndi.dm

@@ -15,10 +15,7 @@
 	icon_state = "rig-syndie"
 	name = "blood-red voidsuit"
 	desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
-	item_state_slots = list(
-		slot_l_hand_str = "syndie_voidsuit",
-		slot_r_hand_str = "syndie_voidsuit",
-	)
+	item_state = "syndie-void"
 	w_class = ITEM_SIZE_LARGE //normally voidsuits are bulky but the syndi voidsuit is 'advanced' or something
 	armor = list(melee = 80, bullet = 100, laser = 120, energy = 35, bomb = 30, bio = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/one_hand,/obj/item/handcuffs)