only moving turfs gib/destroy things

This commit is contained in:
ninjanomnom
2017-10-08 08:30:12 -04:00
parent 37b1452c69
commit df54e07ff7
2 changed files with 5 additions and 3 deletions
+4 -2
View File
@@ -15,6 +15,10 @@ All ShuttleMove procs go here
// Only gets called if fromShuttleMove returns true first
// returns the new move_mode (based on the old)
/turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port/mobile/shuttle)
. = move_mode
if(!(. & MOVE_TURF))
return
var/shuttle_dir = shuttle.dir
for(var/i in contents)
var/atom/movable/thing = i
@@ -41,8 +45,6 @@ All ShuttleMove procs go here
else
qdel(thing)
return move_mode
// Called on the old turf to move the turf data
/turf/proc/onShuttleMove(turf/newT, turf_type, baseturf_type, rotation, list/movement_force, move_dir)
if(newT == src) // In case of in place shuttle rotation shenanigans.
+1 -1
View File
@@ -574,7 +574,7 @@
continue
move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode) //atoms
move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode) //turfs
move_mode = oldT.fromShuttleMove(newT, underlying_turf_type, baseturf_cache, move_mode) //turfs
move_mode = newT.toShuttleMove(oldT, move_mode , src) //turfs
if(move_mode & MOVE_AREA)