From f89a980e0ccb0907ed1a57eb1c82fcb78a281d4f Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Wed, 8 Jul 2026 02:43:55 -0700 Subject: [PATCH] [MIRROR] Fixes spring traps being triggered by abstract objects (#12881) Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com> --- code/game/objects/structures/spring_trap.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/spring_trap.dm b/code/game/objects/structures/spring_trap.dm index 8e8e79c3ec..50aeca07b2 100644 --- a/code/game/objects/structures/spring_trap.dm +++ b/code/game/objects/structures/spring_trap.dm @@ -97,7 +97,7 @@ addtimer(CALLBACK(src, PROC_REF(reset)), reset_time, TIMER_DELETE_ME) /obj/structure/spring_trap/Crossed(atom/movable/AM) - if(AM.is_incorporeal()) + if(AM.is_incorporeal() || isobserver(AM) || istype(AM, /obj/effect/abstract) || AM.throwing || istype(AM, /obj/item/projectile)) return if(!sprung) if(isliving(AM)) @@ -128,4 +128,5 @@ playsound(src, 'sound/machines/click.ogg', 50, 1) var/obj/structure/spring_trap/spring_trap = new(get_turf(src)) spring_trap.add_fingerprint(user) + spring_trap.dir = user.dir qdel(src)