diff --git a/maps/map_files/BigRed/standalone/crashlanding-upp-dorms.dmm b/maps/map_files/BigRed/standalone/crashlanding-upp-dorms.dmm
index de1b8b64c347..32bd5f0b155f 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-upp-dorms.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-upp-dorms.dmm
@@ -89,15 +89,6 @@
 	icon_state = "rasputin3"
 	},
 /area/bigredv2/outside/dorms)
-"cs" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 4
-	},
-/turf/closed/shuttle/ert{
-	icon_state = "test8";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "ct" = (
 /obj/structure/machinery/blackbox_recorder,
 /turf/open/floor/plating,
@@ -200,7 +191,7 @@
 /area/bigredv2/outside/bar)
 "eD" = (
 /turf/closed/shuttle/ert{
-	icon_state = "upp20";
+	icon_state = "T8";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -214,12 +205,6 @@
 	icon_state = "darkred2"
 	},
 /area/bigredv2/outside/admin_building)
-"eS" = (
-/turf/closed/shuttle/ert{
-	icon_state = "T10";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "eX" = (
 /obj/structure/bed/chair/dropship/passenger,
 /obj/item/storage/belt/medical/lifesaver/upp,
@@ -310,7 +295,7 @@
 /area/bigredv2/outside/bar)
 "fN" = (
 /turf/closed/shuttle/ert{
-	icon_state = "upp20";
+	icon_state = "T11";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -436,11 +421,9 @@
 	},
 /area/bigredv2/outside/c)
 "hY" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 4
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/closed/shuttle/ert{
-	icon_state = "upp1";
+	icon_state = "T20";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -452,12 +435,6 @@
 	},
 /turf/open/floor/plating,
 /area/bigredv2/outside/dorms)
-"ic" = (
-/turf/closed/shuttle/ert{
-	icon_state = "T12";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "ii" = (
 /turf/open/mars{
 	icon_state = "mars_dirt_8"
@@ -596,11 +573,10 @@
 /area/bigredv2/outside/dorms)
 "lC" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor/plating{
-	dir = 8;
-	icon_state = "platingdmg3"
+/obj/structure/pipes/standard/simple/hidden/green{
+	dir = 10
 	},
+/turf/open/floor/plating,
 /area/bigredv2/outside/dorms)
 "lF" = (
 /obj/effect/decal/cleanable/blood,
@@ -696,12 +672,6 @@
 	icon_state = "rasputin15"
 	},
 /area/bigredv2/outside/dorms)
-"mS" = (
-/turf/closed/shuttle/ert{
-	icon_state = "T13";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "mW" = (
 /obj/item/trash/semki,
 /turf/open/shuttle/dropship,
@@ -819,7 +789,7 @@
 "pc" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/shuttle/ert{
-	icon_state = "upp25";
+	icon_state = "T16";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -828,9 +798,11 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/dorms)
 "pn" = (
-/obj/item/stack/sheet/metal,
+/obj/structure/pipes/standard/simple/hidden/green{
+	dir = 4
+	},
 /turf/closed/shuttle/ert{
-	icon_state = "upp_leftengine";
+	icon_state = "T17";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -847,10 +819,11 @@
 	},
 /area/bigredv2/outside/dorms)
 "pG" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+	dir = 4
+	},
 /turf/closed/shuttle/ert{
-	icon_state = "upp1";
-	name = "Fulcrum"
+	icon_state = "T19"
 	},
 /area/bigredv2/outside/dorms)
 "pK" = (
@@ -940,7 +913,7 @@
 /area/bigredv2/outside/c)
 "ro" = (
 /turf/closed/shuttle/ert{
-	icon_state = "upp1";
+	icon_state = "T4";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -950,15 +923,10 @@
 	},
 /area/bigredv2/outside/dorms)
 "rq" = (
-/obj/structure/machinery/light/double{
-	dir = 4;
-	pixel_y = -5
-	},
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+/obj/effect/landmark/good_item,
+/turf/open/floor/plating{
+	dir = 8;
+	icon_state = "platingdmg3"
 	},
 /area/bigredv2/outside/dorms)
 "rJ" = (
@@ -1242,13 +1210,6 @@
 	icon_state = "wood"
 	},
 /area/bigredv2/outside/bar)
-"wN" = (
-/turf/closed/shuttle/ert{
-	icon_state = "rightengine_1";
-	opacity = 0;
-	name = s
-	},
-/area/bigredv2/outside/dorms)
 "wU" = (
 /obj/structure/surface/table/almayer,
 /turf/open/floor/plating,
@@ -1402,15 +1363,6 @@
 	icon_state = "mars_dirt_12"
 	},
 /area/bigredv2/outside/c)
-"zy" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 4
-	},
-/turf/closed/shuttle/ert{
-	icon_state = "T15";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "zH" = (
 /obj/structure/barricade/wooden,
 /turf/open/mars{
@@ -1467,7 +1419,7 @@
 "AY" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/shuttle/ert{
-	icon_state = "upp2";
+	icon_state = "T7";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -1511,15 +1463,6 @@
 	icon_state = "platingdmg3"
 	},
 /area/bigredv2/outside/dorms)
-"BB" = (
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 4
-	},
-/turf/closed/shuttle/ert{
-	icon_state = "T16";
-	name = "Fulcrum
-	},
-/area/bigredv2/outside/dorms)
 "BD" = (
 /obj/structure/machinery/light/double{
 	dir = 4;
@@ -1654,14 +1597,10 @@
 /turf/open/floor,
 /area/bigredv2/outside/dorms)
 "Dt" = (
-/obj/structure/machinery/light/double{
-	dir = 8
-	},
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/shuttle/ert{
+	icon_state = "T2";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "Dv" = (
@@ -1680,9 +1619,10 @@
 	},
 /area/bigredv2/outside/bar)
 "DI" = (
-/obj/effect/landmark/good_item,
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
+/obj/structure/pipes/standard/manifold/hidden/green,
+/turf/closed/shuttle/ert{
+	icon_state = "T15";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "DY" = (
@@ -1707,12 +1647,9 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/dorms)
 "En" = (
-/obj/item/prop/colony/usedbandage{
-	dir = 5;
-	pixel_y = 8
-	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
+/turf/closed/shuttle/ert{
+	icon_state = "T14";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "EF" = (
@@ -1777,11 +1714,9 @@
 	},
 /area/bigredv2/outside/dorms)
 "FI" = (
-/obj/structure/machinery/shower{
-	dir = 8
-	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
+/turf/closed/shuttle/ert{
+	icon_state = "T5";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "Gh" = (
@@ -1789,12 +1724,9 @@
 /turf/open/mars,
 /area/bigredv2/outside/c)
 "Gi" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
-	dir = 5
-	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
+/turf/closed/shuttle/ert{
+	icon_state = "T2";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "Gr" = (
@@ -2098,7 +2030,7 @@
 /area/bigredv2/outside/dorms)
 "KO" = (
 /turf/closed/shuttle/ert{
-	icon_state = "upp_rightengine";
+	icon_state = "T7";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -2224,7 +2156,7 @@
 "MK" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/shuttle/ert{
-	icon_state = "upp3";
+	icon_state = "T8";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -2241,6 +2173,20 @@
 	icon_state = "mars_dirt_5"
 	},
 /area/bigredv2/outside/c)
+"Nn" = (
+/turf/closed/shuttle/ert{
+	icon_state = "T1";
+	name = "Fulcrum"
+	},
+/area/bigredv2/outside/dorms)
+"Nv" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/shuttle/ert{
+	icon_state = "T4";
+	name = "Fulcrum"
+	},
+/area/bigredv2/outside/dorms)
 "NM" = (
 /obj/structure/pipes/standard/simple/hidden/green{
 	dir = 5
@@ -2502,8 +2448,8 @@
 "SG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/green{
-	dir = 1
+/obj/structure/pipes/standard/simple/hidden/green{
+	dir = 4
 	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -2515,7 +2461,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/shuttle/ert{
-	icon_state = "upp1";
+	icon_state = "T6";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -2597,12 +2543,6 @@
 	icon_state = "mars_dirt_5"
 	},
 /area/bigredv2/outside/c)
-"TK" = (
-/turf/closed/shuttle/ert{
-	icon_state = "T11";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "TL" = (
 /obj/item/stack/rods,
 /obj/structure/prop/invuln/lattice_prop{
@@ -2695,7 +2635,7 @@
 /area/bigredv2/outside/c)
 "Vl" = (
 /turf/closed/shuttle/ert{
-	icon_state = "upp25";
+	icon_state = "T16";
 	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
@@ -2783,9 +2723,10 @@
 	},
 /area/bigredv2/outside/dorms)
 "WH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/metal,
-/turf/open/floor/plating,
+/turf/closed/shuttle/ert{
+	icon_state = "T3";
+	name = "Fulcrum"
+	},
 /area/bigredv2/outside/dorms)
 "WL" = (
 /obj/item/prop/colony/usedbandage{
@@ -2822,13 +2763,6 @@
 	icon_state = "rasputin7"
 	},
 /area/bigredv2/outside/dorms)
-"WS" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/shuttle/ert{
-	icon_state = "T14";
-	name = "Fulcrum"
-	},
-/area/bigredv2/outside/dorms)
 "Xe" = (
 /obj/item/stack/sheet/metal,
 /obj/effect/decal/cleanable/dirt,
@@ -2900,9 +2834,9 @@
 	},
 /area/bigredv2/outside/bar)
 "Yf" = (
-/obj/item/ammo_casing/bullet,
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
+/turf/closed/shuttle/ert{
+	icon_state = "T12";
+	name = "Fulcrum"
 	},
 /area/bigredv2/outside/dorms)
 "Yx" = (
@@ -3266,12 +3200,12 @@ Ww
 UK
 fl
 qs
-CX
+rq
 fN
 MK
 XQ
+FI
 qe
-Yf
 HE
 Xg
 PO
@@ -3298,10 +3232,11 @@ Jm
 oe
 UE
 AH
-Kh
-Sh
-ya
-pn
+AH
+fN
+eD
+KO
+Wm
 Fb
 Op
 hQ
@@ -3329,17 +3264,18 @@ ql
 NW
 CX
 KX
-AH
-Sh
-ya
-XQ
+CX
+wB
+eD
 KO
+KO
+Ls
 Ti
 IP
 UD
-Sh
-mq
-mq
+Nn
+WH
+WH
 ro
 qI
 hT
@@ -3372,8 +3308,8 @@ mq
 mq
 mq
 WN
-lP
-ya
+Dt
+En
 wo
 VX
 Lf
@@ -3403,7 +3339,8 @@ Qf
 mH
 mH
 mH
-XQ
+bY
+rp
 KD
 rP
 VX
@@ -3501,7 +3438,8 @@ BQ
 Gr
 Gr
 Gr
-XQ
+Ve
+rp
 Kd
 rP
 YO
@@ -3535,7 +3473,7 @@ lP
 gF
 gF
 ya
-mq
+WH
 ro
 ji
 Qb
@@ -3557,18 +3495,19 @@ pz
 ql
 JX
 Bf
-KX
+GU
 pc
 hY
 AY
-pn
+AY
+pG
 Fb
 Op
 pg
-fC
-gF
-gF
-ya
+Yf
+Gi
+Gi
+En
 hX
 cD
 eb
@@ -3590,13 +3529,13 @@ pg
 JX
 GU
 HZ
-WH
+ql
 pc
 hY
-KO
+AY
+pn
 Ti
 IP
-dd
 KX
 AH
 UE
@@ -3623,12 +3562,12 @@ pg
 hy
 Kh
 aI
-ql
-pz
-pc
-pG
+CX
+KX
+Vl
+hY
 XQ
-oe
+FI
 Lk
 ct
 qs
@@ -3658,10 +3597,10 @@ lM
 Pq
 oL
 Dk
-Gi
+zZ
 Vl
-ya
-sy
+DI
+En
 Cb
 Sk
 lV