fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon

2024-04-24 22:30:25 -04:00
parent e094437056
commit 0517ece12a
36 changed files with 35 additions and 10 deletions
@@ -77,6 +77,7 @@
 		. = . || (caller.pass_flags & PASSBLOB)

 /obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind.
+	. = ..()
 	if(overmind)
 		add_atom_colour(overmind.blobstrain.color, FIXED_COLOUR_PRIORITY)
 	else
@@ -25,6 +25,7 @@
 		playsound(src, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3)

 /obj/item/assembly/mousetrap/update_icon()
+	. = ..()
 	if(armed)
 		icon_state = "mousetraparmed"
 	else
@@ -57,9 +57,9 @@
 	return TRUE

 /obj/item/assembly/signaler/update_icon()
+	. = ..()
 	if(holder)
 		holder.update_icon()
-	return

 /obj/item/assembly/signaler/ui_status(mob/user)
 	if(is_secured(user))
@@ -74,6 +74,7 @@
 	update_icon()

 /obj/machinery/atmospherics/components/binary/circulator/update_icon()
+	. = ..()
 	if(!is_operational())
 		icon_state = "circ-p-[flipped]"
 	else if(last_pressure_delta > 0)
@@ -26,6 +26,7 @@
 	icon_state = "he_map-3"

 /obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon()
+	. = ..()
 	if(nodes[1])
 		icon_state = "he1"
 		var/obj/machinery/atmospherics/node = nodes[1]
@@ -31,6 +31,7 @@
 	return ..(target, given_layer, TRUE)

 /obj/machinery/atmospherics/pipe/heat_exchanging/junction/update_icon()
+	. = ..()
 	icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
 	update_layer()
 	update_alpha()
@@ -25,6 +25,7 @@
 			initialize_directions = EAST|WEST

 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_icon()
+	. = ..()
 	icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
 	update_layer()
 	update_alpha()
@@ -28,6 +28,7 @@
 			initialize_directions = EAST|WEST

 /obj/machinery/atmospherics/pipe/simple/update_icon()
+	. = ..()
 	icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
 	update_layer()
 	update_alpha()
@@ -388,6 +388,7 @@
 	..()

 /obj/item/clothing/glasses/sunglasses/blindfold/white/update_icon(mob/living/carbon/human/user)
+	. = ..()
 	if(ishuman(user) && !colored_before)
 		add_atom_colour("#[user.left_eye_color]", FIXED_COLOUR_PRIORITY)
 		colored_before = TRUE
@@ -155,6 +155,7 @@
 	..()

 /obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user)
+	. = ..()
 	if(ishuman(user))
 		add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)

@@ -104,6 +104,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 	. += "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>"

 /obj/structure/marker_beacon/update_icon()
+	. = ..()
 	while(!picked_color || !GLOB.marker_beacon_colors[picked_color])
 		picked_color = pick(GLOB.marker_beacon_colors)
 	icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
@@ -186,9 +186,6 @@
 /obj/machinery/stasis/survival_pod/play_power_sound()
 	return

-/obj/machinery/stasis/survival_pod/update_icon()
-	return
-
 //NanoMed
 /obj/machinery/vending/wallmed/survival_pod
 	name = "survival pod medical supply"
@@ -199,6 +199,7 @@ Doesn't work on other aliens/AI.*/
 		add_ranged_ability(user, message, TRUE)

 /obj/effect/proc_holder/alien/neurotoxin/update_icon()
+	. = ..()
 	action.button_icon_state = "alien_neurotoxin_[active]"
 	action.UpdateButtons()

@@ -1,4 +1,5 @@
 /mob/living/silicon/pai/update_icon()
+	. = ..()
 	if(chassis == "custom")			//Make sure custom exists if it's set to custom
 		custom_holoform_icon = client?.prefs?.get_filtered_holoform(HOLOFORM_FILTER_PAI)
 		if(!custom_holoform_icon)
@@ -276,6 +276,7 @@
 	internal_ext.afterattack(target, user, null)

 /mob/living/simple_animal/bot/firebot/update_icon()
+	. = ..()
 	if(!on)
 		icon_state = "firebot0"
 		return
@@ -380,6 +380,7 @@
 	target = null

 /mob/living/simple_animal/bot/floorbot/update_icon()
+	. = ..()
 	icon_state = "floorbot[on]"


@@ -401,6 +401,7 @@
 	action = new(src)

 /obj/effect/proc_holder/wrap/update_icon()
+	. = ..()
 	action.button_icon_state = "wrap_[active]"
 	action.UpdateButtons()

@@ -57,6 +57,7 @@
 	reagents.handle_reactions()

 /obj/machinery/plumbing/acclimator/update_icon()
+	. = ..()
 	icon_state = initial(icon_state)
 	switch(acclimate_state)
 		if(COOLING)
@@ -486,6 +486,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
 				WS.fire()

 /obj/machinery/atmospherics/components/trinary/nuclear_reactor/update_icon()
+	. = ..()
 	icon_state = "reactor_off"
 	switch(temperature)
 		if(0 to 200)
@@ -7,6 +7,7 @@
 	max_ammo = 20

 /obj/item/ammo_box/magazine/recharge/update_icon()
+	. = ..()
 	desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
 	icon_state = "oldrifle-[round(ammo_count(),4)]"

@@ -7,6 +7,7 @@
 	max_ammo = 10

 /obj/item/ammo_box/magazine/m10mm/rifle/update_icon()
+	. = ..()
 	if(ammo_count())
 		icon_state = "75-8"
 	else
@@ -6,6 +6,7 @@
 	caliber = ".50"

 /obj/item/ammo_box/magazine/sniper_rounds/update_icon()
+	. = ..()
 	if(ammo_count())
 		icon_state = "[initial(icon_state)]-ammo"
 	else
@@ -88,6 +88,7 @@
 	list_reagents = list(/datum/reagent/medicine/adminordrazine/quantum_heal = 80, /datum/reagent/medicine/synaptizine = 20)

 /obj/item/reagent_containers/hypospray/combat/nanites/update_icon()
+	. = ..()
 	if(reagents.total_volume > 0)
 		icon_state = initial(icon_state)
 	else
@@ -266,6 +267,7 @@
 	list_reagents = list(/datum/reagent/medicine/atropine = 10, /datum/reagent/medicine/epinephrine = 10, /datum/reagent/medicine/salbutamol = 20, /datum/reagent/medicine/spaceacillin = 20)

 /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure/update_icon()
+	. = ..()
 	if(reagents.total_volume > 30)
 		icon_state = initial(icon_state)
 	else if (reagents.total_volume > 0)
@@ -43,6 +43,7 @@

 // update iconstate and dpdir due to dir and type
 /obj/structure/disposalconstruct/update_icon()
+	. = ..()
 	icon_state = initial(pipe_type.icon_state)
 	if(is_pipe())
 		icon_state = "con[icon_state]"
@@ -30,6 +30,7 @@

 // update the icon_state
 /obj/machinery/spaceship_navigation_beacon/update_icon()
+	. = ..()
 	if(powered())
 		icon_state = "core"
 	else
@@ -40,6 +40,7 @@
 	return

 /obj/effect/proc_holder/spell/aimed/update_icon()
+	. = ..()
 	if(!action)
 		return
 	action.button_icon_state = "[base_icon_state][active]"
@@ -57,6 +57,7 @@
 	return

 /obj/effect/proc_holder/spell/pointed/update_icon()
+	. = ..()
 	if(!action)
 		return
 	if(active)
@@ -47,6 +47,7 @@
 	new /obj/item/grown/bananapeel(target)

 /obj/effect/proc_holder/spell/aimed/banana_peel/update_icon()
+	. = ..()
 	if(!action)
 		return
 	if(active)
@@ -55,7 +56,6 @@
 		action.button_icon_state = action_icon_state

 	action.UpdateButtons()
-	return
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////

 /obj/effect/proc_holder/spell/targeted/touch/megahonk