diff --git a/_maps/shuttles/emergency_airless.dmm b/_maps/shuttles/emergency_airless.dmm
index 444a104f1d..5e4eeab679 100644
--- a/_maps/shuttles/emergency_airless.dmm
+++ b/_maps/shuttles/emergency_airless.dmm
@@ -3,329 +3,605 @@
 /turf/open/space,
 /area/space)
 "b" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "c" = (
-/turf/closed/wall,
+/turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
 "d" = (
-/obj/structure/closet/malf,
+/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/escape)
 "e" = (
-/obj/machinery/status_display,
 /turf/closed/wall,
 /area/shuttle/escape)
 "f" = (
-/obj/effect/shuttle_build,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "g" = (
-/turf/open/floor/plating,
+/obj/docking_port/mobile/emergency{
+	dwidth = 11;
+	height = 18;
+	name = "Shuttle Under Construction";
+	port_direction = 4;
+	preferred_direction = 2;
+	timid = 1;
+	width = 30
+	},
+/turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "h" = (
-/obj/docking_port/mobile/emergency{
-	name = "Shuttle Under Construction";
-	timid = 1
-	},
+/obj/effect/shuttle_build,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "i" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 4;
-	name = "4maintenance loot spawner"
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
-"j" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/shuttle/engine/heater,
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
-"k" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
-"l" = (
-/obj/structure/closet/malf,
-/obj/machinery/light/built{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
-"m" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 4;
-	name = "4maintenance loot spawner"
-	},
-/obj/machinery/light/built{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
+/turf/open/space/basic,
+/area/space)
 
 (1,1,1) = {"
 a
-a
-a
-a
-a
-a
-b
+c
+e
+f
+f
+f
+f
+f
+f
+f
+f
 g
-b
-h
-b
-b
-b
-b
-a
-a
-a
-a
-a
-a
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+e
 a
+i
+i
+i
 a
 "}
 (2,1,1) = {"
-a
 b
-c
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
 e
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-c
-c
-c
 a
+i
+i
+i
 a
 "}
 (3,1,1) = {"
 b
-b
 d
-l
-d
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+a
+i
+i
+i
+a
 "}
 (4,1,1) = {"
 b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+a
+i
+i
+i
+a
 "}
 (5,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
+c
+c
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+e
+f
+f
+e
+e
 "}
 (6,1,1) = {"
 b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
 "}
 (7,1,1) = {"
 b
-b
-b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
 f
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
 "}
 (8,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-j
-k
+c
+c
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
 "}
 (9,1,1) = {"
 b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-i
-m
-i
-b
-b
-j
-k
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
 "}
 (10,1,1) = {"
-a
 b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-c
-e
-c
-b
-c
-a
-a
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+h
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
 "}
 (11,1,1) = {"
-a
-a
-a
-a
-a
-a
-c
-c
-c
 c
 c
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+"}
+(12,1,1) = {"
 b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+"}
+(13,1,1) = {"
+b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+"}
+(14,1,1) = {"
 c
 c
-a
-a
-a
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+e
+f
+f
+e
+e
+"}
+(15,1,1) = {"
+b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+b
+d
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+c
+e
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+e
+e
 a
 a
 a