mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +01:00
You can now resist out of nested containers (also fixes the GBJ associated with it) (#63449)
Co-authored-by: SuperNovaa41 <supernovaa41@protonmail.com>
This commit is contained in:
co-authored by
SuperNovaa41
parent
4c28fb5a99
commit
6869abefb1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user