From c699ea6f1fc38666eaa26df13b5f5fe3e8eb278a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 26 Dec 2022 03:00:57 +0100 Subject: [PATCH] [MIRROR] Fixes secure briefcase and wall safes not sending icon update signals properly [MDB IGNORE] (#18238) * Fixes secure briefcase and wall safes not sending icon update signals properly (#72081) #71788 used the wrong procs. :cl: ShizCalev fix: Fixed secure briefcase and wall safes not sending icon update signals properly /:cl: * Fixes secure briefcase and wall safes not sending icon update signals properly Co-authored-by: ShizCalev --- code/game/objects/items/storage/secure.dm | 11 +++-------- code/modules/shuttle/emergency.dm | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 44ea8cc643d..fbc1215bc8c 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -36,14 +36,9 @@ if(can_hack_open) . += "The service panel is currently [panel_open ? "unscrewed" : "screwed shut"]." -/obj/item/storage/secure/update_icon() - ..() - if(!atom_storage) - return - if(atom_storage.locked) - icon_state = "[initial(icon_state)]_locked" - else - icon_state = "[initial(icon_state)]" +/obj/item/storage/secure/update_icon_state() + . = ..() + icon_state = "[initial(icon_state)][atom_storage?.locked ? "_locked" : null]" /obj/item/storage/secure/tool_act(mob/living/user, obj/item/tool) if(can_hack_open && atom_storage.locked) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index a5e9f9fa3c7..1ba6f7b6a48 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -677,7 +677,7 @@ icon_state = "wall_safe_locked" var/unlocked = FALSE -/obj/item/storage/pod/update_icon() +/obj/item/storage/pod/update_icon_state() . = ..() icon_state = "wall_safe[unlocked ? "" : "_locked"]"