Fixes more belt missing texture crap (#51597)

* Fixes more belt missing texture crap

* #51010 progress

* tank fixes

* typo

* Removed dead/duplicated code

* cleanup

* don't need the - meme anymore with build_worn_icon

* icon fix

* commentary

* yelling at future coders

* more condensedd

code/game/objects/items.dm

@@ -11,6 +11,16 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	name = "item"
 	icon = 'icons/obj/items_and_weapons.dmi'
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC
+
+	/*	!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!
+
+		IF YOU ADD MORE ICON CRAP TO THIS
+		ENSURE YOU ALSO ADD THE NEW VARS TO CHAMELEON ITEM_ACTION'S update_item() PROC (/datum/action/item_action/chameleon/change/proc/update_item())
+		WASHING MASHINE'S dye_item() PROC (/obj/item/proc/dye_item())
+		AND ALSO TO THE CHANGELING PROFILE DISGUISE SYSTEMS (/datum/changelingprofile / /datum/antagonist/changeling/proc/create_profile() / /proc/changeling_transform())
+
+		!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!	*/
+
 	///icon state for inhand overlays, if null the normal icon_state will be used.
 	var/inhand_icon_state = null
 	///Icon file for left hand inhand overlays
@@ -25,6 +35,15 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	///Forced mob worn layer instead of the standard preferred ssize.
 	var/alternate_worn_layer
 
+	/*	!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!
+
+		IF YOU ADD MORE ICON CRAP TO THIS
+		ENSURE YOU ALSO ADD THE NEW VARS TO CHAMELEON ITEM_ACTION'S update_item() PROC (/datum/action/item_action/chameleon/change/proc/update_item())
+		WASHING MASHINE'S dye_item() PROC (/obj/item/proc/dye_item())
+		AND ALSO TO THE CHANGELING PROFILE DISGUISE SYSTEMS (/datum/changelingprofile / /datum/antagonist/changeling/proc/create_profile() / /proc/changeling_transform())
+
+		!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!	*/
+
 	///Dimensions of the icon file used when this item is worn, eg: hats.dmi (32x32 sprite, 64x64 sprite, etc.). Allows inhands/worn sprites to be of any size, but still centered on a mob properly
 	var/worn_x_dimension = 32
 	///Dimensions of the icon file used when this item is worn, eg: hats.dmi (32x32 sprite, 64x64 sprite, etc.). Allows inhands/worn sprites to be of any size, but still centered on a mob properly

code/game/objects/items/defib.dm

@@ -240,6 +240,7 @@
 	desc = "A belt-equipped defibrillator that can be rapidly deployed."
 	icon_state = "defibcompact"
 	inhand_icon_state = "defibcompact"
+	worn_icon_state = "defibcompact"
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_BELT
 
@@ -257,6 +258,7 @@
 	desc = "A belt-equipped blood-red defibrillator. Can revive through spacesuits, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or agressive manner."
 	icon_state = "defibcombat" //needs defib inhand sprites
 	inhand_icon_state = "defibcombat"
+	worn_icon_state = "defibcombat"
 	combat = TRUE
 	safety = FALSE
 	cooldown_duration = 2.5 SECONDS
@@ -277,6 +279,7 @@
 	desc = "A belt-equipped state-of-the-art defibrillator. Can revive through spacesuits, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or agressive manner."
 	icon_state = "defibnt" //needs defib inhand sprites
 	inhand_icon_state = "defibnt"
+	worn_icon_state = "defibnt"
 	paddle_type = /obj/item/shockpaddles/syndicate/nanotrasen
 
 //paddles

code/game/objects/items/devices/traitordevices.dm

@@ -186,6 +186,7 @@ effective or pretty fucking useless.
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
 	inhand_icon_state = "utility"
+	worn_icon_state = "utility"
 	slot_flags = ITEM_SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
 

code/game/objects/items/holy_weapons.dm

@@ -360,6 +360,7 @@
 	desc = "Capable of cutting clean through a holy claymore."
 	icon_state = "katana"
 	inhand_icon_state = "katana"
+	worn_icon_state = "katana"
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
 
 /obj/item/nullrod/claymore/multiverse

code/game/objects/items/melee/misc.dm

@@ -137,6 +137,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "beesword"
 	inhand_icon_state = "stinger"
+	worn_icon_state = "stinger"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	slot_flags = ITEM_SLOT_BELT

code/game/objects/items/storage/belt.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
 	inhand_icon_state = "utility"
+	worn_icon_state = "utility"
 	lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
 	slot_flags = ITEM_SLOT_BELT
@@ -31,6 +32,7 @@
 	desc = "Holds tools."
 	icon_state = "utility"
 	inhand_icon_state = "utility"
+	worn_icon_state = "utility"
 	content_overlays = TRUE
 	custom_premium_price = 300
 	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
@@ -72,6 +74,7 @@
 	desc = "Holds tools, looks snazzy."
 	icon_state = "utility_ce"
 	inhand_icon_state = "utility_ce"
+	worn_icon_state = "utility_ce"
 
 /obj/item/storage/belt/utility/chief/full/PopulateContents()
 	new /obj/item/screwdriver/power(src)
@@ -125,6 +128,7 @@
 	desc = "Can hold various medical equipment."
 	icon_state = "medical"
 	inhand_icon_state = "medical"
+	worn_icon_state = "medical"
 
 /obj/item/storage/belt/medical/ComponentInitialize()
 	. = ..()
@@ -199,6 +203,7 @@
 	desc = "Can hold security gear like handcuffs and flashes."
 	icon_state = "security"
 	inhand_icon_state = "security"//Could likely use a better one.
+	worn_icon_state = "security"
 	content_overlays = TRUE
 
 /obj/item/storage/belt/security/ComponentInitialize()
@@ -239,6 +244,7 @@
 	desc = "Unique and versatile chest rig, can hold security gear."
 	icon_state = "securitywebbing"
 	inhand_icon_state = "securitywebbing"
+	worn_icon_state = "securitywebbing"
 	content_overlays = FALSE
 	custom_premium_price = 900
 
@@ -252,6 +258,7 @@
 	desc = "A versatile chest rig, cherished by miners and hunters alike."
 	icon_state = "explorer1"
 	inhand_icon_state = "explorer1"
+	worn_icon_state = "explorer1"
 	w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/storage/belt/mining/ComponentInitialize()
@@ -307,12 +314,14 @@
 /obj/item/storage/belt/mining/alt
 	icon_state = "explorer2"
 	inhand_icon_state = "explorer2"
+	worn_icon_state = "explorer2"
 
 /obj/item/storage/belt/mining/primitive
 	name = "hunter's belt"
 	desc = "A versatile belt, woven from sinew."
 	icon_state = "ebelt"
 	inhand_icon_state = "ebelt"
+	worn_icon_state = "ebelt"
 
 /obj/item/storage/belt/mining/primitive/ComponentInitialize()
 	. = ..()
@@ -324,6 +333,7 @@
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
 	icon_state = "soulstonebelt"
 	inhand_icon_state = "soulstonebelt"
+	worn_icon_state = "soulstonebelt"
 
 /obj/item/storage/belt/soulstone/ComponentInitialize()
 	. = ..()
@@ -346,6 +356,7 @@
 	desc = "Proves to the world that you are the strongest!"
 	icon_state = "championbelt"
 	inhand_icon_state = "championbelt"
+	worn_icon_state = "championbelt"
 	custom_materials = list(/datum/material/gold=400)
 
 /obj/item/storage/belt/champion/ComponentInitialize()
@@ -361,6 +372,7 @@
 	desc = "A set of tactical webbing worn by Syndicate boarding parties."
 	icon_state = "militarywebbing"
 	inhand_icon_state = "militarywebbing"
+	worn_icon_state = "militarywebbing"
 	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/belt/military/ComponentInitialize()
@@ -436,12 +448,14 @@
 	desc = "A belt used by military forces."
 	icon_state = "grenadebeltold"
 	inhand_icon_state = "security"
+	worn_icon_state = "grenadebeltold"
 
 /obj/item/storage/belt/military/assault
 	name = "assault belt"
 	desc = "A tactical assault belt."
 	icon_state = "assaultbelt"
 	inhand_icon_state = "security"
+	worn_icon_state = "assault"
 
 /obj/item/storage/belt/military/assault/ComponentInitialize()
 	. = ..()
@@ -453,6 +467,7 @@
 	desc = "A belt for holding grenades."
 	icon_state = "grenadebeltnew"
 	inhand_icon_state = "security"
+	worn_icon_state = "grenadebeltnew"
 
 /obj/item/storage/belt/grenade/ComponentInitialize()
 	. = ..()
@@ -493,6 +508,7 @@
 	desc = "A belt designed to hold various rods of power. A veritable fanny pack of exotic magic."
 	icon_state = "soulstonebelt"
 	inhand_icon_state = "soulstonebelt"
+	worn_icon_state = "soulstonebelt"
 
 /obj/item/storage/belt/wands/ComponentInitialize()
 	. = ..()
@@ -519,6 +535,7 @@
 	desc = "A belt used to hold most janitorial supplies."
 	icon_state = "janibelt"
 	inhand_icon_state = "janibelt"
+	worn_icon_state = "janibelt"
 
 /obj/item/storage/belt/janitor/ComponentInitialize()
 	. = ..()
@@ -553,6 +570,7 @@
 	desc = "A bandolier for holding shotgun ammunition."
 	icon_state = "bandolier"
 	inhand_icon_state = "bandolier"
+	worn_icon_state = "bandolier"
 
 /obj/item/storage/belt/bandolier/ComponentInitialize()
 	. = ..()
@@ -569,6 +587,7 @@
 	desc = "A dorky fannypack for keeping small items in."
 	icon_state = "fannypack_leather"
 	inhand_icon_state = "fannypack_leather"
+	worn_icon_state = "fannypack_leather"
 	dying_key = DYE_REGISTRY_FANNYPACK
 	custom_price = 100
 
@@ -582,57 +601,68 @@
 	name = "black fannypack"
 	icon_state = "fannypack_black"
 	inhand_icon_state = "fannypack_black"
+	worn_icon_state = "fannypack_black"
 
 /obj/item/storage/belt/fannypack/red
 	name = "red fannypack"
 	icon_state = "fannypack_red"
 	inhand_icon_state = "fannypack_red"
+	worn_icon_state = "fannypack_red"
 
 /obj/item/storage/belt/fannypack/purple
 	name = "purple fannypack"
 	icon_state = "fannypack_purple"
 	inhand_icon_state = "fannypack_purple"
+	worn_icon_state = "fannypack_purple"
 
 /obj/item/storage/belt/fannypack/blue
 	name = "blue fannypack"
 	icon_state = "fannypack_blue"
 	inhand_icon_state = "fannypack_blue"
+	worn_icon_state = "fannypack_blue"
 
 /obj/item/storage/belt/fannypack/orange
 	name = "orange fannypack"
 	icon_state = "fannypack_orange"
 	inhand_icon_state = "fannypack_orange"
+	worn_icon_state = "fannypack_orange"
 
 /obj/item/storage/belt/fannypack/white
 	name = "white fannypack"
 	icon_state = "fannypack_white"
 	inhand_icon_state = "fannypack_white"
+	worn_icon_state = "fannypack_white"
 
 /obj/item/storage/belt/fannypack/green
 	name = "green fannypack"
 	icon_state = "fannypack_green"
 	inhand_icon_state = "fannypack_green"
+	worn_icon_state = "fannypack_green"
 
 /obj/item/storage/belt/fannypack/pink
 	name = "pink fannypack"
 	icon_state = "fannypack_pink"
 	inhand_icon_state = "fannypack_pink"
+	worn_icon_state = "fannypack_pink"
 
 /obj/item/storage/belt/fannypack/cyan
 	name = "cyan fannypack"
 	icon_state = "fannypack_cyan"
 	inhand_icon_state = "fannypack_cyan"
+	worn_icon_state = "fannypack_cyan"
 
 /obj/item/storage/belt/fannypack/yellow
 	name = "yellow fannypack"
 	icon_state = "fannypack_yellow"
 	inhand_icon_state = "fannypack_yellow"
+	worn_icon_state = "fannypack_yellow"
 
 /obj/item/storage/belt/sabre
 	name = "sabre sheath"
 	desc = "An ornate sheath designed to hold an officer's blade."
 	icon_state = "sheath"
 	inhand_icon_state = "sheath"
+	worn_icon_state = "sheath"
 	w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/storage/belt/sabre/ComponentInitialize()
@@ -663,11 +693,13 @@
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 
 /obj/item/storage/belt/sabre/update_icon_state()
-	icon_state = "sheath"
-	inhand_icon_state = "sheath"
+	icon_state = initial(inhand_icon_state)
+	inhand_icon_state = initial(inhand_icon_state)
+	worn_icon_state = initial(worn_icon_state)
 	if(contents.len)
 		icon_state += "-sabre"
 		inhand_icon_state += "-sabre"
+		worn_icon_state += "-sabre"
 
 /obj/item/storage/belt/sabre/PopulateContents()
 	new /obj/item/melee/sabre(src)
@@ -678,6 +710,7 @@
 	desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green."
 	icon_state = "plantbelt"
 	inhand_icon_state = "plantbelt"
+	worn_icon_state = "plantbelt"
 	content_overlays = TRUE
 
 /obj/item/storage/belt/plant/ComponentInitialize()

code/game/objects/items/storage/holsters.dm

@@ -4,6 +4,7 @@
 	desc = "A rather plain but still badass looking holster with a single pouch that can hold a small firearm."
 	icon_state = "holster"
 	inhand_icon_state = "holster"
+	worn_icon_state = "holster"
 	alternate_worn_layer = UNDER_SUIT_LAYER
 
 /obj/item/storage/belt/holster/equipped(mob/user, slot)
@@ -56,6 +57,7 @@
 	desc = "A two pouched hip holster that uses chameleon technology to disguise itself and any guns in it."
 	icon_state = "syndicate_holster"
 	inhand_icon_state = "syndicate_holster"
+	worn_icon_state = "syndicate_holster"
 	var/datum/action/item_action/chameleon/change/chameleon_action
 
 /obj/item/storage/belt/holster/chameleon/Initialize()
@@ -100,6 +102,7 @@
 	desc = "A deep shoulder holster capable of holding almost any form of ballistic weaponry."
 	icon_state = "syndicate_holster"
 	inhand_icon_state = "syndicate_holster"
+	worn_icon_state = "syndicate_holster"
 	w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/storage/belt/holster/nukie/ComponentInitialize()

code/game/objects/items/tanks/tank_types.dm

@@ -113,6 +113,8 @@
 /obj/item/tank/internals/plasmaman/belt
 	icon_state = "plasmaman_tank_belt"
 	inhand_icon_state = "plasmaman_tank_belt"
+	worn_icon_state = "plasmaman_tank_belt"
+	worn_icon = null
 	slot_flags = ITEM_SLOT_BELT
 	force = 5
 	volume = 6
@@ -134,6 +136,8 @@
 	name = "emergency oxygen tank"
 	desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
 	icon_state = "emergency"
+	worn_icon_state = "emergency"
+	worn_icon = null
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
@@ -153,6 +157,8 @@
 /obj/item/tank/internals/emergency_oxygen/engi
 	name = "extended-capacity emergency oxygen tank"
 	icon_state = "emergency_engi"
+	worn_icon_state = "emergency_engi"
+	worn_icon = null
 	volume = 2 // should last a bit over 30 minutes if full
 
 /obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas()

code/game/objects/items/tanks/tanks.dm

@@ -5,6 +5,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tanks_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BACK
+	worn_icon = 'icons/mob/clothing/back.dmi' //since these can also get thrown into suit storage slots. if something goes on the belt, set this to null.
 	hitsound = 'sound/weapons/smash.ogg'
 	pressure_resistance = ONE_ATMOSPHERE * 5
 	force = 5

code/game/objects/items/toys.dm

@@ -454,6 +454,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "katana"
 	inhand_icon_state = "katana"
+	worn_icon_state = "katana"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	flags_1 = CONDUCT_1
@@ -1208,6 +1209,7 @@
 	desc = "A stylish steampunk watch made out of thousands of tiny cogwheels."
 	icon = 'icons/obj/clockwork_objects.dmi'
 	icon_state = "dread_ipad"
+	worn_icon_state = "dread_ipad"
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	var/cooldown = 0

code/game/objects/items/weaponry.dm

@@ -208,6 +208,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	desc = "Woefully underpowered in D20."
 	icon_state = "katana"
 	inhand_icon_state = "katana"
+	worn_icon_state = "katana"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	flags_1 = CONDUCT_1