From 4f379bb0d059fa5897948f0c8898b84d4bbeee80 Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 12 Jun 2018 11:44:24 +1200 Subject: [PATCH 1/2] Merge pull request #38376 from AutomaticFrenzy/patch/lockbox [s] Fix lockboxes not actually being locked --- code/datums/components/storage/storage.dm | 7 +++++-- code/game/objects/items/storage/lockbox.dm | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 304ac6591c..86b139be22 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -697,7 +697,10 @@ if(A.loc == user) . = COMPONENT_NO_ATTACK_HAND - show_to(user) + if(locked) + to_chat(user, "[parent] seems to be locked!") + else + show_to(user) /datum/component/storage/proc/signal_on_pickup(mob/user) var/atom/A = parent @@ -718,7 +721,7 @@ return hide_from(target) /datum/component/storage/proc/on_alt_click(mob/user) - if(!isliving(user) || user.incapacitated() || !quickdraw || !user.CanReach(parent)) + if(!isliving(user) || user.incapacitated() || !quickdraw || locked || !user.CanReach(parent)) return var/obj/item/I = locate() in real_location() if(!I) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 3f8c3b24e7..e1d65be1b7 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -19,6 +19,7 @@ STR.max_w_class = WEIGHT_CLASS_NORMAL STR.max_combined_w_class = 14 STR.max_items = 4 + STR.locked = TRUE /obj/item/storage/lockbox/attackby(obj/item/W, mob/user, params) var/locked = SendSignal(COMSIG_IS_STORAGE_LOCKED)