tweak(clothing): continuing to update the sprites in the hand and min…

…or fix

#12881

code/datums/outfits/spec_op.dm

@@ -18,7 +18,7 @@
 
 /decl/hierarchy/outfit/spec_op_officer/space
 	name = "Spec Ops - Officer in space"
-	suit = /obj/item/clothing/suit/space/void/swat
+	suit = /obj/item/clothing/suit/space/void/deathsquad
 	back = /obj/item/tank/jetpack/oxygen
 	mask = /obj/item/clothing/mask/gas/swat
 

code/game/antagonist/outsider/deathsquad.dm

@@ -55,7 +55,7 @@ GLOBAL_DATUM_INIT(deathsquad, /datum/antagonist/deathsquad, new)
 	player.equip_to_slot_or_del(new /obj/item/ammo_magazine/c50(player), slot_in_backpack)
 	player.equip_to_slot_or_del(new /obj/item/ammo_magazine/c50(player), slot_in_backpack)
 	player.equip_to_slot_or_del(new /obj/item/melee/energy/sword/one_hand(player), slot_l_hand)
-	player.equip_to_slot_or_del(new /obj/item/clothing/suit/space/void/swat(player), slot_wear_suit)
+	player.equip_to_slot_or_del(new /obj/item/clothing/suit/space/void/deathsquad(player), slot_wear_suit)
 	player.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(player), slot_head)
 	player.implant_loyalty(player)
 

code/game/machinery/suit_storage_unit.dm

@@ -1097,71 +1097,71 @@
 		if("Engineering")
 			if(helmet)
 				helmet.SetName("engineering voidsuit helmet")
-				helmet.icon_state = "rig0-engineering"
+				helmet.icon_state = "eng_helm"
 				helmet.item_state = "eng_helm"
 			if(suit)
 				suit.SetName("engineering voidsuit")
-				suit.icon_state = "rig-engineering"
+				suit.icon_state = "eng_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "eng_voidsuit",
 					slot_r_hand_str = "eng_voidsuit",
 				)
 		if("Mining")
 			if(helmet)
 				helmet.SetName("mining voidsuit helmet")
-				helmet.icon_state = "rig0-mining"
+				helmet.icon_state = "mining_helm"
 				helmet.item_state = "mining_helm"
 			if(suit)
 				suit.SetName("mining voidsuit")
-				suit.icon_state = "rig-mining"
+				suit.icon_state = "mining_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "mining_voidsuit",
 					slot_r_hand_str = "mining_voidsuit",
 				)
 		if("Science")
 			if(helmet)
 				helmet.SetName("excavation voidsuit helmet")
-				helmet.icon_state = "rig0-excavation"
+				helmet.icon_state = "excavation_helm"
 				helmet.item_state = "excavation_helm"
 			if(suit)
 				suit.SetName("excavation voidsuit")
-				suit.icon_state = "rig-excavation"
+				suit.icon_state = "excavation_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "excavation_voidsuit",
 					slot_r_hand_str = "excavation_voidsuit",
 				)
 		if("Medical")
 			if(helmet)
 				helmet.SetName("medical voidsuit helmet")
-				helmet.icon_state = "rig0-medical"
+				helmet.icon_state = "medical_helm"
 				helmet.item_state = "medical_helm"
 			if(suit)
 				suit.SetName("medical voidsuit")
-				suit.icon_state = "rig-medical"
+				suit.icon_state = "medical_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "medical_voidsuit",
 					slot_r_hand_str = "medical_voidsuit",
 				)
 		if("Security")
 			if(helmet)
 				helmet.SetName("security voidsuit helmet")
-				helmet.icon_state = "rig0-sec"
+				helmet.icon_state = "sec_helm"
 				helmet.item_state = "sec_helm"
 			if(suit)
 				suit.SetName("security voidsuit")
-				suit.icon_state = "rig-sec"
+				suit.icon_state = "sec_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "sec_voidsuit",
 					slot_r_hand_str = "sec_voidsuit",
 				)
 		if("Atmos")
 			if(helmet)
 				helmet.SetName("atmospherics voidsuit helmet")
-				helmet.icon_state = "rig0-atmos"
+				helmet.icon_state = "atmos_helm"
 				helmet.item_state = "atmos_helm"
 			if(suit)
 				suit.SetName("atmospherics voidsuit")
-				suit.icon_state = "rig-atmos"
+				suit.icon_state = "atmos_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "atmos_voidsuit",
 					slot_r_hand_str = "atmos_voidsuit",
@@ -1178,23 +1178,23 @@
 		if("^%###^%$",  "Syndicate")
 			if(helmet)
 				helmet.SetName("blood-red voidsuit helmet")
-				helmet.icon_state = "rig0-syndie"
+				helmet.icon_state = "syndie_helm"
 				helmet.item_state = "syndie_helm"
 			if(suit)
 				suit.SetName("blood-red voidsuit")
-				suit.icon_state = "rig-syndie"
+				suit.icon_state = "syndie_voidsuit"
 				suit.item_state_slots = list(
 					slot_l_hand_str = "syndie_voidsuit",
 					slot_r_hand_str = "syndie_voidsuit",
 				)
 		if("Pilot")
 			if(helmet)
 				helmet.SetName("pilot voidsuit helmet")
-				helmet.icon_state = "rig0_pilot"
+				helmet.icon_state = "pilot_helm"
 				helmet.item_state = "pilot_helm"
 			if(suit)
 				suit.SetName("pilot voidsuit")
-				suit.icon_state = "rig-pilot"
+				suit.icon_state = "pilot_voidsuit"
 
 	if(helmet) helmet.SetName("refitted [helmet.name]")
 	if(suit) suit.SetName("refitted [suit.name]")

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -61,7 +61,7 @@
 		/obj/item/clothing/head/helmet/swat = 2,
 		/obj/item/clothing/mask/gas = 2,
 		/obj/item/clothing/shoes/swat = 2,
-		/obj/item/clothing/suit/space/void/swat = 2,
+		/obj/item/clothing/suit/space/void/deathsquad = 2,
 		/obj/item/clothing/under/syndicate/tacticool = 2)
 
 /obj/structure/closet/thunderdome

code/modules/clothing/head.dm

@@ -4,8 +4,8 @@
 	name = "head"
 	icon = 'icons/obj/clothing/hats.dmi'
 	item_icons = list(
-		slot_l_hand_str = 'icons/mob/onmob/items/lefthand_hats.dmi',
-		slot_r_hand_str = 'icons/mob/onmob/items/righthand_hats.dmi',
+		slot_l_hand_str = 'icons/inv_slots/hats/hand_l_default.dmi',
+		slot_r_hand_str = 'icons/inv_slots/hats/hand_r_default.dmi',
 		)
 	body_parts_covered = HEAD
 	slot_flags = SLOT_HEAD

code/modules/clothing/head/helmet.dm

@@ -2,10 +2,7 @@
 	name = "helmet"
 	desc = "Reinforced headgear. Protects the head from impacts."
 	icon_state = "helmet"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet",
-		slot_r_hand_str = "helmet",
-		)
+	item_state = "helmet"
 	valid_accessory_slots = list(ACCESSORY_SLOT_HELM_C, ACCESSORY_SLOT_HELM_H)
 	restricted_accessory_slots = list(ACCESSORY_SLOT_HELM_C, ACCESSORY_SLOT_HELM_H)
 	item_flags = ITEM_FLAG_THICKMATERIAL

code/modules/clothing/head/misc.dm

@@ -251,6 +251,7 @@
 	name = "witch costume wig"
 	desc = "Eeeee~heheheheheheh!"
 	icon_state = "witch"
+	item_state = "witch"
 	flags_inv = BLOCKHAIR
 	siemens_coefficient = 2.0
 	armor = list(melee = 5, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0)

code/modules/clothing/spacesuits/spacesuits.dm

@@ -5,13 +5,10 @@
 /obj/item/clothing/head/helmet/space
 	name = "Space helmet"
 	icon_state = "space"
+	item_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE | ITEM_FLAG_THICKMATERIAL | ITEM_FLAG_AIRTIGHT
 	flags_inv = BLOCKHAIR
-	item_state_slots = list(
-		slot_l_hand_str = "s_helmet",
-		slot_r_hand_str = "s_helmet",
-		)
 	permeability_coefficient = 0
 	armor = list(melee = 40, bullet = 10, laser = 35,energy = 15, bomb = 0, bio = 100)
 	coverage = 1.0

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

@@ -3,6 +3,7 @@
 	name = "void helmet"
 	desc = "A high-tech dark red space suit helmet. Used for AI satellite maintenance."
 	icon_state = "void"
+	item_state = "void"
 
 	heat_protection = HEAD
 	armor = list(melee = 40, bullet = 20, laser = 35,energy = 15, bomb = 35, bio = 100)
@@ -23,8 +24,8 @@
 
 /obj/item/clothing/suit/space/void
 	name = "voidsuit"
-	icon_state = "void"
-	item_state = "void"
+	icon_state = "voidsuit"
+	item_state = "voidsuit"
 	w_class = ITEM_SIZE_HUGE//bulky item
 	desc = "A high-tech dark red space suit. Used for AI satellite maintenance."
 	armor = list(melee = 40, bullet = 20, laser = 35,energy = 15, bomb = 35, bio = 100)

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

@@ -3,12 +3,8 @@
 /obj/item/clothing/head/helmet/space/void/atmos
 	name = "atmospherics voidhelmet"
 	desc = "A flame-retardant voidsuit helmet with a self-repairing visor and light anti-radiation shielding."
-	icon_state = "rig0-atmos"
+	icon_state = "atmos_helm"
 	item_state = "atmos_helm"
-	item_state_slots = list(
-		slot_l_hand_str = "atmos_helm",
-		slot_r_hand_str = "atmos_helm",
-		)
 	armor = list(melee = 50, bullet = 45, laser = 70, energy = 45, bomb = 35, bio = 100)
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	light_overlay = "helmet_light_dual_low"
@@ -17,7 +13,7 @@
 /obj/item/clothing/suit/space/void/atmos
 	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"
+	icon_state = "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
@@ -32,16 +28,17 @@
 /obj/item/clothing/head/helmet/space/void/atmos/alt
 	name = "atmos hardsuit helmet"
 	desc = "A voidsuit helmet plated with an expensive heat and radiation resistant ceramic."
-	icon_state = "rig0-atmosalt"
+	icon_state = "atmosalt_helm"
 	item_state = "atmosalt_helm"
 	armor = list(melee = 50, bullet = 45, laser = 90, energy = 45, bomb = 45, bio = 100)
 	max_heat_protection_temperature = ATMOS_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	light_overlay = "helmet_light"
 
 /obj/item/clothing/suit/space/void/atmos/alt
-	desc = "An expensive NanoTrasen voidsuit, rated to withstand extreme heat and even minor radiation without exceeding room temperature within."
-	icon_state = "rig-atmosalt"
 	name = "atmos hardsuit"
+	desc = "An expensive NanoTrasen voidsuit, rated to withstand extreme heat and even minor radiation without exceeding room temperature within."
+	icon_state = "atmosalt_voidsuit"
+	item_state = "atmosalt_voidsuit"
 	armor = list(melee = 50, bullet = 45, laser = 90, energy = 45, bomb = 45, bio = 100)
 	max_heat_protection_temperature = ATMOS_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 

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

@@ -3,20 +3,16 @@
 /obj/item/clothing/head/helmet/space/void/engineering
 	name = "engineering voidhelmet"
 	desc = "A sturdy looking voidsuit helmet rated to protect against radiation."
-	icon_state = "rig0-engineering"
+	icon_state = "eng_helm"
 	item_state = "eng_helm"
-	item_state_slots = list(
-		slot_l_hand_str = "eng_helm",
-		slot_r_hand_str = "eng_helm",
-		)
 	siemens_coefficient = 0.3
 	armor = list(melee = 60, bullet = 50, laser = 60, energy = 45, bomb = 35, bio = 100)
 	rad_resist_type = /datum/rad_resist/void_engi_salvage
 
 /obj/item/clothing/suit/space/void/engineering
 	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"
+	icon_state = "eng_voidsuit"
 	item_state = "eng_voidsuit"
 	siemens_coefficient = 0.3
 	armor = list(melee = 60, bullet = 50, laser = 60, energy = 45, bomb = 35, bio = 100)
@@ -35,15 +31,16 @@
 /obj/item/clothing/head/helmet/space/void/engineering/alt
 	name = "engineering hardsuit helmet"
 	desc = "A heavy, radiation-shielded voidsuit helmet with a surprisingly comfortable interior."
-	icon_state = "rig0-engineeringalt"
+	icon_state = "engalt_helm"
 	item_state = "engalt_helm"
 	armor = list(melee = 80, bullet = 70, laser = 60, energy = 65, bomb = 35, bio = 100)
 	light_overlay = "helmet_light_dual_low"
 
 /obj/item/clothing/suit/space/void/engineering/alt
 	name = "engineering hardsuit"
 	desc = "A bulky industrial voidsuit. It's a few generations old, but a reliable design and radiation shielding make up for the lack of climate control."
-	icon_state = "rig-engineeringalt"
+	icon_state = "engalt_voidsuit"
+	item_state = "engalt_voidsuit"
 	armor = list(melee = 80, bullet = 70, laser = 60, energy = 65, bomb = 35, bio = 100)
 
 /obj/item/clothing/suit/space/void/engineering/alt/New()

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

@@ -3,19 +3,15 @@
 /obj/item/clothing/head/helmet/space/void/medical
 	name = "medical voidhelmet"
 	desc = "A bulbous voidsuit helmet with minor radiation shielding and a massive visor."
-	icon_state = "rig0-medical"
+	icon_state = "medical_helm"
 	item_state = "medical_helm"
-	item_state_slots = list(
-		slot_l_hand_str = "medical_helm",
-		slot_r_hand_str = "medical_helm",
-		)
 	armor = list(melee = 40, bullet = 20, laser = 40, energy = 15, bomb = 0, bio = 100)
 	rad_resist_type = /datum/rad_resist/void_med
 
 /obj/item/clothing/suit/space/void/medical
-	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."
+	icon_state = "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)
@@ -34,14 +30,15 @@
 /obj/item/clothing/head/helmet/space/void/medical/alt
 	name = "streamlined medical voidhelmet"
 	desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a fetching blue."
-	icon_state = "rig0-medicalalt"
+	icon_state = "medicalalt_helm"
 	item_state = "medicalalt_helm"
 	armor = list(melee = 45, bullet = 20, laser = 40, energy = 15, bomb = 0, bio = 100)
 	light_overlay = "helmet_light_dual_green"
 
 /obj/item/clothing/suit/space/void/medical/alt
-	icon_state = "rig-medicalalt"
 	name = "streamlined medical voidsuit"
+	icon_state = "medicalalt_voidsuit"
+	item_state = "medicalalt_voidsuit"
 	desc = "A more recent model of Vey-Med voidsuit, featuring the latest in radiation shielding technology, without sacrificing comfort or style."
 	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 = 45, bullet = 20, laser = 40, energy = 15, bomb = 0, bio = 100)

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

@@ -3,20 +3,16 @@
 /obj/item/clothing/head/helmet/space/void/mining
 	name = "mining voidhelmet"
 	desc = "A scuffed voidsuit helmet with a boosted communication system and reinforced armor plating."
-	icon_state = "rig0-mining"
+	icon_state = "mining_helm"
 	item_state = "mining_helm"
-	item_state_slots = list(
-		slot_l_hand_str = "mining_helm",
-		slot_r_hand_str = "mining_helm",
-		)
 	armor = list(melee = 110, bullet = 75, laser = 45, energy = 5, bomb = 55, bio = 100)
 	light_overlay = "helmet_light_dual_low"
 	rad_resist_type = /datum/rad_resist/deathsquad
 
 /obj/item/clothing/suit/space/void/mining
-	icon_state = "rig-mining"
 	name = "mining voidsuit"
 	desc = "A grimy, decently armored voidsuit with purple blazes and extra insulation."
+	icon_state = "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)
@@ -29,14 +25,15 @@
 /obj/item/clothing/head/helmet/space/void/mining/alt
 	name = "frontier mining voidhelmet"
 	desc = "An armored voidsuit helmet. Someone must have through they were pretty cool when they painted a mohawk on it."
-	icon_state = "rig0-miningalt"
+	icon_state = "miningalt_helm"
 	item_state = "miningalt_helm"
 	armor = list(melee = 50, bullet = 15, laser = 20,energy = 5, bomb = 55, bio = 100)
 
 /obj/item/clothing/suit/space/void/mining/alt
-	icon_state = "rig-miningalt"
 	name = "frontier mining voidsuit"
 	desc = "A cheap prospecting voidsuit. What it lacks in comfort it makes up for in armor plating and street cred."
+	icon_state = "miningalt_voidsuit"
+	item_state = "miningalt_voidsuit"
 	armor = list(melee = 50, bullet = 15, laser = 20,energy = 5, bomb = 55, bio = 100)
 
 /obj/item/clothing/suit/space/void/mining/alt/prepared
@@ -46,14 +43,15 @@
 /obj/item/clothing/head/helmet/space/void/mining/reinforced
 	name = "mining hardsuit helmet"
 	desc = "An armored hardsuit helmet. Provides exceptionally good protection against aggressive asteroid dwellers."
-	icon_state = "rig0-miningref"
+	icon_state = "miningref_helm"
 	item_state = "miningref_helm"
 	armor = list(melee = 125, bullet = 80, laser = 65, energy = 15, bomb = 65, bio = 100)
 
 /obj/item/clothing/suit/space/void/mining/reinforced
-	icon_state = "rig-miningref"
 	name = "mining hardsuit"
 	desc = "A heavy-duty prospecting hardsuit. What it lacks in comfort it makes up for in armor plating and street cred."
+	icon_state = "miningref_voidsuit"
+	item_state = "miningref_voidsuit"
 	armor = list(melee = 125, bullet = 80, laser = 65, energy = 15, bomb = 65, bio = 100)
 
 /obj/item/clothing/suit/space/void/mining/reinforced/prepared