shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update on_move.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-11 13:56:28 -05:00
committed by GitHub
parent c2c69d359f
commit 2f10e78ba7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/shuttle/on_move.dm
View File

@@ -14,12 +14,9 @@ All ShuttleMove procs go here
// Called from the new turf before anything has been moved
// Only gets called if fromShuttleMove returns true first
// returns the new move_mode (based on the old)
<<<<<<< HEAD
/turf/proc/toShuttleMove(turf/oldT, shuttle_dir, move_mode)
=======
/turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port/mobile/shuttle)
var/shuttle_dir = shuttle.dir
>>>>>>> 9ac60a8... Typo
for(var/i in contents)
var/atom/movable/thing = i
if(ismob(thing))
@@ -388,4 +385,4 @@ All ShuttleMove procs go here
/obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
//timer so it only happens once
addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)
addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)