cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes infinite loop in closet resist code (#92355)

Browse Source
This commit is contained in:
LemonInTheDark
2025-07-30 17:37:44 -04:00
committed by Roxy
parent 71d1633667
commit 9bf9c875bb
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+8 -8
View File
@@ -73,22 +73,22 @@
if(!hasmob)
disposal_holder.destinationTag = sort_tag
/obj/item/delivery/relay_container_resist_act(mob/living/user, obj/object)
/obj/item/delivery/relay_container_resist_act(mob/living/user, obj/container)
if(ismovable(loc))
var/atom/movable/movable_loc = loc //can't unwrap the wrapped container if it's inside something.
movable_loc.relay_container_resist_act(user, object)
movable_loc.relay_container_resist_act(user, container)
return
to_chat(user, span_notice("You lean on the back of [object] and start pushing to rip the wrapping around it."))
if(do_after(user, 5 SECONDS, target = object))
if(!user || user.stat != CONSCIOUS || user.loc != object || object.loc != src)
to_chat(user, span_notice("You lean on the back of [container] and start pushing to rip the wrapping around it."))
if(do_after(user, 5 SECONDS, target = container))
if(!user || user.stat != CONSCIOUS || user.loc != container || container.loc != src)
return
to_chat(user, span_notice("You successfully removed [object]'s wrapping!"))
object.forceMove(loc)
to_chat(user, span_notice("You successfully removed [container]'s wrapping!"))
container.forceMove(loc)
unwrap_contents()
post_unwrap_contents(user)
else
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 remove [object]'s wrapping!"))
to_chat(user, span_warning("You fail to remove [container]'s wrapping!"))
/obj/item/delivery/update_icon_state()
. = ..()