cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored CollidedWith (#19541)

Browse Source 
Refactored CollidedWith()
This commit is contained in:
Fluffy
2024-06-29 10:01:18 +00:00
committed by GitHub
parent d63d63d78c
commit d8d67ebd3a
31 changed files with 317 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/traps.dm
+4 -4
View File
@@ -233,7 +233,7 @@
if(AM.loc != loc)
AM.forceMove(loc)
captured = WEAKREF(L)
buckle(L)
INVOKE_ASYNC(src, PROC_REF(buckle), L)
layer = L.layer + 0.1
playsound(src, 'sound/weapons/beartrap_shut.ogg', 100, 1)
deployed = FALSE
@@ -282,9 +282,9 @@
release()
/obj/item/trap/animal/CollidedWith(atom/AM)
if(deployed && is_type_in_list(AM, allowed_mobs))
Crossed(AM)
/obj/item/trap/animal/CollidedWith(atom/bumped_atom)
if(deployed && is_type_in_list(bumped_atom, allowed_mobs))
Crossed(bumped_atom)
else
..()