[MIRROR] clothing _vr dmi cleanup: hats and headwear [IDB IGNORE] (#11611)

Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>

code/__defines/sprite_sheets.dm

@@ -21,13 +21,13 @@ SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/head/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/head/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/head/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/head/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/head/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/head/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_FENNEC = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_ALTEVIAN = 'icons/inventory/head/mob_vr_altevian.dmi')
+SPECIES_ALTEVIAN = 'icons/inventory/head/mob_altevian.dmi')
 #define VR_SPECIES_SPRITE_SHEETS_HANDS_MOB list(\
 SPECIES_HUMAN = 'icons/inventory/hands/mob.dmi',\
 SPECIES_TAJARAN = 'icons/inventory/hands/mob_tajaran.dmi',\
@@ -35,12 +35,12 @@ SPECIES_SKRELL = 'icons/inventory/hands/mob_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/hands/mob_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/hands/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/hands/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/hands/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/hands/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/hands/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/hands/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/hands/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/hands/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/hands/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/hands/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/hands/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/hands/mob_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/hands/mob_vulpkanin.dmi')
 #define VR_SPECIES_SPRITE_SHEETS_FEET_MOB list(\
 SPECIES_HUMAN = 'icons/inventory/feet/mob.dmi',\
 SPECIES_TAJARAN = 'icons/inventory/feet/mob_tajaran.dmi',\
@@ -48,12 +48,12 @@ SPECIES_SKRELL = 'icons/inventory/feet/mob_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/feet/mob_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/feet/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/feet/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/feet/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/feet/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/feet/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/feet/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/feet/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/feet/mob_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/feet/mob_vulpkanin.dmi')
 
 #define SPECIES_SPRITE_SHEETS_SUIT_ITEM list(\
 SPECIES_HUMAN = 'icons/inventory/suit/item.dmi',\
@@ -76,13 +76,13 @@ SPECIES_SKRELL = 'icons/inventory/head/item_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/head/item_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/head/item_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/head/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/head/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/head/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/head/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/head/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/head/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/head/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_FENNEC = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_ALTEVIAN = 'icons/inventory/head/item_vr_altevian.dmi')
+SPECIES_ALTEVIAN = 'icons/inventory/head/item_altevian.dmi')
 #define VR_SPECIES_SPRITE_SHEETS_HANDS_ITEM list(\
 SPECIES_HUMAN = 'icons/inventory/hands/item.dmi',\
 SPECIES_TAJARAN = 'icons/inventory/hands/item_tajaran.dmi',\
@@ -90,12 +90,12 @@ SPECIES_SKRELL = 'icons/inventory/hands/item_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/hands/item_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/hands/item_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/hands/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/hands/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/hands/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/hands/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/hands/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/hands/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/hands/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/hands/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/hands/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/hands/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/hands/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/hands/item_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/hands/item_vulpkanin.dmi')
 #define VR_SPECIES_SPRITE_SHEETS_FEET_ITEM list(\
 SPECIES_HUMAN = 'icons/inventory/feet/item.dmi',\
 SPECIES_TAJARAN = 'icons/inventory/feet/item_tajaran.dmi',\
@@ -103,89 +103,89 @@ SPECIES_SKRELL = 'icons/inventory/feet/item_skrell.dmi',\
 SPECIES_UNATHI = 'icons/inventory/feet/item_unathi.dmi',\
 SPECIES_TESHARI = 'icons/inventory/feet/item_teshari.dmi',\
 SPECIES_XENOHYBRID = 'icons/inventory/feet/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/feet/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/feet/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/feet/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/feet/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/feet/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/feet/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/feet/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/feet/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/feet/item_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/feet/item_vulpkanin.dmi')
 #define ALL_VR_SPRITE_SHEETS_HEAD_MOB list(\
-SPECIES_HUMAN = 'icons/inventory/head/mob_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/head/mob.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/head/mob_vr_tajaran.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/head/mob_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi',\
-SPECIES_UNATHI = 'icons/inventory/head/mob_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/head/mob_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/head/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/head/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/head/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/head/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/head/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/head/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi',\
+SPECIES_FENNEC = 'icons/inventory/head/mob_vulpkanin.dmi',\
-SPECIES_ALTEVIAN = 'icons/inventory/head/mob_vr_altevian.dmi')
+SPECIES_ALTEVIAN = 'icons/inventory/head/mob_altevian.dmi')
 #define ALL_VR_SPRITE_SHEETS_HANDS_MOB list(\
-SPECIES_HUMAN = 'icons/inventory/hands/mob_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/hands/mob.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/hands/mob_vr_tajaran.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/hands/mob_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/hands/mob_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/hands/mob_skrell.dmi',\
-SPECIES_UNATHI = 'icons/inventory/hands/mob_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/hands/mob_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/hands/mob_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/hands/mob_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/hands/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/hands/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/hands/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/hands/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/hands/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/hands/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/hands/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/hands/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/hands/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/hands/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/hands/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/hands/mob_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/hands/mob_vulpkanin.dmi')
 #define ALL_VR_SPRITE_SHEETS_FEET_MOB list(\
-SPECIES_HUMAN = 'icons/inventory/feet/mob_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/feet/mob.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/feet/mob_vr_tajaran.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/feet/mob_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/feet/mob_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/feet/mob_skrell.dmi',\
-SPECIES_UNATHI = 'icons/inventory/feet/mob_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/feet/mob_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/feet/mob_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/feet/mob_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/feet/mob_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/feet/mob_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/feet/mob_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/feet/mob_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/feet/mob_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/feet/mob_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/feet/mob_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/feet/mob_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/feet/mob_vulpkanin.dmi')
 #define ALL_VR_SPRITE_SHEETS_HEAD_ITEM list(\
-SPECIES_HUMAN = 'icons/inventory/head/item_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/head/item.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/head/item_vr_unathi.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/head/item_unathi.dmi',\
-SPECIES_SKRELL = 'icons/inventory/head/item_vr_unathi.dmi',\
+SPECIES_SKRELL = 'icons/inventory/head/item_unathi.dmi',\
-SPECIES_UNATHI = 'icons/inventory/head/item_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/head/item_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/head/item_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/head/item_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/head/item_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/head/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/head/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/head/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/head/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/head/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/head/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/head/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/head/item_vr_vulpkanin.dmi',\
+SPECIES_FENNEC = 'icons/inventory/head/item_vulpkanin.dmi',\
-SPECIES_ALTEVIAN = 'icons/inventory/head/item_vr_altevian.dmi')
+SPECIES_ALTEVIAN = 'icons/inventory/head/item_altevian.dmi')
 #define ALL_VR_SPRITE_SHEETS_HANDS_ITEM list(\
-SPECIES_HUMAN = 'icons/inventory/hands/item_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/hands/item.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/hands/item_vr_tajaran.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/hands/item_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/hands/item_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/hands/item_skrell.dmi',\
-SPECIES_UNATHI = 'icons/inventory/hands/item_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/hands/item_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/hands/item_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/hands/item_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/hands/item_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/hands/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/hands/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/hands/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/hands/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/hands/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/hands/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/hands/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/hands/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/hands/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/hands/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/hands/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/hands/item_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/hands/item_vulpkanin.dmi')
 #define ALL_VR_SPRITE_SHEETS_FEET_ITEM list(\
-SPECIES_HUMAN = 'icons/inventory/feet/item_vr.dmi',\
+SPECIES_HUMAN = 'icons/inventory/feet/item.dmi',\
-SPECIES_TAJARAN = 'icons/inventory/feet/item_vr_tajaran.dmi',\
+SPECIES_TAJARAN = 'icons/inventory/feet/item_tajaran.dmi',\
-SPECIES_SKRELL = 'icons/inventory/feet/item_vr_skrell.dmi',\
+SPECIES_SKRELL = 'icons/inventory/feet/item_skrell.dmi',\
-SPECIES_UNATHI = 'icons/inventory/feet/item_vr_unathi.dmi',\
+SPECIES_UNATHI = 'icons/inventory/feet/item_unathi.dmi',\
-SPECIES_TESHARI = 'icons/inventory/feet/item_vr_teshari.dmi',\
+SPECIES_TESHARI = 'icons/inventory/feet/item_teshari.dmi',\
-SPECIES_XENOHYBRID = 'icons/inventory/feet/item_vr_unathi.dmi',\
+SPECIES_XENOHYBRID = 'icons/inventory/feet/item_unathi.dmi',\
-SPECIES_AKULA = 'icons/inventory/feet/item_vr_akula.dmi',\
+SPECIES_AKULA = 'icons/inventory/feet/item_akula.dmi',\
-SPECIES_SERGAL = 'icons/inventory/feet/item_vr_sergal.dmi',\
+SPECIES_SERGAL = 'icons/inventory/feet/item_sergal.dmi',\
-SPECIES_NEVREAN = 'icons/inventory/feet/item_vr_sergal.dmi',\
+SPECIES_NEVREAN = 'icons/inventory/feet/item_sergal.dmi',\
-SPECIES_VULPKANIN = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\
+SPECIES_VULPKANIN = 'icons/inventory/feet/item_vulpkanin.dmi',\
-SPECIES_ZORREN_HIGH = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\
+SPECIES_ZORREN_HIGH = 'icons/inventory/feet/item_vulpkanin.dmi',\
-SPECIES_FENNEC = 'icons/inventory/feet/item_vr_vulpkanin.dmi')
+SPECIES_FENNEC = 'icons/inventory/feet/item_vulpkanin.dmi')

code/modules/clothing/clothing_vr.dm

@@ -60,4 +60,4 @@
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
 		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
-		SPECIES_WEREBEAST = 'icons/inventory/head/mob_vr_werebeast.dmi')
+		SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi')

code/modules/clothing/head/fishing.dm

@@ -3,13 +3,13 @@
 /obj/item/clothing/head/fishing
 	name = "fishing hat"
 	desc = "It's a peaked cap with a quirky slogan."
-	icon = 'icons/inventory/head/item_vr_fishing.dmi'
+	icon = 'icons/inventory/head/item_fishing.dmi'
 	icon_state = "greensoft0"
 	item_state_slots = list(slot_r_hand_str = "greensoft", slot_l_hand_str = "greensoft", slot_head_str = "greensoft0")
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_hats.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi',
-		slot_head_str = 'icons/inventory/head/mob_vr_fishing.dmi'
+		slot_head_str = 'icons/inventory/head/mob_fishing.dmi'
 		)
 	siemens_coefficient = 0.9
 	body_parts_covered = 0

code/modules/clothing/head/helmet_vr.dm

@@ -11,30 +11,22 @@
 	desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!"
 	icon_state = "unsc_helm"
 	item_state = "unsc_helm"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/helmet/combat/imperial
 	name = "imperial soldier helmet"
 	desc = "Veni, vidi, vici; I came, I saw, I conquered."
 	icon_state = "ge_helm"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/helmet/combat/imperial/centurion
 	name = "imperial centurion helmet"
 	desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
 	icon_state = "ge_helmcent"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 // Armor Versions Here
 /obj/item/clothing/head/helmet/combat/crusader
 	name = "crusader helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "crusader"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 2
 
@@ -42,8 +34,6 @@
 	name = "bedevere's helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "bedevere_helmet"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	tint = TINT_HEAVY
 	siemens_coefficient = 2
@@ -90,8 +80,6 @@
 	name = "crusader costume helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "crusader"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 1
 
@@ -99,8 +87,6 @@
 	name = "bedevere's costume helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "bedevere_helmet"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	tint = TINT_HEAVY
 	siemens_coefficient = 1

code/modules/clothing/head/hood.dm

@@ -211,8 +211,6 @@
 /obj/item/clothing/head/hood/hoodie
 	name = "hood"
 	desc = "The hood of a hoodie. Cosy!"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "hood_plain"
 
 /obj/item/clothing/head/hood/raincoat

code/modules/clothing/head/hood_vr.dm

@@ -37,16 +37,12 @@
 /obj/item/clothing/head/hood/winter/talon
 	name = "Talon winter hood"
 	desc = "A cozy winter hood attached to a heavy winter jacket."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "winterhood_talon"
 
 // Centcom Winter Hood
 /obj/item/clothing/head/hood/winter/centcom
 	name = "centcom winter hood"
 	desc = "A cozy winter hood attached to a heavy winter jacket."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob.dmi'
 	icon_state = "winterhood_centcom"
 	armor = list(melee = 40, bullet = 45, laser = 45, energy = 35, bomb = 40, bio = 25, rad = 25, fire = 35, acid = 50)
 
@@ -54,8 +50,6 @@
 /obj/item/clothing/head/hood/winter/medical/sar
 	name = "search and rescue winter hood"
 	desc = "A cozy winter hood attached to a heavy winter jacket."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "winterhood_sar"
 	armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5)
 
@@ -64,8 +58,6 @@
 /obj/item/clothing/head/hood_vr/hotdog_hood
 	name = "Hotdog suit hood"
 	desc = "The hood of a hotdog suit, attached to said hotdog suit." //Honestly i just don't know how to force the costume to hide hats.
-	icon = 'icons/inventory/head/mob_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "hotdog_hood"
 	flags_inv = HIDEEARS|BLOCKHAIR
 
@@ -73,15 +65,9 @@
 /obj/item/clothing/head/hood_vr/turnip_hood
 	name = "Turnip suit hood"
 	desc = "The hood of a hotdog suit, attached to said hotdog suit. Most cooks cut this part off and throw it in the garbage"
-	icon = 'icons/inventory/head/mob_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "turnip_hood"
 	flags_inv = HIDEEARS|BLOCKHAIR
 
-/obj/item/clothing/head/hood/winter
-	sprite_sheets = list(	SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi',
-							SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi')
-
 //Better hoodies hood
 /obj/item/clothing/head/hood/toggleable
 	name = "super special hood"
@@ -91,8 +77,6 @@
 /obj/item/clothing/head/hood/toggleable/colorable
 	name = "hoodie hood"
 	desc = "It's the hood part of a hoodie. What kind of hoodie would it be without one? A poser, obviously."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "choodie"
 
 /obj/item/clothing/head/hood/toggleable/colorable/update_icon()

code/modules/clothing/head/jobs_vr.dm

@@ -2,6 +2,4 @@
 	name = "Type-34C Semi-Enclosed Headwear"
 	desc = "Civilian model of a popular helmet used by certain law enforcement agencies. It does not have any armor plating, but has a neo-laminated fiber lining."
 	icon_state = "cyberpunkgoggle"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR

code/modules/clothing/head/misc_special.dm

@@ -108,8 +108,6 @@
 /obj/item/clothing/head/welding/arar
 	name = "replikant welding helmet"
 	desc = "A protective welding mask designed for repair-technician biosynthetic crew, the visor slits are particularly difficult to see out of."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "ararwelding"
 	item_state_slots = list(
 		SLOT_ID_LEFT_HAND = "ararwelding",

code/modules/clothing/head/misc_special_vr.dm

@@ -1,4 +1,4 @@
 /obj/item/clothing/head/cone
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi'
 		)

code/modules/clothing/head/misc_vr.dm

@@ -5,23 +5,17 @@
 	name = "fish skull"
 	desc = "You... you're not actually going to wear that, right?"
 	icon_state = "fishskull"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	flags_inv = HIDEEARS|BLOCKHAIR
 
 /obj/item/clothing/head/crown
 	name = "crown"
 	desc = "How regal!"
 	icon_state = "crown"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/fancy_crown
 	name = "fancy crown"
 	desc = "How extraordinarily regal!"
 	icon_state = "fancycrown"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/shiny_hood
 	icon_override = 'icons/mob/modular_shiny_vr.dmi'
@@ -51,8 +45,6 @@
 /obj/item/clothing/head/pelt
 	name = "Bear pelt"
 	desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "bearpelt_brown"
 	item_state = "bearpelt_brown"
 
@@ -91,37 +83,27 @@
 /obj/item/clothing/head/pizzaguy
 	name = "pizza delivery visor"
 	desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "pizzadelivery"
 	item_state = "pizzadelivery"
 
 /obj/item/clothing/head/wedding
 	name = "wedding veil"
 	desc = "A lace veil worn over the face, typically by a bride during their wedding."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "weddingveil"
 
 /obj/item/clothing/head/halo/alt
 	name = "metal halo"
 	desc = "A halo made of a light metal. This one doesn't float, but it's still a circle on your head!"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "halo_alt"
 
 /obj/item/clothing/head/buckethat
 	name = "bucket hat"
 	desc = "Turns out these are actually called 'gatsby caps' but telling people you wear a bucket is slightly more interesting, so that's what it's called."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "buckethat"
 
 /obj/item/clothing/head/nonla
 	name = "non la"
 	desc = "A conical hat typically woven from leaves, good for keeping the sun AND rain off your head, in case it happens to be sunny while raining."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "nonla"
 
 //////////TALON HATS//////////
@@ -129,8 +111,6 @@
 /obj/item/clothing/head/soft/talon
 	name = "Talon baseball cap"
 	desc = "It's a ballcap bearing the colors of ITV Talon."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "talonsoft"
 	item_state = "talonsoft"
 	item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft")
@@ -138,39 +118,26 @@
 /obj/item/clothing/head/caphat/talon
 	name = "Talon nautical hat"
 	desc = "It's a classic nautical hat bearing the colors of ITV Talon. Perfect for commanding the ship."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "talon_captain_cap"
 	item_state = "taloncaptaincap"
 
 /obj/item/clothing/head/beret/talon
 	name = "Talon beret"
-	desc = "It's a basic baret colored to match ITV Talon's uniforms."
+	desc = "It's a basic beret colored to match ITV Talon's uniforms."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "beret_talon"
 	item_state = "baret_talon"
 
 /obj/item/clothing/head/beret/talon/command
 	name = "Talon officer beret"
-	desc = "It's a basic baret colored to match ITV Talon's uniforms with a badge pinned on the front. Perfect for commanders."
+	desc = "It's a basic beret colored to match ITV Talon's uniforms with a badge pinned on the front. Perfect for commanders."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "beret_talon_officer"
 	item_state = "baret_talon_command"
 
-/obj/item/clothing/head/cowboy
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
-
 // tiny tophat
 
 /obj/item/clothing/head/tinytophat
 	name = "tiny tophat"
 	desc = "A tophat that is far too small to properly sit on someone's head!"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "tiny_tophat"
 
 // CHOMPEdit Start
@@ -187,6 +154,4 @@
 /obj/item/clothing/head/eulrhat
 	name = "sleek side cap"
 	desc = "A simple wedge cap with red accents, popular with biosynthetic personnel."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "eulrhat"

code/modules/clothing/head/pilot_helmet_vr.dm

@@ -2,17 +2,12 @@
 /obj/item/clothing/head/pilot_vr
 	name = "standard pilot helmet"
 	desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
-	icon = 'icons/inventory/head/item_vr.dmi'
 	icon_state = "pilot1"
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	w_class = ITEMSIZE_NORMAL
-	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
 	actions_types = list(/datum/action/item_action/toggle_visor)
 
 /obj/item/clothing/head/pilot_vr/attack_self(mob/user as mob)
@@ -28,10 +23,6 @@
 	name = "colored pilot helmet"
 	desc = "A colored version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
 	icon_state = "pilot2"
-	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
 	actions_types = list(/datum/action/item_action/toggle_visor)
 
 /obj/item/clothing/head/pilot_vr/alt/attack_self(mob/user as mob)
@@ -49,10 +40,6 @@
 	name = "Talon pilot helmet"
 	desc = "An ITV Talon version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
 	icon_state = "pilot3"
-	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
 	actions_types = list(/datum/action/item_action/toggle_visor)
 
 /obj/item/clothing/head/pilot_vr/talon/attack_self(mob/user as mob)
@@ -70,11 +57,7 @@
 	name = "\improper Major Bill's pilot helmet"
 	desc = "An Major Bill's Transportation version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
 	icon_state = "pilot3"
-	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills)
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
 	actions_types = list(/datum/action/item_action/toggle_visor)
 
 /obj/item/clothing/head/pilot_vr/mbill/attack_self(mob/user as mob)

code/modules/clothing/masks/miscellaneous_vr.dm

@@ -1,13 +1,6 @@
-/obj/item/clothing/mask/emotions
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi'
-		)
-
 /obj/item/clothing/mask/lacemask
 	name = "lace mask"
 	desc = "A sheer lace mask that rests above the nose and trails down below the chin."
-	icon = 'icons/inventory/face/item.dmi'
 	icon_state = "lace_mask"
-	icon_override = 'icons/inventory/face/mob.dmi'
 	item_flags = FLEXIBLEMATERIAL
 	w_class = ITEMSIZE_SMALL

code/modules/clothing/spacesuits/rig/rig_pieces.dm

@@ -12,16 +12,16 @@
 		SPECIES_SKRELL 			= 'icons/inventory/head/mob_skrell.dmi',
 		SPECIES_UNATHI 			= 'icons/inventory/head/mob_unathi.dmi',
 		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_unathi.dmi',
-		SPECIES_AKULA 			= 'icons/inventory/head/mob_vr_akula.dmi',
+		SPECIES_AKULA 			= 'icons/inventory/head/mob_akula.dmi',
-		SPECIES_SERGAL			= 'icons/inventory/head/mob_vr_sergal.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_sergal.dmi',
-		SPECIES_NEVREAN			= 'icons/inventory/head/mob_vr_sergal.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/mob_sergal.dmi',
-		SPECIES_VULPKANIN 		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_VULPKANIN 		= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_ZORREN_HIGH 	= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH 	= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_FENNEC 			= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC 			= 'icons/inventory/head/mob_vulpkanin.dmi',
 		SPECIES_PROMETHEAN		= 'icons/inventory/head/mob_skrell.dmi',
 		SPECIES_VOX 			= 'icons/inventory/head/mob_vox.dmi',
 		SPECIES_TESHARI 		= 'icons/inventory/head/mob_teshari.dmi',
-		SPECIES_ALTEVIAN 		= 'icons/inventory/head/mob_vr_altevian.dmi'
+		SPECIES_ALTEVIAN 		= 'icons/inventory/head/mob_altevian.dmi'
 		)
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJARAN, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_FENNEC, SPECIES_XENOHYBRID, SPECIES_ALTEVIAN, SPECIES_SHADEKIN)
 	max_pressure_protection = null

code/modules/clothing/spacesuits/rig/suits/station.dm

@@ -314,16 +314,12 @@
 	)
 
 /obj/item/clothing/head/helmet/space/rig/focalpoint
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "techno_rig"
 	// No animal people sprites for these yet, sad times
 	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
 	sprite_sheets = null
 
 /obj/item/clothing/suit/space/rig/focalpoint
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "techno_rig"
 	// No animal people sprites for these yet, sad times
 	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
@@ -370,16 +366,12 @@
 	)
 
 /obj/item/clothing/head/helmet/space/rig/hephaestus
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "ihs_rig"
 	// No animal people sprites for these yet, sad times
 	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
 	sprite_sheets = null
 
 /obj/item/clothing/suit/space/rig/hephaestus
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "ihs_rig"
 	// No animal people sprites for these yet, sad times
 	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
@@ -426,16 +418,12 @@
 
 /obj/item/clothing/head/helmet/space/rig/zero
 	desc = "A bubble helmet that maximizes the field of view. A state of the art holographic display provides a stream of information."
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "null_rig"
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 	slowdown = 0
 
 /obj/item/clothing/suit/space/rig/zero
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "null_rig"
 	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
 	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
@@ -476,8 +464,6 @@
 	)
 
 /obj/item/clothing/head/helmet/space/rig/baymed
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "medical_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
@@ -485,8 +471,6 @@
 	camera_networks = list(NETWORK_MEDICAL)
 
 /obj/item/clothing/suit/space/rig/baymed
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "medical_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
@@ -538,8 +522,6 @@
 	)
 
 /obj/item/clothing/head/helmet/space/rig/bayeng
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "engineering_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
@@ -547,8 +529,6 @@
 	camera_networks = list(NETWORK_ENGINEERING)
 
 /obj/item/clothing/suit/space/rig/bayeng
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "engineering_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
@@ -599,16 +579,12 @@
 	)
 
 /obj/item/clothing/head/helmet/space/rig/pathfinder
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "pathfinder_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 /obj/item/clothing/suit/space/rig/pathfinder
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "pathfinder_rig_bay"
 	item_state = null
 	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB

code/modules/clothing/spacesuits/spacesuits.dm

@@ -37,7 +37,7 @@
 		verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera
 
 	if(type == /obj/item/clothing/head/helmet/space) //VOREStation edit - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes.
-		LAZYSET(sprite_sheets, SPECIES_TESHARI, 'icons/inventory/head/mob_vr_teshari.dmi')
+		LAZYSET(sprite_sheets, SPECIES_TESHARI, 'icons/inventory/head/mob_teshari.dmi')
 
 /obj/item/clothing/head/helmet/space/proc/toggle_camera()
 	set name = "Toggle Helmet Camera"

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

@@ -111,8 +111,6 @@
 	species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN)	//this thing can autoadapt too
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
 	siemens_coefficient = 0.5
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
 	var/away_planes = null
 	plane_slots = list(slot_head)
@@ -208,39 +206,39 @@
 
 /obj/item/clothing/head/helmet/space/void/responseteam
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_HUMAN			= 'icons/inventory/head/mob.dmi',
-		SPECIES_TAJARAN 			= 'icons/inventory/head/mob_vr_tajaran.dmi',
+		SPECIES_TAJARAN 			= 'icons/inventory/head/mob_tajaran.dmi',
 		SPECIES_LLEILL 			= 'icons/inventory/suit/mob_tajaran.dmi',
-		SPECIES_SKRELL 			= 'icons/inventory/head/mob_vr_skrell.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_skrell.dmi',
-		SPECIES_UNATHI 			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_unathi.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_unathi.dmi',
-		SPECIES_AKULA			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/mob_unathi.dmi',
-		SPECIES_SERGAL			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_unathi.dmi',
-		SPECIES_VULPKANIN		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_FENNEC			= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_SHADEKIN		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_SHADEKIN		= 'icons/inventory/head/mob_vulpkanin.dmi',
-		SPECIES_VASILISSAN		= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/head/mob.dmi',
-		SPECIES_NEVREAN			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/mob.dmi',
-		SPECIES_RAPALA			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/head/mob.dmi',
-		SPECIES_ALRAUNE			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/head/mob.dmi',
-		SPECIES_ZADDAT			= 'icons/inventory/head/mob_vr.dmi'
+		SPECIES_ZADDAT			= 'icons/inventory/head/mob.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJARAN 			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_TAJARAN 			= 'icons/inventory/head/item.dmi',
-		SPECIES_SKRELL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item.dmi',
-		SPECIES_UNATHI			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item.dmi',
-		SPECIES_XENOHYBRID		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/head/item.dmi',
-		SPECIES_AKULA			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/item.dmi',
-		SPECIES_SERGAL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/item.dmi',
-		SPECIES_VULPKANIN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/item.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item.dmi',
-		SPECIES_FENNEC			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/item.dmi',
-		SPECIES_SHADEKIN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SHADEKIN		= 'icons/inventory/head/item.dmi',
-		SPECIES_VASILISSAN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/head/item.dmi',
-		SPECIES_NEVREAN			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/item.dmi',
-		SPECIES_RAPALA			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/head/item.dmi',
-		SPECIES_ALRAUNE			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/head/item.dmi',
-		SPECIES_ZADDAT			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ZADDAT			= 'icons/inventory/head/item.dmi',
 		SPECIES_LLEILL			= 'icons/inventory/suit/item.dmi'
 		)

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

@@ -88,14 +88,8 @@
 /obj/item/clothing/suit/space/void/hev
 	name = "hazardous environment suit"
 	desc = "Has a strange smell to it, but you feel like it might be an old friend."
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "hev_orange"
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/suit/space/void/hev/violet
 	icon_state = "hev_violet"
 	desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
@@ -103,14 +97,8 @@
 /obj/item/clothing/head/helmet/space/void/hev
 	name = "hazardous environment helmet"
 	desc = "Has a strange smell to it, but you feel like it might be an old friend."
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "hev_orange"
 
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-
 /obj/item/clothing/head/helmet/space/void/hev/violet
 	icon_state = "hev_violet"
 	desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
@@ -119,83 +107,47 @@
 /obj/item/clothing/suit/space/void/makeshift
 	name = "makeshift voidsuit"
 	desc = "This is not something you should use if you have other options, but it's better than nothing!"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "makeshift_void"
 
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/head/helmet/space/void/makeshift
 	name = "makeshift voidsuit helmet"
 	desc = "This is not something you should use if you have other options, but it's better than nothing!"
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "makeshift_void"
 
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
 
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-
 // 'Custodian' armor
 /obj/item/clothing/suit/space/void/custodian
 	name = "custodian suit"
 	desc = "Vacuum-capable armor for a Custodian to do their duty."
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "custodian"
 
 	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/head/helmet/space/void/custodian
 	name = "custodian helmet"
 	desc = "Vacuum-capable helmet for a Custodian to do their duty."
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "custodian"
 
 	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
 
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-
 // 'Moebius' armor
 /obj/item/clothing/suit/space/void/aether
 	name = "\improper Aether voidsuit"
 	desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics."
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "moebiussuit"
 
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/head/helmet/space/void/aether
 	name = "\improper Aether voidsuit helmet"
 	desc = "Aether Atmospherics thought that giving this helmet selectable colored lighting would improve market penetration. Very comfortable, regardless."
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "moebiushelm_White"
 
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
 
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-
 /obj/item/clothing/head/helmet/space/void/aether/verb/select_color()
 	set name = "Helmet Color"
 	set desc = "Change the color of the helmet"
@@ -212,26 +164,13 @@
 /obj/item/clothing/suit/space/void/excelsior
 	name = "\improper Excelsior voidsuit"
 	desc = "A space suit from a particular spaceship: Excelsior."
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "excelsior"
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/head/helmet/space/void/excelsior
 	name = "\improper Excelsior voidsuit helmet"
 	desc = "A space helmet from a particular spaceship: Excelsior."
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "excelsior"
 
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-
-
 /obj/item/clothing/suit/space/void/altevian_heartbreaker
 	name = "\improper heartbreaker voidsuit"
 	desc = "The altevians' newest iteration of their armored suits. This one is tailored for zero-g environments, and while it can still be worn in an area with gravity, it'll put a strain on even the most athletic of individuals."
@@ -250,8 +189,8 @@
 	name = "\improper heartbreaker helmet"
 	desc = "The altevians' newest iteration of their armored suits. This one is tailored for zero-g environments, and while it can still be worn in an area with gravity, it'll put a strain on even the most athletic of individuals."
 
-	icon = 'icons/inventory/head/item_vr_altevian.dmi'
+	icon = 'icons/inventory/head/item_altevian.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr_altevian.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_altevian.dmi'
 	icon_state = "rig0-heartbreaker"
 
 	armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40)
@@ -262,9 +201,6 @@
 /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker
 	name = "\improper CSC industrial voidsuit"
 	desc = "A heavy-duty Kirillov-Y771 voidsuit intended for use in hazardous shipbreaking, salvage, and industrial operations, manufactured (or more likely refurbished) by the Coyote Salvage Corporation. It's slow and awkward if used outside of microgravity, but it offers good protection for what is technically a civilian-legal voidsuit."
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "breaker_suit"
 
 	armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80)
@@ -272,18 +208,9 @@
 	breach_threshold = 14
 	allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING)
 
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
-
 /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker
 	name = "\improper CSC industrial voidsuit helmet"
 	desc = "A dome/bubble style helmet for use with the Kirillov-Y771 voidsuit. It offers surprisingly good protection and visibility, though wearers are still advised to avoid face-on collisions. Sadly, this one doesn't seem to have the (in)famous 0PTIK3WL cross-spectrum imaging visor installed..."
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "breaker_helmet"
 
 	armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80)
-
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM

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

@@ -31,8 +31,6 @@
 	icon_state = "rig0-odst"
 	item_state = "rig0-odst"
 	item_state_slots = null
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	light_overlay = "helmet_light_dual"
 	species_restricted = null
 
@@ -50,8 +48,6 @@
 	icon_state = "odst"
 	item_state = "odst"
 	item_state_slots = null
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	species_restricted = null
 	breach_threshold = 16 //Extra Thicc
 	resilience = 0.05 //Military Armor

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

@@ -3,199 +3,127 @@
 /obj/item/clothing/suit/space/void/mining/alt2
 	desc = "A surplus Solgov mining voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_mining_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0
 
 /obj/item/clothing/head/helmet/space/void/mining/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_mining_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt anomaly/excavation suit
 /obj/item/clothing/suit/space/anomaly/alt
 	desc = "A surplus Solgov anomaly suit! Slightly more comfortable and easier to move in than your average anomaly suit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_excavation_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0.5
 
 /obj/item/clothing/head/helmet/space/anomaly/alt
 	desc = "A surplus Solgov helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_excavation_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 	camera_networks = list(NETWORK_RESEARCH)
 
 // Alt riot suit
 /obj/item/clothing/suit/space/void/security/riot/alt
 	desc = "A surplus Solgov riot control voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_secalt_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0.5
 
 /obj/item/clothing/head/helmet/space/void/security/riot/alt
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_secalt_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt pilot suit
 /obj/item/clothing/suit/space/void/pilot/alt2
 	desc = "A surplus Solgov pilot voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_pilot_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0
 
 /obj/item/clothing/head/helmet/space/void/pilot/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_pilot_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt medical/emt suit
 /obj/item/clothing/suit/space/void/medical/alt2
 	desc = "A surplus Solgov medical voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_medicalalt_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0
 
 /obj/item/clothing/head/helmet/space/void/medical/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_medicalalt_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt explorer suit
 /obj/item/clothing/suit/space/void/exploration/alt2
 	desc = "A surplus Solgov exploration voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_explorer_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0
 
 /obj/item/clothing/head/helmet/space/void/exploration/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_explorer_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt engineering voidsuit
 /obj/item/clothing/suit/space/void/engineering/alt2
 	desc = "A surplus Solgov engineering voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_engineeringalt_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0.5
 
 /obj/item/clothing/head/helmet/space/void/engineering/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_engineeringalt_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt atmos voidsuit
 /obj/item/clothing/suit/space/void/atmos/alt2
 	desc = "A surplus Solgov atmospherics voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_atmosalt_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 0.5
 
 /obj/item/clothing/head/helmet/space/void/atmos/alt2
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_atmosalt_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 
 // Alt command voidsuit
 /obj/item/clothing/suit/space/void/captain/alt
 	desc = "A surplus Solgov Navy captain voidsuit! Slightly more comfortable and easier to move in than your average voidsuit."
 
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "void_command_bay"
 	item_state = null
-	sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB
-	sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM
 	slowdown = 1.0
 
 /obj/item/clothing/head/helmet/space/void/captain/alt
 	desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier."
 
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "void_command_bay"
 	item_state = null
-	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
 	camera_networks = list(NETWORK_COMMAND)
 // CHOMPStation Edit End

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

@@ -16,8 +16,6 @@
 	desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
 	item_state = "hostile_env"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20)
 
 /obj/item/clothing/head/helmet/space/void/heck/Initialize(mapload)
@@ -38,8 +36,6 @@
 	desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
 	item_state = "hostile_env"
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	slowdown = 1.5
 	armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20)
 
@@ -48,8 +44,6 @@
 	desc = "A free helmet, gifted you by your new not-quite-corporate master!"
 	icon_state = "syndicate-contract"
 	item_state = "syndicate-contract"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 	camera_networks = list(NETWORK_MERCENARY)
@@ -59,8 +53,6 @@
 	desc = "A free suit, gifted you by your new not-quite-corporate master!"
 	icon_state = "syndicate-contract"
 	item_state = "syndicate-contract"
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 
@@ -69,21 +61,16 @@
 	desc = "From out of space and time, this helmet will protect you while you perform your duties."
 	icon_state = "chronohelmet"
 	item_state = "chronohelmet"
-	icon = 'icons/inventory/head/item_vr.dmi'
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/suit/space/void/chrono
 	name = "chrono-suit"
 	desc = "From out of space and time, this helmet will protect you while you perform your duties."
 	icon_state = "chronosuit"
 	item_state = "chronosuit"
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 
 /obj/item/clothing/suit/space/void/autolok
 	name = "AutoLok pressure suit"
 	desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer."
-	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "autoloksuit"
 	item_state = "autoloksuit"
 	item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate")
@@ -143,11 +130,9 @@
 /obj/item/clothing/head/helmet/space/void/autolok
 	name = "AutoLok pressure helmet"
 	desc = "A rather close-fitting helmet designed to protect the wearer from hazardous conditions. Automatically deploys when the suit's sensors detect an environment that is hazardous to the wearer."
-	icon = 'icons/inventory/head/item_vr.dmi'
 	icon_state = "autolokhelmet"
 	item_state = "autolokhelmet"
 	species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX)	//this thing can autoadapt too
 	flags_inv = HIDEEARS|BLOCKHAIR //removed HIDEFACE/MASK/EYES flags so sunglasses or facemasks don't disappear. still gotta have BLOCKHAIR or it'll clip out tho.
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
 	sprite_sheets_obj = null

code/modules/clothing/suits/armor_vr.dm

@@ -55,16 +55,12 @@
 	name = "marine body armor"
 	desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon-and we had to <i>share</i> the rock!"
 	icon_state = "unsc_armor"
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	body_parts_covered = CHEST // ToDo: Break up the armor into smaller bits.
 
 /obj/item/clothing/suit/armor/combat/imperial
 	name = "imperial soldier armor"
 	desc = "Made out of an especially light metal, it lets you conquer in style."
 	icon_state = "ge_armor"
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	body_parts_covered = CHEST
 
 /obj/item/clothing/suit/armor/combat/imperial/centurion
@@ -135,21 +131,13 @@
 /obj/item/clothing/suit/armor/crusader
 	name = "crusader armor"
 	desc = "God will protect those who defend his faith."
-
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "crusader_suit"
 
 /obj/item/clothing/head/helmet/crusader
 	name = "crusader helmet"
 	desc = "God will protect those who defend his faith."
-
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "crusader_head"
 
 /obj/item/clothing/suit/armor/combat/crusader_explo

code/modules/clothing/suits/labcoat_vr.dm

@@ -1,9 +1,6 @@
 // 'Modern' labcoats
 /obj/item/clothing/suit/storage/toggle/labcoat/modern
 	name = "modern labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_mod"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo
@@ -14,16 +11,10 @@
 // 'Modern' biosuits
 /obj/item/clothing/suit/bio_suit/modern
 	name = "modern bio suit"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "bio_mod"
 
 /obj/item/clothing/head/bio_hood/modern
 	name = "modern bio hood"
-
-	icon = 'icons/inventory/head/item_vr.dmi'
-	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "bio_mod"
 
 // Labcoat icons from before the fulpstation labcoats became default
@@ -31,35 +22,20 @@
 
 /obj/item/clothing/suit/storage/toggle/labcoat/old
 	name = "old-school labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_old"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/old/tox
 	name = "old-school scientist's labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_old_tox"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/old/chem
 	name = "old-school chemist's labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_old_chem"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/old/vir
 	name = "old-school virologist's labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_old_vir"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo
 	name = "old-school CMO's labcoat"
-
-	icon = 'icons/inventory/suit/item.dmi'
-	default_worn_icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "labcoat_old_cmo"

code/modules/clothing/suits/utility_vr.dm

@@ -5,8 +5,6 @@
 /obj/item/clothing/suit/storage/toggle/paramedic
 	name = "paramedic vest"
 	desc = "A vest that protects against minor chemical spills."
-	icon = 'icons/inventory/suit/item.dmi'
-	icon_override = 'icons/inventory/suit/mob.dmi'
 	icon_state = "paramedic-vest"
 	item_state = "paramedic-vest"
 	item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat")
@@ -18,9 +16,9 @@
 
 /obj/item/clothing/head/radiation
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_ch_teshari.dmi', //CHOMPstation edit, using our overwrite icons
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
 		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
-		SPECIES_WEREBEAST = 'icons/inventory/head/mob_vr_werebeast.dmi'
+		SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi'
 		)
 
 /obj/item/clothing/suit/radiation

code/modules/clothing/suits/wiz_robe.dm

@@ -28,9 +28,6 @@
 /obj/item/clothing/head/wizard/fake/realistic/colorable
 	desc = "A cool-looking 'magic' hat."
 	icon_state = "wizard-white"
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
-		)
 
 /obj/item/clothing/head/wizard/marisa
 	name = "Witch Hat"

code/modules/vore/resizing/holder_micro_vr.dm

@@ -3,8 +3,8 @@
 /obj/item/holder/micro
 	name = "micro"
 	desc = "Another crewmember, small enough to fit in your hand."
-	icon_state = "blank" //CHOMPEdit
+	icon_state = "micro"
-	icon_override = 'icons/inventory/head/mob_vr.dmi'
+	icon_override = 'icons/inventory/head/mob.dmi'
 	slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID | SLOT_HOLSTER
 	w_class = ITEMSIZE_SMALL
 	item_icons = null // No in-hand sprites (for now, anyway, we could totally add some)