From fd5c77580979b9dcd9075c59e26c22440917e21c Mon Sep 17 00:00:00 2001 From: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Thu, 22 Sep 2022 21:04:52 -0400 Subject: [PATCH 1/2] [MIRROR] Fixes zone_sel always having torso overlay (Able to be merged) (#12892) * Fixes zone_sel always having torso overlay * fix Co-authored-by: Sypsoti <98442665+Sypsoti@users.noreply.github.com> Co-authored-by: C.L --- code/_onclick/hud/screen_objects.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 8954bf45bc..72e2219ad8 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -167,6 +167,9 @@ vis_contents -= hover_overlays_cache[hovering_choice] hovering_choice = choice + if(!choice) + return + var/obj/effect/overlay/zone_sel/overlay_object = hover_overlays_cache[choice] if(!overlay_object) overlay_object = new @@ -174,7 +177,6 @@ hover_overlays_cache[choice] = overlay_object vis_contents += overlay_object - /obj/effect/overlay/zone_sel icon = 'icons/mob/zone_sel.dmi' mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -240,7 +242,7 @@ update_icon() /obj/screen/zone_sel/update_icon() - cut_overlay(selecting_appearance) + cut_overlays() selecting_appearance = mutable_appearance('icons/mob/zone_sel.dmi', "[selecting]") add_overlay(selecting_appearance) @@ -985,4 +987,4 @@ else //"0" is still length 1 so this means it's over 999 overlays += image('icons/mob/screen_ammo.dmi', src, "o9") overlays += image('icons/mob/screen_ammo.dmi', src, "t9") - overlays += image('icons/mob/screen_ammo.dmi', src, "h9") \ No newline at end of file + overlays += image('icons/mob/screen_ammo.dmi', src, "h9")