From 0aa0bc414155e4bbf148d49b0048ee92385291ce Mon Sep 17 00:00:00 2001
From: MrStonedOne <kyleshome@gmail.com>
Date: Wed, 22 Jul 2015 09:49:32 -0700
Subject: [PATCH] OH GOD THE RUNTIMES! fixes shuttles causing atmos runtimes
 that fill up our runtime logs

---
 code/modules/shuttle/shuttle.dm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index cbb37c661d3..ce79b1e6ec6 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -344,18 +344,6 @@
 		if(!T1)
 			continue
 
-
-		//lighting stuff
-		T1.redraw_lighting()
-		SSair.remove_from_active(T1)
-		T1.CalculateAdjacentTurfs()
-		SSair.add_to_active(T1,1)
-
-		T0.redraw_lighting()
-		SSair.remove_from_active(T0)
-		T0.CalculateAdjacentTurfs()
-		SSair.add_to_active(T0,1)
-
 		T0.copyTurf(T1)
 		areaInstance.contents += T1
 
@@ -403,9 +391,23 @@
 					if(!M.buckled)
 						M.Weaken(3)
 
-		T0.ChangeTurf(turf_type)
+
 		if (rotation)
 			T1.shuttleRotate(rotation)
+
+		//lighting stuff
+		T1.redraw_lighting()
+		SSair.remove_from_active(T1)
+		T1.CalculateAdjacentTurfs()
+		SSair.add_to_active(T1,1)
+
+		T0.ChangeTurf(turf_type)
+
+		T0.redraw_lighting()
+		SSair.remove_from_active(T0)
+		T0.CalculateAdjacentTurfs()
+		SSair.add_to_active(T0,1)
+
 	loc = S1.loc
 	dir = S1.dir