cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +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/effects/bump_teleporter.dm
+4 -2
View File
@@ -19,8 +19,10 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
BUMP_TELEPORTERS -= src
return ..()
/obj/effect/bump_teleporter/CollidedWith(atom/user)
if(!ismob(user))
/obj/effect/bump_teleporter/CollidedWith(atom/bumped_atom)
. = ..()
if(!ismob(bumped_atom))
//user.forceMove(src.loc) //Stop at teleporter location
return
code/game/objects/effects/portals.dm
+3 -3
View File
@@ -30,11 +30,11 @@
precision = precise
/obj/effect/portal/CollidedWith(mob/M)
set waitfor = FALSE
/obj/effect/portal/CollidedWith(atom/bumped_atom)
. = ..()
if(does_teleport)
teleport(M)
teleport(bumped_atom)
/obj/effect/portal/Crossed(AM)
set waitfor = FALSE