cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[GBP: No Update] Fixes orbiting in vents and disposals (#17330)

Browse Source
This commit is contained in:
Luc
2022-01-18 19:05:44 +01:00
committed by GitHub
parent f85420ec01
commit b2704e06b2
8 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/orbiter.dm
+2 -2
View File
@@ -239,7 +239,7 @@
/datum/component/orbiter/proc/orbiter_move_react(atom/movable/orbiter, atom/oldloc, direction)
SIGNAL_HANDLER // COMSIG_MOVABLE_MOVED
if(get_turf(orbiter) == get_turf(parent) || get_turf(orbiter) == get_turf(oldloc) || get_turf(orbiter) == oldloc)
if(get_turf(orbiter) == get_turf(parent) || get_turf(orbiter) == get_turf(oldloc) || get_turf(orbiter) == oldloc || orbiter.loc == oldloc)
return
if(orbiter in orbiter_list)
@@ -269,7 +269,7 @@
if(isturf(start))
return
var/atom/cur_atom = start
while(!isturf(cur_atom.loc) && !(cur_atom.loc in orbiter_list))
while(cur_atom.loc && !isturf(cur_atom.loc) && !(cur_atom.loc in orbiter_list))
RegisterSignal(cur_atom, COMSIG_MOVABLE_MOVED, .proc/on_intermediate_move, TRUE)
RegisterSignal(cur_atom, COMSIG_ATOM_EXITED, .proc/on_remove_child, TRUE)
cur_atom = cur_atom.loc