From bc91f78c9382e1f196196216a11e83ae9d721b7d Mon Sep 17 00:00:00 2001
From: Mark van Alphen <markvanalphen2@gmail.com>
Date: Wed, 8 May 2019 22:05:11 +0200
Subject: [PATCH] Shuttle and map fixes

---
 _maps/map_files/Delta/delta.dmm               | 17 +++++++++++++--
 .../MetaStation/MetaStation.v41A.II.dmm       |  2 +-
 code/modules/shuttle/shuttle.dm               | 21 +++++++++----------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 4aac0c8ed61..bedbf0239c7 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -19500,11 +19500,11 @@
 "aLU" = (
 /turf/simulated/wall,
 /area/crew_quarters/bar/atrium)
+"aLV" = (
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
-	c_tag = "Cargo Office SouthWest";
 	dir = 4;
-	network = list("SS13")
+	location = "QM #4"
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /mob/living/simple_animal/bot/mulebot{
@@ -57483,6 +57483,10 @@
 /obj/structure/lattice/catwalk,
 /area/space/nearstation)
 "bYn" = (
+/obj/structure/sign/directions/evac{
+	pixel_y = -8
+	},
+/obj/structure/sign/directions/medical{
 	dir = 2
 	},
 /obj/structure/sign/directions/security{
@@ -69742,6 +69746,11 @@
 /turf/space,
 /obj/structure/lattice/catwalk,
 /area/space/nearstation)
+"ctK" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/crayons,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
 /area/library)
 "ctL" = (
@@ -78830,6 +78839,10 @@
 /obj/structure/lattice/catwalk,
 /area/space/nearstation)
 "cKm" = (
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8";
 	tag = ""
 	},
 /obj/effect/landmark{
diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
index d5ec22a62b6..937d3acfa47 100644
--- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
@@ -43987,7 +43987,7 @@
 /turf/space,
 /obj/structure/lattice/catwalk,
 /area/space/nearstation)
-/obj/structure/transit_tube_pod,
+"bxp" = (/obj/structure/transit_tube_pod,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index c2bab325388..5fad9348769 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -484,18 +484,17 @@
 		if(!T1)
 			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
+		T0.copyTurf(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
-			for(var/atom/movable/AM in T0)
-				AM.onShuttleMove(T1, rotation)
+		//move mobile to new location
+		for(var/atom/movable/AM in T0)
+			AM.onShuttleMove(T0, T1, rotation)
 
 		if(rotation)
 			T1.shuttleRotate(rotation)
@@ -913,4 +912,4 @@
 		T.color = color
 	if(T.dir != dir)
 		T.dir = dir
-	return T
+	return T
\ No newline at end of file