Porting update_icon improvements. Part 1.

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

@@ -10,23 +10,21 @@
 	attack_verb = list("whipped", "lashed", "disciplined")
 	max_integrity = 300
 	var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
-	var/worn_overlays = FALSE //worn counterpart of the above.
+	var/onmob_overlays = FALSE //worn counterpart of the above.
 
 /obj/item/storage/belt/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return BRUTELOSS
 
-/obj/item/storage/belt/update_icon()
-	cut_overlays()
+/obj/item/storage/belt/update_overlays()
+	. = ..()
 	if(content_overlays)
 		for(var/obj/item/I in contents)
-			var/mutable_appearance/M = I.get_belt_overlay()
-			add_overlay(M)
-	..()
+			. += I.get_belt_overlay()
 
 /obj/item/storage/belt/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
-	if(!isinhands && worn_overlays)
+	if(!isinhands && onmob_overlays)
 		for(var/obj/item/I in contents)
 			. += I.get_worn_belt_overlay(icon_file)
 
@@ -34,6 +32,11 @@
 	. = ..()
 	update_icon()
 
+/obj/item/storage/belt/ComponentInitialize()
+	. = ..()
+	if(onmob_overlays)
+		AddElement(/datum/element/update_icon_updates_onmob)
+
 /obj/item/storage/belt/utility
 	name = "toolbelt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
 	desc = "Holds tools."
@@ -769,7 +772,7 @@
 	item_state = "sheath"
 	w_class = WEIGHT_CLASS_BULKY
 	content_overlays = TRUE
-	worn_overlays = TRUE
+	onmob_overlays = TRUE
 	var/list/fitting_swords = list(/obj/item/melee/sabre, /obj/item/melee/baton/stunsword)
 	var/starting_sword = /obj/item/melee/sabre
 
@@ -787,12 +790,6 @@
 	if(length(contents))
 		. += "<span class='notice'>Alt-click it to quickly draw the blade.</span>"
 
-/obj/item/storage/belt/sabre/update_icon()
-	. = ..()
-	if(isliving(loc))
-		var/mob/living/L = loc
-		L.regenerate_icons()
-
 /obj/item/storage/belt/sabre/PopulateContents()
 	new starting_sword(src)