Revert "kat's changes"

This reverts commit 3447838.

code/modules/shuttle/on_move.dm

@@ -10,6 +10,8 @@ All ShuttleMove procs go here
 	if(!(move_mode & MOVE_AREA) || !isshuttleturf(src))
 		return move_mode
 
+	clear_adjacencies()
+
 	return move_mode | MOVE_TURF | MOVE_CONTENTS
 
 // Called from the new turf before anything has been moved
@@ -20,6 +22,8 @@ All ShuttleMove procs go here
 	if(!(. & MOVE_TURF))
 		return
 
+	clear_adjacencies()
+
 	for(var/atom/movable/thing as anything in contents)
 		if(ismob(thing))
 			if(isliving(thing))
@@ -109,7 +113,7 @@ All ShuttleMove procs go here
 		CRASH("A turf queued to clean up after a shuttle dock somehow didn't have enough skipovers in baseturfs. [oldT]([oldT.type]):[oldT.loc]")
 
 	if(BT_index != length(baseturfs))
-		oldT.ScrapeAway(baseturfs.len - BT_index, CHANGETURF_FORCEOP|CHANGETURF_DEFER_CHANGE)
+		oldT.ScrapeAway(baseturfs.len - BT_index, CHANGETURF_FORCEOP)
 
 	return TRUE