U_I Phase 1.0: First consolidation pass

code/game/objects/items/devices/radio/headset.dm

@@ -3,6 +3,7 @@
 	desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
 	var/radio_desc = ""
 	icon_state = "headset"
+	item_state = null //To remove the radio's state
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	subspace_transmission = 1
 	canhear_range = 0 // can't hear headsets from very far away
@@ -63,6 +64,17 @@
 			return ..(freq, level)
 	return -1
 
+/obj/item/device/radio/headset/get_worn_icon_state(var/slot_name)
+	var/append = ""
+	if(icon_override)
+		switch(slot_name)
+			if(slot_l_ear_str)
+				append = "_l"
+			if(slot_r_ear_str)
+				append = "_r"
+
+	return "[..()][append]"
+
 /obj/item/device/radio/headset/syndicate
 	origin_tech = list(TECH_ILLEGAL = 3)
 	syndie = 1

code/game/objects/items/weapons/cigs_lighters.dm

@@ -89,6 +89,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/weldermes = "USER lights NAME with FLAME"
 	var/ignitermes = "USER lights NAME with FLAME"
 	var/brand
+	blood_sprite_state = null //Can't bloody these
 
 /obj/item/clothing/mask/smokable/New()
 	..()

code/game/objects/items/weapons/handcuffs.dm

@@ -20,6 +20,12 @@
 	var/use_time = 30
 	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi')
 
+/obj/item/weapon/handcuffs/get_worn_icon_state(var/slot_name)
+	if(slot_name == slot_handcuffed_str)
+		return "handcuff1" //Simple
+
+	return ..()
+
 /obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)
 
 	if(!user.IsAdvancedToolUser())
@@ -210,6 +216,12 @@ var/last_chew = 0
 	breakouttime = 30
 	cuff_sound = 'sound/weapons/towelwipe.ogg' //Is there anything this sound can't do?
 
+/obj/item/weapon/handcuffs/legcuffs/get_worn_icon_state(var/slot_name)
+	if(slot_name == slot_legcuffed_str)
+		return "legcuff1"
+
+	return ..()
+
 /obj/item/weapon/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user)
 	if(user) //A ranged legcuff, until proper implementation as items it remains a projectile-only thing.
 		return 1

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -112,6 +112,12 @@
 	usr << "The fingerprint hash on the card is [fingerprint_hash]."
 	return
 
+/obj/item/weapon/card/id/get_worn_icon_state(var/slot_name)
+	if(slot_name == slot_wear_id_str)
+		return "id" //Legacy, just how it is. There's only one sprite.
+
+	return ..()
+
 /obj/item/weapon/card/id/initialize()
 	. = ..()
 	var/datum/job/J = job_master.GetJob(rank)

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

@@ -22,6 +22,16 @@
 	show_above_suit = !show_above_suit
 	update_icon()
 
+//Some belts have sprites to show icons
+/obj/item/weapon/storage/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
+	var/image/standing = ..()
+	if(contents.len)
+		for(var/obj/item/i in contents)
+			var/i_state = i.item_state
+			if(!i_state) i_state = i.icon_state
+			standing.add_overlay(image(icon = INV_BELT_DEF_ICON, icon_state = i_state))
+	return standing
+
 /obj/item/weapon/storage/update_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc