diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index c012b3f83d174..f53e068ad9546 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -11160,8 +11160,36 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/safe_room/bridge)
 "bIy" = (
+/obj/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/decal/cleanable/dirt,
+/obj/machinery/status_light{
+	id_tag = "ReacEng1";
+	name = "Deck Four Starboard status indicator";
+	pixel_x = -8;
+	pixel_y = 25
+	},
+/obj/machinery/status_light{
+	id_tag = "ReacEng3";
+	name = "Deck One Starboard status indicator";
+	pixel_x = -8;
+	pixel_y = 34
+	},
+/obj/machinery/status_light{
+	id_tag = "ReacEng4";
+	name = "Deck One Port status indicator";
+	pixel_x = 8;
+	pixel_y = 34
+	},
+/obj/machinery/status_light{
+	id_tag = "ReacEng2";
+	name = "Deck Four Port status indicator";
+	pixel_x = 8;
+	pixel_y = 25
+	},
 /turf/simulated/floor/plating,
-/area/vacant/prototype/engine)
+/area/engineering/fuelbay)
 "bIO" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -19204,7 +19232,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/thirddeck/port)
 "cTo" = (
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /obj/machinery/atmospherics/binary/pump/high_power/on{
@@ -68674,37 +68702,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/fourthdeck/aft)
-"kuR" = (
-/obj/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/decal/cleanable/dirt,
-/obj/machinery/status_light{
-	id_tag = "ReacEng1";
-	name = "Deck Four Starboard status indicator";
-	pixel_x = -8;
-	pixel_y = 25
-	},
-/obj/machinery/status_light{
-	id_tag = "ReacEng3";
-	name = "Deck One Starboard status indicator";
-	pixel_x = -8;
-	pixel_y = 34
-	},
-/obj/machinery/status_light{
-	id_tag = "ReacEng4";
-	name = "Deck One Port status indicator";
-	pixel_x = 8;
-	pixel_y = 34
-	},
-/obj/machinery/status_light{
-	id_tag = "ReacEng2";
-	name = "Deck Four Port status indicator";
-	pixel_x = 8;
-	pixel_y = 25
-	},
-/turf/simulated/floor/plating,
-/area/engineering/fuelbay)
 "kuV" = (
 /obj/floor_decal/corner/brown/mono,
 /obj/machinery/computer/modular/preset/supply_public{
@@ -74120,7 +74117,7 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /turf/simulated/floor/reinforced,
@@ -74989,18 +74986,8 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/firstdeck/forestarboard)
 "lrV" = (
-/obj/floor_decal/corner/purple/border{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/table/standard,
-/obj/random/tech_loot,
-/obj/random/tech_loot,
-/obj/random/tech_loot,
-/turf/simulated/floor/tiled/monotile,
-/area/rnd/misc_lab)
+/turf/simulated/floor/plating,
+/area/vacant/prototype/engine)
 "lrY" = (
 /obj/floor_decal/techfloor{
 	dir = 1
@@ -76528,7 +76515,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/primary/fourthdeck/fore)
 "lCR" = (
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /obj/machinery/atmospherics/binary/pump/high_power/on{
@@ -84978,7 +84965,7 @@
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/captain)
 "mSU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /obj/machinery/atmospherics/binary/pump/high_power/on{
@@ -131661,7 +131648,7 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /turf/simulated/floor/reinforced,
@@ -132843,7 +132830,7 @@
 	},
 /area/space)
 "ucW" = (
-/obj/machinery/atmospherics/pipe/simple/visible/green{
+/obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4
 	},
 /obj/machinery/alarm{
@@ -156192,6 +156179,19 @@
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/seconddeck/forestarboard)
+"xKw" = (
+/obj/floor_decal/corner/purple/border{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/table/standard,
+/obj/random/tech_loot,
+/obj/random/tech_loot,
+/obj/random/tech_loot,
+/turf/simulated/floor/tiled/monotile,
+/area/rnd/misc_lab)
 "xKB" = (
 /obj/structure/table/rack,
 /obj/item/aiModule/freeform,
@@ -205676,7 +205676,7 @@ tXe
 aSX
 aSX
 rZl
-bIy
+lrV
 bXN
 roC
 ddK
@@ -205684,7 +205684,7 @@ fEQ
 qqj
 fbN
 bXN
-bIy
+lrV
 wve
 aSX
 aSX
@@ -225485,7 +225485,7 @@ kid
 kid
 kid
 jLt
-kuR
+bIy
 iDo
 vUh
 mxo
@@ -304274,7 +304274,7 @@ oLF
 dNN
 hnB
 lxZ
-lrV
+xKw
 dpq
 nPt
 qSx