diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 8c26359e436..d1cdf24c677 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -10648,12 +10648,12 @@
 /turf/unsimulated/floor/plating,
 /area/shuttle/escape/centcom)
 "aCQ" = (
-/turf/unsimulated/floor/plating,
-/turf/simulated/wall/shuttle/unique/transfer{
+/obj/structure/shuttle_part/transfer{
 	desc = "A large, bloated shuttle designed for automated passenger transport.";
 	icon_state = "4,22";
 	name = "transport shuttle"
 	},
+/turf/unsimulated/floor/plating,
 /area/shuttle/escape/centcom)
 "aCR" = (
 /turf/unsimulated/wall/fakepdoor{
@@ -15042,16 +15042,18 @@
 /turf/space,
 /area/skipjack_station/start)
 "aNh" = (
-/obj/structure/window/shuttle/unique/raider{
+/obj/structure/shuttle_part/raider{
+	desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
 	icon_state = "9,16";
-	name = "skipjack cockpit"
+	name = "Skipjack"
 	},
 /turf/space,
 /area/skipjack_station/start)
 "aNi" = (
-/obj/structure/window/shuttle/unique/raider{
+/obj/structure/shuttle_part/raider{
+	desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands.";
 	icon_state = "12,16";
-	name = "skipjack cockpit"
+	name = "Skipjack"
 	},
 /turf/space,
 /area/skipjack_station/start)
@@ -15185,7 +15187,7 @@
 	icon_state = "9,15";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "aNA" = (
 /obj/structure/table/standard,
@@ -15213,7 +15215,7 @@
 	icon_state = "12,15";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "aND" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -15310,7 +15312,7 @@
 	icon_state = "9,14";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "aNR" = (
 /obj/structure/table/standard,
@@ -15329,7 +15331,7 @@
 	icon_state = "12,14";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "aNT" = (
 /obj/machinery/meter,
@@ -33154,7 +33156,7 @@
 	icon_state = "10,16";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "rSM" = (
 /obj/structure/shuttle_part/transfer{
@@ -33778,7 +33780,7 @@
 	icon_state = "12,13";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "sMK" = (
 /obj/structure/sign/pods{
@@ -34786,12 +34788,12 @@
 /turf/space,
 /area/skipjack_station/start)
 "tWH" = (
-/turf/unsimulated/floor/plating,
-/turf/simulated/wall/shuttle/unique/transfer{
+/obj/structure/shuttle_part/transfer{
 	desc = "A large, bloated shuttle designed for automated passenger transport.";
 	icon_state = "10,22";
 	name = "transport shuttle"
 	},
+/turf/unsimulated/floor/plating,
 /area/shuttle/escape/centcom)
 "tXm" = (
 /obj/structure/shuttle_part/arrivals{
@@ -35295,7 +35297,7 @@
 	icon_state = "9,13";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "uHS" = (
 /obj/structure/window/shuttle/unique/merchant{
@@ -36583,7 +36585,7 @@
 	icon_state = "11,16";
 	name = "skipjack cockpit"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/skipjack_station/start)
 "wdn" = (
 /obj/structure/shuttle_part/hapt{
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 21de45a87ce..25f4c2edb8b 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -11934,7 +11934,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "5,15"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "vG" = (
 /obj/structure/disposalpipe/trunk,
@@ -12340,7 +12340,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "5,13"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "wq" = (
 /obj/structure/cable/yellow{
@@ -12424,6 +12424,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hydroponics/garden)
+"wx" = (
+/obj/structure/shuttle_part/escape_pod{
+	icon_state = "2,3"
+	},
+/turf/unsimulated/floor/asteroid/ash,
+/area/shuttle/escape_pod3/station)
 "wy" = (
 /turf/simulated/floor/wood,
 /area/hydroponics/garden)
@@ -14865,6 +14871,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/fitness/changing)
+"AG" = (
+/obj/structure/shuttle_part/escape_pod{
+	icon_state = "0,3"
+	},
+/turf/unsimulated/floor/asteroid/ash,
+/area/shuttle/escape_pod3/station)
 "AI" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/effect/floor_decal/corner/white/diagonal{
@@ -16505,8 +16517,10 @@
 	},
 /area/shuttle/research/station)
 "DK" = (
-/obj/structure/window/shuttle/unique/research{
-	icon_state = "7,16"
+/obj/structure/shuttle_part/research{
+	desc = "The largest commercially available sublight engine, with a shuttle built around it and painted in NanoTrasen research division colors. Looks sleek, and fast.";
+	icon_state = "7,16";
+	name = "survey shuttle"
 	},
 /turf/unsimulated/floor/asteroid/ash,
 /area/shuttle/research/station)
@@ -18003,7 +18017,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "7,15"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "Gp" = (
 /obj/effect/floor_decal/corner/brown{
@@ -19829,6 +19843,12 @@
 "JH" = (
 /turf/simulated/wall,
 /area/sconference_room)
+"JI" = (
+/obj/structure/window/shuttle/unique/escape_pod{
+	icon_state = "1,3"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape_pod2/station)
 "JJ" = (
 /obj/item/device/radio/intercom{
 	dir = 4;
@@ -22657,7 +22677,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "7,13"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "Pe" = (
 /obj/effect/decal/cleanable/dirt,
@@ -22886,7 +22906,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "5,14"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "PD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -22909,8 +22929,10 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/stairs)
 "PF" = (
-/obj/structure/window/shuttle/unique/research{
-	icon_state = "5,16"
+/obj/structure/shuttle_part/research{
+	desc = "The largest commercially available sublight engine, with a shuttle built around it and painted in NanoTrasen research division colors. Looks sleek, and fast.";
+	icon_state = "5,16";
+	name = "survey shuttle"
 	},
 /turf/unsimulated/floor/asteroid/ash,
 /area/shuttle/research/station)
@@ -23326,7 +23348,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "6,16"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "Qx" = (
 /obj/machinery/door/firedoor,
@@ -23392,6 +23414,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/cargo/surface)
+"QE" = (
+/obj/structure/window/shuttle/unique/escape_pod{
+	icon_state = "1,3"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/escape_pod3/station)
 "QF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -23808,6 +23836,12 @@
 	temperature = 303.15
 	},
 /area/crew_quarters/fitness/pool)
+"Rv" = (
+/obj/structure/shuttle_part/escape_pod{
+	icon_state = "2,3"
+	},
+/turf/unsimulated/floor/asteroid/ash,
+/area/shuttle/escape_pod2/station)
 "Rw" = (
 /obj/machinery/computer/telecomms/traffic,
 /obj/machinery/alarm{
@@ -25306,7 +25340,7 @@
 /obj/structure/window/shuttle/unique/research{
 	icon_state = "7,14"
 	},
-/turf/space,
+/turf/simulated/floor/plating,
 /area/shuttle/research/station)
 "Uu" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -25891,6 +25925,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge/levela/research_dock)
+"VE" = (
+/obj/structure/shuttle_part/escape_pod{
+	icon_state = "0,3"
+	},
+/turf/unsimulated/floor/asteroid/ash,
+/area/shuttle/escape_pod2/station)
 "VF" = (
 /obj/effect/floor_decal/plaque,
 /turf/simulated/floor/tiled,
@@ -76135,7 +76175,7 @@ aa
 aa
 aa
 aa
-rx
+VE
 Dk
 pW
 sq
@@ -76392,7 +76432,7 @@ aa
 aa
 aa
 aa
-ry
+JI
 mu
 rX
 sr
@@ -76649,7 +76689,7 @@ aa
 aa
 aa
 aa
-Nm
+Rv
 qi
 xp
 uA
@@ -77163,7 +77203,7 @@ aa
 aa
 aa
 aa
-rx
+AG
 rw
 Dm
 ss
@@ -77420,7 +77460,7 @@ aa
 aa
 aa
 aa
-ry
+QE
 mw
 rY
 st
@@ -77677,7 +77717,7 @@ aa
 aa
 aa
 aa
-Nm
+wx
 OC
 VQ
 vM