From b97e1741df2bbdebc0164d0a1da23ed166468cab Mon Sep 17 00:00:00 2001
From: Emmett Gaines <ninjanomnom@gmail.com>
Date: Fri, 3 Nov 2017 16:22:48 -0400
Subject: [PATCH] fixes shuttle parallax again (#32350)

---
 code/modules/shuttle/shuttle.dm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 3f3883becc..c9ff08f5b0 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -622,6 +622,18 @@
 
 	/******************************************All afterShuttleMove procs****************************************/
 
+	underlying_old_area.afterShuttleMove()
+
+	// Parallax handling
+	// This needs to be done before the atom after move
+	var/new_parallax_dir = FALSE
+	if(istype(new_dock, /obj/docking_port/stationary/transit))
+		new_parallax_dir = preferred_direction
+	for(var/i in 1 to areas_to_move.len)
+		CHECK_TICK
+		var/area/internal_area = areas_to_move[i]
+		internal_area.afterShuttleMove(new_parallax_dir)													//areas
+
 	for(var/i in 1 to old_turfs.len)
 		CHECK_TICK
 		if(!(old_turfs[old_turfs[i]] & MOVE_TURF))
@@ -647,17 +659,6 @@
 		newT.blocks_air = initial(newT.blocks_air)
 		newT.air_update_turf(TRUE)
 
-	underlying_old_area.afterShuttleMove()
-
-	// Parallax handling
-	var/new_parallax_dir = FALSE
-	if(istype(new_dock, /obj/docking_port/stationary/transit))
-		new_parallax_dir = preferred_direction
-	for(var/i in 1 to areas_to_move.len)
-		CHECK_TICK
-		var/area/internal_area = areas_to_move[i]
-		internal_area.afterShuttleMove(new_parallax_dir)													//areas
-
 	check_poddoors()
 	new_dock.last_dock_time = world.time
 	setDir(new_dock.dir)