Voidsuit Icon Repaths (#18651)

* repaths various factional voidsuit icons

* tweak to gear loadout messages

* sol fix

* the new standard, apparently

* konyang voidsuit -> coalition.dmi

code/datums/uplink/gear loadout.dm

@@ -48,12 +48,12 @@
 
 /datum/uplink_item/item/gear_loadout/dominia
 	name = "Empire of Dominia Assets (Group)"
-	desc = "A crate containing gear for a group. The voidsuits and the hardsuit are only usable by humans."
+	desc = "A crate containing gear for a group. The voidsuits and the hardsuit are only usable by humans and Unathi."
 	path = /obj/structure/closet/crate/secure/gear_loadout/dominia
 
 /datum/uplink_item/item/gear_loadout/dominia_single
 	name = "Empire of Dominia Assets (Single)"
-	desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans."
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans and Unathi."
 	path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single
 	telecrystal_cost = 10
 

code/modules/clothing/spacesuits/void/alien/unathi.dm

@@ -136,7 +136,6 @@
 	name = "hegemony military voidsuit"
 	desc = "A Hephaestus-manufactured armoured voidsuit, made for Unathi. The standard spacefaring attire of the Izweski Hegemony Navy."
 	icon = 'icons/obj/clothing/voidsuit/hegemony.dmi'
-	icon_override = 'icons/mob/species/unathi/suit.dmi'
 	icon_state = "hegemony-voidsuit"
 	item_state = "hegemony-voidsuit_item"
 
@@ -158,9 +157,9 @@
 	name = "hegemony military helmet"
 	desc = "A Hephaestus-manufactured armoured space helmet, made for Unathi. Usually seen on soldiers of the Izweski Hegemony Navy."
 	icon = 'icons/obj/clothing/voidsuit/hegemony.dmi'
-	icon_override = 'icons/mob/species/unathi/helmet.dmi'
 	icon_state = "hegemony-voidhelm"
-	item_state = "hegemony-voidhelm_item"
+	item_state = "hegemony-voidhelm"
+	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,
 		bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -180,37 +179,37 @@
 	name = "hegemony specialist voidsuit"
 	desc = "A Hephaestus-manufactured armoured voidsuit, made for Unathi. This one bears a green insignia, marking the wearer as a specialist within the Izweski Navy."
 	icon_state = "hegemony-voidsuit-spec"
-	item_state = "hegemony-voidsuit-spec_item"
+	item_state = "hegemony-voidsuit-spec"
 
 /obj/item/clothing/head/helmet/space/void/hegemony/specialist
 	name = "hegemony specialist helmet"
 	desc = "A Hephaestus-manufactured armoured space helmet, made for Unathi. This one bears a green insignia, marking the wearer as a specialist within the Izweski Navy."
 	icon_state = "hegemony-voidhelm-spec"
-	item_state = "hegemony-voidhelm-spec_item"
+	item_state = "hegemony-voidhelm-spec"
 
 /obj/item/clothing/suit/space/void/hegemony/captain
 	name = "hegemony captain's voidsuit"
 	desc = "A Hephaestus-manufactured armoured voidsuit, made for Unathi. This one bears a purple insignia, marking the wearer as a captain within the Izweski Navy."
 	icon_state = "hegemony-voidsuit-lead"
-	item_state = "hegemony-voidsuit-lead_item"
+	item_state = "hegemony-voidsuit-lead"
 
 /obj/item/clothing/head/helmet/space/void/hegemony/captain
 	name = "hegemony captain's helmet"
 	desc = "A Hephaestus-manufactured armoured space helmet, made for Unathi. This one bears a purple insignia, marking the wearer as a captain within the Izweski Navy."
 	icon_state = "hegemony-voidhelm-lead"
-	item_state = "hegemony-voidhelm-lead_item"
+	item_state = "hegemony-voidhelm-lead"
 
 /obj/item/clothing/suit/space/void/hegemony/priest
 	name = "hegemony priest's voidsuit"
 	desc = "A Hephaestus-manufactured armoured voidsuit, made for Unathi. This one bears a white insignia, marking the wearer as a Sk'akh priest within the Izweski Navy."
 	icon_state = "hegemony-voidsuit-priest"
-	item_state = "hegemony-voidsuit-priest_item"
+	item_state = "hegemony-voidsuit-priest"
 
 /obj/item/clothing/head/helmet/space/void/hegemony/priest
 	name = "hegemony priest's helmet"
 	desc = "A Hephaestus-manufactured armoured space helmet, made for Unathi. This one bears a purple insignia, marking the wearer as a Sk'akh priest within the Izweski Navy."
 	icon_state = "hegemony-voidhelm-priest"
-	item_state = "hegemony-voidhelm-priest_item"
+	item_state = "hegemony-voidhelm-priest"
 
 /obj/item/clothing/suit/space/void/unathi_pirate/tarwa
 	name = "tarwa conglomerate voidsuit"

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

@@ -1,8 +1,10 @@
 /obj/item/clothing/head/helmet/space/void/sol
 	name = "gargoyle voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military."
+	icon = 'icons/obj/clothing/voidsuit/sol.dmi'
 	icon_state = "sol_helmet"
 	item_state = "sol_helmet"
+	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
 		bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -21,8 +23,10 @@
 /obj/item/clothing/suit/space/void/sol
 	name = "gargoyle voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military."
+	icon = 'icons/obj/clothing/voidsuit/sol.dmi'
 	icon_state = "sol_suit"
 	item_state = "sol_suit"
+	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
 		bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -42,8 +46,10 @@
 	name = "coalition vulture voidsuit helmet"
 	desc = "A helmet resembling an avian, built for the All-Xanu Grand Army and the Frontier Rangers. Heavy and plated with plasteel across its faces."
 	desc_extended = "The dNAXS-02 \"Vulture\" suit (formerly designated the dNXS-2) was designed by de Namur Defense Systems on Xanu in 2291, to provide the All-Xanu Grand Army with a modern voidsuit using the lessons learned from the then-recently ended Interstellar War. This model of voidsuit, designed to look like an avian, has been extremely successful and has been exported across the Coalition of Colonies and beyond. These wildly successful voidsuits are still produced to this day by de Namur's successor company, d.N.A Defense & Aerospace."
-	icon_state = "vulture"
-	item_state = "vulture"
+	icon = 'icons/obj/clothing/voidsuit/coalition.dmi'
+	icon_state = "vulture_helmet"
+	item_state = "vulture_helmet"
+	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
 		bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -55,15 +61,21 @@
 	)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC, BODYTYPE_SKRELL, BODYTYPE_TAJARA)
+	icon_supported_species_tags = list("ipc", "skr", "taj")
+	icon_auto_adapt = TRUE
+	icon_species_in_hand = TRUE
 
 	brightness_on = 6
+	refittable = FALSE
 
 /obj/item/clothing/suit/space/void/coalition
 	name = "coalition vulture voidsuit"
 	desc = "An iconic voidsuit of Xanan make, designed after the Interstellar War. It sees use to this day all throughout the Coalition of Colonies."
 	desc_extended = "The dNAXS-02 \"Vulture\" suit (formerly designated the dNXS-2) was designed by de Namur Defense Systems on Xanu in 2291, to provide the All-Xanu Grand Army with a modern voidsuit using the lessons learned from the then-recently ended Interstellar War. This model of voidsuit, designed to look like an avian, has been extremely successful and has been exported across the Coalition of Colonies and beyond. These wildly successful voidsuits are still produced to this day by de Namur's successor company, d.N.A Defense & Aerospace."
+	icon = 'icons/obj/clothing/voidsuit/coalition.dmi'
 	icon_state = "vulture"
 	item_state = "vulture"
+	contained_sprite = TRUE
 	slowdown = 1
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
@@ -77,53 +89,34 @@
 	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,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC, BODYTYPE_SKRELL, BODYTYPE_TAJARA)
+	icon_supported_species_tags = list("ipc", "skr", "taj")
+	icon_auto_adapt = TRUE
+	icon_species_in_hand = TRUE
+	refittable = FALSE
 
-/obj/item/clothing/head/helmet/space/void/xanu
+/obj/item/clothing/head/helmet/space/void/coalition/xanu
 	name = "\improper Xanan eagle voidsuit helmet"
 	desc = "An advanced voidsuit helmet, designed specifically for the All-Xanu Armed Forces as a major upgrade to the iconic vulture voidsuit. Its armor has been upgraded, but it feels no heavier than a vulture."
 	desc_extended = "The dNAXS-24 \"Eagle\" suit was commissioned by the All-Xanu Armed Forces as an upgrade to the aging vulture voidsuit in 2437. Having met all the requirements set out and more, the suit has been adopted by the majority of the Xanan armed forces, with only the National Militia still using the older vulture suits regularly. Despite the upgrades however, these suits have rarely been exported out of Xanu, due to its high cost."
-	icon = 'icons/obj/clothing/voidsuit/xanu.dmi'
 	icon_state = "xanu_void_helmet"
 	item_state = "xanu_void_helmet"
-	contained_sprite = TRUE
-	armor = list(
-		melee = ARMOR_MELEE_MAJOR,
-		bullet = ARMOR_BALLISTIC_CARBINE,
-		laser = ARMOR_LASER_KEVLAR,
-		energy = ARMOR_ENERGY_MINOR,
-		bomb = ARMOR_BOMB_PADDED,
-		bio = ARMOR_BIO_SHIELDED,
-		rad = ARMOR_RAD_SMALL
-	)
 	siemens_coefficient = 0.35
-	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL)
 
 	light_overlay = "helmet_light_xanu_voidsuit"
 	brightness_on = 6
-	refittable = FALSE
 
-/obj/item/clothing/suit/space/void/xanu
+/obj/item/clothing/suit/space/void/coalition/xanu
 	name = "\improper Xanan eagle voidsuit"
 	desc = "An advanced voidsuit, designed specifically for the All-Xanu Armed Forces as a major upgrade to the iconic vulture voidsuit. Its armor has been upgraded, but it feels no heavier than a vulture."
 	desc_extended = "The dNAXS-24 \"Eagle\" suit was commissioned by the All-Xanu Armed Forces as an upgrade to the aging vulture voidsuit in 2437. Having met all the requirements set out and more, the suit has been adopted by the majority of the Xanan armed forces, with only the National Militia still using the older vulture suits regularly. Despite the upgrades however, these suits have rarely been exported out of Xanu, due to its high cost."
-	icon = 'icons/obj/clothing/voidsuit/xanu.dmi'
 	icon_state = "xanu_voidsuit"
 	item_state = "xanu_voidsuit"
 	contained_sprite = TRUE
 	slowdown = 1
-	armor = list(
-		melee = ARMOR_MELEE_MAJOR,
-		bullet = ARMOR_BALLISTIC_CARBINE,
-		laser = ARMOR_LASER_KEVLAR,
-		energy = ARMOR_ENERGY_MINOR,
-		bomb = ARMOR_BOMB_PADDED,
-		bio = ARMOR_BIO_SHIELDED,
-		rad = ARMOR_RAD_SMALL
-	)
 	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,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
-	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
-	refittable = FALSE
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL)
 
 /obj/item/clothing/head/helmet/space/void/cruiser
 	name = "cruiser voidsuit helmet"
@@ -168,8 +161,10 @@
 /obj/item/clothing/head/helmet/space/void/valkyrie
 	name = "valkyrie voidsuit helmet"
 	desc = "A slot-eyed space helmet, sleek and designed for military purposes. Colored in Elyran military camouflage."
-	icon_state = "valkyrie"
-	item_state = "valkyrie"
+	icon_state = "valkyrie_helmet"
+	item_state = "valkyrie_helmet"
+	icon = 'icons/obj/clothing/voidsuit/elyra.dmi'
+	contained_sprite = TRUE
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
 		bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -190,6 +185,8 @@
 	desc = "A pricey specialist voidsuit designed for atmospheric long jumping and combat. Colored in Elyran military camouflage."
 	icon_state = "valkyrie"
 	item_state = "valkyrie"
+	icon = 'icons/obj/clothing/voidsuit/elyra.dmi'
+	contained_sprite = TRUE
 	slowdown = 1
 	armor = list(
 		melee = ARMOR_MELEE_RESISTANT,
@@ -511,7 +508,7 @@
 /obj/item/clothing/head/helmet/space/void/dominia
 	name = "dominian prejoroub combat helmet"
 	desc = "A glamorous, decorated helmet with thick plating across its faces. It holds the emblematic markings of the Empire of Dominia, if its design wasn't unmistakable enough."
-	icon = 'icons/clothing/rig/dominia.dmi'
+	icon = 'icons/obj/clothing/voidsuit/dominia.dmi'
 	icon_state = "dvoidsuithelm"
 	item_state = "dvoidsuithelm"
 	contained_sprite = 1
@@ -526,26 +523,24 @@
 		rad = ARMOR_RAD_SMALL
 	)
 	siemens_coefficient = 0.35
-	species_restricted = list(BODYTYPE_HUMAN)
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
 	brightness_on = 6
+	icon_supported_species_tags = list("una")
+	icon_auto_adapt = TRUE
 
 /obj/item/clothing/head/helmet/space/void/dominia/voidsman
 	name = "dominian voidsman helmet"
 	desc = "A Dominian voidsuit helmet issued to imperial fleet voidsmen. Not as flashy as most Dominian equipment tends to be."
 	icon_state = "voidsmanhelm"
 	item_state = "voidsmanhelm"
-
-/obj/item/clothing/head/helmet/space/void/dominia/unathi
-	name = "dominian unathi prejoroub combat helmet"
-	icon_state = "una_dvoidsuithelm"
-	item_state = "una_dvoidsuithelm"
-
-	species_restricted = list(BODYTYPE_UNATHI)
+	species_restricted = list(BODYTYPE_HUMAN)
+	icon_supported_species_tags = null
+	icon_auto_adapt = FALSE
 
 /obj/item/clothing/suit/space/void/dominia
 	name = "dominian prejoroub combat suit"
 	desc = "An offshoot of the Coalition's vulture suit design, painted in Dominian colors with portability and maneuverability in mind over its bulkier counterpart."
-	icon = 'icons/clothing/rig/dominia.dmi'
+	icon = 'icons/obj/clothing/voidsuit/dominia.dmi'
 	icon_state = "dvoidsuit"
 	item_state = "dvoidsuit"
 	contained_sprite = 1
@@ -563,21 +558,19 @@
 	)
 	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,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
-	species_restricted = list(BODYTYPE_HUMAN)
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
+	icon_supported_species_tags = list("una")
+	icon_auto_adapt = TRUE
 
 /obj/item/clothing/suit/space/void/dominia/voidsman
 	name = "dominian voidsman suit"
 	desc = "A Dominian voidsuit helmet issued to imperial fleet voidsmen. Not as flashy as most Dominian equipment tends to be."
 	icon_state = "voidsman"
 	item_state = "voidsman"
+	species_restricted = list(BODYTYPE_HUMAN)
+	icon_supported_species_tags = null
+	icon_auto_adapt = FALSE
 
-/obj/item/clothing/suit/space/void/dominia/unathi
-	name = "dominian unathi prejoroub combat suit"
-	desc = "An offshoot of the Coalition's vulture suit design, painted in Dominian colors with portability and maneuverability in mind over its bulkier counterpart. This variant is fit for an Unathi."
-	icon_state = "una_dvoidsuit"
-	item_state = "una_dvoidsuit"
-
-	species_restricted = list(BODYTYPE_UNATHI)
 /obj/item/clothing/head/helmet/space/void/golden_deep
 	name = "golden helmet"
 	desc = "A glamorous, decorated helmet plated with gold. Very hefty."
@@ -709,7 +702,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	icon_state = "rig0-himeotaj"
 	item_state = "rig0-himeotaj"
 	item_state_slots = list(
@@ -726,7 +719,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	item_state = "rig-himeotaj"
 	icon_state = "rig-himeotaj"
 	item_state_slots = list(
@@ -742,7 +735,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	icon_state = "rig0-himeotaj-engineering"
 	item_state = "rig0-himeotaj-engineering"
 	item_state_slots = list(
@@ -760,7 +753,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	item_state = "rig-himeotaj-engineering"
 	icon_state = "rig-himeotaj-engineering"
 	item_state_slots = list(
@@ -776,7 +769,7 @@
 	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	icon_state = "rig0-himeotaj-engineering"
 	item_state = "rig0-himeotaj-engineering"
 	item_state_slots = list(
@@ -794,7 +787,7 @@
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
-	icon = 'icons/obj/item/clothing/voidsuits/himeotaj.dmi'
+	icon = 'icons/obj/clothing/voidsuit/himeotaj.dmi'
 	item_state = "rig-himeotaj-engineering"
 	icon_state = "rig-himeotaj-engineering"
 	item_state_slots = list(
@@ -807,7 +800,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/srf
 	name = "solarian restoration front voidsuit helmet"
 	desc = "An uparmored variant of the gargoyle voidsuit helmet, with a solid visor and redundant comms antenna. Intended for urban combat operations."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "srf_helmet"
 	item_state = "srf_helmet"
 	contained_sprite = TRUE
@@ -816,7 +808,6 @@
 	name = "solarian restoration front voidsuit"
 	desc = "A variant of the Solarian Armed Forces Type-4 \"Gargoyle\" voidsuit, the Type-5 \"Cyclops\" is the urban combat version of the Gargoyle. While practical testing showed it was a marginal improvement over the Type-4 at best, the SRF have taken to using this modification \
 	both on account of its intimidating design and in an effort to distinguish its forces from others using the Type-4, warlord or not. This one has the SRF's flag on the breastplate."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "srf_suit"
 	item_state = "srf_suit"
 	contained_sprite = TRUE
@@ -824,7 +815,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/league
 	name = "anti-corporate league voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \"Vulture\" voidsuit, and also features a modified comms antenna."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "league_helmet"
 	item_state = "league_helmet"
 	contained_sprite = TRUE
@@ -833,7 +823,6 @@
 	name = "anti-corporate league voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \
 	\"Vulture\" voidsuit, to make it more easily identified by friendly Coalition forces."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "league_suit"
 	item_state = "league_suit"
 	contained_sprite = TRUE
@@ -841,7 +830,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/fsf
 	name = "free solarian fleets voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Free Solarian Fleets to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "fsf_helmet"
 	item_state = "fsf_helmet"
 	contained_sprite = TRUE
@@ -850,7 +838,6 @@
 	name = "free solarian fleets voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Free Solarian Fleets to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "fsf_suit"
 	item_state = "fsf_suit"
 	contained_sprite = TRUE
@@ -858,7 +845,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/ssmd
 	name = "military district voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Solarian Military District to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "ssmd_helmet"
 	item_state = "ssmd_helmet"
 	contained_sprite = TRUE
@@ -867,7 +853,6 @@
 	name = "military district voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Southern Solarian Military District to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "ssmd_suit"
 	item_state = "ssmd_suit"
 	contained_sprite = TRUE
@@ -875,7 +860,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/spg
 	name = "provisional government voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Solarian Provisional Government to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "spg_helmet"
 	item_state = "spg_helmet"
 	contained_sprite = TRUE
@@ -884,7 +868,6 @@
 	name = "provisional government voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Solarian Provisional Government to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "spg_suit"
 	item_state = "spg_suit"
 	contained_sprite = TRUE
@@ -892,7 +875,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/mrsp
 	name = "shield pact voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Middle Ring Shield Pact to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "mrsp_helmet"
 	item_state = "mrsp_helmet"
 	contained_sprite = TRUE
@@ -901,7 +883,6 @@
 	name = "shield pact voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Middle Ring Shield Pact to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "mrsp_suit"
 	item_state = "mrsp_suit"
 	contained_sprite = TRUE
@@ -909,7 +890,6 @@
 /obj/item/clothing/head/helmet/space/void/sol/sfa
 	name = "southern fleet administration voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Fleet Administration to make it more easily identifiable from other forces using the Type-4, warlord or not."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "sfa_helmet"
 	item_state = "sfa_helmet"
 	contained_sprite = TRUE
@@ -918,7 +898,6 @@
 	name = "southern fleet administration voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Southern Fleet Administration to make it more easily identifiable \
 	from other forces using the Type-4, warlord or not. Due to poor maintenance, the highlights appear to have gone out."
-	icon = 'icons/obj/item/clothing/voidsuits/warlordsuit.dmi'
 	icon_state = "sfa_suit"
 	item_state = "sfa_suit"
 	contained_sprite = TRUE
@@ -926,42 +905,35 @@
 /obj/item/clothing/head/helmet/space/void/coalition/gadpathur
 	name = "coalition vulture-GP voidsuit helmet"
 	desc = "A helmet resembling an avian. This one has been modified for usage with Gadpathur's navy."
-	icon = 'icons/clothing/rig/gadpathurian_suit.dmi'
 	icon_state = "gadpathur_vulture_helm"
 	item_state = "gadpathur_vulture_helm"
-	contained_sprite = TRUE
-	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU)
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_INDUSTRIAL)
 
 	brightness_on = 6
 
 /obj/item/clothing/suit/space/void/coalition/gadpathur
 	name = "coalition vulture-GP voidsuit"
 	desc = "An iconic voidsuit of Xanan make, designed after the Interstellar War. This one has been modified for usage with Gadpathur's navy."
-	icon = 'icons/clothing/rig/gadpathurian_suit.dmi'
 	icon_state = "gadpathur_vulture"
 	item_state = "gadpathur_vulture"
-	contained_sprite = TRUE
-	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU, BODYTYPE_SKRELL)
+	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL)
 
 /obj/item/clothing/head/helmet/space/void/sol/konyang
 	name = "konyang aerospace forces voidsuit helmet"
 	desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been painted in the colors of the Konyang Armed Forces."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/clothing/voidsuit/coalition.dmi'
 	icon_state = "konyang_helmet"
 	item_state = "konyang_helmet"
-	contained_sprite = TRUE
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
-	icon_auto_adapt = TRUE
 	icon_supported_species_tags = "ipc"
 
 
 /obj/item/clothing/suit/space/void/sol/konyang
 	name = "konyang aerospace forces voidsuit"
 	desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military.This one has been painted in the colors of the Konyang Armed Forces."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/clothing/voidsuit/coalition.dmi'
 	icon_state = "konyang_suit"
 	item_state = "konyang_suit"
-	contained_sprite = TRUE
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
 	icon_auto_adapt = TRUE
 	icon_supported_species_tags = "ipc"

html/changelogs/RustingWithYou - icontweak.yml

@@ -0,0 +1,41 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Repaths factional voidsuit icons."

maps/away/ships/coc/coc_ranger/coc_ship.dmm

@@ -511,7 +511,7 @@
 /obj/structure/sign/flag/kazhkz{
 	pixel_y = 32
 	},
-/obj/item/clothing/head/helmet/space/void/dominia/unathi,
+/obj/item/clothing/head/helmet/space/void/dominia,
 /obj/item/material/hatchet/unathiknife,
 /obj/machinery/light{
 	dir = 8;

maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm

@@ -475,8 +475,8 @@
 /area/ship/dominian_unathi/engineering)
 "dF" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia/unathi,
-/obj/item/clothing/head/helmet/space/void/dominia/unathi,
+/obj/item/clothing/suit/space/void/dominia,
+/obj/item/clothing/head/helmet/space/void/dominia,
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/mask/breath,
 /obj/effect/floor_decal/corner/orange{
@@ -7247,8 +7247,8 @@
 /area/ship/dominian_unathi/crew)
 "Xh" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia/unathi,
-/obj/item/clothing/head/helmet/space/void/dominia/unathi,
+/obj/item/clothing/suit/space/void/dominia,
+/obj/item/clothing/head/helmet/space/void/dominia,
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/mask/breath,
 /obj/effect/floor_decal/corner/orange{
@@ -7552,8 +7552,8 @@
 /area/shuttle/dominian_unathi)
 "YF" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia/unathi,
-/obj/item/clothing/head/helmet/space/void/dominia/unathi,
+/obj/item/clothing/suit/space/void/dominia,
+/obj/item/clothing/head/helmet/space/void/dominia,
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/mask/breath,
 /obj/effect/floor_decal/corner/orange{

maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm

@@ -3622,7 +3622,7 @@
 "iyd" = (
 /obj/structure/table/steel,
 /obj/structure/window/reinforced,
-/obj/item/clothing/head/helmet/space/void/dominia/unathi,
+/obj/item/clothing/head/helmet/space/void/dominia,
 /turf/simulated/floor/carpet/rubber,
 /area/hiskyn_ship/trophy)
 "izj" = (