cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes spring traps being triggered by abstract objects (#12881)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-07-08 11:43:55 +02:00
committed by GitHub
co-authored by Guti
parent d2de031334
commit f89a980e0c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/spring_trap.dm
+2 -1
View File
@@ -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)