From aeb29a28d0de73de6cac66b3cde0e7a651e15ab0 Mon Sep 17 00:00:00 2001
From: KorPhaeron <kortgstation@gmail.com>
Date: Tue, 15 Dec 2015 14:33:30 -0600
Subject: [PATCH 1/2] Shuttle tweaks

---
 code/game/turfs/space/transit.dm | 1 +
 code/modules/shuttle/shuttle.dm  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index db03173f624..60c82e3399f 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -1,6 +1,7 @@
 /turf/space/transit
 	icon_state = "black"
 	dir = SOUTH
+	baseturf = /turf/space/transit
 
 /turf/space/transit/horizontal
 	dir = WEST
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 250e3e01423..233e15956fd 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -347,8 +347,8 @@
 		var/turf/T1 = L1[i]
 		if(!T1)
 			continue
-
-		T0.copyTurf(T1)
+		if(T0.type != T0.baseturf) //So if there is a hole in the shuttle we don't drag along the space/asteroid/etc to wherever we are going next
+			T0.copyTurf(T1)
 		areaInstance.contents += T1
 
 		//copy over air

From 32e713b1b37a3e797567566fb30a11f9907c7a48 Mon Sep 17 00:00:00 2001
From: KorPhaeron <kortgstation@gmail.com>
Date: Tue, 15 Dec 2015 15:17:04 -0600
Subject: [PATCH 2/2] Doesn't move stuff either

---
 code/modules/shuttle/shuttle.dm | 75 ++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 233e15956fd..4666b639b2e 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -349,51 +349,50 @@
 			continue
 		if(T0.type != T0.baseturf) //So if there is a hole in the shuttle we don't drag along the space/asteroid/etc to wherever we are going next
 			T0.copyTurf(T1)
-		areaInstance.contents += T1
+			areaInstance.contents += T1
 
-		//copy over air
-		if(istype(T1, /turf/simulated))
-			var/turf/simulated/Ts1 = T1
-			Ts1.copy_air_with_tile(T0)
+			//copy over air
+			if(istype(T1, /turf/simulated))
+				var/turf/simulated/Ts1 = T1
+				Ts1.copy_air_with_tile(T0)
 
-		//move mobile to new location
+			//move mobile to new location
 
 
+			for(var/atom/movable/AM in T0)
+				if (rotation)
+					AM.shuttleRotate(rotation)
 
-		for(var/atom/movable/AM in T0)
-			if (rotation)
-				AM.shuttleRotate(rotation)
+				if (istype(AM,/obj))
+					var/obj/O = AM
+					if(O.invisibility >= 101)
+						continue
+					if(O == T0.lighting_object)
+						continue
+					O.loc = T1
 
-			if (istype(AM,/obj))
-				var/obj/O = AM
-				if(O.invisibility >= 101)
-					continue
-				if(O == T0.lighting_object)
-					continue
-				O.loc = T1
+					//close open doors
+					if(istype(O, /obj/machinery/door))
+						var/obj/machinery/door/Door = O
+						spawn(-1)
+							if(Door)
+								Door.close()
+				else if (istype(AM,/mob))
+					var/mob/M = AM
+					if(!M.move_on_shuttle)
+						continue
+					M.loc = T1
 
-				//close open doors
-				if(istype(O, /obj/machinery/door))
-					var/obj/machinery/door/Door = O
-					spawn(-1)
-						if(Door)
-							Door.close()
-			else if (istype(AM,/mob))
-				var/mob/M = AM
-				if(!M.move_on_shuttle)
-					continue
-				M.loc = T1
-
-				//docking turbulence
-				if(M.client)
-					spawn(0)
-						if(M.buckled)
-							shake_camera(M, 2, 1) // turn it down a bit come on
-						else
-							shake_camera(M, 7, 1)
-				if(istype(M, /mob/living/carbon))
-					if(!M.buckled)
-						M.Weaken(3)
+					//docking turbulence
+					if(M.client)
+						spawn(0)
+							if(M.buckled)
+								shake_camera(M, 2, 1) // turn it down a bit come on
+							else
+								shake_camera(M, 7, 1)
+					if(istype(M, /mob/living/carbon))
+						if(!M.buckled)
+							M.Weaken(3)
 
 
 		if (rotation)