diff --git a/_maps/boxstation.json b/_maps/boxstation.json
index edf5f993d35..92d377171fe 100644
--- a/_maps/boxstation.json
+++ b/_maps/boxstation.json
@@ -1,5 +1,11 @@
 {
     "map_name": "Box Station",
     "map_path": "map_files/BoxStation",
-    "map_file": "BoxStation.dmm"
+    "map_file": "BoxStation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_meta",
+	    "emergency": "emergency_box"
+    }
 }
diff --git a/_maps/deltastation.json b/_maps/deltastation.json
index dde878a26b3..6d20f578fae 100644
--- a/_maps/deltastation.json
+++ b/_maps/deltastation.json
@@ -1,5 +1,11 @@
 {
     "map_name": "Delta Station",
     "map_path": "map_files/Deltastation",
-    "map_file": "DeltaStation2.dmm"
+    "map_file": "DeltaStation2.dmm",
+    "shuttles": {
+	    "emergency": "emergency_delta",
+	    "ferry": "ferry_fancy",
+	    "cargo": "cargo_delta",
+	    "whiteship": "whiteship_delta"
+    }
 }
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index f0473320ff3..ad009429e85 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2129,12 +2129,6 @@
 /turf/open/floor/plating,
 /area/ai_monitored/security/armory)
 "afa" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	name = "Box emergency shuttle"
-	},
 /obj/docking_port/stationary{
 	dir = 4;
 	dwidth = 12;
@@ -2144,8 +2138,8 @@
 	turf_type = /turf/open/space;
 	width = 32
 	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "afb" = (
 /obj/machinery/recharger,
 /obj/structure/table,
@@ -2253,7 +2247,8 @@
 	id = "pod3";
 	name = "escape pod 3";
 	port_direction = 2;
-	preferred_direction = 4
+	preferred_direction = 4;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_3)
@@ -5855,29 +5850,17 @@
 /turf/open/floor/plating,
 /area/security/processing)
 "anO" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "prisonshuttle";
-	name = "Labor Shuttle Airlock"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp";
-	name = "labor camp shuttle";
-	port_direction = 4;
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
 	height = 5;
 	id = "laborcamp_home";
 	name = "fore bay 1";
+	roundstart_template = /datum/map_template/shuttle/labour/box;
 	width = 9
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "anP" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
@@ -7871,7 +7854,8 @@
 	dir = 4;
 	dwidth = 4;
 	height = 9;
-	width = 9
+	width = 9;
+	timid = 0
 	},
 /obj/machinery/bluespace_beacon,
 /obj/machinery/computer/auxillary_base,
@@ -35231,29 +35215,17 @@
 /turf/open/floor/plating,
 /area/quartermaster/miningdock)
 "bJc" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "0"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 3;
-	height = 5;
-	id = "mining";
-	name = "mining shuttle";
-	port_direction = 4;
-	width = 7
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 3;
 	height = 5;
 	id = "mining_home";
 	name = "mining shuttle bay";
+	roundstart_template = /datum/map_template/shuttle/mining/box;
 	width = 7
 	},
-/turf/open/floor/plating,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "bJd" = (
 /obj/machinery/door/airlock/mining/glass{
 	cyclelinkeddir = 8;
@@ -48219,7 +48191,8 @@
 	id = "pod4";
 	name = "escape pod 4";
 	port_direction = 2;
-	preferred_direction = 4
+	preferred_direction = 4;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_4)
@@ -48506,7 +48479,8 @@
 	dir = 8;
 	id = "pod2";
 	name = "escape pod 2";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_2)
@@ -51230,18 +51204,6 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/transport)
 "cxE" = (
-/obj/machinery/door/airlock/titanium,
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 13;
-	id = "ferry";
-	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	roundstart_move = "ferry_away";
-	width = 5
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
@@ -51251,8 +51213,8 @@
 	turf_type = /turf/open/space;
 	width = 5
 	},
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "cxF" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Escape Pod Airlock"
@@ -51261,7 +51223,8 @@
 	dir = 8;
 	id = "pod1";
 	name = "escape pod 1";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_1)
@@ -51415,28 +51378,6 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned)
 "cyd" = (
-/obj/docking_port/mobile{
-	callTime = 250;
-	dheight = 0;
-	dir = 2;
-	dwidth = 11;
-	height = 15;
-	id = "whiteship";
-	launch_status = 0;
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "NT Recovery White-Ship";
-	port_direction = 8;
-	preferred_direction = 4;
-	roundstart_move = "whiteship_away";
-	width = 28
-	},
-/obj/machinery/door/airlock/titanium{
-	name = "recovery shuttle external airlock"
-	},
-/obj/effect/decal/cleanable/dirt{
-	desc = "A thin layer of dust coating the floor.";
-	name = "dust"
-	},
 /obj/docking_port/stationary{
 	dir = 2;
 	dwidth = 11;
@@ -51445,8 +51386,8 @@
 	name = "SS13: Auxiliary Dock, Station-Port";
 	width = 35
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "cye" = (
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -51753,14 +51694,6 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/supply)
 "cyT" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Supply Shuttle Airlock";
-	req_access_txt = "31"
-	},
-/obj/docking_port/mobile/supply{
-	dwidth = 5;
-	width = 12
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 5;
@@ -51769,8 +51702,8 @@
 	name = "Cargo Bay";
 	width = 12
 	},
-/turf/open/floor/plating,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "cyU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -54425,20 +54358,17 @@
 	},
 /area/science/robotics/lab)
 "cIg" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4
-	},
-/obj/docking_port/mobile/arrivals,
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 3;
 	height = 15;
 	id = "arrivals_stationary";
 	name = "arrivals";
+	roundstart_template = /datum/map_template/shuttle/arrival/box;
 	width = 7
 	},
-/turf/open/floor/plating/airless,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "cIh" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 1;
@@ -62756,11 +62686,11 @@ aaa
 aaa
 aaa
 aaa
-cyc
-cyc
-Qll
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -63009,19 +62939,19 @@ aaa
 aaa
 aaa
 aaa
-cyf
-cym
-cym
-cym
-cyR
-Qmq
-cyi
-QmU
-cyR
-cym
-cym
-cym
-cyF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -63265,21 +63195,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-cyc
-cyo
-cyo
-cyc
-cyc
-cyc
-QmF
-cyc
-cyc
-cyc
-cyo
-cyo
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -63522,21 +63452,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-cyc
-cyc
-cyc
-cyc
-Qmg
-Qmr
-cyi
-QmV
-Qng
-cyc
-cyc
-cyc
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -63779,21 +63709,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-Qlm
-cyc
-QlL
-QlW
-cyI
-cyI
-cyI
-cyI
-cyI
-cyc
-Qnt
-QnD
-QnP
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -64036,21 +63966,21 @@ aaa
 aaa
 aaa
 aaa
-cyR
-Qln
-Qlx
-QlM
-QlX
-Qmi
-cye
-QmG
-Qmw
-cyI
-Qno
-Qnu
-cyi
-QnP
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -64293,21 +64223,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-cyc
-cyc
-cyc
-cyc
-Qmj
-Qmt
-QmH
-cMc
-cyI
-Qnp
-cyi
-cyI
-QnR
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -64550,21 +64480,21 @@ aaa
 aaa
 aaa
 aae
-cyR
-Qlo
-Qly
-QlN
-QlY
-Qmk
-Qmt
-QmI
-cMc
-Qnh
-cyc
-Qnv
-QnE
-QnP
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -64807,21 +64737,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-Qlp
-Qlz
-QlO
-QlZ
-cyI
-Qmt
-QmJ
-cMc
-cyI
-cyc
-cyc
-QnF
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65064,21 +64994,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-cyc
-cyc
-cyc
-cyc
-cyI
-Qmw
-QmK
-cye
-cyI
-Qnq
-cyI
-QnG
-QnT
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65321,21 +65251,21 @@ aaa
 aaa
 aaa
 aaa
-cyc
-Qlq
-QlA
-cyn
-cyc
-cLY
-cyI
-cyi
-cyI
-cyI
-cyc
-Qnw
-cyi
-czr
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65555,11 +65485,11 @@ ckq
 aaa
 aaa
 aaa
-aCS
-cMB
-aCV
-aCV
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65569,7 +65499,7 @@ cwU
 aaa
 aaa
 aaa
-cxt
+aaa
 aaa
 aaa
 aaf
@@ -65578,21 +65508,21 @@ aaa
 aaa
 aaa
 aaf
-cyR
-Qlr
-QlB
-QlP
-cyc
-cyc
-cyc
-QmL
-cyc
-cyc
-cyc
-Qnx
-QnH
-QnU
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65812,11 +65742,11 @@ asE
 arB
 aaa
 aaa
-aCS
-aFC
-aEr
-aIG
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 arB
@@ -65825,9 +65755,9 @@ cyb
 asE
 arB
 aaa
-cxt
-cxD
-cxt
+aaa
+aaa
+aaa
 aaa
 aaf
 aaa
@@ -65835,21 +65765,21 @@ aaa
 aaa
 aaf
 aaf
-cyR
-Qlr
-cyi
-cyI
-QlD
-cyi
-cyI
-cyI
-cyI
-cyI
-cyc
-Qny
-QnI
-QnV
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66069,11 +65999,11 @@ cwT
 aAC
 aaa
 aaa
-aCS
-cLJ
-aEr
-cLK
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aAC
@@ -66082,9 +66012,9 @@ auP
 cxY
 arB
 aaa
-cxy
-cxC
-cCy
+aaa
+aaa
+aaa
 aaa
 aaf
 aaa
@@ -66092,21 +66022,21 @@ aaf
 aaa
 aAC
 aaf
-cyc
-Qlt
-cyI
-QlR
-cyc
-cyI
-cye
-QmM
-cye
-cyI
-cyc
-cyc
-cyc
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66325,13 +66255,13 @@ cyb
 asE
 arB
 aaa
-aCS
-aCS
-aCS
-aHs
-aCS
-aCS
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 arB
 asE
@@ -66339,9 +66269,9 @@ cyb
 avP
 arB
 aaa
-cxu
-cLQ
-cxu
+aaa
+aaa
+aaa
 aaa
 arB
 awW
@@ -66349,21 +66279,21 @@ awW
 asE
 arB
 aaf
-cyc
-cyc
-QlD
-cyc
-cyc
-Qmn
-Qmw
-QmN
-Qmw
-Qni
-cyc
-Qnz
-QnJ
-QnW
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66582,45 +66512,45 @@ ayk
 awW
 aAD
 awW
-aCS
-aEo
-aEr
-aEr
-aEr
-aKg
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awW
 awW
 aQG
 aRX
 arB
-cxu
-cxu
-cCw
-cxu
-cxu
+aaa
+aaa
+aaa
+aaa
+aaa
 arB
 awY
 ayk
 awW
 aAD
 awW
-Qll
-Qlu
-cyI
-cyi
-Qmb
-cyI
-Qmk
-QmO
-cyI
-cyI
-Qnr
-cyI
-QnK
-QnX
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66839,24 +66769,24 @@ ayl
 azy
 auP
 cIh
-aCU
-aEr
-aFE
-aFE
-aFE
-aEr
-aCU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 azy
 auP
 cIh
 ayl
 aRY
 awW
-cxw
-cxB
-cxC
-cxI
-cxw
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayl
@@ -66864,20 +66794,20 @@ beK
 auP
 cyt
 cyd
-cyi
-QlF
-cyx
-Qmb
-cyi
-cyI
-cMa
-cyi
-cyI
-cyc
-cye
-czm
-QnY
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67096,45 +67026,45 @@ ayk
 awW
 awW
 awW
-aCS
-aEq
-aEr
-aEr
-aEr
-cLL
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awW
 awW
 awV
 aRY
 awW
-cxu
-cxB
-cxC
-cxI
-cxu
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayk
 awW
 awW
 awW
-cyc
-cyc
-QlG
-cyc
-cyc
-cyI
-cye
-QmP
-cye
-Qnj
-cyc
-cyc
-cyc
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67353,45 +67283,45 @@ cqr
 azz
 aAF
 awW
-aCV
-aEt
-aFE
-aFE
-aFE
-aEr
-aCV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 aOf
 azz
 aPu
 aRY
 awW
-cxu
-cLP
-cxC
-cxC
-cxu
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 aym
 azz
 aAF
 awW
-cyc
-cyk
-QlH
-QlS
-Qmd
-cyI
-cye
-QmQ
-Qmw
-cyI
-Qns
-QnA
-QnL
-QnZ
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67610,45 +67540,45 @@ aIK
 ayl
 aAE
 awW
-aCV
-aEs
-aEr
-aEr
-aEr
-aEr
-aCV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 aOe
 ayl
 ayl
 aRY
 awW
-cCu
-cxC
-cCx
-cxC
-cCz
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayl
 ayl
 aAE
 awW
-cyR
-cyj
-QlI
-QlI
-Qme
-cyI
-cyI
-cyi
-cyI
-cyI
-cMf
-cyi
-QnM
-Qoa
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67867,45 +67797,45 @@ aIK
 ayl
 aAH
 awW
-aCV
-aEv
-aFE
-aFE
-aFE
-aEr
-aCV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 aOh
 ayl
 ayl
 aRY
 awW
-cxu
-cxC
-cxC
-cLR
-cxu
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayl
 ayl
 bgi
 awW
-cyR
-Qlv
-QlI
-QlU
-cyc
-cyc
-cyc
-QmR
-cyc
-cyc
-cyc
-QnB
-QnN
-Qob
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68124,45 +68054,45 @@ cry
 azA
 aAG
 awW
-aCV
-aEu
-aEr
-aEr
-aEr
-aEr
-aCV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 aOg
 azA
 aQH
 aRY
 awW
-cxu
-cxB
-cxC
-cxI
-cxu
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayn
 azA
 bgh
 awW
-cyc
-Qlw
-QlK
-QlV
-cyc
-cyw
-QmC
-cyI
-cye
-Qnk
-cyc
-QnC
-QnO
-Qoc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68381,45 +68311,45 @@ crz
 awW
 awW
 awW
-aCS
-aEw
-aFE
-aFE
-aFE
-aKh
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awW
 awW
 awV
 aRY
 awW
-cxw
-cxB
-cxC
-cxI
-cxw
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awZ
 ayk
 awW
 awW
 awW
-cyc
-cyc
-cyR
-cyc
-cyc
-Qmo
-QmD
-cyI
-Qnd
-Qnl
-cyc
-cyc
-cyR
-cyc
-cyc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68638,24 +68568,24 @@ aIK
 azy
 auP
 cIh
-aCU
-aEr
-aEr
-aEr
-aEr
-aEr
-aCU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 azy
 auP
 cIh
 ayl
 aRY
 awW
-cxu
-cxw
+aaa
+aaa
 cxE
-cxw
-cxu
+aaa
+aaa
 awW
 awZ
 ayl
@@ -68666,13 +68596,13 @@ aaa
 aaa
 aaa
 aaa
-cyR
-Qmp
-cyI
-QmS
-Qne
-Qnm
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68895,13 +68825,13 @@ ayp
 awW
 aAD
 awW
-aCS
-aEy
-aEy
-aEy
-aEy
-aEy
-aCS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 awW
 awW
 awW
@@ -68923,13 +68853,13 @@ aaa
 aaa
 aaa
 aaa
-cyR
-cLZ
-cyO
-QmT
-Qnf
-Qnn
-cyR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69152,13 +69082,13 @@ ayo
 azB
 awW
 aaa
-aCS
-aEx
-aFF
+aaa
+aaa
+aaa
 cIg
-aFF
-aKi
-aCS
+aaa
+aaa
+aaa
 aaa
 awW
 aPt
@@ -69180,13 +69110,13 @@ aaa
 aaa
 aaa
 aaa
-Qmf
-cyR
-cyR
-cyR
-cyR
-cyR
-Qmf
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73033,17 +72963,17 @@ bea
 bfq
 bji
 bkF
-cys
-cys
-cys
-cys
-cys
-cys
-cys
-cys
-cys
-cys
-cys
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73290,18 +73220,18 @@ bdZ
 bhO
 bjh
 bkE
-cys
-cyB
-cyB
-cyB
-cyB
-cMb
-cyB
-cyB
-cyB
-czf
-cys
-czs
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73547,18 +73477,18 @@ aXQ
 bhQ
 bjj
 bkF
-cys
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-czp
-czt
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73804,18 +73734,18 @@ aZt
 bhQ
 bjj
 bkF
-cys
-cLX
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-czp
-czt
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -74061,18 +73991,18 @@ bgr
 bhQ
 bjj
 bkF
-cys
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-cyB
-czp
-czt
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -74318,18 +74248,18 @@ bfa
 bhQ
 bjk
 bkE
-cys
-cyB
-cyB
-cyB
-cyB
-cyS
-cyB
-cyB
-cyB
-czf
-cys
-czu
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -74575,17 +74505,17 @@ bgs
 bhQ
 bjk
 bkF
-cys
-cys
-cys
-cyN
-cyQ
-cys
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 cyT
-cyZ
-cys
-cys
-cys
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -76645,13 +76575,13 @@ aaa
 aaa
 aaa
 aaa
-cTg
-cTg
-cTi
-cTg
-cTi
-cTg
-cTg
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bCq
 bPS
@@ -76902,13 +76832,13 @@ aaa
 aaa
 aaa
 aaa
-cTg
-bGg
-cTo
-cMl
-bHx
-cTx
-cTg
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bLv
 bPR
@@ -77159,13 +77089,13 @@ bxx
 bxu
 bxu
 bDi
-cTi
-bGh
-bHx
-cTo
-bHx
-bLt
-bMF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bCq
 bPS
@@ -77416,13 +77346,13 @@ bzP
 bAS
 bxu
 aaa
-cTg
-bGg
-cTo
-cTo
-bHx
-bLs
-cTg
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bLv
 bPT
@@ -77673,13 +77603,13 @@ bzR
 byd
 bxx
 aaa
-cTg
-cTg
-cTi
+aaa
+aaa
+aaa
 bJc
-cTi
-cTg
-cTg
+aaa
+aaa
+aaa
 aaa
 bCq
 bPV
@@ -79154,15 +79084,15 @@ aaa
 aaa
 aaa
 aaa
-akD
-akD
-ajX
-akD
-akD
-ajX
-akD
-akD
-akD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -79411,15 +79341,15 @@ aaa
 aaa
 aaa
 aaa
-ajX
-akC
-alj
-alY
-amI
-amI
-anM
-aop
-aoY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -79668,15 +79598,15 @@ aaa
 aaa
 aaa
 aaa
-ajX
-akF
-alm
-akD
-cLI
-amI
-amI
-aop
-aoY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -79925,15 +79855,15 @@ aaa
 aaa
 aaa
 aaa
-ajX
-akE
-all
-alZ
-amJ
-anr
-amI
-aop
-aoY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 arP
@@ -80182,15 +80112,15 @@ aaa
 aaa
 aaa
 aaa
-akD
-akD
-alo
-akD
-akD
-akD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 anO
-akD
-akD
+aaa
+aaa
 aaa
 aaa
 arP
@@ -108479,23 +108409,23 @@ aaa
 aaa
 aaa
 aaa
-cwI
-cwI
-cwI
-cxg
-cwI
+aaa
+aaa
+aaa
+aaa
+aaa
 afa
-cwI
-crx
-crx
-crx
-cwI
-cxK
-cwI
-cxK
-cwI
-cwI
-cwI
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108733,27 +108663,27 @@ aaa
 aaa
 aaa
 aaa
-cwI
-cwI
-cwI
-cwI
-cwY
-cxd
-cxe
-cwI
-cLO
-anq
-anq
-anq
-anq
-anq
-cLS
-cwI
-cxQ
-cLU
-cxU
-cwI
-cwI
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108989,28 +108919,28 @@ aae
 aaa
 aaa
 aaa
-cwI
-crO
-cwK
-cwP
-cwI
-cwY
-cxe
-cxh
-cwI
-cxo
-cwL
-cwL
-cwL
-cwL
-cwL
-cxL
-cwI
-cxQ
-cxQ
-cxU
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -109246,28 +109176,28 @@ aaa
 aaa
 aaa
 aaa
-crx
-crN
-cwJ
-cwO
-cwI
-cwY
-cxe
-cxh
-cwI
-cwL
-cxq
-cxq
-cxq
-cxq
-cxq
-cwL
-cxM
-cxQ
-cxQ
-cxV
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -109503,28 +109433,28 @@ aaa
 aaa
 aaa
 aaa
-crx
-cwF
-cwL
-cwR
-cwI
-crx
-cxf
-crx
-cxm
-cwL
-cxr
-cxr
-cxr
-cxr
-cxr
-cwL
-cwI
-cxR
-cLV
-cxV
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -109760,28 +109690,28 @@ aaa
 aaa
 aaa
 aaa
-crx
-crQ
-cwL
-cwQ
-cwI
-cwZ
-cwL
-cxi
-cLN
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-cLT
-cwW
-cwI
-cwI
-cwI
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -110017,28 +109947,28 @@ aaa
 aaa
 aaa
 aaa
-crx
-cwF
-cwL
-cwL
-cwX
-cwL
-cwL
-anq
-cxj
-cwL
-cxq
-cxq
-cxq
-cxq
-cxq
-cwL
-crx
-cxc
-cLW
-cxc
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -110274,28 +110204,28 @@ aaa
 aaa
 aaa
 aaa
-crx
-cwG
-amB
-amB
-cwW
-cxa
-cwL
-cxj
-cxj
-cwL
-cxr
-cxr
-cxr
-cxr
-cxr
-cwL
-cxO
-cxa
-cxa
-cxa
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -110531,28 +110461,28 @@ aaa
 aaa
 aaa
 aaa
-cwI
-crO
-cwN
-cwS
-cwI
-cxc
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-cwL
-crx
-cxa
-cxa
-cxa
-cxX
-cxZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -110789,27 +110719,27 @@ aaa
 aaa
 aaa
 aaa
-cwI
-cwI
-cwI
-cwI
-cxb
-cLM
-cxa
-cxa
-cxp
-cxs
-cxs
-cxs
-cxs
-cxs
-cxp
-crx
-cxS
-cxT
-cxS
-cwI
-cwI
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -111049,23 +110979,23 @@ aaa
 aaa
 aaa
 aaa
-cwI
-crx
-cwI
-crx
-cwI
-cwI
-cwI
-crx
-crx
-crx
-cwI
-cwI
-cwI
-crx
-cwI
-crx
-cwI
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 6f03fd8d315..0c75e2e2332 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -616,7 +616,8 @@
 /obj/docking_port/mobile/pod{
 	id = "pod1";
 	name = "escape pod 1";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /obj/effect/turf_decal/stripes/end,
 /turf/open/floor/plasteel/white,
@@ -632,7 +633,8 @@
 /obj/docking_port/mobile/pod{
 	id = "pod2";
 	name = "escape pod 2";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /obj/effect/turf_decal/stripes/end,
 /turf/open/floor/plasteel/white,
@@ -1048,12 +1050,8 @@
 /turf/open/floor/plasteel/neutral,
 /area/shuttle/abandoned)
 "aci" = (
-/obj/effect/decal/cleanable/dirt{
-	desc = "A thin layer of dust coating the floor.";
-	name = "dust"
-	},
-/turf/open/floor/plasteel/neutral,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "acj" = (
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -1256,23 +1254,17 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/arrival)
 "acF" = (
-/obj/docking_port/mobile/arrivals{
-	dir = 2;
-	dwidth = 4;
-	height = 17;
-	name = "delta arrivals shuttle";
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 2;
 	dwidth = 4;
 	height = 17;
 	id = "arrivals_stationary";
 	name = "delta arrivals";
-	width = 9
+	width = 9;
+	roundstart_template = /datum/map_template/shuttle/arrival/delta
 	},
-/turf/closed/wall/mineral/plastitanium,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "acG" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/belt/utility,
@@ -1710,8 +1702,8 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "adu" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "adv" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/arrival)
@@ -2244,8 +2236,8 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/transport)
 "aeu" = (
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "aev" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 1
@@ -3133,7 +3125,8 @@
 	dir = 2;
 	dwidth = 4;
 	height = 9;
-	width = 9
+	width = 9;
+	timid = 0
 	},
 /obj/machinery/bluespace_beacon,
 /obj/docking_port/mobile/auxillary_base,
@@ -3359,27 +3352,6 @@
 /turf/open/floor/plating,
 /area/shuttle/abandoned)
 "agS" = (
-/obj/machinery/door/airlock/titanium{
-	cyclelinkeddir = 8;
-	name = "External Airlock"
-	},
-/obj/effect/decal/cleanable/dirt{
-	desc = "A thin layer of dust coating the floor.";
-	name = "dust"
-	},
-/obj/docking_port/mobile{
-	dheight = 0;
-	dir = 8;
-	dwidth = 11;
-	height = 15;
-	id = "whiteship";
-	launch_status = 0;
-	name = "White-Ship";
-	port_direction = 8;
-	preferred_direction = 8;
-	roundstart_move = "whiteship_away";
-	width = 32
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 11;
@@ -3388,8 +3360,8 @@
 	name = "SS13: Auxiliary Dock, Station-Fore";
 	width = 32
 	},
-/turf/open/floor/plasteel/neutral,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "agT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/stripes/line{
@@ -3991,17 +3963,6 @@
 	},
 /area/shuttle/abandoned)
 "aid" = (
-/obj/docking_port/mobile{
-	dir = 1;
-	dwidth = 2;
-	height = 13;
-	id = "ferry";
-	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	roundstart_move = "ferry_away";
-	width = 5
-	},
 /obj/docking_port/stationary{
 	dir = 1;
 	dwidth = 2;
@@ -4011,9 +3972,8 @@
 	turf_type = /turf/open/space;
 	width = 5
 	},
-/obj/machinery/door/airlock/titanium,
-/turf/open/floor/pod/dark,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "aie" = (
 /obj/structure/frame/computer{
 	dir = 1
@@ -12425,9 +12385,8 @@
 /turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aAM" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "aAN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
@@ -13597,13 +13556,16 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aDi" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Supply Shuttle Airlock";
-	req_access_txt = "31"
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 4;
+	height = 7;
+	id = "supply_home";
+	name = "Cargo Bay";
+	width = 12
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "aDj" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -14544,22 +14506,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
-"aFl" = (
-/obj/docking_port/mobile/supply{
-	dwidth = 5;
-	roundstart_move = "supply_away";
-	width = 12
-	},
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 5;
-	height = 7;
-	id = "supply_home";
-	name = "Cargo Bay";
-	width = 12
-	},
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/supply)
 "aFm" = (
 /turf/closed/wall/r_wall,
 /area/security/prison)
@@ -25578,7 +25524,8 @@
 	id = "pod3";
 	name = "escape pod 3";
 	port_direction = 2;
-	preferred_direction = 4
+	preferred_direction = 4;
+	timid = 0
 	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
@@ -28077,18 +28024,17 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/miningoffice)
 "bgU" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "0"
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 3;
+	height = 5;
+	id = "mining_home";
+	name = "mining shuttle bay";
+	width = 7;
+	roundstart_template = /datum/map_template/shuttle/mining/delta
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "bgV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -28097,44 +28043,14 @@
 /turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bgW" = (
-/turf/open/floor/plasteel/neutral,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "bgX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/shuttle/mining)
-"bgY" = (
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 3;
-	height = 5;
-	id = "mining";
-	name = "mining shuttle";
-	port_direction = 4;
-	width = 7
-	},
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 3;
-	height = 5;
-	id = "mining_home";
-	name = "mining shuttle bay";
-	width = 7
-	},
-/obj/machinery/door/airlock/shuttle{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "0"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/mining)
 "bgZ" = (
 /turf/closed/wall/r_wall,
 /area/security/brig)
@@ -37803,12 +37719,8 @@
 /turf/open/floor/plasteel,
 /area/shuttle/labor)
 "bAa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/end{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "bAb" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
@@ -37816,35 +37728,17 @@
 /turf/open/floor/plasteel,
 /area/shuttle/labor)
 "bAc" = (
-/obj/machinery/door/airlock/shuttle{
-	id_tag = "prisonshuttle";
-	name = "Labor Shuttle Airlock"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp";
-	name = "labor camp shuttle";
-	port_direction = 4;
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
 	height = 5;
 	id = "laborcamp_home";
 	name = "fore bay 1";
-	width = 9
+	width = 9;
+	roundstart_template = /datum/map_template/shuttle/labour/delta
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "bAd" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 4;
@@ -98701,8 +98595,8 @@
 	},
 /area/shuttle/escape)
 "dUD" = (
-/turf/open/floor/plasteel/neutral,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "dUE" = (
 /obj/machinery/light{
 	dir = 4
@@ -101190,18 +101084,6 @@
 /turf/open/floor/plasteel/neutral,
 /area/hallway/secondary/exit/departure_lounge)
 "eab" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dheight = 0;
-	dwidth = 11;
-	height = 18;
-	name = "Delta emergency shuttle";
-	width = 30;
-	preferred_direction = 2;
-	port_direction = 4
-	},
 /obj/docking_port/stationary{
 	dheight = 0;
 	dir = 4;
@@ -101212,14 +101094,8 @@
 	turf_type = /turf/open/space;
 	width = 30
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "eac" = (
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -132956,28 +132832,28 @@ aaa
 aaa
 aaa
 aaa
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-acR
-acR
-aav
-aav
-aav
-aav
-acR
-acR
-acR
-aav
-aav
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -133212,29 +133088,29 @@ aaa
 aaa
 aaa
 aaa
-aap
-aaw
-aaF
-aaT
-aav
-abw
-abI
-abU
-acg
-acw
-aav
-adk
-adz
-adS
-ael
-aeI
-aav
-afH
-aga
-agu
-agP
-ahd
-aav
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -133469,33 +133345,33 @@ aaa
 aaa
 aaa
 aaa
-aap
-aaw
-aaG
-aaU
-aav
-abx
-abI
-aaL
-ach
-abo
-aav
-adl
-adA
-adT
-aem
-aeJ
-aav
-afI
-aen
-agv
-aen
-ahe
-aav
-aav
-aav
-acR
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -133727,33 +133603,33 @@ aab
 aaa
 aaa
 aaa
-aav
-aav
-aaV
-aaq
-aaq
-abJ
-aaL
-aci
-acx
-aav
-adm
-adB
-adU
-aen
-aeK
-aav
-afJ
-aen
-agw
-agQ
-ahf
-aav
-ahI
-ahZ
-ait
-acR
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -133984,33 +133860,33 @@ aaa
 aaa
 aaa
 aaa
-aav
-aaH
-aaW
-abk
-aaq
-aav
-aav
-acj
-aav
-aav
-aav
-aav
-acR
-aeo
-aeL
-aav
-acR
-agb
-agx
-aav
-aav
-aav
-ahJ
-aci
-ahh
-aiK
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -134241,33 +134117,33 @@ aaa
 aaa
 aaa
 aaa
-aav
-aaI
-aaX
-abl
-aby
-abK
-abV
-ack
-acy
-acR
-adn
-adC
-adV
-aep
-aeM
-afl
-afK
-agc
-agy
-aaW
-aaW
-ahy
-aci
-aci
-aiu
-aiL
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -134497,34 +134373,34 @@ aaa
 aaa
 aaa
 aaa
-aaq
-aaq
-aaq
-aaY
-abc
-aaW
-abL
-aaW
-acl
-aaW
-acS
-aaW
-abc
-adW
-aeq
-aaW
-afm
-afL
-agd
-agz
-agR
-abn
-aav
-ahK
-aia
-aci
-aiM
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -134754,34 +134630,34 @@ aaa
 aaa
 aaa
 aaa
-aar
-aax
-aaJ
-aaZ
-aaW
-abz
-aaW
-abc
-aaW
-acz
-acT
-ado
-abc
-abc
-aaW
-aaW
-afn
-abc
-afn
-aaW
-aaW
-ahg
-aav
-ahL
-aib
-aiv
-aiN
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -135011,34 +134887,34 @@ aaa
 aaa
 aaa
 aaa
-aaq
-aay
-aaq
-aba
-abm
-aaW
-aaW
-abW
-aaW
-aaW
-acS
-aaW
-aaW
-adX
-abc
-aaW
-afo
-afM
-age
-aaW
-aaW
-ahh
-aav
-aaY
-aci
-aci
-aiO
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -135269,33 +135145,33 @@ aaa
 aaa
 aaa
 aaa
-aav
-aaK
-aaY
-abn
-abA
-abM
-abX
-acm
-acA
-acR
-adp
-adD
-aaW
-aer
-aaW
-afp
-afN
-agf
-agA
-aaW
-ahi
-ahy
-aci
-aci
-aiw
-aiP
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -135526,33 +135402,33 @@ aaa
 aaa
 aaa
 aaa
-aav
-aaL
-aaW
-abo
-aaq
-aav
-aav
-abY
-aav
-aav
-aav
-aav
-adY
-aav
-aeN
-acR
-afO
-aav
-aav
-adY
-aav
-aav
-ahM
-aci
-aix
-aiy
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -135783,33 +135659,33 @@ aaa
 aaa
 aaa
 aaa
-aav
-aav
-abb
-aaq
-aaq
-abN
-abY
-aci
-acB
-acB
-aav
-adE
-aci
-aav
-aeO
-afq
-aci
-agg
-aav
-aci
-ahj
-aav
-ahN
-aic
-aiy
-acR
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -136039,33 +135915,33 @@ aaa
 aaa
 aaa
 aaa
-aap
-aaw
-aaM
-abc
-aav
-aav
-aav
-aav
-acn
-acC
-acU
-aav
-adF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aci
-aes
-aeP
-afr
-afP
-agh
-aes
-aci
-acU
-aav
-aav
-aav
-acR
-acR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -136296,29 +136172,29 @@ aaa
 aaa
 aaa
 aaa
-aap
-aaz
-aaN
-abd
-aav
-abB
-abO
-abY
-aci
-acD
-acD
-aav
-adG
-aci
-aav
-aeQ
-afs
-afs
-agi
-aav
-aci
-ahk
-aav
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -136554,28 +136430,28 @@ aaa
 aaa
 aaa
 aaa
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-aav
-adH
-adZ
-aav
-aav
-acR
-acR
-aav
-aav
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 agS
-adH
-aav
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -139139,15 +139015,15 @@ aaa
 aaa
 aaa
 aaa
-aeT
-afQ
-aeT
-aeT
-agU
-aeT
-aeT
-ahQ
-aeT
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aad
 adq
 agk
@@ -139393,18 +139269,18 @@ aaa
 aaa
 aaa
 aaa
-adI
-aet
-aeT
-aeT
-afR
-afR
-aeu
-aeu
-ahl
-afR
-afR
-afQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaO
 aaO
 aaO
@@ -139649,18 +139525,18 @@ aaa
 aaa
 aaa
 aaa
-adI
-aed
-aeu
-aeU
-afv
-aeu
-aeu
-aeu
-agV
-aeu
-aeu
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aeu
+aaa
 aid
 aiA
 aeb
@@ -139907,18 +139783,18 @@ aaa
 aaa
 aaa
 aaa
-adI
-aev
-aeT
-aeT
-afS
-afS
-agD
-aeu
-aeu
-afS
-afS
-afQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaO
 aaO
 aaO
@@ -140167,15 +140043,15 @@ aaa
 aaa
 aaa
 aaa
-aeT
-afQ
-aeT
-aeT
-agU
-aeT
-aeT
-ahQ
-aeT
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aad
 ads
 agj
@@ -142988,19 +142864,19 @@ aaa
 aad
 aaa
 aaa
-acZ
-adu
-adv
-aef
-adv
-adw
-adw
-adw
-adw
-agG
-aef
-adv
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -143244,20 +143120,20 @@ abj
 aaa
 aad
 aaa
-acE
-acZ
-adv
-adJ
-aeg
-aey
-aeY
-aeY
-aeY
-aeY
-agH
-aeg
-ahm
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -143501,23 +143377,23 @@ abj
 aaa
 aad
 aaa
-acE
-ada
-adw
-adK
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-ahn
-adv
-adv
-adw
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaO
 ajE
@@ -143758,23 +143634,23 @@ abj
 aaa
 aad
 aaa
-acE
-ada
-adw
-adL
-aeh
-aeh
-aeZ
-aeZ
-aeZ
-aeZ
-agI
-aeh
-aho
-ahA
-ahT
-aie
-adw
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaO
 ajw
@@ -144016,22 +143892,22 @@ aad
 aad
 aaa
 acF
-acZ
+aaa
 adu
-adM
-aeh
-aez
-afa
-afy
-afU
-afy
-agJ
-agX
-ahp
-ahB
-ahU
-aif
-adw
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaO
 ajw
@@ -144272,23 +144148,23 @@ abj
 aaa
 aad
 aaa
-acE
-ada
-adw
-adN
-aeh
-aeh
-aeY
-aeY
-aeY
-aeY
-agK
-aeh
-ahq
-ahC
-ahV
-aie
-adw
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaO
 ajw
@@ -144529,23 +144405,23 @@ abj
 aaa
 aad
 aaa
-acE
-ada
-adw
-adK
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-aeh
-ahr
-adv
-adv
-adw
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaO
 ajw
@@ -144786,20 +144662,20 @@ abj
 aaa
 aad
 aaa
-acE
-acZ
-adv
-adJ
-aei
-aeA
-aeZ
-aeZ
-aeZ
-aeZ
-agL
-aei
-ahs
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -145044,19 +144920,19 @@ aaa
 aad
 aaa
 aaa
-acZ
-adu
-adv
-aef
-adv
-adw
-adw
-adw
-adw
-agG
-aef
-adv
-adv
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -145963,29 +145839,29 @@ aaa
 aaa
 aaa
 aaa
-dQT
-dSV
-dSW
-dSW
-dSX
-dSX
-dSW
-dSW
-dYK
-dZs
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 eab
-dSW
-dSX
-dSX
-dSX
-dSW
-dYK
-dSW
-eeV
-dSW
-dSW
-dSW
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -146219,30 +146095,30 @@ dNT
 aaa
 aaa
 aaa
-dQS
-dRY
-dSW
-dTK
-dUC
-dVm
-dVm
-dWX
-dXP
-dWj
-dZt
-dWj
-dXP
-dVm
-dVm
-dVm
-dUC
-dWj
-dSW
-eeW
-efH
-egt
-egI
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -146476,30 +146352,30 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTL
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-edE
-eel
-eeW
-eeW
-eeW
-egI
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -146733,30 +146609,30 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTL
-dUD
-dVn
-dVn
-dVn
-dVn
-dVn
-dUD
-dVn
-dVn
-dVn
-dVn
-dVn
-dUD
-edE
-dSW
-eeX
-eeW
-eeW
-egJ
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -146990,35 +146866,35 @@ dNT
 aad
 aaa
 aaa
-dQT
-dQT
-dSW
-dTL
-dUD
-dVo
-dWh
-dWY
-dXQ
-dVo
-dUD
-eac
-dXQ
-ebn
-dWi
-eac
-dUD
-edE
-dSX
-eeX
-eeW
-egu
-egI
-dSW
-dSW
-dZs
-dSX
-dSW
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aab
 aaa
 aaa
@@ -147247,35 +147123,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSW
-dTM
-dUD
-dVm
-dVm
-dVm
-dVm
-dVm
-dUD
-dVm
-dVm
-dVm
-dVm
-dVm
-dUD
-edE
-dSW
-eeY
-eeW
-egv
-egK
-dSW
-egR
-egW
-ehb
-ehi
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147504,35 +147380,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTL
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-edF
-dSW
-dSW
-eel
-dSX
-dZs
-dSW
-egS
-egX
-ehc
-ehj
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -147761,35 +147637,35 @@ dNT
 aad
 aaa
 aaa
-dQT
-dQT
-dSW
-dTM
-dUD
-dVn
-dVn
-dVn
-dVn
-dVn
-dUD
-dVn
-dVn
-dVn
-dVn
-dVn
-dUD
-edE
-dSX
-eeZ
-efI
-egw
-egL
-dUF
-egT
-egT
-ehd
-ehk
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148018,35 +147894,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTL
-dUD
-dVo
-dWi
-dWY
-dXQ
-dVo
-dUD
-eac
-dWh
-ebn
-ecd
-eac
-dUD
-edE
-eem
-dTL
-dUD
-dUD
-egM
-eem
-egT
-egT
-ehe
-ehl
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148275,35 +148151,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTL
-dUD
-dVm
-dVm
-dVm
-dVm
-dVm
-dUD
-dVm
-dVm
-dVm
-dVm
-dVm
-dUD
-edE
-eem
-dTL
-dUD
-dUD
-egM
-eem
-egT
-egT
-ehf
-ehm
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148532,35 +148408,35 @@ dNT
 aad
 aaa
 aaa
-dQT
-dQT
-dSW
-dTL
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-dUD
-edE
-dSX
-efa
-efJ
-egx
-efM
-dUF
-egT
-egY
-ehd
-ehn
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -148789,35 +148665,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTK
-dUE
-dVn
-dWj
-dWj
-dVn
-dVn
-dZu
-dVn
-dVn
-dVn
-dWj
-dWj
-dUE
-dTK
-dSW
-dZs
-dSW
-dSW
-egN
-dSW
-egS
-egZ
-ehg
-eho
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -149046,35 +148922,35 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSW
-dSW
-dUF
-dSX
-dWk
-dWk
-dSX
-dYL
-dSW
-dSW
-dSW
-dSW
-ece
-ece
-dSW
-dSW
-dSW
-efb
-efK
-egy
-egO
-dSW
-egU
-eha
-ehh
-ehp
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -149303,35 +149179,35 @@ dNT
 aad
 aaa
 aaa
-dQT
-dQT
-dSW
-dTN
-dUG
-dVp
-dWj
-dWj
-dXR
-dYM
-dSW
-ead
-eaG
-ebo
-dWj
-dWj
-edc
-edG
-dSW
-efc
-efL
-dSV
-dSW
-dSW
-dSW
-dZs
-dSX
-dSW
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -149560,30 +149436,30 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTO
-dUH
-dVq
-dUD
-dUD
-dXS
-dYN
-dZv
-dWj
-eaH
-ebp
-ebp
-ebp
-edd
-edH
-dSW
-efd
-efM
-egz
-egP
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -149817,30 +149693,30 @@ dNS
 aaa
 aaa
 aaa
-dQS
-dRY
-dSX
-dTP
-dUI
-dVr
-dUD
-dUD
-dXS
-dYN
-dZv
-dWj
-eaI
-ebq
-ebq
-ebq
-ede
-edH
-dSW
-efc
-efN
-dTL
-egP
-dSX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -150074,30 +149950,30 @@ dNT
 aaa
 aaa
 aaa
-dQS
-dRY
-dSW
-dTQ
-dUJ
-dVs
-dWl
-dWZ
-dXT
-dYO
-dYL
-eae
-eaJ
-ebr
-ecf
-ecf
-dTK
-edI
-dSW
-dTK
-efO
-egA
-egP
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -150332,29 +150208,29 @@ aaa
 aaa
 aaa
 aaa
-dQT
-dSV
-dSW
-dSX
-dSX
-dSX
-dSX
-dSW
-dSW
-dZs
-dSW
-dSX
-dSX
-dSX
-dSX
-dSX
-dSW
-dSW
-dSX
-efP
-efP
-dSX
-dSW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -151759,17 +151635,17 @@ atE
 auM
 aoE
 aaa
-ayF
-ayF
-ayF
-aCe
+aaa
+aaa
+aaa
+aaa
 aDi
-ayF
-aDi
-aGG
-ayF
-ayF
-ayF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aad
@@ -152016,18 +151892,18 @@ atF
 auN
 aoE
 aaa
-ayF
-azH
-aAL
-aAL
-aDj
-aEj
-aDj
-aDj
-aHY
-ayF
-ayF
-aLZ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aad
 aQQ
@@ -152273,18 +152149,18 @@ atG
 auO
 aoF
 aaa
-ayF
-azI
+aaa
+aaa
+aaa
+aaa
 aAM
-aCf
-aAM
-aAM
-aAM
-aAN
-aHZ
-aJw
-aKT
-aMa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aad
 aQR
@@ -152303,15 +152179,15 @@ bkf
 aaa
 aaa
 aaa
-brc
-brc
-buu
-brc
-brc
-buu
-brc
-brc
-brc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bHr
 bJj
@@ -152530,18 +152406,18 @@ aoE
 aoF
 aoF
 aaa
-ayF
-azJ
-aAN
-aAN
-aAN
-aAM
-aAN
-aAM
-aIa
-aJw
-aKU
-aMa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aad
 aQU
@@ -152551,24 +152427,24 @@ aVZ
 aXG
 aZi
 aad
-bcH
-bcH
-bcI
+aaa
+aaa
+aaa
 bgU
-bcI
-bcH
-bcH
 aaa
 aaa
-brd
-bsX
-buv
-bvU
-bxj
-byA
-bzZ
-brc
-bDU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bHs
 bJk
@@ -152787,18 +152663,18 @@ aad
 aad
 aaa
 aaa
-ayF
-azK
-aAN
-aAM
-aAM
-aAM
-aAM
-aAM
-aIa
-aJx
-aKU
-aMa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aad
 aQS
@@ -152808,24 +152684,24 @@ aWa
 aXH
 aQS
 aad
-bcH
-bem
-bfK
-bgV
-biv
-bkg
-bcH
 aaa
 aaa
-brd
-bsY
-buw
-bvV
-bxk
-byB
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 bAa
-bBX
-bDU
+aaa
+aaa
 aaa
 bHs
 bJl
@@ -153044,18 +152920,18 @@ aac
 aaa
 aaa
 aaa
-ayF
-azL
-aAO
-aCg
-aAO
-aEk
-aCg
-aAO
-aIb
-ayF
-ayF
-aMb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aad
 aQV
@@ -153065,24 +152941,24 @@ aQQ
 aXI
 aZj
 aad
-bcI
-ben
-bfL
+aaa
+aaa
+aaa
 bgW
-biw
-bkh
-bmb
 aaa
 aaa
-brd
-bsZ
-bux
-bvW
-bxl
-byC
-bAb
-brc
-bDU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 bHr
 bJm
@@ -153301,17 +153177,17 @@ aaa
 aaa
 aaa
 aaa
-ayF
-ayF
-ayF
-ayF
-ayF
-ayF
-aFl
-ayF
-ayF
-ayF
-ayF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aad
@@ -153322,24 +153198,24 @@ aaa
 aad
 aad
 aad
-bcH
-beo
-bfM
-bgX
-bix
-bki
-bcH
 aaa
 aaa
-brc
-brc
-buy
-brc
-brc
-brc
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 bAc
-brc
-brc
+aaa
+aaa
 aaa
 bHr
 bHr
@@ -153579,13 +153455,13 @@ aad
 aad
 aaa
 aaa
-bcH
-bcH
-bcI
-bgY
-bcI
-bcH
-bcH
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 3a994ab4f64..6c728cef02d 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -478,7 +478,8 @@
 /obj/docking_port/mobile/pod{
 	id = "pod2";
 	name = "escape pod 2";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_2)
@@ -1547,7 +1548,8 @@
 	id = "pod3";
 	name = "escape pod 3";
 	port_direction = 2;
-	preferred_direction = 4
+	preferred_direction = 4;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_3)
@@ -11561,8 +11563,8 @@
 	},
 /area/security/nuke_storage)
 "ayt" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "ayu" = (
 /obj/machinery/mineral/labor_claim_console{
 	machinedir = 1;
@@ -11886,8 +11888,8 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "azh" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "azi" = (
 /obj/structure/chair{
 	dir = 1
@@ -12605,29 +12607,17 @@
 	},
 /area/library)
 "aAA" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "0"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 3;
-	height = 5;
-	id = "mining";
-	name = "mining shuttle";
-	port_direction = 4;
-	width = 7
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 3;
 	height = 5;
 	id = "mining_home";
 	name = "mining shuttle bay";
-	width = 7
+	width = 7;
+	roundstart_template = /datum/map_template/shuttle/mining/box
 	},
-/turf/open/floor/plating,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "aAB" = (
 /obj/machinery/door/airlock/external{
 	name = "Mining Dock Airlock";
@@ -12818,29 +12808,17 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/labor)
 "aAV" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "prisonshuttle";
-	name = "Labor Shuttle Airlock"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp";
-	name = "labor camp shuttle";
-	port_direction = 4;
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
 	height = 5;
 	id = "laborcamp_home";
 	name = "fore bay 1";
-	width = 9
+	width = 9;
+	roundstart_template = /datum/map_template/shuttle/labour/box
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "aAW" = (
 /obj/machinery/door/airlock/external{
 	name = "Labor Camp Shuttle Airlock"
@@ -20686,7 +20664,8 @@
 /obj/docking_port/mobile/pod{
 	id = "pod1";
 	name = "escape pod 1";
-	port_direction = 2
+	port_direction = 2;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_1)
@@ -27027,8 +27006,8 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "beC" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "beD" = (
 /obj/machinery/computer/arcade,
 /obj/machinery/light{
@@ -28798,7 +28777,8 @@
 	id = "pod4";
 	name = "escape pod 4";
 	port_direction = 2;
-	preferred_direction = 4
+	preferred_direction = 4;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_4)
@@ -72303,8 +72283,8 @@
 /turf/open/floor/wood,
 /area/library)
 "cUV" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "cUW" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -72343,15 +72323,6 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/supply)
 "cUZ" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Supply Shuttle Airlock";
-	req_access_txt = "31"
-	},
-/obj/docking_port/mobile/supply{
-	dwidth = 5;
-	roundstart_move = "supply_away";
-	width = 12
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 5;
@@ -72360,8 +72331,8 @@
 	name = "Cargo Bay";
 	width = 12
 	},
-/turf/open/floor/plating,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "cVa" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -72479,8 +72450,8 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/transport)
 "cVv" = (
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "cVw" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 8
@@ -72491,18 +72462,6 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/transport)
 "cVx" = (
-/obj/machinery/door/airlock/titanium,
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 13;
-	id = "ferry";
-	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	roundstart_move = "ferry_away";
-	width = 5
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
@@ -72512,8 +72471,8 @@
 	turf_type = /turf/open/space;
 	width = 5
 	},
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "cVy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/effect/spawner/structure/window/reinforced,
@@ -72848,7 +72807,8 @@
 	dir = 2;
 	dwidth = 4;
 	height = 9;
-	width = 9
+	width = 9;
+	timid = 0
 	},
 /obj/machinery/bluespace_beacon,
 /obj/machinery/computer/auxillary_base,
@@ -72940,17 +72900,8 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/abandoned)
 "cWp" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/blood/gibs/old,
-/obj/effect/decal/cleanable/dirt{
-	desc = "A thin layer of dust coating the floor.";
-	name = "dust"
-	},
-/obj/effect/decal/remains/human{
-	desc = "They look like human remains, and have clearly been gnawed at."
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "cWq" = (
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt{
@@ -74208,16 +74159,6 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
 "cYJ" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dir = 2;
-	dwidth = 5;
-	height = 14;
-	name = "Meta emergency shuttle";
-	width = 25
-	},
 /obj/docking_port/stationary{
 	dheight = 0;
 	dir = 2;
@@ -74227,8 +74168,8 @@
 	name = "MetaStation emergency evac bay";
 	width = 29
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "cYK" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -74344,8 +74285,8 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "cYO" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "cYP" = (
 /obj/machinery/door/airlock/engineering{
 	cyclelinkeddir = 1;
@@ -78566,20 +78507,17 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "djM" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4
-	},
-/obj/docking_port/mobile/arrivals,
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 3;
 	height = 15;
 	id = "arrivals_stationary";
 	name = "arrivals";
-	width = 7
+	width = 7;
+	roundstart_template = /datum/map_template/shuttle/arrival/box
 	},
-/turf/open/floor/plating/airless,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "djR" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
@@ -80112,28 +80050,6 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "EDi" = (
-/obj/docking_port/mobile{
-	callTime = 250;
-	dheight = 0;
-	dir = 2;
-	dwidth = 11;
-	height = 15;
-	id = "whiteship";
-	launch_status = 0;
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "NT Recovery White-Ship";
-	port_direction = 8;
-	preferred_direction = 4;
-	roundstart_move = "whiteship_away";
-	width = 28
-	},
-/obj/machinery/door/airlock/titanium{
-	name = "recovery shuttle external airlock"
-	},
-/obj/effect/decal/cleanable/dirt{
-	desc = "A thin layer of dust coating the floor.";
-	name = "dust"
-	},
 /obj/docking_port/stationary{
 	dir = 2;
 	dwidth = 11;
@@ -80142,8 +80058,8 @@
 	name = "SS13: Auxiliary Dock, Station-Port";
 	width = 28
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "EDj" = (
 /obj/structure/sign/departments/restroom,
 /turf/closed/wall/mineral/titanium,
@@ -86547,11 +86463,11 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVF
-cVI
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -86800,19 +86716,19 @@ aaa
 aac
 aaa
 aaa
-cVN
-cWf
-cWf
-cWf
-cVG
-cWX
-cVY
-cXw
-cVG
-cWf
-cWf
-cWf
-cYq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87056,21 +86972,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVF
-cWe
-cWe
-cVF
-cVF
-cVF
-cXg
-cVF
-cVF
-cVF
-cWe
-cWe
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87313,21 +87229,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVF
-cVF
-cVF
-cVF
-cWO
-cWY
-cVY
-cXx
-cXF
-cVF
-cVF
-cVF
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87570,21 +87486,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVO
-cVF
-cWu
-EDj
-cWo
-cWo
-cWo
-cWo
-cWo
-cVF
-cXS
-cYd
-cYr
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87827,21 +87743,21 @@ aaa
 aaa
 aaa
 aaa
-cVG
-cVR
-cWi
-cWv
-cWG
-cWQ
-cXa
-cXi
-cXb
-cWo
-cXM
-cXT
-cVY
-cYr
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88084,21 +88000,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVF
-cVF
-cVF
-cVF
-cWP
-cWZ
-cXh
-cXy
-cWo
-cXL
-cVY
-cWo
-cYs
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88341,21 +88257,21 @@ aaa
 aaa
 aaa
 aaa
-cVG
-cVT
-cWk
-cWx
-cWI
-cWR
-cWZ
-cXk
-cXy
-dlm
-cVF
-cXU
-cYf
-cYr
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88598,21 +88514,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVS
-cWj
-cWw
-cWH
-cWo
-cWZ
-cXj
-cXy
-cWo
-cVF
-cVF
-cYe
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88855,21 +88771,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVF
-cVF
-cVF
-cVF
-cWo
-cXb
-cXl
-cXa
-cWo
-cXN
-cWo
-cYg
-cYu
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89112,21 +89028,21 @@ aaa
 aaa
 aaa
 aaa
-cVF
-cVU
-cWl
-cWy
-cVF
-cWS
-cWo
-cVY
-cWo
-cWo
-cVF
-cXV
-cVY
-cYt
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89369,21 +89285,21 @@ aaf
 aaf
 aaf
 aaf
-cVG
-cVV
-cWm
-cWz
-cVF
-cVF
-cVF
-cXm
-cVF
-cVF
-cVF
-cXX
-cYi
-cYw
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89617,7 +89533,7 @@ aaa
 aaf
 aaa
 aaa
-cVm
+aaa
 aaa
 aaa
 aaf
@@ -89626,21 +89542,21 @@ aaa
 aaf
 aaa
 aaf
-cVG
-cVV
-cVY
-cWo
-cWn
-cVY
-cWo
-cWo
-cWo
-cWo
-cVF
-cXW
-cYh
-cYv
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89873,9 +89789,9 @@ aVs
 aVs
 aVs
 aaa
-cVm
-cVw
-cVm
+aaa
+aaa
+aaa
 aaa
 aVs
 aVs
@@ -89883,21 +89799,21 @@ aVs
 aVs
 aaa
 aaf
-cVF
-cVX
-cWo
-cWB
-cVF
-cWo
-cXa
-cXo
-cXa
-cWo
-cVF
-cVF
-cVF
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -90117,11 +90033,11 @@ aVs
 aaf
 aaf
 aaa
-bcS
-bcS
-bcU
-bcS
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaf
 aaf
@@ -90130,9 +90046,9 @@ bvB
 aWT
 aVs
 aaa
-cVr
-cVv
-ddL
+aaa
+aaa
+aaa
 aaa
 aVs
 bKS
@@ -90140,21 +90056,21 @@ aWT
 aVs
 aVs
 aVs
-cVF
-cVF
-cWn
-cVF
-cVF
-dll
-cXb
-cXn
-cXb
-cXG
-cVF
-cXY
-dlo
-cYx
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -90374,11 +90290,11 @@ aYC
 aaa
 aaf
 aaa
-bcS
-bgq
-beC
-bjU
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaf
 aaa
@@ -90387,9 +90303,9 @@ aVu
 aWU
 aRA
 aaa
-cVn
-dlF
-cVn
+aaa
+aaa
+aaa
 aaa
 aRA
 btS
@@ -90397,21 +90313,21 @@ aWU
 bOd
 bPA
 bOd
-cVI
-cVZ
-cWo
-cVY
-cWL
-cWo
-cWR
-cXq
-cWo
-cWo
-cXO
-cWo
-cYl
-cYz
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -90631,11 +90547,11 @@ aVs
 aaf
 aaf
 aaa
-bcS
-dli
-beC
-dlj
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaf
 aaf
@@ -90643,11 +90559,11 @@ aVs
 aVw
 aWU
 aVs
-cVn
-cVn
-ddJ
-cVn
-cVn
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVw
 aWU
@@ -90655,20 +90571,20 @@ bOd
 aZZ
 bOd
 EDi
-cVY
+aaa
 cWp
-dlk
-cWL
-cVY
-cWo
-cXp
-cVY
-cWo
-cVF
-cXa
-dlp
-cYy
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -90887,45 +90803,45 @@ aWV
 aRA
 aaa
 aaa
-bcS
-bcS
-bcS
-bcT
-bcS
-bcS
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aRA
 bvC
 bxt
 aYC
-cVp
-cVu
-cVv
-cVB
-cVp
+aaa
+aaa
+aaa
+aaa
+aaa
 aYC
 bKT
 aWU
 aVs
 aVs
 aVs
-cVF
-cVF
-cWr
-cVF
-cVF
-cWo
-cXa
-cXs
-cXa
-dln
-cVF
-cVF
-cVF
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -91144,45 +91060,45 @@ aWU
 aVs
 aVs
 aVs
-bcS
-beB
-beC
-beC
-beC
-blN
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVs
 aVs
 bvD
 aWU
 aVs
-cVn
-cVu
-cVv
-cVB
-cVn
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVw
 aWU
 aVs
 aaa
 aaf
-cVF
-cWa
-cWq
-cWC
-EDk
-cWo
-cXa
-cXr
-cXb
-cWo
-cXP
-cYa
-cYm
-cYA
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -91401,45 +91317,45 @@ aWU
 djz
 aZZ
 djC
-bcT
-beC
-djE
-djE
-djE
-beC
-djR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 djz
 bsk
 djC
 aVu
 bxu
 aRA
-cVn
-dlE
-cVv
-cVv
-cVn
+aaa
+aaa
+aaa
+aaa
+aaa
 aRA
 aVu
 aWU
 aVs
 aaf
 aaf
-cVG
-cWc
-cWs
-cWs
-cWN
-cWo
-cWo
-cVY
-cWo
-cWo
-cXQ
-cVY
-cYo
-cYC
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -91658,45 +91574,45 @@ aWU
 aVs
 aVs
 aVs
-bcS
-beD
-beC
-beC
-beC
-blO
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVs
 aVs
 aVu
 bxv
 aVs
-ddH
-cVv
-ddK
-cVv
-ddM
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVu
 bMu
 aRA
 aaa
 aaf
-cVG
-cWb
-cWs
-cWD
-cVF
-cVF
-cVF
-cXt
-cVF
-cVF
-cVF
-cYb
-cYn
-cYB
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -91915,45 +91831,45 @@ aWW
 aWT
 baa
 aVs
-bcU
-beE
-djE
-djE
-djE
-beC
-bcU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 bsl
 btO
 bvE
 bxw
 aVs
-cVn
-cVv
-cVv
-dlG
-cVn
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 bKU
 bMv
 aVs
 aaa
 aaf
-cVF
-cWd
-cWt
-cWE
-cVF
-cWU
-EDm
-cWo
-cXa
-dDP
-cVF
-cJI
-cYp
-cYD
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaf
@@ -92172,45 +92088,45 @@ bvF
 aWU
 baa
 aVs
-bcS
-beF
-beC
-beC
-beC
-blP
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 bsm
 aVu
 bvF
 bxw
 aVs
-cVn
-cVu
+aaa
+aaa
 cVv
-cVB
-cVn
+aaa
+aaa
 aVs
 aVu
 bMw
 aRA
 aaa
 aaf
-cVF
-cVF
-cVG
-cVF
-cVF
-cWT
-dDN
-cWo
-dDO
-cXH
-cVF
-cVF
-cVG
-cVF
-cVF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaf
@@ -92429,24 +92345,24 @@ bvF
 aWU
 bab
 aVs
-bcS
-beG
-djE
-djE
-djE
-blQ
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 baa
 btP
 aWX
 bxx
 aRA
-cVp
-cVu
-cVv
-cVB
-cVp
+aaa
+aaa
+aaa
+aaa
+aaa
 aRA
 btS
 bxw
@@ -92457,13 +92373,13 @@ aaa
 aaa
 aaa
 aaa
-cVG
-cWW
-cWo
-cXv
-cXD
-cXK
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -92686,24 +92602,24 @@ aWY
 aYE
 bac
 aVs
-bcU
-beH
-beC
-beC
-beC
-beC
-bcU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 bsn
 btQ
 bvG
 bxw
 aVs
-cVn
-cVp
+aaa
+aaa
 cVx
-cVp
-cVn
+aaa
+aaa
 aVs
 aVu
 bxw
@@ -92714,13 +92630,13 @@ aaa
 aaa
 aaa
 aaa
-cVG
-cWV
-cXf
-cXu
-cXC
-cXJ
-cVG
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -92943,13 +92859,13 @@ aWZ
 aVs
 aVs
 aVs
-bcS
-beI
-djE
-djE
-djE
-blR
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVs
 aVs
@@ -92971,13 +92887,13 @@ aaa
 aaa
 aaa
 aaa
-EDl
-cVG
-cVG
-cVG
-cVG
-cVG
-EDl
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -93200,13 +93116,13 @@ aWZ
 djz
 aZZ
 djC
-bcT
+aaa
+aaa
+aaa
 beC
-beC
-beC
-beC
-beC
-bcT
+aaa
+aaa
+aaa
 djz
 bsk
 djC
@@ -93457,13 +93373,13 @@ aWZ
 aVs
 aVs
 aVs
-bcS
-bcS
-bgt
-bgt
-bgt
-bcS
-bcS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aVs
 aVs
 aVs
@@ -93714,13 +93630,13 @@ aXa
 aYF
 aVs
 aaa
-bcS
-beJ
-bgu
+aaa
+aaa
+aaa
 djM
-bgu
-blS
-bcS
+aaa
+aaa
+aaa
 aaa
 aVs
 btR
@@ -95232,25 +95148,25 @@ doJ
 atq
 aaf
 aaa
-awN
-awN
-awO
-awN
-awO
-awN
-awN
 aaa
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
-cUS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 dne
@@ -95489,26 +95405,26 @@ doJ
 atq
 aaf
 aaa
-awN
-ayg
-azh
-dlB
-azi
-aDe
-awN
 aaa
-cUS
-cUV
-cUV
-cUV
-cUV
-dlD
-cUV
-cUV
-cUV
-cVc
-cUS
-cVk
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaf
 dne
 bag
@@ -95746,26 +95662,26 @@ doJ
 atq
 aaf
 aaa
-awO
-ayh
-azi
-azh
-azi
-aDf
-aEu
 aaa
-cUS
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cVg
-cVj
+aaa
+aaa
+azh
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaf
 aip
 doJ
@@ -96003,26 +95919,26 @@ doJ
 atq
 aaf
 aaa
-awN
-ayg
-azh
-azh
-azi
-aDg
-awN
 aaa
-cUS
-dlC
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cVg
-cVj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aip
 asi
@@ -96260,26 +96176,26 @@ doJ
 atq
 aaf
 aaa
-awN
-awN
-awO
-aAA
-awO
-awN
-awN
 aaa
-cUS
+aaa
+aaa
+aAA
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cUV
-cVg
-cVj
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aip
 doJ
@@ -96525,18 +96441,18 @@ ayi
 ayi
 aaf
 aaa
-cUS
-cUV
-cUV
-cUV
-cUV
-cUY
-cUV
-cUV
-cUV
-cVc
-cUS
-cVl
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaf
 dne
 daX
@@ -96782,17 +96698,17 @@ aBS
 ayi
 aaf
 aaa
-cUS
-cUS
-cUS
-cUW
-cUX
-cUS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 cUZ
-cTh
-cUS
-cUS
-cUS
+aaa
+aaa
+aaa
+aaa
 aaa
 aaf
 dne
@@ -103045,16 +102961,16 @@ dbF
 cMI
 aaa
 aaa
-cZj
-cZj
-cZj
-cZe
-cZj
-cZj
-cZe
-cZj
-cZj
-cZj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -103301,18 +103217,18 @@ cRn
 cOS
 cMI
 aaa
-cZe
-cZl
-cZl
-cZl
-cZe
-cZl
-cZl
-cZe
-cZl
-cZl
-cZl
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -103453,15 +103369,15 @@ aoj
 apC
 doA
 dne
-auQ
-auQ
-atJ
-auQ
-auQ
-atJ
-auQ
-auQ
-auQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aDu
 aDu
 aDu
@@ -103557,20 +103473,20 @@ cQE
 cQl
 cRo
 cMI
-cZe
-cZe
-cYF
-cYF
-cYF
-cZe
-cYF
-cYF
-cZe
-cYF
-cYF
-cYF
-cZe
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -103710,15 +103626,15 @@ aok
 aox
 aqV
 dne
-atJ
-auR
-avU
-awX
-ayt
-azA
-aAU
-aCi
-aDt
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 azC
 aFV
 aHu
@@ -103814,20 +103730,20 @@ cQF
 cQV
 cRp
 cRL
-cYF
-daj
-dai
-dak
-dal
-dan
-dam
-dao
-dax
-cZL
-cZL
-cZL
-dar
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -103967,15 +103883,15 @@ aol
 apD
 aqW
 dne
-atJ
-auS
-avV
-auQ
-dlA
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 ayt
-ayt
-aCi
-aDt
+aaa
+aaa
 azC
 aFW
 aHv
@@ -104071,20 +103987,20 @@ cQF
 cOP
 cRp
 cRL
-cYF
-daf
-cYO
-dag
-cZZ
-cZm
-cYO
-cZy
-cZe
-cYV
-dly
-cYV
-cYV
-dae
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -104224,15 +104140,15 @@ aom
 ajm
 dne
 dne
-atJ
-auT
-avW
-awY
-ayu
-azB
-ayt
-aCi
-aDt
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 azC
 aFW
 aHw
@@ -104328,20 +104244,20 @@ cQG
 cQW
 cRq
 cRL
-cYF
-daa
-cZm
-cYO
-cYO
-cYO
-dag
-cZA
-cZe
-dae
-cYI
-cYV
-cYV
-dae
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -104481,15 +104397,15 @@ aon
 ajm
 aqX
 dne
-auQ
-auQ
-avX
-auQ
-auQ
-auQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aAV
-auQ
-auQ
+aaa
+aaa
 aDu
 aFX
 aHx
@@ -104585,20 +104501,20 @@ cQF
 cOP
 cRp
 cRL
-cYF
-cZT
-cZS
-cYO
-cYO
-cYO
-dlt
-cYO
-cZV
-dlx
-cZe
-dad
-dad
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -104842,20 +104758,20 @@ cQF
 cQV
 cRp
 cRL
-cZe
-cZe
-cZn
-cZe
-cZQ
-cZe
-cZn
-cZe
-cZe
-cZe
-cZe
-cZn
-cZe
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -105099,20 +105015,20 @@ cQH
 cQX
 cRr
 cMI
-cZe
-cZK
-dlr
-cYO
-cYO
-cYO
-dlr
-cZK
-cZe
-cZD
-cZD
-cZD
-daq
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -105356,20 +105272,20 @@ cQI
 cZc
 cZd
 cMI
-cYF
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cZI
-cZG
-cZG
-cZG
-cZJ
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -105613,20 +105529,20 @@ cMI
 cMI
 cMI
 cMI
-cZe
-cZi
-cYO
-cZo
-cYF
-cZi
-cYO
-cZo
-cYF
-cZF
-cZG
-cZG
-cZH
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -105870,20 +105786,20 @@ cQJ
 cQY
 cRs
 cQY
-cYH
-cYO
-cYO
-cZo
-dat
-cZi
-cYO
-cZo
-cZe
-cZF
-cZY
-dlz
-cZE
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -106127,20 +106043,20 @@ cQK
 cPv
 cPv
 cPv
-cZe
-dlq
-cYO
-cZo
-cYF
-cZi
-cYO
-cZk
-cZe
-cZe
-dab
-cZn
-cZe
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -106384,20 +106300,20 @@ cQL
 cQY
 cQK
 cQY
-cYH
-cYO
-cYO
-cZo
-dax
-cZi
-cYO
-cZo
-cZe
-cZx
-cZw
-cZz
-das
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -106641,20 +106557,20 @@ cQK
 cPv
 cPv
 cPv
-cZg
-cZi
-cYO
-cZo
-cYF
-cZi
-cYO
-cZo
-cYF
-cZM
-cYO
-cYO
-dau
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -106898,20 +106814,20 @@ cQK
 cPv
 aaa
 aaf
-cYF
-cZi
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cZp
-cYO
-cYO
-cYO
-cZt
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -107155,20 +107071,20 @@ cQM
 cPv
 aaa
 aaf
-cYF
-cZi
-cYO
-cZo
-cYF
-cZi
-cYO
-cZo
-cYF
-dlH
-cZN
-cYO
-cZs
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -107412,20 +107328,20 @@ cQK
 cPv
 aaa
 aaf
-cYF
-cZi
-cYO
-cZo
-cYY
-cZi
-cYO
-cZo
-cZr
-cZe
-cYF
-cZp
-cZr
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -107669,20 +107585,20 @@ cQK
 cPv
 cPv
 cPv
-cZe
-cYS
-cYO
-cZo
-cYF
-cZi
-cYO
-dlw
-cZe
-cZO
-dac
-dah
-dav
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -107927,19 +107843,19 @@ cQY
 cQK
 cQY
 cYJ
+aaa
 cYO
-cYO
-cZo
-cYZ
-cZi
-cYO
-cZo
-cYF
-cZP
-cYX
-cYV
-cZB
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108183,20 +108099,20 @@ cQO
 cPv
 cPv
 cPv
-cYF
-cZi
-cYO
-cZo
-cYF
-cZi
-cYO
-cZo
-dax
-cZU
-cYV
-cYV
-cZb
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108440,20 +108356,20 @@ cQP
 cQY
 cRt
 cQY
-cYH
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cZC
-cZW
-cYV
-cYX
-cYW
-cYF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108697,20 +108613,20 @@ cPb
 cPv
 cPv
 cPv
-cZe
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cYO
-cZC
-cZW
-cYV
-cYV
-daw
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -108954,20 +108870,20 @@ aaf
 aaa
 aaa
 aaf
-cZe
-cYN
-cYM
-cYO
-dls
-cYO
-dlv
-cYN
-cZg
-cZX
-cZW
-cZW
-cYU
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -109211,20 +109127,20 @@ aaf
 aaf
 aaf
 aaf
-cZe
-cZe
-cZe
-cYF
-cYF
-cYF
-cZe
-cZe
-cZe
-cZe
-cYF
-cYF
-cZe
-cZe
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index e4d7102de06..90c99a2eff8 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -2442,12 +2442,16 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aeZ" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Supply Shuttle Airlock";
-	req_access_txt = "31"
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 9;
+	height = 7;
+	id = "supply_home";
+	name = "Cargo Bay";
+	width = 20
 	},
-/turf/open/floor/plating,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "afa" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -3286,22 +3290,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
-"agD" = (
-/obj/docking_port/mobile/supply{
-	dwidth = 5;
-	roundstart_move = "supply_away";
-	width = 12
-	},
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 5;
-	height = 7;
-	id = "supply_home";
-	name = "Cargo Bay";
-	width = 12
-	},
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/supply)
 "agE" = (
 /obj/item/ore/silver,
 /obj/item/ore/iron,
@@ -8127,18 +8115,17 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
 "app" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "0"
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 3;
+	height = 5;
+	id = "mining_home";
+	name = "mining shuttle bay";
+	roundstart_template = /datum/map_template/shuttle/mining/delta;
+	width = 7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/mining)
+/turf/open/space/basic,
+/area/space)
 "apr" = (
 /turf/open/floor/plasteel/neutral,
 /area/shuttle/mining)
@@ -15252,16 +15239,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit)
 "aDj" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Emergency Shuttle Airlock"
-	},
-/obj/docking_port/mobile/emergency{
-	dheight = 0;
-	dwidth = 5;
-	height = 11;
-	name = "Omega emergency shuttle";
-	width = 19
-	},
 /obj/docking_port/stationary{
 	dheight = 0;
 	dir = 4;
@@ -15272,14 +15249,8 @@
 	turf_type = /turf/open/space;
 	width = 30
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "aDk" = (
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -32499,23 +32470,17 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "btj" = (
-/obj/docking_port/mobile/arrivals{
-	dir = 2;
-	dwidth = 4;
-	height = 17;
-	name = "omega arrivals shuttle";
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 2;
 	dwidth = 4;
 	height = 17;
 	id = "arrivals_stationary";
 	name = "omega arrivals";
+	roundstart_template = /datum/map_template/shuttle/arrival/delta;
 	width = 9
 	},
-/turf/closed/wall/mineral/plastitanium,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "btk" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 4;
@@ -32826,18 +32791,6 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/transport)
 "bwz" = (
-/obj/machinery/door/airlock/titanium,
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 13;
-	id = "ferry";
-	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	roundstart_move = "ferry_away";
-	width = 5
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
@@ -32847,8 +32800,8 @@
 	turf_type = /turf/open/space;
 	width = 5
 	},
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "bwB" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 8
@@ -71091,7 +71044,7 @@ aaa
 aaa
 aaa
 aaa
-bwb
+aaa
 aaa
 aaa
 aaa
@@ -71347,9 +71300,9 @@ aaa
 aaa
 aaa
 aaa
-bwb
-bwo
-bwb
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71604,9 +71557,9 @@ aaa
 aaa
 aaa
 aaa
-bwc
-bwi
-bwB
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71861,9 +71814,9 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bwq
-bvS
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72117,11 +72070,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bvS
-bwr
-bvS
-bvS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72374,11 +72327,11 @@ aaa
 aaa
 aaa
 aaa
-bvT
-bwf
-bwi
-bwE
-bvT
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72631,11 +72584,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bwf
-bwi
-bwE
-bvS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72888,11 +72841,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bwh
-bwi
-bwi
-bvS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73145,11 +73098,11 @@ aaa
 aaa
 aaa
 aaa
-bvW
-bwi
-bwv
-bwi
-bwQ
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73402,11 +73355,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bwi
-bwi
-bwI
-bvS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73659,11 +73612,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bwf
-bwi
-bwE
-bvS
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -73916,11 +73869,11 @@ aaa
 aaa
 aaa
 aaa
-bvT
-bwf
-bwi
-bwE
-bvT
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -74173,11 +74126,11 @@ aaa
 aaa
 aaa
 aaa
-bvS
-bvT
+aaa
+aaa
 bwz
-bvT
-bvS
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -76478,19 +76431,19 @@ bgV
 aae
 aaa
 aaa
-bjO
-bjZ
-bka
-bkm
-bka
-bkb
-bkb
-bkb
-bkb
-bkG
-bkm
-bka
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -76734,20 +76687,20 @@ biv
 bgU
 aae
 aaa
-bjN
-bjO
-bka
-bkc
-bkn
-bkq
-bkv
-bkv
-bkv
-bkv
-bkH
-bkn
-bkM
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -76991,23 +76944,23 @@ bxY
 bgU
 aaa
 aaa
-bjN
-bjW
-bkb
-bkd
-bko
-bko
-bko
-bko
-bko
-bko
-bko
-bko
-bkN
-bka
-bka
-bkb
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -77248,23 +77201,23 @@ bix
 bgU
 aaa
 aaa
-bjN
-bjW
-bkb
-bke
-bko
-bko
-bkw
-bkw
-bkw
-bkw
-bkI
-bko
-bkO
-bkT
-bkY
-bld
-bkb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -77506,22 +77459,22 @@ bgU
 aaa
 aaa
 btj
-bjO
-bjZ
-bkf
-bko
-bkr
-buA
-bkx
-bkD
-bkx
-bkF
-buB
-bkP
-bkU
-bkZ
-ble
-bkb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -77762,23 +77715,23 @@ bix
 bgU
 aaa
 aaa
-bjN
-bjW
-bkb
-bkg
-bko
-bko
-bkv
-bkv
-bkv
-bkv
-bkJ
-bko
-bkQ
-bkV
-bla
-bld
-bkb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -78019,23 +77972,23 @@ biw
 bgU
 aaa
 aaa
-bjN
-bjW
-bkb
-bkd
-bko
-bko
-bko
-bko
-bko
-bko
-bko
-bko
-byn
-bka
-bka
-bkb
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -78276,20 +78229,20 @@ biy
 bgU
 aae
 aaa
-bjN
-bjO
-bka
-bkc
-bkp
-bks
-bkw
-bkw
-bkw
-bkw
-bkK
-bkp
-bkR
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -78534,19 +78487,19 @@ bgT
 aae
 aaa
 aaa
-bjO
-bjZ
-bka
-bkb
-bka
-bkb
-bkb
-bkb
-bkb
-bkG
-bkb
-bka
-bka
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -84374,17 +84327,17 @@ aaa
 aaa
 aaa
 aaa
-abQ
-abQ
-abQ
-aei
+aaa
+aaa
+aaa
+aaa
 aeZ
-abQ
-aeZ
-aht
-abQ
-abQ
-abQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 amC
@@ -84631,18 +84584,18 @@ aaa
 aaa
 aaa
 aaa
-abQ
-acz
-afa
-afa
-afa
-afK
-afa
-afa
-aig
-abQ
-abQ
-akQ
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 amC
 amC
@@ -84888,18 +84841,18 @@ aaa
 aaa
 aaa
 aaa
-abQ
-acA
-ads
-aej
-ads
-ads
-ads
-ads
-aii
-aiQ
-ajN
-akR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aae
 amD
@@ -85145,18 +85098,18 @@ aaa
 aaa
 aaa
 aaa
-abQ
-buy
-ads
-ads
-ads
-ads
-ads
-ads
-aii
-aiQ
-ajN
-akR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aae
 ant
@@ -85402,18 +85355,18 @@ aaa
 aaa
 aaa
 aaa
-abQ
-acA
-ads
-ads
-ads
-ads
-ads
-ads
-aii
-aiQ
-ajN
-akR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 amD
@@ -85659,26 +85612,26 @@ aaa
 aaa
 aaa
 aaa
-abQ
-acC
-aek
-aek
-aek
-buz
-aek
-aek
-aij
-abQ
-abQ
-akS
 aaa
-amE
-amE
-amF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 app
-amF
-amE
-amE
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -85916,26 +85869,26 @@ aaa
 aaa
 aaa
 aaa
-abQ
-abQ
-abQ
-abQ
-abQ
-abQ
-agD
-abQ
-abQ
-abQ
-abQ
 aaa
 aaa
-amE
-anu
-aon
-aon
-aqw
-arn
-amE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -86186,13 +86139,13 @@ aaa
 aaa
 aaa
 aaa
-amF
-anv
-aoo
-apr
-aqx
-aro
-asu
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -86443,13 +86396,13 @@ aaa
 aaa
 aaa
 aaa
-amE
-anw
-aop
-aps
-aqy
-arp
-amE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -86700,13 +86653,13 @@ aaa
 aaa
 aaa
 aaa
-amE
-amE
-amF
-apt
-amF
-amE
-amE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87226,24 +87179,24 @@ aaa
 aaa
 aaa
 aaa
-axX
-axX
-axX
-aBj
-axZ
+aaa
+aaa
+aaa
+aaa
+aaa
 aDj
-axX
-axY
-axY
-axY
-axX
-aJe
-axZ
-aJe
-axX
-axX
-aLz
-aPD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87483,25 +87436,25 @@ aaa
 aaa
 aaa
 aaa
-axX
-azc
-aAa
-aAb
-axY
-aDk
-aEg
-aEm
-aEm
-aEm
-aEg
-aDk
-axY
-aDk
-aMD
-aNL
-axX
-aPD
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87740,25 +87693,25 @@ aaa
 aaa
 aaa
 aaa
-axY
-azd
-aAb
-aAb
-aCo
-aDl
-aEh
-aEh
-aEh
-aEh
-aEh
-aJf
-aKm
-aLw
-aME
-aNM
-axY
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -87997,25 +87950,25 @@ aaa
 aaa
 aaa
 aaa
-axY
-azd
-aAb
-aAb
-axY
-aDl
-aEi
-bvP
-aEi
-aEi
-aEi
-aJf
-aKm
-aLx
-aMF
-aNN
-axY
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88254,25 +88207,25 @@ aaa
 aaa
 aaa
 aaa
-axX
-aze
-aAb
-aBk
-axY
-aDl
-aEj
-aFo
-aEl
-aFp
-aEj
-aJf
-axY
-aLy
-aMG
-aNO
-axX
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88511,25 +88464,25 @@ aaa
 aaa
 aaa
 aaa
-axZ
-axY
-aAc
-axY
-aCp
-bvO
-aEk
-aEj
-aGd
-aEl
-aEk
-bvR
-aKn
-aLz
-axY
-aLz
-aLz
-aPD
-aPD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -88768,25 +88721,25 @@ aaa
 aaa
 aaa
 aaa
-axX
-azf
-aAd
-aBl
-axY
-aDl
-aEl
-aFp
-aEj
-aFo
-aEl
-aJf
-axY
-aLA
-aMH
-aNP
-axX
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89025,25 +88978,25 @@ aaa
 aaa
 aaa
 aaa
-axY
-azg
-aAe
-aAd
-aCq
-aDl
-aEm
-bvQ
-aEm
-aEm
-aEm
-aJf
-aKo
-aLB
-aLB
-aNQ
-axY
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89282,25 +89235,25 @@ aaa
 aaa
 aaa
 aaa
-axY
-azh
-aAd
-aBm
-axY
-aDl
-aEh
-aEh
-aEh
-aEh
-aEh
-aJf
-aKo
-aLB
-aLB
-aNR
-axY
-aPE
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89539,25 +89492,25 @@ aaa
 aaa
 aaa
 aaa
-axY
-azi
-aAf
-aBn
-axX
-aDm
-aEi
-aEi
-aEi
-aEi
-aEi
-aJg
-axY
-aLC
-aMI
-aNS
-axX
-aPD
-aQE
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -89796,24 +89749,24 @@ aaa
 aaa
 aaa
 aaa
-axX
-axY
-axY
-axX
-axZ
-axX
-axY
-axY
-axY
-axY
-axY
-axX
-axZ
-axX
-axX
-axX
-aLz
-aPD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index d29f8a3214b..accbc438e7a 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -6295,7 +6295,8 @@
 	launch_status = 0;
 	name = "monastery shuttle";
 	port_direction = 2;
-	width = 5
+	width = 5;
+	timid = 0
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_1)
@@ -8167,29 +8168,17 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/labor)
 "avp" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "prisonshuttle";
-	name = "Labor Shuttle Airlock"
-	},
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp";
-	name = "labor camp shuttle";
-	port_direction = 4;
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
 	height = 5;
 	id = "laborcamp_home";
 	name = "fore bay 1";
+	roundstart_template = /datum/map_template/shuttle/labour/box;
 	width = 9
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "avq" = (
 /obj/machinery/door/airlock/external{
 	name = "Labor Camp Shuttle Airlock"
@@ -18416,9 +18405,6 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "aTH" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Emergency Shuttle Airlock"
-	},
 /obj/docking_port/stationary{
 	dheight = 0;
 	dir = 8;
@@ -18428,17 +18414,8 @@
 	name = "PubbyStation emergency evac bay";
 	width = 20
 	},
-/obj/docking_port/mobile/emergency{
-	dheight = 0;
-	dir = 8;
-	dwidth = 4;
-	height = 15;
-	name = "Pubby emergency shuttle";
-	port_direction = 4;
-	width = 18
-	},
-/turf/open/floor/plating,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 "aTI" = (
 /obj/machinery/light,
 /turf/open/floor/plating,
@@ -18785,13 +18762,6 @@
 /turf/open/floor/plating,
 /area/quartermaster/storage)
 "aUA" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Supply Shuttle Airlock";
-	req_access_txt = "31"
-	},
-/obj/docking_port/mobile/supply{
-	dir = 4
-	},
 /obj/docking_port/stationary{
 	dir = 4;
 	dwidth = 5;
@@ -18800,8 +18770,8 @@
 	name = "Cargo Bay";
 	width = 12
 	},
-/turf/open/floor/plating,
-/area/shuttle/supply)
+/turf/open/space/basic,
+/area/space)
 "aUB" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -23424,12 +23394,17 @@
 /turf/open/floor/plating,
 /area/quartermaster/miningdock)
 "bfK" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Mining Shuttle Airlock";
-	req_access_txt = "48"
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 3;
+	height = 5;
+	id = "mining_home";
+	name = "mining shuttle bay";
+	roundstart_template = /datum/map_template/shuttle/mining/delta;
+	width = 7
 	},
-/turf/open/floor/plating,
-/area/shuttle/labor)
+/turf/open/space/basic,
+/area/space)
 "bfL" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Mining Shuttle Airlock";
@@ -23901,24 +23876,17 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "bgS" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4
-	},
-/obj/docking_port/mobile/arrivals{
-	height = 13;
-	name = "pubby arrivals shuttle";
-	width = 6
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 3;
 	height = 13;
 	id = "arrivals_stationary";
 	name = "pubby arrivals";
+	roundstart_template = /datum/map_template/shuttle/arrival/pubby;
 	width = 6
 	},
-/turf/open/floor/plating/airless,
-/area/shuttle/arrival)
+/turf/open/space/basic,
+/area/space)
 "bgU" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green{
@@ -29341,18 +29309,6 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/transport)
 "btK" = (
-/obj/machinery/door/airlock/titanium,
-/obj/docking_port/mobile{
-	dir = 8;
-	dwidth = 2;
-	height = 13;
-	id = "ferry";
-	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	roundstart_move = "ferry_away";
-	width = 5
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 2;
@@ -29362,8 +29318,8 @@
 	turf_type = /turf/open/space;
 	width = 5
 	},
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
+/turf/open/space/basic,
+/area/space)
 "btL" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 4;
@@ -46543,22 +46499,6 @@
 /turf/open/floor/plating/abductor,
 /area/shuttle/abandoned)
 "cjB" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Shuttle Airlock"
-	},
-/obj/docking_port/mobile{
-	dheight = 0;
-	dir = 8;
-	dwidth = 4;
-	height = 9;
-	id = "whiteship";
-	launch_status = 0;
-	name = "White Ship";
-	port_direction = 4;
-	preferred_direction = 1;
-	roundstart_move = "whiteship_away";
-	width = 9
-	},
 /obj/docking_port/stationary{
 	dir = 8;
 	dwidth = 11;
@@ -46568,8 +46508,8 @@
 	turf_type = /turf/open/space;
 	width = 35
 	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/abandoned)
+/turf/open/space/basic,
+/area/space)
 "cjC" = (
 /obj/structure/sign/warning/vacuum/external{
 	pixel_y = 32
@@ -59865,11 +59805,11 @@ aaa
 aaa
 aaa
 aaa
-cil
-cja
-cin
-cja
-cil
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -60121,13 +60061,13 @@ aaa
 aaa
 aaa
 aaa
-cil
-cil
-ciw
-cix
-ciw
-cil
-cil
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -60377,15 +60317,15 @@ aaa
 aaa
 aaa
 aaa
-cil
-cil
-ciw
-ciw
-cix
-ciw
-ciw
-cil
-cil
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -60634,15 +60574,15 @@ aaa
 aaa
 aaa
 aaa
-cim
-ciw
-ciw
-cjb
-cjy
-cjW
-ciw
-ciw
-ckY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -60891,15 +60831,15 @@ aaa
 aaa
 aaa
 aaa
-cin
-cix
-cix
-cjc
-cjz
-cjX
-cix
-cix
-cin
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -61148,15 +61088,15 @@ aaa
 aaa
 aaa
 aaa
-cim
-ciw
-ciw
-cjd
-cjA
-cjY
-ciw
-ciw
-ckY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -61405,15 +61345,15 @@ aaa
 aaa
 aaa
 aaa
-cil
-cil
-ciw
-ciw
-cix
-ciw
-ciw
-cil
-cil
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -61663,13 +61603,13 @@ aaa
 aaa
 aaa
 aaa
-cil
-cil
-ciw
-cix
-ciw
-cil
-cil
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -61921,11 +61861,11 @@ aaa
 aaa
 aaa
 aaa
-cil
-cje
+aaa
+aaa
 cjB
-cje
-cil
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65176,21 +65116,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-cBN
-cBN
-aKs
-aFS
-aFS
-cBN
-cBN
-aFS
-aKs
-aFS
-aKs
-aFS
-aFS
-aFS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65433,21 +65373,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIs
-aJx
-aJx
-cBN
-aMI
-aNZ
-aNZ
-aNZ
-aMI
-aNZ
-aMI
-aNZ
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65690,21 +65630,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIt
-aJx
-aJx
-aLp
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65947,21 +65887,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIu
-aJy
-aKt
-cBN
-aIx
-aOa
-aOa
-aOa
-aIx
-aIx
-aOe
-aOe
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66204,22 +66144,22 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aFS
-aFS
-aFS
-aHv
-aMJ
-aOb
-aOb
-aOb
-aRA
-aHv
-aFS
-aFS
-aFS
-aFS
-aFS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66459,24 +66399,24 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aFS
-aHv
-aIv
-aJz
-aKu
-aLq
-aIx
-aIx
-aIx
-aIx
-aIx
-aFS
-aTF
-aUE
-aTF
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66716,24 +66656,24 @@ aaa
 aaa
 aaa
 aaa
-cBN
-aGQ
-aHw
-aIw
-aIw
-cBN
-aIx
-aIx
-aOc
-aPj
-aOc
-aIx
-cBN
-aMI
-aMI
-aMI
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66973,24 +66913,24 @@ aaa
 aaa
 aaa
 aaa
-aFT
-aGR
-aHx
-aIx
-aIx
-aKv
-aIx
-aIx
-aOd
-aPk
-aQq
-aIx
-aSp
-aMI
-aMI
-aMI
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67230,24 +67170,24 @@ aaa
 aaa
 aaa
 aaa
-aFT
-aGS
-aHy
-aIy
-aIy
-aFT
-aIx
-aIx
-aOc
-aPl
-aOc
-aIx
-aFT
-aMI
-aNZ
-aNZ
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67487,24 +67427,24 @@ axB
 aaa
 aaa
 aaa
-aFS
-aFS
-aHv
-aIz
-aJA
-aKu
-aLq
-aIx
-aIx
-aIx
-aIx
-aIx
-aFS
-aTG
-aUF
-aVK
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67746,22 +67686,22 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aFS
-aFS
-aFS
-aHv
-aMJ
-aOa
-aOa
-aOa
-aRA
-aHv
-aFS
-aFS
-aFS
-aFS
-aFS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68003,21 +67943,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIA
-aJB
-aKw
-aFT
-aIx
-aOb
-aOb
-aOb
-aIx
-aIx
-aNZ
-aNZ
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68260,21 +68200,21 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIA
-aJC
-aJC
-aLr
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aIx
-aVJ
-aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68517,21 +68457,6 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aIA
-aJC
-aJC
-aFT
-aMI
-aOe
-aOe
-aOe
-aMI
-aOe
-aMI
-aOe
-aVJ
-aWD
 aaa
 aaa
 aaa
@@ -68553,7 +68478,22 @@ aaa
 aaa
 aaa
 aaa
-bsg
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68774,21 +68714,18 @@ aaa
 aaa
 aaa
 aaa
-aFS
-aFT
-aFT
-aKx
-aFS
-aFS
-aFT
-aFT
-aFS
-aKs
-aFS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aTH
-aFS
-aFS
-aFS
 aaa
 aaa
 aaa
@@ -68809,9 +68746,12 @@ aaa
 aaa
 aaa
 aaa
-bsg
-btG
-bsg
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69054,10 +68994,6 @@ aaa
 aaa
 aaa
 aaa
-beV
-bgP
-bgP
-beV
 aaa
 aaa
 aaa
@@ -69066,9 +69002,13 @@ aaa
 aaa
 aaa
 aaa
-bsh
-bsk
-buX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69311,10 +69251,6 @@ aaa
 aaa
 aaa
 aaa
-beV
-bfR
-bhC
-beV
 aaa
 aaa
 aaa
@@ -69323,9 +69259,13 @@ aaa
 aaa
 aaa
 aaa
-bqP
-btH
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69567,23 +69507,23 @@ aZx
 aZx
 aaa
 aaa
-beV
-beV
-bgQ
-bgQ
-beV
-beV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aZx
 aZx
 aZx
 aZx
-bqP
-bqP
-btI
-bqP
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69784,15 +69724,15 @@ amI
 anu
 aog
 aiu
-apC
-apC
-apD
-apC
-apC
-apD
-apC
-apC
-apC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aiu
 azW
 aBa
@@ -69824,23 +69764,23 @@ baJ
 aZx
 bcW
 aZx
-beV
-bfQ
-bfR
-bfR
-bhX
-beV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 aZx
 aZx
 baJ
 bon
 aZx
-bqQ
-bsi
-bsk
-buY
-cqq
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70041,15 +69981,15 @@ amJ
 anv
 aoh
 aiu
-apD
-aqj
-are
-ass
-atr
-auv
-avo
-awG
-axD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aiu
 azX
 aBb
@@ -70081,23 +70021,23 @@ baK
 bbQ
 bcX
 bdV
-beW
-bfR
-bgR
-bgR
-bfR
-beW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 bbQ
 bcX
 bdV
 baK
 bon
 aZx
-bqP
-bsi
-bsk
-buY
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70298,15 +70238,15 @@ amK
 anw
 aoh
 aiu
-apD
-aqk
-arf
-apC
-ats
-atr
-atr
-awG
-axD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aiu
 azY
 aiu
@@ -70338,23 +70278,23 @@ baK
 aZx
 aZx
 aZx
-beV
-bfS
-bfR
-bfR
-bhY
-beV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 aZx
 aZx
 baK
 bon
 aZx
-bqP
-bsj
-bsk
-bsk
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70555,15 +70495,15 @@ akA
 akA
 aoi
 aiu
-apD
-aql
-arg
-ast
-att
-auw
-atr
-awG
-axD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aiu
 azZ
 aiu
@@ -70595,23 +70535,23 @@ baK
 bbR
 bcY
 aZx
-beX
-bfT
-bgR
-bgR
-bfR
-beX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 bkQ
 bbR
 baK
 bon
 aZx
-bqR
-bsk
-btJ
-bsk
-bwp
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70812,15 +70752,15 @@ amL
 anx
 aoj
 aiu
-apC
-apC
-arh
-apC
-apC
-apC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 avp
-apC
-apC
+aaa
+aaa
 aiu
 aAa
 aiu
@@ -70852,23 +70792,23 @@ baL
 baK
 bcZ
 aZx
-beX
-bfU
-bfR
-bfR
-bfR
-beX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 bkR
 baK
 baL
 bon
 aZx
-bqP
-bsk
-bsk
-buZ
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71109,23 +71049,23 @@ baK
 bbS
 bda
 aZx
-beX
-bfR
-bgR
-bgR
-bfR
-beX
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 bkS
 bbS
 baK
 bon
 aZx
-bqP
-bsi
-bsk
-buY
-bqP
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71366,23 +71306,23 @@ baM
 aZx
 aZx
 aZx
-beV
-bfV
-bgR
-bgR
-bhZ
-beV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 aZx
 aZx
 bno
 boo
 aZx
-bqQ
-bsi
-bsk
-buY
-cqq
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71623,23 +71563,23 @@ baN
 bbQ
 bcX
 bdV
-beW
-bfR
-bfR
-bfR
-bfR
-beW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 bbQ
 bcX
 bdV
 bnp
 bon
 aZx
-bqP
-bqQ
+aaa
+aaa
 btK
-bqQ
-bqP
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71880,12 +71820,12 @@ baN
 aZx
 bcW
 aZx
-beV
-bfW
-bfW
-bfW
-bfW
-beV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aZx
 aZx
 aZx
@@ -72137,12 +72077,12 @@ baN
 bbR
 bbR
 aYG
-beV
-bfX
+aaa
+aaa
 bgS
-bhD
-bia
-beV
+aaa
+aaa
+aaa
 aYG
 bbR
 bbR
@@ -90624,10 +90564,10 @@ aJm
 aKg
 cDa
 aMo
-cDd
-cDf
-cDg
-cDh
+cDa
+cDa
+cDa
+cDa
 aLg
 aTj
 aUu
@@ -91655,8 +91595,8 @@ aMs
 aNO
 aPb
 aQe
-cDi
-cDj
+cDa
+cDa
 aTn
 aUx
 aVA
@@ -91913,7 +91853,7 @@ aNP
 aPb
 aNO
 aNP
-cDk
+cDa
 aTo
 aSk
 aTm
@@ -92170,7 +92110,7 @@ aNO
 aPc
 aQf
 aRq
-cDl
+cDa
 aTp
 aSk
 aTm
@@ -92427,7 +92367,7 @@ aNQ
 aNO
 aQg
 aNP
-cDm
+cDa
 aTq
 aSk
 aVB
@@ -92678,13 +92618,13 @@ aEd
 aEd
 aEd
 cCX
-cDb
-cDc
-cDe
+cDa
+cDa
+cDa
 coL
 coL
 coL
-cDn
+cDa
 aTr
 aUy
 aPd
@@ -93453,25 +93393,25 @@ aKq
 aJs
 aEj
 aaa
-aQh
-aQh
-aQh
-aTt
-aUA
-aQh
-aWC
-aXB
-aQh
-aQh
-aQh
 aaa
-apC
-apC
-apD
+aaa
+aaa
+aaa
+aUA
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 bfK
-apD
-apC
-apC
+aaa
+aaa
+aaa
 aEj
 aTx
 bkE
@@ -93709,26 +93649,26 @@ aKn
 aKn
 aMy
 aEj
-aPe
-aQh
-aQh
-aRr
-aRr
-aRr
-aVC
-aRr
-aRr
-aRr
-aRr
-aQh
 aaa
-apC
-bdN
-atr
-atr
-beQ
-bhw
-apC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aEj
 aTx
 bkE
@@ -93966,26 +93906,26 @@ aEj
 aLk
 aLk
 aEj
-aPe
-aQi
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aQh
 aaa
-apD
-bdO
-beQ
-atr
-beQ
-bhx
-bhW
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aEj
 bjz
 bkE
@@ -94223,26 +94163,26 @@ aKo
 aLl
 aMz
 aEj
-aPe
-aQi
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aZu
-aQh
 aaa
-apC
-bdP
-atr
-atr
-beQ
-bhy
-apC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aEj
 aTx
 bkF
@@ -94480,26 +94420,26 @@ aFi
 aFi
 aEj
 aEj
-aPe
-aQi
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aRr
-aQh
 aaa
-apC
-apC
-apD
-bfL
-apD
-apC
-apC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aEj
 aTx
 bkF
@@ -94737,18 +94677,18 @@ aKp
 aFi
 aMA
 aEj
-aPe
-aQh
-aQh
-aRr
-aRr
-aRr
-aVD
-aRr
-aRr
-aRr
-aRr
-aQh
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -94995,17 +94935,17 @@ aFi
 aFi
 aEj
 aaa
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
-aQh
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 9203da36b2b..e5cceca5df2 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -3245,11 +3245,12 @@
 "jC" = (
 /obj/docking_port/stationary{
 	dir = 8;
-	dwidth = 5;
+	dwidth = 8;
 	height = 7;
 	id = "supply_away";
+	json_key = "cargo";
 	name = "CentCom";
-	width = 12
+	width = 20
 	},
 /turf/open/space,
 /area/space)
@@ -5636,6 +5637,12 @@
 /obj/effect/turf_decal/bot_white,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/bridge)
+"pE" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows2";
+	dir = 6
+	},
+/area/syndicate_mothership/control)
 "pF" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Auxillary Dock";
@@ -6076,6 +6083,27 @@
 "qE" = (
 /turf/closed/indestructible/riveted/uranium,
 /area/wizard_station)
+"qF" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 8;
+	icon_state = "fakewindows"
+	},
+/area/wizard_station)
+"qG" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 8;
+	icon_state = "fakewindows2"
+	},
+/area/wizard_station)
+"qH" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 4;
+	icon_state = "fakewindows"
+	},
+/area/wizard_station)
 "qI" = (
 /turf/open/floor/plasteel/vault/side,
 /area/shuttle/syndicate/bridge)
@@ -7104,6 +7132,24 @@
 	dir = 5
 	},
 /area/shuttle/syndicate/hallway)
+"tb" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows";
+	dir = 9
+	},
+/area/syndicate_mothership/control)
+"tc" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows2";
+	dir = 8
+	},
+/area/syndicate_mothership/control)
+"td" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows";
+	dir = 4
+	},
+/area/syndicate_mothership/control)
 "te" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom,
@@ -7159,6 +7205,14 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/assault_pod)
+"tm" = (
+/turf/open/floor/plating/asteroid/snow/airless,
+/obj/machinery/porta_turret/syndicate/pod,
+/turf/closed/wall/mineral/plastitanium{
+	dir = 1;
+	icon_state = "diagonalWall3"
+	},
+/area/shuttle/assault_pod)
 "tn" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -7459,6 +7513,13 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
 /area/centcom/evac)
+"tW" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 6;
+	icon_state = "fakewindows2"
+	},
+/area/wizard_station)
 "tX" = (
 /obj/machinery/door/airlock{
 	icon = 'icons/obj/doors/airlocks/station/uranium.dmi';
@@ -7763,6 +7824,12 @@
 	},
 /turf/open/floor/plating,
 /area/syndicate_mothership/control)
+"uK" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows";
+	dir = 8
+	},
+/area/syndicate_mothership/control)
 "uL" = (
 /obj/machinery/button/door{
 	id = "nukeop_ready";
@@ -7959,7 +8026,8 @@
 	height = 50;
 	id = "emergency_away";
 	name = "CentCom Emergency Shuttle Dock";
-	width = 50
+	width = 50;
+	json_key = "emergency"
 	},
 /turf/open/space,
 /area/space)
@@ -8319,6 +8387,14 @@
 	},
 /turf/open/floor/carpet,
 /area/wizard_station)
+"we" = (
+/obj/structure/sign/warning/securearea{
+	desc = "A warning sign which reads 'FOURTH WALL'.";
+	name = "\improper FOURTH WALL";
+	pixel_x = -32
+	},
+/turf/open/floor/plating/asteroid/snow/airless,
+/area/syndicate_mothership)
 "wf" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/light{
@@ -8341,6 +8417,31 @@
 	dir = 8
 	},
 /area/shuttle/syndicate/hallway)
+"wi" = (
+/obj/item/storage/toolbox/syndicate,
+/obj/item/crowbar/red,
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"wj" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"wk" = (
+/obj/structure/chair{
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
 "wl" = (
 /obj/machinery/light,
 /turf/open/floor/wood,
@@ -8630,6 +8731,21 @@
 	dir = 2
 	},
 /area/syndicate_mothership/control)
+"wZ" = (
+/turf/open/floor/plating/asteroid/snow/airless,
+/obj/machinery/porta_turret/syndicate/pod,
+/turf/closed/wall/mineral/plastitanium{
+	icon_state = "diagonalWall3"
+	},
+/area/shuttle/assault_pod)
+"xa" = (
+/turf/open/floor/plating/asteroid/snow/airless,
+/obj/machinery/porta_turret/syndicate/pod,
+/turf/closed/wall/mineral/plastitanium{
+	dir = 4;
+	icon_state = "diagonalWall3"
+	},
+/area/shuttle/assault_pod)
 "xb" = (
 /obj/docking_port/stationary{
 	dir = 8;
@@ -8819,6 +8935,21 @@
 /obj/structure/window/plastitanium,
 /turf/open/floor/plating,
 /area/shuttle/syndicate/airlock)
+"xE" = (
+/obj/structure/chair{
+	dir = 1;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"xF" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/space/syndicate/black/red,
+/obj/item/clothing/head/helmet/space/syndicate/black/red,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
 "xG" = (
 /turf/open/floor/plasteel/dark,
 /area/syndicate_mothership/control)
@@ -9462,6 +9593,13 @@
 	dir = 1
 	},
 /area/centcom/evac)
+"zn" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 1;
+	icon_state = "fakewindows"
+	},
+/area/wizard_station)
 "zo" = (
 /obj/structure/destructible/cult/tome,
 /turf/open/floor/engine/cult,
@@ -9623,6 +9761,13 @@
 	},
 /turf/open/floor/plating/asteroid,
 /area/centcom/evac)
+"zM" = (
+/turf/closed/indestructible/fakeglass{
+	color = "#008000";
+	dir = 1;
+	icon_state = "fakewindows2"
+	},
+/area/wizard_station)
 "zN" = (
 /obj/structure/bookcase/random/reference,
 /turf/open/floor/engine/cult,
@@ -12957,6 +13102,18 @@
 "Il" = (
 /turf/closed/indestructible/fakeglass,
 /area/tdome/tdomeobserve)
+"Im" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows2";
+	dir = 8
+	},
+/area/tdome/tdomeobserve)
+"In" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows";
+	dir = 4
+	},
+/area/tdome/tdomeobserve)
 "Io" = (
 /obj/item/storage/box/matches{
 	pixel_x = -3;
@@ -13116,6 +13273,13 @@
 	dir = 4
 	},
 /area/tdome/arena)
+"IK" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
 "IL" = (
 /obj/effect/landmark/thunderdome/one,
 /obj/effect/turf_decal/stripes/line{
@@ -13137,6 +13301,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/tdome/arena)
+"IO" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
 "IP" = (
 /obj/structure/rack,
 /obj/item/clothing/under/color/green,
@@ -13417,6 +13588,13 @@
 /obj/effect/turf_decal/loading_area,
 /turf/open/floor/plasteel,
 /area/tdome/arena)
+"JE" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomehea";
+	name = "Heavy Supply"
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
 "JF" = (
 /obj/machinery/computer/camera_advanced/abductor{
 	team_number = 1
@@ -13443,6 +13621,18 @@
 "JI" = (
 /turf/closed/indestructible/fakeglass,
 /area/tdome/tdomeadmin)
+"JJ" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows2";
+	dir = 8
+	},
+/area/tdome/tdomeadmin)
+"JK" = (
+/turf/closed/indestructible/fakeglass{
+	icon_state = "fakewindows";
+	dir = 4
+	},
+/area/tdome/tdomeadmin)
 "JL" = (
 /obj/structure/rack,
 /obj/item/clothing/under/color/green,
@@ -13889,11 +14079,8 @@
 /turf/closed/wall/mineral/titanium/interior,
 /area/centcom/evac)
 "KT" = (
-/obj/machinery/computer/camera_advanced{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/wizard_station)
+/turf/closed/wall/mineral/titanium/interior,
+/area/centcom/evac)
 "KU" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/mineral/titanium/blue,
@@ -14303,6 +14490,106 @@
 	},
 /turf/open/floor/plasteel,
 /area/tdome/arena)
+"Mj" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mk" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Ml" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mm" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mn" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mo" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mp" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mq" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Mr" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdome";
+	name = "Thunderdome Blast Door"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
+"Ms" = (
+/obj/machinery/door/poddoor{
+	id = "thunderdomegen";
+	name = "General Supply"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/tdome/arena)
 "Mt" = (
 /obj/structure/chair{
 	dir = 4;
@@ -14320,12 +14607,23 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/syndicate/airlock)
+"Mv" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
 "Mw" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/syndicate/airlock)
+"Mx" = (
+/turf/open/floor/plating/asteroid/snow/airless,
+/area/syndicate_mothership)
 "My" = (
 /obj/docking_port/stationary{
 	area_type = /area/syndicate_mothership;
@@ -14336,39 +14634,27 @@
 	height = 17;
 	id = "syndicate_away";
 	name = "syndicate recon outpost";
+	roundstart_template = /datum/map_template/shuttle/infiltrator/basic;
 	turf_type = /turf/open/floor/plating/asteroid/snow;
 	width = 23
 	},
-/obj/machinery/door/poddoor{
-	id = "smindicate";
-	name = "outer blast door"
-	},
-/obj/machinery/button/door{
-	id = "smindicate";
-	name = "external door control";
-	pixel_y = 26;
-	req_access_txt = "150"
-	},
-/obj/docking_port/mobile{
-	dheight = 1;
-	dir = 8;
-	dwidth = 12;
-	height = 17;
-	hidden = 1;
-	id = "syndicate";
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "syndicate infiltrator";
-	port_direction = 4;
-	roundstart_move = null;
-	width = 23
-	},
-/obj/structure/fans/tiny,
+/turf/open/floor/plating/asteroid/snow/airless,
+/area/syndicate_mothership)
+"Mz" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"MA" = (
 /obj/effect/turf_decal/stripes/line{
-	dir = 1
+	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/syndicate/airlock)
-"Mz" = (
+"MB" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/bot_white,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/airlock)
 "MC" = (
@@ -14393,6 +14679,12 @@
 	},
 /turf/open/floor/plating/asteroid/snow/airless,
 /area/syndicate_mothership)
+"ME" = (
+/obj/machinery/computer/camera_advanced{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/wizard_station)
 
 (1,1,1) = {"
 aa
@@ -19451,7 +19743,7 @@ lI
 lI
 qE
 qE
-KT
+ME
 vj
 ya
 qZ
@@ -26646,16 +26938,16 @@ kt
 kt
 kt
 kt
-yc
-yd
-yd
-yd
-yd
-yd
-yd
-yd
-yd
-yd
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -26897,22 +27189,22 @@ hl
 hl
 hl
 kt
-tY
-tZ
-tZ
-tZ
-tZ
-tZ
-yd
-yL
-zs
-yL
-AC
-Bj
-BT
-Cj
-CS
-Di
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -27154,22 +27446,22 @@ hl
 hl
 hl
 kt
-tZ
-uG
-vo
-vo
-vo
-xA
-yd
-yM
-zt
-zR
-zR
-Bk
-zR
-Ck
-CS
-Dj
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -27411,22 +27703,22 @@ kt
 kt
 kt
 kt
-tZ
-uH
-uH
-uH
-uH
-uH
-ye
-yN
-zt
-zS
-AD
-Bl
-BU
-Cl
-CS
-Dk
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -27661,29 +27953,29 @@ hl
 hl
 my
 hl
-oS
-oT
-oT
-oT
-oT
 hl
 hl
-tZ
-uH
-uH
-uH
-uH
-uH
-yd
-yO
-zt
-zT
-AE
-Bm
-yf
-yd
-yd
-Dl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -27918,26 +28210,26 @@ hl
 hl
 hl
 hl
-oT
-px
-pR
-qI
-oT
-rY
 hl
-tZ
-uI
-vp
-wf
-wR
-xB
-yd
-yP
-zt
-zT
-AE
-Bn
-yd
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 hl
 hl
 kt
@@ -28175,28 +28467,28 @@ hl
 hl
 hl
 hl
-oU
-py
-pS
-qI
-oT
-rZ
-rZ
-tZ
-tZ
-tZ
-tZ
-wS
-xC
-yf
-yQ
-yQ
-zU
-yQ
-yd
-yd
-rZ
-rZ
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hl
@@ -28432,28 +28724,28 @@ hl
 hl
 hl
 nx
-oU
-pz
-pT
-qI
-rb
-sa
-sY
-ua
-sY
-sY
-wg
-sb
-sb
-sb
-sb
-zu
-zV
-AF
-Bo
-BV
-Cm
-CT
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hl
@@ -28689,28 +28981,28 @@ hl
 hl
 hl
 hl
-oU
-pA
-pU
-qI
-rc
-sb
-sZ
-sZ
-sZ
-sb
-wh
-sb
-sZ
-sZ
-sZ
-sZ
-zV
-AF
-Bo
-BW
-Cm
-CU
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hl
@@ -28946,28 +29238,28 @@ hl
 my
 hl
 hl
-oU
-pB
-pT
-qI
-oT
-sc
-ta
-ub
-ta
-ta
-wg
-sb
-sb
-sb
-sb
-zv
-zV
-AF
-Bo
-BV
-Cm
-CV
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hl
@@ -29203,28 +29495,28 @@ hl
 hl
 hl
 hl
-oU
-pC
-pV
-qI
-oT
-rZ
-rZ
-vq
-vq
-vq
-vq
-wT
-xD
-yg
-yR
-yR
-zW
-yR
-yh
-yh
-rZ
-rZ
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hl
@@ -29460,26 +29752,26 @@ hl
 hl
 hl
 hl
-oT
-pD
-pW
-qI
-oT
-sd
 hl
-vq
-Mt
-Mt
-uc
-Mz
-Mt
-yh
-yS
-zw
-zX
-AG
-Bp
-yh
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 hl
 hl
 kt
@@ -29717,29 +30009,29 @@ hl
 hl
 hl
 hl
-oV
-oT
-oT
-oT
-oT
 hl
 hl
-vq
-wU
-wU
-wU
-wU
-wU
-yh
-yT
-zw
-zX
-AG
-Bq
-yg
-yh
-yh
-Dm
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -29981,22 +30273,22 @@ kt
 kt
 kt
 kt
-vq
-wU
-wU
-wU
-wU
-wU
-yi
-yU
-zw
-zY
-AH
-Br
-zZ
-Cn
-CW
-Dn
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -30238,22 +30530,22 @@ nx
 hl
 hl
 kt
-vq
-Mu
-Mw
-Mw
-Mw
-MC
-yh
-yV
-zw
-zZ
-zZ
-Bs
-zZ
-Co
-CW
-Do
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -30495,22 +30787,22 @@ hl
 hl
 hl
 kt
-vt
-vq
-vq
+hl
+hl
+hl
 My
-vs
-vq
-yh
-yW
-zw
-Aa
-AI
-Bt
-BX
-Cn
-CW
-Dp
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
@@ -30758,16 +31050,16 @@ nz
 uJ
 nz
 kt
-yj
-yh
-yh
-yh
-yh
-yh
-yh
-yh
-yh
-yh
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 kt
 hl
 hh
diff --git a/_maps/map_files/generic/SpaceDock.dmm b/_maps/map_files/generic/SpaceDock.dmm
index b0a9ccbf71f..286ca3e97de 100644
--- a/_maps/map_files/generic/SpaceDock.dmm
+++ b/_maps/map_files/generic/SpaceDock.dmm
@@ -10,7 +10,8 @@
 	height = 22;
 	id = "whiteship_away";
 	name = "Deep Space";
-	width = 35
+	width = 35;
+	json_key = "whiteship"
 	},
 /turf/open/space,
 /area/space)
diff --git a/_maps/metastation.json b/_maps/metastation.json
index 6b023ba02d3..fdadfb058cc 100644
--- a/_maps/metastation.json
+++ b/_maps/metastation.json
@@ -1,5 +1,11 @@
 {
     "map_name": "MetaStation",
     "map_path": "map_files/MetaStation",
-    "map_file": "MetaStation.dmm"
+    "map_file": "MetaStation.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_meta",
+	    "emergency": "emergency_meta"
+    }
 }
diff --git a/_maps/omegastation.json b/_maps/omegastation.json
index 0f3732c36c9..805ec5eccc9 100644
--- a/_maps/omegastation.json
+++ b/_maps/omegastation.json
@@ -1,5 +1,10 @@
 {
     "map_name": "OmegaStation",
     "map_path": "map_files/OmegaStation",
-    "map_file": "OmegaStation.dmm"
-}
\ No newline at end of file
+    "map_file": "OmegaStation.dmm",
+    "shuttles": {
+	    "emergency": "emergency_omega",
+	    "ferry": "ferry_fancy",
+	    "cargo": "cargo_delta"
+    }
+}
diff --git a/_maps/pubbystation.json b/_maps/pubbystation.json
index b63f196b6c7..f99cca57c5b 100644
--- a/_maps/pubbystation.json
+++ b/_maps/pubbystation.json
@@ -1,5 +1,11 @@
 {
     "map_name": "PubbyStation",
     "map_path": "map_files/PubbyStation",
-    "map_file": "PubbyStation.dmm"
-}
\ No newline at end of file
+    "map_file": "PubbyStation.dmm",
+    "shuttles": {
+	    "emergency": "emergency_pubby",
+	    "whiteship": "whiteship_pubby",
+	    "ferry": "ferry_fancy",
+	    "cargo": "cargo_box"
+    }
+}
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
new file mode 100644
index 00000000000..1bd1c69d395
--- /dev/null
+++ b/_maps/shuttles/arrival_box.dmm
@@ -0,0 +1,288 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"c" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Arrivals Shuttle Airlock"
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"d" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"e" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"f" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"g" = (
+/obj/machinery/computer/arcade,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"h" = (
+/obj/structure/closet/wardrobe/green,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"i" = (
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"j" = (
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"k" = (
+/obj/structure/closet/wardrobe/grey,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"l" = (
+/obj/machinery/requests_console{
+	department = "Arrival shuttle";
+	name = "Arrivals Shuttle console";
+	pixel_y = 30
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"m" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"n" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"o" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"p" = (
+/obj/structure/chair,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"q" = (
+/obj/structure/chair,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"r" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"s" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"t" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Arrivals Shuttle Airlock"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"u" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/obj/docking_port/mobile/arrivals,
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"v" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"w" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"x" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"y" = (
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"z" = (
+/obj/item/device/radio/intercom{
+	name = "Station Intercom (General)";
+	pixel_y = -29
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"A" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+b
+o
+d
+d
+b
+a
+"}
+(2,1,1) = {"
+a
+b
+p
+f
+v
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+q
+f
+w
+b
+a
+"}
+(4,1,1) = {"
+b
+b
+b
+t
+b
+b
+b
+"}
+(5,1,1) = {"
+b
+e
+f
+f
+f
+x
+b
+"}
+(6,1,1) = {"
+c
+f
+r
+r
+r
+f
+c
+"}
+(7,1,1) = {"
+b
+g
+f
+f
+f
+y
+b
+"}
+(8,1,1) = {"
+d
+h
+r
+r
+r
+f
+d
+"}
+(9,1,1) = {"
+d
+i
+f
+f
+f
+f
+d
+"}
+(10,1,1) = {"
+d
+j
+r
+r
+r
+f
+d
+"}
+(11,1,1) = {"
+d
+k
+f
+f
+f
+f
+d
+"}
+(12,1,1) = {"
+b
+l
+r
+r
+r
+z
+b
+"}
+(13,1,1) = {"
+c
+f
+f
+f
+f
+f
+c
+"}
+(14,1,1) = {"
+b
+m
+m
+m
+m
+m
+b
+"}
+(15,1,1) = {"
+b
+n
+s
+u
+s
+A
+b
+"}
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
new file mode 100644
index 00000000000..aaa30ac5c16
--- /dev/null
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -0,0 +1,568 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"c" = (
+/obj/docking_port/mobile/arrivals{
+	dir = 2;
+	dwidth = 4;
+	height = 17;
+	name = "delta arrivals shuttle";
+	timid = 1;
+	width = 9
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/arrival)
+"d" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/arrival)
+"e" = (
+/obj/structure/window/reinforced,
+/obj/structure/shuttle/engine/heater{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"f" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"g" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"h" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"i" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"j" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"k" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"l" = (
+/obj/structure/table/reinforced,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 32
+	},
+/obj/item/storage/firstaid/regular{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/regular,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"m" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"n" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Arrival Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/arrival)
+"o" = (
+/turf/open/floor/plasteel/neutral/side{
+	dir = 8;
+	heat_capacity = 1e+006
+	},
+/area/shuttle/arrival)
+"p" = (
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/arrival)
+"q" = (
+/turf/open/floor/plasteel/neutral/side{
+	dir = 4
+	},
+/area/shuttle/arrival)
+"r" = (
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21"
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 8;
+	heat_capacity = 1e+006
+	},
+/area/shuttle/arrival)
+"s" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"t" = (
+/obj/machinery/ai_status_display{
+	pixel_x = 32
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21"
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 4
+	},
+/area/shuttle/arrival)
+"u" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"v" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"w" = (
+/obj/machinery/requests_console{
+	department = "Arrival shuttle";
+	name = "Arrivals Shuttle console"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"x" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/window/shuttle,
+/turf/open/floor/grass,
+/area/shuttle/arrival)
+"y" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/window/shuttle,
+/turf/open/floor/grass,
+/area/shuttle/arrival)
+"z" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"A" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21"
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 8;
+	heat_capacity = 1e+006
+	},
+/area/shuttle/arrival)
+"B" = (
+/obj/structure/table/reinforced,
+/obj/item/clipboard,
+/obj/item/toy/figure/assistant,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"C" = (
+/obj/machinery/vending/wallmed{
+	name = "Emergency NanoMed";
+	req_access_txt = "0";
+	use_power = 0
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"D" = (
+/obj/structure/table/reinforced,
+/obj/item/folder,
+/obj/item/storage/pill_bottle/dice,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"E" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21"
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 4
+	},
+/area/shuttle/arrival)
+"F" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/arrival)
+"G" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"H" = (
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/plasteel/neutral/side,
+/area/shuttle/arrival)
+"I" = (
+/obj/structure/closet/wardrobe/grey,
+/turf/open/floor/plasteel/blue/corner,
+/area/shuttle/arrival)
+"J" = (
+/turf/open/floor/plasteel/blue/side,
+/area/shuttle/arrival)
+"K" = (
+/obj/structure/closet/wardrobe/yellow,
+/turf/open/floor/plasteel/blue/corner{
+	dir = 8
+	},
+/area/shuttle/arrival)
+"L" = (
+/obj/structure/closet/wardrobe/grey,
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/arrival)
+"M" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/briefcase{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/secure/briefcase,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"N" = (
+/obj/machinery/status_display,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"O" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/machinery/door/airlock/shuttle{
+	name = "Arrival Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/arrival)
+"P" = (
+/obj/machinery/ai_status_display,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"Q" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/blue/side{
+	dir = 8
+	},
+/area/shuttle/arrival)
+"R" = (
+/obj/structure/chair/office/dark,
+/turf/open/floor/plasteel/blue/side{
+	dir = 1
+	},
+/area/shuttle/arrival)
+"S" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/blue/side{
+	dir = 4
+	},
+/area/shuttle/arrival)
+"T" = (
+/turf/template_noop,
+/area/template_noop)
+"U" = (
+/obj/structure/frame/computer{
+	dir = 1
+	},
+/turf/open/floor/plasteel/blue,
+/area/shuttle/arrival)
+"V" = (
+/obj/structure/frame/computer{
+	dir = 1
+	},
+/turf/open/floor/plasteel/blue/side,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+d
+f
+g
+n
+g
+h
+h
+h
+h
+z
+n
+g
+g
+a
+T
+T
+"}
+(2,1,1) = {"
+b
+d
+g
+i
+o
+r
+u
+u
+u
+u
+A
+o
+G
+g
+a
+T
+T
+"}
+(3,1,1) = {"
+b
+e
+h
+j
+p
+p
+p
+p
+p
+p
+p
+p
+H
+g
+g
+h
+g
+"}
+(4,1,1) = {"
+b
+e
+h
+k
+p
+p
+v
+v
+v
+v
+B
+p
+I
+N
+Q
+U
+h
+"}
+(5,1,1) = {"
+c
+d
+f
+l
+p
+s
+w
+x
+y
+x
+C
+F
+J
+O
+R
+V
+h
+"}
+(6,1,1) = {"
+b
+e
+h
+m
+p
+p
+u
+u
+u
+u
+D
+p
+K
+P
+S
+U
+h
+"}
+(7,1,1) = {"
+b
+e
+h
+j
+p
+p
+p
+p
+p
+p
+p
+p
+L
+g
+g
+h
+g
+"}
+(8,1,1) = {"
+b
+d
+g
+i
+q
+t
+v
+v
+v
+v
+E
+q
+M
+g
+a
+T
+T
+"}
+(9,1,1) = {"
+a
+d
+f
+g
+n
+g
+h
+h
+h
+h
+z
+n
+g
+g
+a
+T
+T
+"}
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
new file mode 100644
index 00000000000..7912a7a5ef2
--- /dev/null
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -0,0 +1,246 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"c" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Arrivals Shuttle Airlock"
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"d" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"e" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+	pixel_y = 4
+	},
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"f" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"g" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/sign/poster/official/enlist{
+	pixel_y = 32
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"h" = (
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"i" = (
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"j" = (
+/obj/machinery/requests_console{
+	department = "Arrival shuttle";
+	name = "Arrivals Shuttle console";
+	pixel_y = 30
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"k" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"l" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"m" = (
+/obj/structure/grille,
+/obj/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "arrivy";
+	name = "ship shutters"
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"n" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Arrivals Shuttle Airlock"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"o" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"p" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/obj/docking_port/mobile/arrivals{
+	height = 13;
+	name = "pubby arrivals shuttle";
+	width = 6
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"q" = (
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"r" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"s" = (
+/obj/structure/closet/emcloset,
+/obj/item/storage/firstaid/o2,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"t" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -29
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"u" = (
+/obj/item/device/radio/intercom{
+	name = "Station Intercom (General)";
+	pixel_y = -29
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"v" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+b
+m
+m
+b
+a
+"}
+(2,1,1) = {"
+a
+b
+f
+q
+b
+a
+"}
+(3,1,1) = {"
+b
+b
+n
+n
+b
+b
+"}
+(4,1,1) = {"
+b
+e
+f
+f
+s
+b
+"}
+(5,1,1) = {"
+c
+f
+o
+o
+f
+c
+"}
+(6,1,1) = {"
+b
+g
+f
+f
+t
+b
+"}
+(7,1,1) = {"
+d
+h
+o
+o
+f
+d
+"}
+(8,1,1) = {"
+d
+i
+f
+f
+f
+d
+"}
+(9,1,1) = {"
+d
+f
+o
+o
+f
+d
+"}
+(10,1,1) = {"
+b
+j
+o
+o
+u
+b
+"}
+(11,1,1) = {"
+c
+f
+f
+f
+f
+c
+"}
+(12,1,1) = {"
+b
+k
+k
+k
+k
+b
+"}
+(13,1,1) = {"
+b
+l
+p
+r
+v
+b
+"}
diff --git a/_maps/shuttles/assaultpod_basic.dmm b/_maps/shuttles/assaultpod_basic.dmm
new file mode 100644
index 00000000000..38d6210f012
--- /dev/null
+++ b/_maps/shuttles/assaultpod_basic.dmm
@@ -0,0 +1,68 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm
new file mode 100644
index 00000000000..ba8a8a555fd
--- /dev/null
+++ b/_maps/shuttles/cargo_delta.dmm
@@ -0,0 +1,320 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"b" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"c" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"d" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"e" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"f" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"g" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"h" = (
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"i" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"j" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"k" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "cargounload"
+	},
+/obj/machinery/door/poddoor{
+	id = "cargounload";
+	name = "supply dock unloading door"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"l" = (
+/obj/effect/decal/cleanable/oil,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"m" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"n" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Supply Shuttle Airlock";
+	req_access_txt = "31"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/docking_port/mobile/supply{
+	dir = 4;
+	dwidth = 4;
+	timid = 1;
+	width = 12
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"o" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"p" = (
+/obj/machinery/button/door{
+	dir = 2;
+	id = "cargounload";
+	name = "Loading Doors";
+	pixel_x = -24;
+	pixel_y = 8
+	},
+/obj/machinery/button/door{
+	id = "cargoload";
+	name = "Loading Doors";
+	pixel_x = -24;
+	pixel_y = -8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"q" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"r" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Supply Shuttle Airlock";
+	req_access_txt = "31"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"s" = (
+/obj/machinery/door/poddoor{
+	id = "cargoload";
+	name = "supply dock loading door"
+	},
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "cargoload"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"t" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"u" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"v" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"w" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"x" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"y" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"z" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/shuttle/engine/heater,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"A" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/shuttle/engine/heater,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"B" = (
+/turf/template_noop,
+/area/template_noop)
+"C" = (
+/obj/structure/shuttle/engine/propulsion/burst/left,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"D" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"E" = (
+/obj/structure/shuttle/engine/propulsion/burst/right,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+
+(1,1,1) = {"
+a
+a
+a
+k
+n
+a
+r
+s
+a
+a
+a
+B
+"}
+(2,1,1) = {"
+a
+b
+g
+g
+o
+p
+o
+o
+t
+a
+a
+C
+"}
+(3,1,1) = {"
+a
+c
+h
+l
+h
+h
+h
+i
+u
+x
+z
+D
+"}
+(4,1,1) = {"
+a
+d
+i
+i
+i
+h
+i
+h
+v
+x
+A
+D
+"}
+(5,1,1) = {"
+a
+e
+i
+h
+h
+h
+h
+h
+v
+y
+A
+D
+"}
+(6,1,1) = {"
+a
+f
+j
+m
+j
+q
+m
+j
+w
+a
+a
+E
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+B
+"}
diff --git a/_maps/shuttles/emergency_airless.dmm b/_maps/shuttles/emergency_airless.dmm
index d5dc2d6d007..76a68bb2d99 100644
--- a/_maps/shuttles/emergency_airless.dmm
+++ b/_maps/shuttles/emergency_airless.dmm
@@ -47,8 +47,8 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "i" = (
-/turf/open/space/basic,
-/area/space)
+/turf/template_noop,
+/area/template_noop)
 
 (1,1,1) = {"
 a
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
new file mode 100644
index 00000000000..19c1cadb7ec
--- /dev/null
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -0,0 +1,955 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"ab" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"ac" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"ad" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -32
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"ae" = (
+/obj/structure/chair,
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"af" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/item/device/radio/intercom{
+	name = "Station Intercom";
+	pixel_y = 24
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"ag" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"ah" = (
+/obj/machinery/computer/emergency_shuttle,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"ai" = (
+/obj/machinery/computer/communications,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"aj" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"ak" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"al" = (
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"am" = (
+/obj/machinery/door/airlock/command{
+	name = "Emergency Recovery Airlock";
+	req_access = null;
+	req_access_txt = "19"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"an" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/escape)
+"ao" = (
+/obj/structure/chair/comfy/brown{
+	color = "#596479";
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/escape)
+"ap" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"aq" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape)
+"ar" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"as" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 4
+	},
+/area/shuttle/escape)
+"at" = (
+/obj/structure/chair/comfy/brown{
+	color = "#596479";
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/escape)
+"au" = (
+/obj/machinery/computer/crew{
+	dir = 8
+	},
+/obj/machinery/ai_status_display{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/escape)
+"av" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Holding Area";
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/escape)
+"aw" = (
+/obj/machinery/ai_status_display,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/escape)
+"ax" = (
+/obj/machinery/door/airlock/command/glass{
+	name = "Cockpit";
+	req_access_txt = "19"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"ay" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/docking_port/mobile/emergency{
+	dheight = 0;
+	dwidth = 5;
+	height = 11;
+	name = "Omega emergency shuttle";
+	width = 19
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape)
+"az" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aA" = (
+/turf/open/floor/plasteel/neutral/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"aB" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 1
+	},
+/area/shuttle/escape)
+"aC" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/device/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aD" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aE" = (
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/escape)
+"aF" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aG" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/window/shuttle,
+/turf/open/floor/grass,
+/area/shuttle/escape)
+"aH" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aI" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/window/shuttle,
+/turf/open/floor/grass,
+/area/shuttle/escape)
+"aJ" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aK" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aL" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/escape)
+"aM" = (
+/obj/machinery/vending/wallmed{
+	name = "Emergency NanoMed";
+	req_access_txt = "0";
+	use_power = 0
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/escape)
+"aN" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aO" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/pointybush,
+/turf/open/floor/grass,
+/area/shuttle/escape)
+"aP" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/escape)
+"aQ" = (
+/turf/open/floor/plasteel/neutral/side,
+/area/shuttle/escape)
+"aR" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/neutral/side,
+/area/shuttle/escape)
+"aS" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-21";
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 24
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aT" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Emergency Shuttle Cargo"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aU" = (
+/obj/machinery/status_display,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/escape)
+"aV" = (
+/obj/machinery/door/airlock/medical/glass{
+	id_tag = null;
+	name = "Escape Shuttle Infirmary";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aX" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aY" = (
+/obj/structure/closet/crate/medical{
+	name = "medical crate"
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/o2{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/toxin{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/obj/item/device/healthanalyzer{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/lazarus_injector,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"aZ" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/escape)
+"ba" = (
+/obj/machinery/sleeper{
+	dir = 4
+	},
+/obj/machinery/vending/wallmed{
+	name = "Emergency NanoMed";
+	pixel_x = -26;
+	req_access_txt = "0";
+	use_power = 0
+	},
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bb" = (
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bc" = (
+/obj/machinery/sleeper{
+	dir = 8
+	},
+/obj/item/device/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bd" = (
+/obj/machinery/recharge_station,
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"be" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bg" = (
+/obj/structure/closet/crate{
+	name = "emergency supplies crate"
+	},
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/emergency,
+/obj/item/device/flashlight/flare{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/device/flashlight/flare{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/crowbar,
+/obj/item/wrench,
+/obj/item/device/radio,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bh" = (
+/obj/machinery/shower{
+	dir = 4;
+	icon_state = "shower";
+	name = "emergency shower"
+	},
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bi" = (
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/o2{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/status_display{
+	pixel_x = 32
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/whiteblue/side{
+	dir = 5
+	},
+/area/shuttle/escape)
+"bj" = (
+/obj/structure/table,
+/obj/item/clipboard,
+/obj/item/folder/yellow,
+/obj/item/pen,
+/obj/item/hand_labeler_refill,
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = -32
+	},
+/obj/item/device/radio/intercom{
+	name = "Station Intercom";
+	pixel_y = -26
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bk" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bl" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = -3;
+	pixel_y = 1
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = -1
+	},
+/obj/item/storage/toolbox/emergency{
+	pixel_x = 3;
+	pixel_y = -5
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bm" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 24
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
+"bn" = (
+/obj/item/scalpel{
+	pixel_y = 12
+	},
+/obj/item/circular_saw,
+/obj/item/retractor{
+	pixel_x = 4
+	},
+/obj/item/hemostat{
+	pixel_x = -4
+	},
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/mask/surgical,
+/obj/structure/table/reinforced,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -24
+	},
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bo" = (
+/obj/structure/table/optable,
+/obj/item/surgical_drapes,
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bp" = (
+/obj/item/defibrillator/loaded,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/cmo,
+/area/shuttle/escape)
+"bq" = (
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/whiteblue/side{
+	dir = 4
+	},
+/area/shuttle/escape)
+"br" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/escape)
+"bs" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/shuttle/engine/heater,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+"bt" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/shuttle/engine/heater,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+"bu" = (
+/turf/template_noop,
+/area/template_noop)
+"bv" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/escape)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aq
+ac
+ay
+aa
+ab
+ab
+ab
+aa
+aP
+ac
+aP
+aa
+aa
+aZ
+br
+bu
+"}
+(2,1,1) = {"
+aa
+ad
+ak
+al
+ab
+az
+aD
+aJ
+aJ
+aJ
+aD
+az
+ab
+az
+bd
+bj
+aa
+br
+bv
+"}
+(3,1,1) = {"
+ab
+ae
+al
+al
+av
+aA
+aE
+aE
+aE
+aE
+aE
+aQ
+aT
+aW
+be
+bk
+ab
+bs
+bv
+"}
+(4,1,1) = {"
+ab
+ae
+al
+al
+ab
+aA
+aF
+aK
+aF
+aF
+aF
+aQ
+aT
+aX
+bf
+bl
+ab
+bt
+bv
+"}
+(5,1,1) = {"
+aa
+af
+al
+ar
+ab
+aA
+aG
+aL
+aI
+aM
+aG
+aQ
+ab
+aY
+bg
+bm
+aa
+bt
+bv
+"}
+(6,1,1) = {"
+ac
+ab
+am
+ab
+aw
+aB
+aH
+aG
+aO
+aI
+aH
+aR
+aU
+aZ
+ab
+aZ
+aZ
+br
+br
+"}
+(7,1,1) = {"
+aa
+ag
+an
+as
+ab
+aA
+aI
+aM
+aG
+aL
+aI
+aQ
+ab
+ba
+bh
+bn
+aa
+bt
+bv
+"}
+(8,1,1) = {"
+ab
+ah
+ao
+an
+ax
+aA
+aJ
+aN
+aJ
+aJ
+aJ
+aQ
+aV
+bb
+bb
+bo
+ab
+bt
+bv
+"}
+(9,1,1) = {"
+ab
+ai
+an
+at
+ab
+aA
+aE
+aE
+aE
+aE
+aE
+aQ
+aV
+bb
+bb
+bp
+ab
+bt
+bv
+"}
+(10,1,1) = {"
+ab
+aj
+ap
+au
+aa
+aC
+aF
+aF
+aF
+aF
+aF
+aS
+ab
+bc
+bi
+bq
+aa
+br
+bv
+"}
+(11,1,1) = {"
+aa
+ab
+ab
+aa
+ac
+aa
+ab
+ab
+ab
+ab
+ab
+aa
+ac
+aa
+aa
+aa
+aZ
+br
+bu
+"}
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index c8178fd9a2b..aab71210401 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -1099,7 +1099,7 @@
 	},
 /obj/machinery/light,
 /turf/open/floor/mineral/titanium/blue,
-/area/space)
+/area/template_noop)
 "eN" = (
 /obj/machinery/light{
 	dir = 4
diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm
index cc24ea92933..b289a489a06 100644
--- a/_maps/shuttles/ferry_base.dmm
+++ b/_maps/shuttles/ferry_base.dmm
@@ -57,7 +57,6 @@
 	height = 12;
 	id = "ferry";
 	name = "ferry shuttle";
-	roundstart_move = "ferry_away";
 	port_direction = 2;
 	width = 5;
 	timid = 1
diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm
new file mode 100644
index 00000000000..83795f0c552
--- /dev/null
+++ b/_maps/shuttles/ferry_fancy.dmm
@@ -0,0 +1,195 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/transport)
+"c" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/transport)
+"d" = (
+/obj/machinery/door/airlock/external,
+/turf/open/floor/pod/dark,
+/area/shuttle/transport)
+"e" = (
+/obj/structure/shuttle/engine/propulsion/left{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"f" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"g" = (
+/obj/structure/chair,
+/turf/open/floor/pod/dark,
+/area/shuttle/transport)
+"h" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"i" = (
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"j" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"k" = (
+/obj/machinery/light/small,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"l" = (
+/obj/machinery/door/airlock/titanium,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"m" = (
+/obj/machinery/computer/shuttle/ferry/request{
+	dir = 8
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/transport)
+"n" = (
+/obj/machinery/door/airlock/titanium,
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 13;
+	id = "ferry";
+	name = "ferry shuttle";
+	port_direction = 1;
+	preferred_direction = 4;
+	timid = 1;
+	width = 5
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"o" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"p" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/pod/dark,
+/area/shuttle/transport)
+"q" = (
+/obj/machinery/light,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"r" = (
+/obj/machinery/door/airlock/external,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+
+(1,1,1) = {"
+a
+a
+e
+a
+a
+"}
+(2,1,1) = {"
+a
+e
+j
+e
+a
+"}
+(3,1,1) = {"
+a
+f
+i
+o
+a
+"}
+(4,1,1) = {"
+a
+b
+k
+b
+a
+"}
+(5,1,1) = {"
+b
+b
+l
+b
+b
+"}
+(6,1,1) = {"
+c
+g
+i
+p
+c
+"}
+(7,1,1) = {"
+b
+g
+i
+p
+b
+"}
+(8,1,1) = {"
+b
+h
+i
+i
+b
+"}
+(9,1,1) = {"
+d
+i
+m
+i
+r
+"}
+(10,1,1) = {"
+b
+i
+i
+q
+b
+"}
+(11,1,1) = {"
+b
+g
+i
+p
+b
+"}
+(12,1,1) = {"
+c
+g
+i
+p
+c
+"}
+(13,1,1) = {"
+b
+c
+n
+c
+b
+"}
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index f7e907a2553..3443db8300e 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -28,7 +28,7 @@
 /area/shuttle/transport)
 "ah" = (
 /obj/structure/foamedmetal,
-/turf/open/space,
+/turf/template_noop,
 /area/shuttle/transport)
 "ai" = (
 /obj/machinery/vending/liberationstation,
@@ -178,7 +178,6 @@
 	height = 27;
 	id = "ferry";
 	name = "The Lighthouse";
-	roundstart_move = "ferry_away";
 	timid = 1;
 	port_direction = 2;
 	width = 16
diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm
index b9d3f496957..bed06e5d5ba 100644
--- a/_maps/shuttles/ferry_meat.dmm
+++ b/_maps/shuttles/ferry_meat.dmm
@@ -113,7 +113,6 @@
 	height = 12;
 	id = "ferry";
 	name = "ferry shuttle";
-	roundstart_move = "ferry_away";
 	port_direction = 2;
 	width = 5;
 	timid = 1
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
new file mode 100644
index 00000000000..03cad6a2f9e
--- /dev/null
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -0,0 +1,1382 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/template_noop,
+/area/template_noop)
+"ac" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 9
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/bridge)
+"ad" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/bridge)
+"ae" = (
+/obj/structure/window/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "syndieshutters";
+	name = "blast shutters"
+	},
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/bridge)
+"af" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 5
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/bridge)
+"ag" = (
+/obj/machinery/computer/med_data/syndie,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"ah" = (
+/obj/machinery/computer/crew/syndie,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"ai" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"aj" = (
+/obj/machinery/computer/shuttle/syndicate,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"ak" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"al" = (
+/obj/machinery/computer/camera_advanced/syndie,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"am" = (
+/obj/machinery/computer/secure_data/syndie,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"an" = (
+/obj/structure/table/reinforced,
+/obj/machinery/status_display{
+	pixel_x = -32
+	},
+/obj/item/clipboard,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/item/folder/red,
+/obj/item/toy/figure/syndie,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/bridge)
+"ao" = (
+/obj/structure/chair/office/dark{
+	dir = 8;
+	name = "tactical swivel chair"
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"ap" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"aq" = (
+/obj/structure/chair/office/dark{
+	dir = 1;
+	name = "tactical swivel chair"
+	},
+/obj/machinery/button/door{
+	id = "syndieshutters";
+	name = "Cockpit View Control";
+	pixel_x = 32;
+	pixel_y = 32;
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"ar" = (
+/obj/structure/chair/office/dark{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/bridge)
+"as" = (
+/obj/structure/table/reinforced,
+/obj/machinery/ai_status_display{
+	pixel_x = 32
+	},
+/obj/item/storage/fancy/donut_box,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/bridge)
+"at" = (
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/bridge)
+"au" = (
+/obj/machinery/status_display,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/bridge)
+"av" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Cockpit";
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/bridge)
+"aw" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 10
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/hallway)
+"ax" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/hallway)
+"ay" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil/white,
+/obj/item/stack/cable_coil/white,
+/obj/item/crowbar/red,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"az" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aA" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/handcuffs{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/zipties,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aB" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 6
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/hallway)
+"aC" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aD" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/hallway)
+"aE" = (
+/obj/structure/chair{
+	dir = 8;
+	name = "tactical chair"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aF" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 9
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/eva)
+"aG" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/eva)
+"aH" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aI" = (
+/obj/structure/chair{
+	dir = 8;
+	name = "tactical chair"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"aJ" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"aK" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 5
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"aL" = (
+/obj/machinery/suit_storage_unit/syndicate,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/eva)
+"aM" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/eva)
+"aN" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/eva)
+"aO" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"aP" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/airlock)
+"aQ" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/crowbar/red,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"aR" = (
+/obj/machinery/suit_storage_unit/syndicate,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/eva)
+"aS" = (
+/obj/structure/tank_dispenser/oxygen,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/eva)
+"aT" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"aU" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/eva)
+"aV" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/hallway)
+"aW" = (
+/obj/machinery/door/airlock/external{
+	name = "Ready Room";
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/hallway)
+"aX" = (
+/obj/structure/chair{
+	dir = 4;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"aY" = (
+/obj/machinery/door/poddoor{
+	id = "smindicate";
+	name = "outer blast door"
+	},
+/obj/machinery/button/door{
+	id = "smindicate";
+	name = "external door control";
+	pixel_y = 26;
+	req_access_txt = "150"
+	},
+/obj/docking_port/mobile{
+	dheight = 1;
+	dir = 8;
+	dwidth = 12;
+	height = 17;
+	hidden = 1;
+	id = "syndicate";
+	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	name = "syndicate infiltrator";
+	port_direction = 4;
+	width = 23
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"aZ" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/eva)
+"ba" = (
+/obj/machinery/door/airlock/external{
+	name = "E.V.A. Gear Storage";
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/eva)
+"bb" = (
+/obj/machinery/door/airlock/external{
+	req_access_txt = "150"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"bc" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"bd" = (
+/obj/structure/sign/warning/securearea{
+	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
+	icon_state = "space";
+	layer = 4;
+	name = "EXTERNAL AIRLOCK"
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"be" = (
+/obj/machinery/suit_storage_unit/syndicate,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/eva)
+"bf" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/eva)
+"bg" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/eva)
+"bh" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/airlock)
+"bi" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/space/syndicate/black/red,
+/obj/item/clothing/head/helmet/space/syndicate/black/red,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/airlock)
+"bj" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 9
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bk" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bl" = (
+/obj/machinery/ai_status_display,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bm" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/syndicate/medical)
+"bn" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/syndicate/armory)
+"bo" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bp" = (
+/obj/machinery/status_display,
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bq" = (
+/obj/machinery/sleeper/syndie{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"br" = (
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"bs" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"bt" = (
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_x = 6
+	},
+/obj/item/reagent_containers/glass/bottle/charcoal{
+	pixel_x = -3
+	},
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_x = -3;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/glass/bottle/charcoal{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/syringe/epinephrine{
+	pixel_x = 3;
+	pixel_y = -2
+	},
+/obj/item/reagent_containers/syringe/epinephrine{
+	pixel_x = 4;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/syringe/epinephrine{
+	pixel_x = -2;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/syringe/epinephrine{
+	pixel_x = 2;
+	pixel_y = 8
+	},
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"bu" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/medical/gauze,
+/obj/item/stack/medical/bruise_pack,
+/obj/item/stack/medical/ointment,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"bv" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/medical)
+"bw" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/armory)
+"bx" = (
+/obj/item/stock_parts/cell/high{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/stock_parts/cell/high,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"by" = (
+/obj/item/screwdriver{
+	pixel_y = 9
+	},
+/obj/item/device/assembly/voice{
+	pixel_y = 3
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bz" = (
+/obj/item/wrench,
+/obj/item/device/assembly/infra,
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bA" = (
+/obj/item/device/assembly/signaler,
+/obj/item/device/assembly/signaler,
+/obj/item/device/assembly/prox_sensor{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/item/device/assembly/prox_sensor{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bB" = (
+/obj/item/weldingtool/largetank{
+	pixel_y = 3
+	},
+/obj/item/device/multitool,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bC" = (
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"bD" = (
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"bE" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"bF" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/hallway)
+"bG" = (
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"bH" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/medical)
+"bI" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bK" = (
+/obj/machinery/door/airlock/hatch{
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/medical)
+"bL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/hallway)
+"bM" = (
+/obj/machinery/door/airlock/hatch{
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/shuttle/syndicate/armory)
+"bN" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bO" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bP" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/armory)
+"bQ" = (
+/obj/structure/closet/syndicate/personal,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bR" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/dropper,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"bS" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bT" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"bU" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/hallway)
+"bV" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"bX" = (
+/obj/structure/closet/syndicate/nuclear,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)
+"bY" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/item/bodypart/r_arm/robot,
+/obj/item/bodypart/l_arm/robot,
+/obj/structure/table/reinforced,
+/obj/item/toy/plush/nukeplushie,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"bZ" = (
+/obj/machinery/door/window{
+	dir = 1;
+	name = "Surgery";
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"ca" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"cb" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/storage/firstaid/regular{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/regular{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"cc" = (
+/obj/item/storage/firstaid/regular{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/regular{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/medical)
+"cd" = (
+/turf/open/floor/plasteel/vault,
+/area/shuttle/syndicate/hallway)
+"ce" = (
+/obj/item/device/sbeacondrop/bomb{
+	pixel_y = 5
+	},
+/obj/item/device/sbeacondrop/bomb,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"cf" = (
+/obj/item/grenade/syndieminibomb{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/obj/item/grenade/syndieminibomb{
+	pixel_x = -1
+	},
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/grenade/plastic/c4,
+/obj/item/grenade/plastic/c4,
+/obj/item/grenade/plastic/c4,
+/obj/item/grenade/plastic/c4,
+/obj/item/grenade/plastic/c4,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"cg" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"ch" = (
+/obj/machinery/door/window{
+	dir = 1;
+	name = "Technological Storage";
+	req_access_txt = "150"
+	},
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"ci" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/table/reinforced,
+/obj/item/device/aicard,
+/turf/open/floor/plasteel/vault/side,
+/area/shuttle/syndicate/armory)
+"cj" = (
+/obj/item/surgicaldrill,
+/obj/item/circular_saw,
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/medical)
+"ck" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 30
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/medical)
+"cl" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/syndicate/hallway)
+"cm" = (
+/obj/machinery/nuclearbomb/syndicate,
+/obj/machinery/door/window{
+	dir = 1;
+	name = "Theatre Stage";
+	req_access_txt = "0"
+	},
+/turf/open/floor/circuit/red,
+/area/shuttle/syndicate/hallway)
+"cn" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/armory)
+"co" = (
+/obj/item/cautery,
+/obj/item/scalpel,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/medical)
+"cp" = (
+/obj/structure/table/optable,
+/obj/item/surgical_drapes,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/medical)
+"cq" = (
+/obj/item/retractor,
+/obj/item/hemostat,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/syndicate/medical)
+"cr" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/hallway)
+"cs" = (
+/obj/machinery/recharge_station,
+/turf/open/floor/circuit/red,
+/area/shuttle/syndicate/armory)
+"ct" = (
+/obj/machinery/telecomms/allinone{
+	intercept = 1
+	},
+/turf/open/floor/circuit/red,
+/area/shuttle/syndicate/armory)
+"cu" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/medical)
+"cv" = (
+/obj/structure/shuttle/engine/propulsion/left,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/hallway)
+"cw" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/hallway)
+"cx" = (
+/obj/structure/shuttle/engine/propulsion/right,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/hallway)
+"cy" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/armory)
+"cz" = (
+/obj/structure/shuttle/engine/propulsion/left,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/medical)
+"cA" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/medical)
+"cB" = (
+/obj/structure/shuttle/engine/propulsion/right,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/medical)
+"cC" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 6
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/medical)
+"cD" = (
+/obj/machinery/porta_turret/syndicate{
+	dir = 10
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/syndicate/armory)
+"cE" = (
+/obj/structure/shuttle/engine/propulsion/left,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/armory)
+"cF" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/armory)
+"cG" = (
+/obj/structure/shuttle/engine/propulsion/right,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/syndicate/armory)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bj
+bk
+bk
+bk
+bk
+bk
+bk
+bk
+bk
+bk
+"}
+(2,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aF
+aG
+aG
+aG
+aG
+aG
+bk
+bq
+bC
+bq
+bR
+bY
+cj
+co
+cu
+cz
+"}
+(3,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aG
+aL
+aR
+aR
+aR
+be
+bk
+br
+bD
+bH
+bH
+bZ
+bH
+cp
+cu
+cA
+"}
+(4,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aG
+aM
+aM
+aM
+aM
+aM
+bl
+bs
+bD
+bI
+bS
+ca
+ck
+cq
+cu
+cB
+"}
+(5,1,1) = {"
+ac
+ad
+ad
+ad
+ad
+ab
+ab
+aG
+aM
+aM
+aM
+aM
+aM
+bk
+bt
+bD
+bJ
+bT
+cb
+bm
+bk
+bk
+cC
+"}
+(6,1,1) = {"
+ad
+ag
+an
+at
+ad
+aw
+ab
+aG
+aN
+aS
+aU
+aZ
+bf
+bk
+bu
+bD
+bJ
+bT
+cc
+bk
+ab
+ab
+ab
+"}
+(7,1,1) = {"
+ae
+ah
+ao
+at
+ad
+ax
+ax
+aG
+aG
+aG
+aG
+ba
+bg
+bm
+bv
+bv
+bK
+bv
+bk
+bk
+ax
+ax
+ab
+"}
+(8,1,1) = {"
+ae
+ai
+ap
+at
+au
+ay
+aC
+aH
+aC
+aC
+aV
+az
+az
+az
+az
+bE
+bL
+bU
+cd
+cl
+cr
+cv
+ab
+"}
+(9,1,1) = {"
+ae
+aj
+aq
+at
+av
+az
+aD
+aD
+aD
+az
+aW
+az
+aD
+aD
+aD
+aD
+bL
+bU
+cd
+cm
+cr
+cw
+ab
+"}
+(10,1,1) = {"
+ae
+ak
+ap
+at
+ad
+aA
+aE
+aI
+aE
+aE
+aV
+az
+az
+az
+az
+bF
+bL
+bU
+cd
+cl
+cr
+cx
+ab
+"}
+(11,1,1) = {"
+ae
+al
+ar
+at
+ad
+ax
+ax
+ax
+ax
+aJ
+aJ
+bb
+bh
+bn
+bw
+bw
+bM
+bw
+bo
+bo
+ax
+ax
+ab
+"}
+(12,1,1) = {"
+ad
+am
+as
+at
+ad
+aB
+ab
+aJ
+aO
+aO
+aX
+bc
+aO
+bo
+bx
+bG
+bN
+bV
+ce
+bo
+ab
+ab
+ab
+"}
+(13,1,1) = {"
+af
+ad
+ad
+ad
+ad
+ab
+ab
+aJ
+aP
+aP
+aP
+aP
+aP
+bo
+by
+bG
+bN
+bV
+cf
+bn
+bo
+bo
+cD
+"}
+(14,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aJ
+aP
+aP
+aP
+aP
+aP
+bp
+bz
+bG
+bO
+bW
+cg
+bP
+cs
+cy
+cE
+"}
+(15,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aJ
+aQ
+aT
+aT
+aT
+bi
+bo
+bA
+bG
+bP
+bP
+ch
+bP
+ct
+cy
+cF
+"}
+(16,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aK
+aJ
+aJ
+aY
+bd
+aJ
+bo
+bB
+bG
+bQ
+bX
+ci
+cn
+cs
+cy
+cG
+"}
+(17,1,1) = {"
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aK
+bo
+bo
+bo
+bo
+bo
+bo
+bo
+bo
+bo
+"}
diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm
new file mode 100644
index 00000000000..dac173c279c
--- /dev/null
+++ b/_maps/shuttles/labour_box.dmm
@@ -0,0 +1,186 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/labor)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"c" = (
+/obj/machinery/computer/shuttle/labor{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -31
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"d" = (
+/obj/structure/chair/office/dark{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"e" = (
+/obj/structure/table,
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"f" = (
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"g" = (
+/obj/machinery/button/flasher{
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	pixel_y = -26;
+	req_access_txt = "1"
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"h" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 2;
+	pixel_x = 30;
+	pixel_y = 30
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"i" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"j" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/labor)
+"k" = (
+/obj/machinery/mineral/stacking_machine/laborstacker{
+	input_dir = 2;
+	output_dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/labor)
+"l" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"m" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"n" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 1;
+	pixel_x = 30
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"o" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 25
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"p" = (
+/obj/structure/closet/crate,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"q" = (
+/obj/machinery/door/airlock/titanium{
+	id_tag = "prisonshuttle";
+	name = "Labor Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp";
+	name = "labor camp shuttle";
+	port_direction = 4;
+	timid = 1;
+	width = 9
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"r" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+"s" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+
+(1,1,1) = {"
+a
+a
+b
+a
+a
+b
+a
+a
+a
+"}
+(2,1,1) = {"
+b
+c
+f
+j
+l
+l
+p
+r
+s
+"}
+(3,1,1) = {"
+b
+d
+g
+a
+m
+l
+l
+r
+s
+"}
+(4,1,1) = {"
+b
+e
+h
+k
+n
+o
+l
+r
+s
+"}
+(5,1,1) = {"
+a
+a
+i
+a
+a
+a
+q
+a
+a
+"}
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm
new file mode 100644
index 00000000000..2ad922d9f40
--- /dev/null
+++ b/_maps/shuttles/labour_delta.dmm
@@ -0,0 +1,333 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/labor)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"c" = (
+/obj/machinery/computer/shuttle/labor{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -31
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"d" = (
+/obj/structure/chair/office/dark{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"e" = (
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"f" = (
+/obj/structure/grille,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"g" = (
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"h" = (
+/obj/machinery/button/flasher{
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	pixel_y = -26;
+	req_access_txt = "1"
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"i" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 2;
+	pixel_x = 30;
+	pixel_y = 30
+	},
+/turf/open/floor/mineral/plastitanium/brig,
+/area/shuttle/labor)
+"j" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/labor)
+"k" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/labor)
+"l" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/labor)
+"m" = (
+/obj/machinery/mineral/stacking_machine/laborstacker{
+	input_dir = 2;
+	output_dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/labor)
+"n" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"o" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"p" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 1;
+	pixel_x = 30
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"q" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"r" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"s" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 25
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"t" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"u" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"v" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"w" = (
+/obj/machinery/door/airlock/shuttle{
+	id_tag = "prisonshuttle";
+	name = "Labor Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp";
+	name = "labor camp shuttle";
+	port_direction = 4;
+	width = 9
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/labor)
+"x" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+"y" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+
+(1,1,1) = {"
+a
+a
+f
+a
+a
+f
+a
+a
+a
+"}
+(2,1,1) = {"
+b
+c
+g
+k
+n
+q
+t
+a
+y
+"}
+(3,1,1) = {"
+b
+d
+h
+l
+o
+r
+u
+x
+y
+"}
+(4,1,1) = {"
+b
+e
+i
+m
+p
+s
+v
+a
+y
+"}
+(5,1,1) = {"
+a
+a
+j
+a
+a
+a
+w
+a
+a
+"}
diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm
new file mode 100644
index 00000000000..2b1771e0c7a
--- /dev/null
+++ b/_maps/shuttles/mining_box.dmm
@@ -0,0 +1,114 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"c" = (
+/obj/structure/table,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"d" = (
+/obj/machinery/computer/shuttle/mining,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"e" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"f" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"g" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"h" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Mining Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "mining";
+	name = "mining shuttle";
+	port_direction = 4;
+	timid = 1;
+	width = 7
+	},
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"i" = (
+/obj/structure/closet/crate,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"j" = (
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"k" = (
+/obj/structure/ore_box,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"l" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+
+(1,1,1) = {"
+a
+a
+b
+a
+b
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+e
+g
+f
+i
+a
+"}
+(3,1,1) = {"
+b
+d
+f
+e
+f
+j
+l
+"}
+(4,1,1) = {"
+a
+c
+e
+e
+f
+k
+a
+"}
+(5,1,1) = {"
+a
+a
+b
+h
+b
+a
+a
+"}
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm
new file mode 100644
index 00000000000..bbdc919afc9
--- /dev/null
+++ b/_maps/shuttles/mining_delta.dmm
@@ -0,0 +1,310 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"c" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"d" = (
+/obj/machinery/computer/shuttle/mining,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"e" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/crowbar/red,
+/obj/item/wrench,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/clothing/mask/gas,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"f" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"g" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/mining)
+"h" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"i" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Mining Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/docking_port/mobile{
+	dir = 4;
+	dwidth = 3;
+	height = 5;
+	id = "mining";
+	name = "mining shuttle";
+	port_direction = 8;
+	width = 7
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/mining)
+"j" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"k" = (
+/turf/open/floor/plasteel/neutral,
+/area/shuttle/mining)
+"l" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"m" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Mining Shuttle Airlock";
+	req_access_txt = "0"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/mining)
+"n" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"o" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"p" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"q" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"r" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+"s" = (
+/obj/structure/ore_box,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/mining)
+"t" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+
+(1,1,1) = {"
+a
+a
+b
+i
+b
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+f
+j
+n
+q
+a
+"}
+(3,1,1) = {"
+b
+d
+g
+k
+o
+r
+t
+"}
+(4,1,1) = {"
+a
+e
+h
+l
+p
+s
+a
+"}
+(5,1,1) = {"
+a
+a
+b
+m
+b
+a
+a
+"}
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index f1c6c838b18..1737e40f3bf 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -22,7 +22,6 @@
 	name = "NT Medical Ship";
 	port_direction = 8;
 	preferred_direction = 4;
-	roundstart_move = "whiteship_away";
 	timid = 1;
 	width = 35
 	},
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index dc51d7630ce..0767cfa40d5 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -24,7 +24,6 @@
 	port_direction = 8;
 	preferred_direction = 1;
 	timid = 1;
-	roundstart_move = "whiteship_away";
 	width = 16
 	},
 /turf/open/floor/plating,
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 91168bf008d..57adba831c8 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -1518,7 +1518,6 @@
 	name = "White-Ship";
 	port_direction = 8;
 	preferred_direction = 8;
-	roundstart_move = "whiteship_away";
 	timid = 1;
 	width = 32
 	},
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index efe7f87ea8f..242708e54cf 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -39,7 +39,6 @@
 	name = "NT Recovery White-Ship";
 	port_direction = 8;
 	preferred_direction = 4;
-	roundstart_move = "whiteship_away";
 	timid = 1;
 	width = 28
 	},
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index 1ea9db3063a..3ef386e2658 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -94,7 +94,6 @@
 	name = "White Ship";
 	port_direction = 4;
 	preferred_direction = 1;
-	roundstart_move = "whiteship_away";
 	timid = 1;
 	width = 9
 	},
diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm
index 46376843ddc..b64db30d78c 100644
--- a/_maps/templates/pirate_ship.dmm
+++ b/_maps/templates/pirate_ship.dmm
@@ -664,7 +664,6 @@
 	name = "Pirate Ship";
 	port_direction = 8;
 	preferred_direction = 1;
-	roundstart_move = "pirateship_home";
 	width = 23
 	},
 /obj/docking_port/stationary{
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 4e4fbb15d3c..ddc4f96f6d8 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -8,6 +8,8 @@ SUBSYSTEM_DEF(shuttle)
 	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME
 
+	var/obj/machinery/shuttle_manipulator/manipulator
+
 	var/list/mobile = list()
 	var/list/stationary = list()
 	var/list/transit = list()
@@ -55,15 +57,6 @@ SUBSYSTEM_DEF(shuttle)
 	var/lockdown = FALSE	//disallow transit after nuke goes off
 
 /datum/controller/subsystem/shuttle/Initialize(timeofday)
-	if(!arrivals)
-		WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
-	if(!emergency)
-		WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
-	if(!backup_shuttle)
-		WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!")
-	if(!supply)
-		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
-
 	ordernum = rand(1, 9000)
 
 	for(var/pack in subtypesof(/datum/supply_pack))
@@ -74,12 +67,32 @@ SUBSYSTEM_DEF(shuttle)
 
 	if(!transit_turfs.len)
 		setup_transit_zone()
-	initial_move()
+
+	initial_load()
+
 #ifdef HIGHLIGHT_DYNAMIC_TRANSIT
 	color_space()
 #endif
+
+	if(!arrivals)
+		WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
+	if(!emergency)
+		WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
+	if(!backup_shuttle)
+		WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!")
+	if(!supply)
+		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
 	..()
 
+/datum/controller/subsystem/shuttle/proc/initial_load()
+	if(!istype(manipulator))
+		CRASH("No shuttle manipulator found.")
+
+	for(var/s in stationary)
+		var/obj/docking_port/stationary/S = s
+		S.load_roundstart()
+		CHECK_TICK
+
 /datum/controller/subsystem/shuttle/proc/setup_transit_zone()
 	// transit zone
 	var/z = SSmapping.transit.z_value
@@ -548,15 +561,7 @@ SUBSYSTEM_DEF(shuttle)
 		T.flags_1 &= ~(UNUSED_TRANSIT_TURF_1)
 
 	M.assigned_transit = new_transit_dock
-	return TRUE
-
-/datum/controller/subsystem/shuttle/proc/initial_move()
-	for(var/obj/docking_port/mobile/M in mobile)
-		if(!M.roundstart_move)
-			continue
-		M.dockRoundstart()
-		M.roundstart_move = FALSE
-		CHECK_TICK
+	return new_transit_dock
 
 /datum/controller/subsystem/shuttle/Recover()
 	if (istype(SSshuttle.mobile))
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
index c49c851ac47..bda639892b3 100644
--- a/code/datums/map_config.dm
+++ b/code/datums/map_config.dm
@@ -11,6 +11,12 @@
 
 	var/minetype = "lavaland"
 
+	var/shuttles = list(
+		"cargo" = "cargo_box",
+		"ferry" = "ferry_fancy",
+		"whiteship" = "whiteship_box",
+		"emergency" = "emergency_box")
+
 	//Order matters here.
 	var/list/transition_config = list(CENTCOM = SELFLOOPING,
 									MAIN_STATION = CROSSLINKED,
@@ -69,6 +75,12 @@
 	map_path = json["map_path"]
 	map_file = json["map_file"]
 
+	if(islist(json["shuttles"]))
+		var/list/L = json["shuttles"]
+		for(var/key in L)
+			var/value = L[key]
+			shuttles[key] = value
+
 	minetype = json["minetype"] || minetype
 	allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
 
@@ -81,12 +93,16 @@
 
 	defaulted = FALSE
 
-#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world(X + "missing from json!"); return; }
+#define CHECK_EXISTS(X) if(!istext(json[X])) { log_world("[##X] missing from json!"); return; }
 /datum/map_config/proc/ValidateJSON(list/json)
 	CHECK_EXISTS("map_name")
 	CHECK_EXISTS("map_path")
 	CHECK_EXISTS("map_file")
 
+	var/shuttles = json["shuttles"]
+	if(shuttles && !islist(shuttles))
+		log_world("json\[shuttles\] is not a list!")
+
 	var/path = GetFullMapPath(json["map_path"], json["map_file"])
 	if(!fexists(path))
 		log_world("Map file ([path]) does not exist!")
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 1a0c19f5ab1..404c584fd47 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -40,6 +40,28 @@
 /datum/map_template/shuttle/whiteship
 	port_id = "whiteship"
 
+/datum/map_template/shuttle/labour
+	port_id = "labour"
+	can_be_bought = FALSE
+
+/datum/map_template/shuttle/mining
+	port_id = "mining"
+	can_be_bought = FALSE
+
+/datum/map_template/shuttle/cargo
+	port_id = "cargo"
+	can_be_bought = FALSE
+
+/datum/map_template/shuttle/arrival
+	port_id = "arrival"
+	can_be_bought = FALSE
+
+/datum/map_template/shuttle/infiltrator
+	port_id = "infiltrator"
+	can_be_bought = FALSE
+
+
+
 // Shuttles start here:
 
 /datum/map_template/shuttle/emergency/airless
@@ -100,7 +122,7 @@
 	description = "The glorious results of centuries of plasma research done by Nanotrasen employees. This is the reason why you are here. Get on and dance like you're on fire, burn baby burn!"
 	admin_notes = "Flaming hot."
 	credit_cost = 10000
-	
+
 /datum/map_template/shuttle/emergency/arena
 	suffix = "arena"
 	name = "The Arena"
@@ -218,6 +240,12 @@
 	admin_notes = "If the crew can solve the puzzle, they will wake the wabbajack statue. It will likely not end well. There's a reason it's boarded up. Maybe they should have just left it alone."
 	credit_cost = 15000
 
+/datum/map_template/shuttle/emergency/omega
+	suffix = "omega"
+	name = "Omegastation Emergency Shuttle"
+	description = "On the smaller size with a modern design, this shuttle is for the crew who like the cosier things, while still being able to stretch their legs."
+	credit_cost = 1000
+
 /datum/map_template/shuttle/ferry/base
 	suffix = "base"
 	name = "transport ferry"
@@ -240,13 +268,18 @@
 	Fulfilling needs you didn't even know you had. We've got EVERYTHING, and something else!"
 	admin_notes = "Currently larger than ferry docking port on Box, will not hit anything, but must be force docked. Trader and ERT bodyguards are not included."
 
+/datum/map_template/shuttle/ferry/fancy
+	suffix = "fancy"
+	name = "fancy transport ferry"
+	description = "At some point, someone upgraded the ferry to have fancier flooring... and less seats."
+
 /datum/map_template/shuttle/whiteship/box
 	suffix = "box"
 	name = "NT Medical Ship"
 
 /datum/map_template/shuttle/whiteship/meta
 	suffix = "meta"
-	name = "NT Recovery White-ship"
+	name = "NT Recovery Whiteship"
 
 /datum/map_template/shuttle/whiteship/pubby
 	suffix = "pubby"
@@ -256,6 +289,11 @@
 	suffix = "cere"
 	name = "NT Construction Vessel"
 
+/datum/map_template/shuttle/whiteship/delta
+	suffix = "delta"
+	name = "Unnamed NT Vessel"
+	admin_notes = "The Delta whiteship doesn't have a name, apparently."
+
 /datum/map_template/shuttle/cargo/box
 	suffix = "box"
 	name = "supply shuttle (Box)"
@@ -277,3 +315,43 @@
 	description = "The CentCom Raven Battlecruiser is currently docked at the CentCom ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The CentCom Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range CentCom Medical Bay."
 	admin_notes = "The long way home"
 	credit_cost = 12500
+
+/datum/map_template/shuttle/arrival/box
+	suffix = "box"
+	name = "arrival shuttle (Box)"
+
+/datum/map_template/shuttle/cargo/box
+	suffix = "box"
+	name = "cargo ferry (Box)"
+
+/datum/map_template/shuttle/mining/box
+	suffix = "box"
+	name = "mining shuttle (Box)"
+
+/datum/map_template/shuttle/labour/box
+	suffix = "box"
+	name = "labour shuttle (Box)"
+
+/datum/map_template/shuttle/infiltrator/basic
+	suffix = "basic"
+	name = "basic syndicate infiltrator"
+
+/datum/map_template/shuttle/cargo/delta
+	suffix = "delta"
+	name = "cargo ferry (Delta)"
+
+/datum/map_template/shuttle/mining/delta
+	suffix = "delta"
+	name = "mining shuttle (Delta)"
+
+/datum/map_template/shuttle/labour/delta
+	suffix = "delta"
+	name = "labour shuttle (Delta)"
+
+/datum/map_template/shuttle/arrival/delta
+	suffix = "delta"
+	name = "arrival shuttle (Delta)"
+
+/datum/map_template/shuttle/arrival/pubby
+	suffix = "pubby"
+	name = "arrival shuttle (Pubby)"
diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm
index 318c896efd6..b7fd4c3d582 100644
--- a/code/modules/shuttle/arrivals.dm
+++ b/code/modules/shuttle/arrivals.dm
@@ -11,8 +11,6 @@
 	callTime = INFINITY
 	ignitionTime = 50
 
-	roundstart_move = TRUE	//force a call to dockRoundstart
-
 	var/sound_played
 	var/damaged	//too damaged to undock?
 	var/list/areas	//areas in our shuttle
@@ -22,16 +20,20 @@
 	var/perma_docked = FALSE	//highlander with RESPAWN??? OH GOD!!!
 
 /obj/docking_port/mobile/arrivals/Initialize(mapload)
-	if(SSshuttle.arrivals)
-		WARNING("More than one arrivals docking_port placed on map!")
-		return INITIALIZE_HINT_QDEL
-	SSshuttle.arrivals = src
-
+	if(!timid)
+		register()
+		
 	. = ..()
 
 	preferred_direction = dir
 	return INITIALIZE_HINT_LATELOAD	//for latejoin list
 
+/obj/docking_port/mobile/arrivals/register()
+	..()
+	if(SSshuttle.arrivals)
+		WARNING("More than one arrivals docking_port placed on map! Ignoring duplicates.")
+	SSshuttle.arrivals = src
+
 /obj/docking_port/mobile/arrivals/LateInitialize()
 	areas = list()
 
@@ -54,13 +56,6 @@
 
 	SSjob.latejoin_trackers = new_latejoin
 
-/obj/docking_port/mobile/arrivals/dockRoundstart()
-	SSshuttle.generate_transit_dock(src)
-	Launch()
-	timer = world.time
-	check()
-	return TRUE
-
 /obj/docking_port/mobile/arrivals/check()
 	. = ..()
 
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 669e7e2185d..59faaf1779c 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -184,7 +184,6 @@
 	height = 11
 	dir = EAST
 	port_direction = WEST
-	roundstart_move = "emergency_away"
 	var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself
 
 /obj/docking_port/mobile/emergency/canDock(obj/docking_port/stationary/S)
@@ -537,7 +536,6 @@
 	width = 8
 	height = 8
 	dir = EAST
-	roundstart_move = "backup_away"
 
 /obj/docking_port/mobile/emergency/backup/Initialize()
 	// We want to be a valid emergency shuttle
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index 721ee601f79..299d9e1eaae 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -23,6 +23,14 @@
 /obj/machinery/shuttle_manipulator/Initialize()
 	. = ..()
 	update_icon()
+	SSshuttle.manipulator = src
+
+/obj/machinery/shuttle_manipulator/Destroy(force)
+	if(!force)
+		. = QDEL_HINT_LETMELIVE
+	else
+		SSshuttle.manipulator = null
+		. = ..()
 
 /obj/machinery/shuttle_manipulator/update_icon()
 	cut_overlays()
@@ -182,8 +190,7 @@
 
 	update_icon()
 
-/obj/machinery/shuttle_manipulator/proc/action_load(
-	datum/map_template/shuttle/loading_template)
+/obj/machinery/shuttle_manipulator/proc/action_load(datum/map_template/shuttle/loading_template, obj/docking_port/stationary/destination_port)
 	// Check for an existing preview
 	if(preview_shuttle && (loading_template != preview_template))
 		preview_shuttle.jumpToNullSpace()
@@ -199,16 +206,15 @@
 	var/mode = SHUTTLE_IDLE
 	var/obj/docking_port/stationary/D
 
-	if(existing_shuttle)
+	if(istype(destination_port))
+		D = destination_port
+	else if(existing_shuttle)
 		timer = existing_shuttle.timer
 		mode = existing_shuttle.mode
 		D = existing_shuttle.get_docked()
-	else
-		D = preview_shuttle.findRoundstartDock()
 
 	if(!D)
-		var/m = "No dock found for preview shuttle, aborting."
-		WARNING(m)
+		var/m = "No dock found for preview shuttle ([preview_template.name]), aborting."
 		throw EXCEPTION(m)
 
 	var/result = preview_shuttle.canDock(D)
@@ -216,11 +222,11 @@
 	// but we can ignore the someone else docked error because we'll
 	// be moving into their place shortly
 	if((result != SHUTTLE_CAN_DOCK) && (result != SHUTTLE_SOMEONE_ELSE_DOCKED))
-		var/m = "Unsuccessful dock of [preview_shuttle] ([result])."
-		WARNING(m)
+		WARNING("Template shuttle [preview_shuttle] cannot dock at [D] ([result]).")
 		return
 
-	existing_shuttle.jumpToNullSpace()
+	if(existing_shuttle)
+		existing_shuttle.jumpToNullSpace()
 
 	preview_shuttle.initiate_docking(D)
 	. = preview_shuttle
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index d87750c3942..6a8fd7b3a11 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -167,6 +167,9 @@
 
 	var/last_dock_time
 
+	var/datum/map_template/shuttle/roundstart_template
+	var/json_key
+
 /obj/docking_port/stationary/Initialize(mapload)
 	. = ..()
 	SSshuttle.stationary += src
@@ -184,6 +187,22 @@
 	highlight("#f00")
 	#endif
 
+/obj/docking_port/stationary/proc/load_roundstart()
+	if(json_key)
+		var/sid = SSmapping.config.shuttles[json_key]
+		roundstart_template = SSmapping.shuttle_templates[sid]
+		if(!roundstart_template)
+			CRASH("json_key:[json_key] value \[[sid]\] resulted in a null shuttle template for [src]")
+	else if(roundstart_template) // passed a PATH
+		var/sid = "[initial(roundstart_template.port_id)]_[initial(roundstart_template.suffix)]"
+
+		roundstart_template = SSmapping.shuttle_templates[sid]
+		if(!roundstart_template)
+			CRASH("Invalid path ([roundstart_template]) passed to docking port.")
+
+	if(roundstart_template)
+		SSshuttle.manipulator.action_load(roundstart_template, src)
+
 //returns first-found touching shuttleport
 /obj/docking_port/stationary/get_docked()
 	. = locate(/obj/docking_port/mobile) in loc
@@ -234,7 +253,6 @@
 	var/mode = SHUTTLE_IDLE			//current shuttle mode
 	var/callTime = 100				//time spent in transit (deciseconds). Should not be lower then 10 seconds without editing the animation of the hyperspace ripples.
 	var/ignitionTime = 55			// time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles.
-	var/roundstart_move				//id of port to send shuttle to at roundstart
 
 	// The direction the shuttle prefers to travel in
 	var/preferred_direction = NORTH
@@ -251,8 +269,9 @@
 	var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
 
 	// A timid shuttle will not register itself with the shuttle subsystem
-	// All shuttle templates are timid
-	var/timid = FALSE
+	// All shuttle templates MUST be timid, imports will fail if they're not
+	// Shuttle defined already on the map MUST NOT be timid, or they won't work
+	var/timid = TRUE
 
 	var/list/ripples = list()
 	var/engine_coeff = 1 //current engine coeff
@@ -473,12 +492,6 @@
 	for(var/obj/machinery/door/poddoor/shuttledock/pod in GLOB.airlocks)
 		pod.check()
 
-/obj/docking_port/mobile/proc/findRoundstartDock()
-	return SSshuttle.getDock(roundstart_move)
-
-/obj/docking_port/mobile/proc/dockRoundstart()
-	. = dock_id(roundstart_move)
-
 /obj/docking_port/mobile/proc/dock_id(id)
 	var/port = SSshuttle.getDock(id)
 	if(port)
@@ -489,6 +502,10 @@
 /obj/effect/landmark/shuttle_import
 	name = "Shuttle Import"
 
+// Never move the shuttle import landmark, otherwise things get WEIRD
+/obj/effect/landmark/shuttle_import/onShuttleMove()
+	return FALSE
+
 //used by shuttle subsystem to check timers
 /obj/docking_port/mobile/proc/check()
 	check_effects()
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index eacacef9339..a0bc4f0d1f1 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -34,7 +34,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 	width = 12
 	dwidth = 5
 	height = 7
-	roundstart_move = "supply_away"
 
 	// When TRUE, these vars allow exporting emagged/contraband items, and add some special interactions to existing exports.
 	var/contraband = FALSE