[MIRROR] Fixes opening storage containers in a locker (or other container) via right click. [MDB IGNORE] (#10579)

* Fixes opening storage containers in a locker (or other container) via right click. (#63955)

* fix

* cleanup

* review

* Fixes opening storage containers in a locker (or other container) via right click.

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
This commit is contained in:
SkyratBot
2022-01-12 16:16:02 +01:00
committed by GitHub
parent 393acaa960
commit cdeaeac44c
+6 -1
View File
@@ -871,7 +871,10 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
/datum/component/storage/proc/open_storage(mob/user)
if(!isliving(user) || !user.CanReach(parent) || user.incapacitated())
if(!user.CanReach(parent))
user.balloon_alert(user, "can't reach!")
return FALSE
if(!isliving(user) || user.incapacitated())
return FALSE
if(locked)
to_chat(user, span_warning("[parent] seems to be locked!"))
@@ -897,6 +900,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
if(open_storage(user))
return COMPONENT_CANCEL_ATTACK_CHAIN
if(LAZYACCESS(modifiers, RIGHT_CLICK))
return COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN
/datum/component/storage/proc/on_open_storage_attackby(datum/source, obj/item/weapon, mob/user, params)
SIGNAL_HANDLER