From aee3c078ae4677f49dec36e6ecb8596700e757be Mon Sep 17 00:00:00 2001 From: BraveMole Date: Thu, 11 Apr 2024 04:08:33 +0200 Subject: [PATCH 1/2] Storage closing QOL (#15610) --- code/game/objects/items/storage/storage.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index fde59f2dd7f..a43942b7048 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -182,11 +182,13 @@ if(!opened) orient2hud() opened = 1 + if (user.s_active == src) + close(user) + return TRUE + user.s_active?.close(user) if (use_sound && user.stat != DEAD) playsound(src.loc, src.use_sound, 25, 1, 3) - if (user.s_active) - user.s_active.close(user) show_to(user) return TRUE From 46322022ad4d88478bcf36c203836218d1ab9c45 Mon Sep 17 00:00:00 2001 From: homexp13 <52973135+homexp13@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:09:01 +0300 Subject: [PATCH 2/2] Update code/game/objects/items/storage/storage.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: homexp13 <52973135+homexp13@users.noreply.github.com> --- code/game/objects/items/storage/storage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index a43942b7048..57258eb5137 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -182,7 +182,7 @@ if(!opened) orient2hud() opened = 1 - if (user.s_active == src) + if(user.s_active == src) close(user) return TRUE user.s_active?.close(user)