From bac6697cf0dbc96755be45f46be0e57b5a8575ff Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 3 Jul 2021 02:17:43 +0200 Subject: [PATCH] [MIRROR] Fix error on secondary attacking certain secure closets. (#6660) * Fix error on secondary attacking certain secure closets. (#59867) * Feex * Reviewify * Fix error on secondary attacking certain secure closets. Co-authored-by: Timberpoes --- code/game/objects/structures/crates_lockers/closets.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9b2c951ef8b..df81646c307 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -473,12 +473,13 @@ open() /obj/structure/closet/attack_hand_secondary(mob/user, modifiers) + . = SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(!user.canUseTopic(src, BE_CLOSE) || !isturf(loc)) return if(!opened && secure) togglelock(user) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/structure/closet/proc/togglelock(mob/living/user, silent) if(secure && !broken)