diff --git a/_maps/shuttles/emergency_construction.dmm b/_maps/shuttles/emergency_construction.dmm
index 47ef968c28..5a003ea175 100644
--- a/_maps/shuttles/emergency_construction.dmm
+++ b/_maps/shuttles/emergency_construction.dmm
@@ -12,7 +12,7 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "c" = (
-/turf/closed/wall/mineral/plastitanium,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "d" = (
 /obj/structure/window/reinforced,
@@ -25,7 +25,8 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "e" = (
-/turf/closed/wall,
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "f" = (
 /turf/open/floor/plating,
@@ -49,37 +50,141 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"m" = (
+/obj/structure/table,
+/obj/item/construction/rcd,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"n" = (
+/obj/structure/table,
+/obj/item/rcl/pre_loaded,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"p" = (
+/obj/structure/table,
+/obj/item/stack/sheet/mineral/titanium/fifty,
+/obj/item/stack/sheet/mineral/plastitanium/fifty{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"w" = (
+/obj/item/clothing/head/welding{
+	pixel_x = -12
+	},
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed{
+	pixel_x = 4
+	},
+/obj/item/clothing/glasses/meson{
+	pixel_x = -10;
+	pixel_y = -2
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"x" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"B" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"C" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"J" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 "K" = (
 /obj/machinery/door/airlock,
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"O" = (
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"Q" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"U" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = -8
+	},
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/toolbox/emergency{
+	pixel_y = 8
+	},
+/obj/item/stack/cable_coil/red,
+/obj/item/stack/cable_coil/red,
+/obj/item/stack/cable_coil/red,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"W" = (
+/obj/machinery/computer/crew{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"X" = (
+/obj/structure/table,
+/obj/item/airlock_painter,
+/obj/item/airlock_painter/decal/tile{
+	pixel_y = 8
+	},
+/obj/item/toner/extreme,
+/obj/item/toner/extreme,
+/turf/open/floor/plating,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 a
 c
-e
-e
-e
-e
-e
-e
-e
+c
+c
+c
+c
+c
+c
+c
 K
 e
 g
+c
 e
 e
 e
-e
-e
+c
 K
 e
 K
-e
-e
-e
-e
+c
+c
+c
+c
 a
 a
 a
@@ -110,7 +215,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -141,7 +246,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -172,7 +277,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -203,12 +308,12 @@ f
 f
 f
 f
+c
+c
 e
 e
-e
-e
-e
-e
+c
+c
 "}
 (6,1,1) = {"
 b
@@ -239,7 +344,7 @@ f
 f
 f
 f
-e
+c
 "}
 (7,1,1) = {"
 b
@@ -286,6 +391,9 @@ f
 f
 f
 f
+p
+f
+Q
 f
 f
 f
@@ -297,10 +405,7 @@ f
 f
 f
 f
-f
-f
-f
-f
+O
 e
 "}
 (9,1,1) = {"
@@ -317,6 +422,9 @@ f
 f
 f
 f
+B
+f
+J
 f
 f
 f
@@ -327,10 +435,7 @@ f
 f
 f
 f
-f
-f
-f
-f
+x
 h
 e
 "}
@@ -348,6 +453,9 @@ f
 f
 f
 f
+n
+f
+w
 f
 f
 f
@@ -358,11 +466,8 @@ f
 f
 f
 f
-f
-f
-f
-f
-f
+x
+W
 e
 "}
 (11,1,1) = {"
@@ -379,6 +484,9 @@ f
 f
 f
 f
+X
+f
+m
 f
 f
 f
@@ -390,10 +498,7 @@ f
 f
 f
 f
-f
-f
-f
-f
+O
 e
 "}
 (12,1,1) = {"
@@ -410,9 +515,9 @@ f
 f
 f
 f
+U
 f
-f
-f
+C
 f
 f
 f
@@ -456,7 +561,7 @@ f
 f
 f
 f
-e
+c
 "}
 (14,1,1) = {"
 c
@@ -482,12 +587,12 @@ f
 f
 f
 f
+c
+c
 e
 e
-e
-e
-e
-e
+c
+c
 "}
 (15,1,1) = {"
 b
@@ -513,7 +618,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -544,7 +649,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -575,7 +680,7 @@ f
 f
 f
 f
-e
+c
 a
 a
 a
@@ -585,28 +690,28 @@ a
 (18,1,1) = {"
 a
 c
+c
+c
+c
+c
+c
+c
+c
 e
 e
 e
+c
 e
 e
 e
+c
 e
 e
 e
-e
-e
-e
-e
-e
-e
-e
-e
-e
-e
-e
-e
-e
+c
+c
+c
+c
 a
 a
 a