diff --git a/_maps/shuttles/pirate/pirate_mechcarrier.dmm b/_maps/shuttles/pirate/pirate_mechcarrier.dmm
index 9bd33ee01151..25979af4c5c7 100644
--- a/_maps/shuttles/pirate/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/pirate/pirate_mechcarrier.dmm
@@ -605,8 +605,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/effect/turf_decal/corner/opaque/black/three_quarters,
-/turf/open/floor/plating/rust,
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "fZ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -641,7 +640,6 @@
 /area/ship/crew/canteen)
 "gp" = (
 /obj/structure/closet/cardboard,
-/obj/item/storage/box/syndimaid,
 /obj/item/hatchet/wooden,
 /obj/item/stack/sheet/mineral/wood/fifty,
 /obj/item/toy/plush/beeplushie,
@@ -747,10 +745,7 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/grey/three_quarters{
-	dir = 8
-	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "hk" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -1047,6 +1042,9 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
+"jN" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/dorm)
 "jU" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1107,21 +1105,6 @@
 	},
 /turf/open/floor/plasteel/stairs,
 /area/ship/engineering)
-"kL" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/platform/industrial{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/hangar/starboard)
 "kX" = (
 /obj/structure/rack,
 /obj/item/stack/sheet/plasteel/twenty{
@@ -1374,16 +1357,10 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/thinplating,
-/obj/effect/turf_decal/corner/opaque/grey{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/grey{
-	dir = 4
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating/rust,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "ov" = (
 /obj/structure/catwalk/over,
@@ -1476,9 +1453,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
-"pu" = (
-/turf/closed/wall/r_wall,
-/area/ship/medical)
 "py" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
@@ -1750,9 +1724,6 @@
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
-"rY" = (
-/turf/closed/wall/r_wall/rust,
-/area/ship/hangar/starboard)
 "sa" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -1767,6 +1738,21 @@
 /obj/effect/turf_decal/siding/thinplating/corner,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
+"sb" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/platform/industrial/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hangar/starboard)
 "sh" = (
 /obj/structure/closet/secure_closet/engineering_welding{
 	req_access = null;
@@ -1820,9 +1806,23 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
-/obj/effect/turf_decal/corner/opaque/grey,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
+"sJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/platform/industrial{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/hangar/starboard)
 "sU" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -1995,13 +1995,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/orange{
+/obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner/opaque/grey{
-	dir = 1
-	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "vH" = (
 /obj/structure/cable/yellow{
@@ -2144,21 +2141,6 @@
 	dir = 4
 	},
 /area/ship/cargo)
-"wQ" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/platform/industrial/corner{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/hangar/starboard)
 "wV" = (
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
@@ -2287,6 +2269,9 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
+"yC" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/crew/dorm)
 "yO" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -2365,6 +2350,9 @@
 	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
+"zn" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/hangar/starboard)
 "zo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2627,6 +2615,9 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hangar/starboard)
+"CN" = (
+/turf/closed/wall/r_wall,
+/area/ship/medical)
 "Dj" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/grille,
@@ -2657,6 +2648,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hangar/starboard)
+"Dw" = (
+/turf/closed/wall/r_wall,
+/area/ship/science/robotics)
 "DD" = (
 /obj/structure/chair/plastic{
 	dir = 1
@@ -2808,9 +2802,6 @@
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
-"EZ" = (
-/turf/closed/wall/r_wall,
-/area/ship/hangar/starboard)
 "Fd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -2919,7 +2910,7 @@
 /area/ship/external/dark)
 "GJ" = (
 /turf/closed/wall/r_wall,
-/area/ship/crew/dorm)
+/area/ship/hangar/starboard)
 "GO" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/atmospherics/pipe/layer_manifold{
@@ -2935,10 +2926,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/corner/opaque/black/three_quarters{
-	dir = 1
-	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Hk" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
@@ -3154,7 +3142,7 @@
 /obj/effect/turf_decal/corner/opaque/grey{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/rust,
 /area/ship/cargo)
 "Jh" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3271,9 +3259,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"KO" = (
-/turf/closed/wall/r_wall/rust,
-/area/ship/medical)
 "KT" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
@@ -3370,9 +3355,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/security/armory)
-"Ml" = (
-/turf/closed/wall/r_wall,
-/area/ship/science/robotics)
 "Mp" = (
 /obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -3387,7 +3369,9 @@
 "MI" = (
 /obj/structure/reagent_dispensers/beerkeg,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/hatch/red,
+/obj/effect/turf_decal/industrial/hatch/red{
+	color = "#521818"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Nk" = (
@@ -3444,9 +3428,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"Ny" = (
-/turf/closed/wall/r_wall/rust,
-/area/ship/crew/dorm)
 "NE" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -3686,7 +3667,9 @@
 "Qn" = (
 /obj/structure/fermenting_barrel,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/hatch/red,
+/obj/effect/turf_decal/industrial/hatch/red{
+	color = "#521818"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Qw" = (
@@ -3740,6 +3723,9 @@
 /obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
+"QM" = (
+/turf/closed/wall/r_wall/rust,
+/area/ship/medical)
 "QO" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 8;
@@ -3949,14 +3935,14 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/effect/turf_decal/corner/opaque/black{
+	dir = 8
 	},
-/obj/structure/cable/yellow{
+/obj/structure/cable/orange{
 	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 8
+/obj/structure/cable/orange{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plating/rust,
 /area/ship/crew/canteen)
@@ -4059,14 +4045,15 @@
 /area/ship/cargo)
 "Ur" = (
 /obj/machinery/light/directional/south,
-/obj/structure/cable/yellow{
+/obj/effect/turf_decal/siding/thinplating,
+/obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/siding/thinplating,
-/obj/structure/cable/yellow{
+/obj/structure/cable/orange{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/opaque/grey,
+/turf/open/floor/plating,
 /area/ship/cargo)
 "UB" = (
 /turf/open/floor/engine/hull/interior,
@@ -4088,7 +4075,9 @@
 "UL" = (
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/smartfridge/drying_rack,
-/obj/effect/turf_decal/industrial/hatch/red,
+/obj/effect/turf_decal/industrial/hatch/red{
+	color = "#521818"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Vf" = (
@@ -4116,13 +4105,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 4
-	},
-/obj/structure/cable/orange{
+/obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Vm" = (
 /obj/structure/railing{
@@ -4779,7 +4765,7 @@ HC
 XT
 eW
 JN
-EZ
+GJ
 DL
 WK
 fB
@@ -4798,7 +4784,7 @@ BI
 BI
 Pi
 CF
-rY
+zn
 mU
 nN
 UB
@@ -4817,7 +4803,7 @@ pU
 Ss
 Cx
 nn
-EZ
+GJ
 wD
 UB
 UB
@@ -4836,7 +4822,7 @@ Ct
 sC
 Rf
 wN
-EZ
+GJ
 Fm
 UB
 UB
@@ -4907,9 +4893,9 @@ RZ
 XG
 XG
 BI
-Ml
-Ml
-Ml
+Dw
+Dw
+Dw
 DT
 jU
 Kt
@@ -5010,9 +4996,9 @@ Mp
 Kt
 PN
 hp
-kL
-kL
-wQ
+sJ
+sJ
+sb
 zL
 YV
 If
@@ -5124,9 +5110,9 @@ vH
 RN
 ga
 qT
-KO
-pu
-pu
+QM
+CN
+CN
 oP
 XG
 XG
@@ -5143,7 +5129,7 @@ Vm
 ka
 qD
 Jh
-pu
+CN
 rT
 hI
 oP
@@ -5181,9 +5167,9 @@ ge
 ty
 mm
 gB
-GJ
-Ny
-GJ
+jN
+yC
+jN
 oy
 XG
 XG
@@ -5295,10 +5281,10 @@ QL
 PW
 ka
 oy
-GJ
-Ny
+jN
+yC
 Jo
-GJ
+jN
 oy
 XG
 "}