Merge pull request #5006 from CHOMPStation2/upstream-merge-12892

[MIRROR] [MIRROR] Fixes zone_sel always having torso overlay (Able to be merged)
This commit is contained in:
Razgriz
2022-09-22 21:39:41 -07:00
committed by GitHub

View File

@@ -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")
overlays += image('icons/mob/screen_ammo.dmi', src, "h9")