From 4a12c0bb5c471505f25476479d18dcc0f28dc923 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Sun, 15 Mar 2020 11:28:33 -0500 Subject: [PATCH] Fixes some oversights with storage altclicking Update secure.dm --- code/game/objects/items/weapons/storage/secure.dm | 12 ++++++++++-- code/game/objects/items/weapons/storage/storage.dm | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index a91d1e10f62..b3736a22620 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -83,13 +83,21 @@ to_chat(user, "You short out the lock on [src].") return +/obj/item/storage/secure/AltClick(mob/user) + if(!try_to_open()) + return FALSE + return ..() /obj/item/storage/secure/MouseDrop(over_object, src_location, over_location) + if(!try_to_open()) + return FALSE + return ..() + +/obj/item/storage/secure/proc/try_to_open() if(locked) add_fingerprint(usr) to_chat(usr, "It's locked!") - return 0 - ..() + return FALSE /obj/item/storage/secure/attack_self(mob/user as mob) user.set_machine(src) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index e99a79abd9b..7cefb4dfd59 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -83,7 +83,7 @@ return /obj/item/storage/AltClick(mob/user) - if(Adjacent(user)) + if(Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) orient2hud(user) if(user.s_active) user.s_active.close(user)