From 6869abefb190fc973feae812db94ca7ddd207187 Mon Sep 17 00:00:00 2001 From: Seth Scherer Date: Sat, 18 Dec 2021 18:22:58 -0500 Subject: [PATCH] You can now resist out of nested containers (also fixes the GBJ associated with it) (#63449) Co-authored-by: SuperNovaa41 --- code/game/objects/structures/crates_lockers/closets.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e3974f2cdec..c7339c1e72f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -576,6 +576,8 @@ return TRUE /obj/structure/closet/container_resist_act(mob/living/user) + if(isstructure(loc)) + relay_container_resist_act(user, loc) if(opened) return if(ismovable(loc)) @@ -605,6 +607,10 @@ if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. to_chat(user, span_warning("You fail to break out of [src]!")) +/obj/structure/closet/relay_container_resist_act(mob/living/user, obj/container) + container.container_resist_act() + + /obj/structure/closet/proc/bust_open() SIGNAL_HANDLER welded = FALSE //applies to all lockers