tweak(armor): adding sprites in the hand to a lot of armor

#12826

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -9,6 +9,7 @@
 	name = "Santa's suit"
 	desc = "Festive!"
 	icon_state = "santa"
+	item_state = "santa"
 	item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE
 	allowed = list(/obj/item) //for stuffing exta special presents
 

code/modules/clothing/spacesuits/spacesuits.dm

@@ -72,14 +72,7 @@
 	name = "Space suit"
 	desc = "A suit that protects against low pressure environments."
 	icon_state = "space"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/onmob/items/lefthand_spacesuits.dmi',
-		slot_r_hand_str = 'icons/mob/onmob/items/righthand_spacesuits.dmi',
-		)
-	item_state_slots = list(
-		slot_l_hand_str = "s_suit",
-		slot_r_hand_str = "s_suit",
-	)
+	item_state = "space"
 	w_class = ITEM_SIZE_LARGE//large item
 	gas_transfer_coefficient = 0
 	permeability_coefficient = 0

code/modules/clothing/spacesuits/syndi.dm

@@ -11,10 +11,7 @@
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"
 	icon_state = "syndicate"
-	item_state_slots = list(
-		slot_l_hand_str = "space_suit_syndicate",
-		slot_r_hand_str = "space_suit_syndicate",
-	)
+	item_state = "syndicate"
 	desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	w_class = ITEM_SIZE_NORMAL
 	allowed = list(/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,/obj/item/tank/emergency)
@@ -36,29 +33,18 @@
 /obj/item/clothing/suit/space/syndicate/green
 	name = "green space suit"
 	icon_state = "syndicate-green"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-green",
-		slot_r_hand_str = "syndicate-green",
-	)
-
+	item_state = "syndicate-green"
 
 //Dark green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/green/dark
 	name = "dark green space helmet"
 	icon_state = "syndicate-helm-green-dark"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-helm-green-dark",
-		slot_r_hand_str = "syndicate-helm-green-dark",
-	)
+	item_state = "syndicate-helm-green-dark"
 
 /obj/item/clothing/suit/space/syndicate/green/dark
 	name = "dark green space suit"
 	icon_state = "syndicate-green-dark"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-green-dark",
-		slot_r_hand_str = "syndicate-green-dark",
-	)
-
+	item_state = "syndicate-green-dark"
 
 //Orange syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/orange
@@ -69,11 +55,7 @@
 /obj/item/clothing/suit/space/syndicate/orange
 	name = "orange space suit"
 	icon_state = "syndicate-orange"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-orange",
-		slot_r_hand_str = "syndicate-orange",
-	)
-
+	item_state = "syndicate-orange"
 
 //Blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/blue
@@ -84,11 +66,7 @@
 /obj/item/clothing/suit/space/syndicate/blue
 	name = "blue space suit"
 	icon_state = "syndicate-blue"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-blue",
-		slot_r_hand_str = "syndicate-blue",
-	)
-
+	item_state = "syndicate-blue"
 
 //Black syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black
@@ -99,11 +77,7 @@
 /obj/item/clothing/suit/space/syndicate/black
 	name = "black space suit"
 	icon_state = "syndicate-black"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black",
-		slot_r_hand_str = "syndicate-black",
-	)
-
+	item_state = "syndicate-black"
 
 //Black-green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/green
@@ -114,11 +88,7 @@
 /obj/item/clothing/suit/space/syndicate/black/green
 	name = "black and green space suit"
 	icon_state = "syndicate-black-green"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black-green",
-		slot_r_hand_str = "syndicate-black-green",
-	)
-
+	item_state = "syndicate-black-green"
 
 //Black-blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/blue
@@ -129,11 +99,7 @@
 /obj/item/clothing/suit/space/syndicate/black/blue
 	name = "black and blue space suit"
 	icon_state = "syndicate-black-blue"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black-blue",
-		slot_r_hand_str = "syndicate-black-blue",
-	)
-
+	item_state = "syndicate-black-blue"
 
 //Black medical syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/med
@@ -144,11 +110,7 @@
 /obj/item/clothing/suit/space/syndicate/black/med
 	name = "black medical space suit"
 	icon_state = "syndicate-black-med"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black",
-		slot_r_hand_str = "syndicate-black",
-	)
-
+	item_state = "syndicate-black-med"
 
 //Black-orange syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/orange
@@ -159,11 +121,7 @@
 /obj/item/clothing/suit/space/syndicate/black/orange
 	name = "black and orange space suit"
 	icon_state = "syndicate-black-orange"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black",
-		slot_r_hand_str = "syndicate-black",
-	)
-
+	item_state = "syndicate-black-orange"
 
 //Black-red syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/red
@@ -174,10 +132,7 @@
 /obj/item/clothing/suit/space/syndicate/black/red
 	name = "black and red space suit"
 	icon_state = "syndicate-black-red"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black-red",
-		slot_r_hand_str = "syndicate-black-red",
-	)
+	item_state = "syndicate-black-red"
 
 //Black with yellow/red engineering syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/engie
@@ -188,7 +143,4 @@
 /obj/item/clothing/suit/space/syndicate/black/engie
 	name = "black engineering space suit"
 	icon_state = "syndicate-black-engie"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-black",
-		slot_r_hand_str = "syndicate-black",
-	)
+	item_state = "syndicate-black-engie"

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

@@ -24,7 +24,7 @@
 /obj/item/clothing/suit/space/void
 	name = "voidsuit"
 	icon_state = "void"
-	//item_state = "syndie_hardsuit"
+	item_state = "void"
 	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

@@ -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
@@ -58,6 +55,7 @@
 
 /obj/item/clothing/suit/space/void/security/hos
 	icon_state = "rig-sechos"
+	item_state = "sechos_voidsuit"
 	name = "security commander voidsuit"
 	desc = "A heavily armored voidsuit. Gold trimming shows who's the boss here, while heavy pauldrons and kama make it extra durable."
 	armor = list(melee = 80, bullet = 120, laser = 90, energy = 35, bomb = 45, bio = 100)

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)

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

@@ -16,6 +16,7 @@
 
 /obj/item/clothing/suit/space/void/wizard
 	icon_state = "rig-wiz"
+	item_state = "wizard-void"
 	name = "gem-encrusted voidsuit"
 	desc = "A bizarre gem-encrusted suit that radiates magical energies."
 	w_class = ITEM_SIZE_LARGE //normally voidsuits are bulky but this one is magic I suppose

code/modules/clothing/suit.dm

@@ -3,6 +3,10 @@
 /obj/item/clothing/suit
 	name = "suit"
 	icon = 'icons/obj/clothing/suits.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/inv_slots/suits/hand_l_default.dmi',
+		slot_r_hand_str = 'icons/inv_slots/suits/hand_r_default.dmi',
+		)
 	w_class = ITEM_SIZE_NORMAL
 
 	siemens_coefficient = 0.9

code/modules/clothing/suits/alien.dm

@@ -88,7 +88,7 @@
 	allowed = list(/obj/item/gun, /obj/item/tank)
 	armor = list(melee = 70, bullet = 30, laser = 20,energy = 5, bomb = 40, bio = 0) //Higher melee armor versus lower everything else.
 	icon_state = "vox-scrap"
-	icon_state = "vox-scrap"
+	item_state = "vox-scrap"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
 	species_restricted = list(SPECIES_VOX)
 	siemens_coefficient = 1 //Its literally metal