diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index 43d2576abaec9..6aab7a169b71b 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -5268,10 +5268,6 @@
 /obj/floor_decal/corner/lime/bordercorner{
 	dir = 8
 	},
-/obj/structure/sign/thera{
-	pixel_y = -32;
-	dir = 1
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/fore)
 "aMC" = (
@@ -6955,6 +6951,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
+/obj/machinery/airlock_sensor/airlock_interior{
+	frequency = 1331;
+	id_tag = "guppy_shuttle_interior_sensor";
+	master_tag = "guppy_shuttle";
+	name = "interior access button";
+	pixel_x = -22;
+	pixel_y = 32;
+	req_access = list("ACCESS_GUPPY")
+	},
 /turf/simulated/floor/tiled,
 /area/guppy_hangar/start)
 "aYE" = (
@@ -11190,6 +11195,18 @@
 	map_airless = 1
 	},
 /area/space)
+"bGK" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/table/woodentable/mahogany,
+/turf/simulated/floor/wood/walnut,
+/area/crew_quarters/cafe/upper)
 "bGO" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -11903,7 +11920,6 @@
 /obj/floor_decal/steeldecal/steel_decals4{
 	dir = 9
 	},
-/obj/machinery/navbeacon/sierra/FD_forehallway2,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/fore)
 "bMC" = (
@@ -13807,10 +13823,6 @@
 "cbm" = (
 /obj/structure/railing/mapped,
 /obj/machinery/shieldgen,
-/obj/structure/sign/warning/pods/south{
-	dir = 8;
-	pixel_x = 32
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/centralstarboard)
 "cbr" = (
@@ -15583,7 +15595,6 @@
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Second Deck - Fore Hallway - Airlock"
 	},
-/obj/machinery/navbeacon/sierra/SD_fore4,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/fore)
 "cqv" = (
@@ -16494,6 +16505,7 @@
 /area/medical/staging)
 "cxF" = (
 /obj/machinery/hologram/holopad,
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "cxG" = (
@@ -24163,14 +24175,15 @@
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/test_room)
 "dAa" = (
-/obj/floor_decal/borderfloor,
-/obj/floor_decal/corner/lime/border,
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -24
+/obj/machinery/door/firedoor,
+/obj/floor_decal/industrial/hatch/yellow,
+/obj/machinery/navbeacon/sierra/SD_centralhallway2,
+/obj/machinery/door/blast/regular/lockdown{
+	dir = 4;
+	id_tag = "lockdown2_3"
 	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/seconddeck/fore)
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/seconddeck/center)
 "dAl" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -26819,7 +26832,6 @@
 /obj/floor_decal/corner/red/border{
 	dir = 1
 	},
-/obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/tiled/steel_grid,
 /area/maintenance/firstdeck/foreport)
 "dTL" = (
@@ -27012,6 +27024,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "dVn" = (
@@ -30378,8 +30391,7 @@
 /area/quartermaster/expedition)
 "etS" = (
 /obj/structure/closet/toolcloset/excavation{
-	locked = 1;
-	req_access = list(list("ACCESS_MINING","ACCESS_XENOARCH"))
+	locked = 1
 	},
 /obj/floor_decal/borderfloor{
 	dir = 5
@@ -30621,7 +30633,7 @@
 	dir = 9
 	},
 /obj/machinery/flasher{
-	id_tag = "security_pod_flash";
+	id_tag = "security_perm_chamber_flash";
 	name = "Floor mounted flash"
 	},
 /turf/simulated/floor/tiled/dark,
@@ -30649,7 +30661,7 @@
 /obj/machinery/atmospherics/omni/filter{
 	tag_north = 1;
 	tag_south = 2;
-	tag_east = 8
+	tag_west = 8
 	},
 /obj/engine_setup/filter,
 /obj/floor_decal/industrial/outline/blue,
@@ -31182,7 +31194,7 @@
 /turf/simulated/wall/prepainted,
 /area/medical/staging)
 "eAG" = (
-/obj/machinery/computer/shuttle_control/explore/guppy{
+/obj/machinery/computer/ship/engines{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel_ridged,
@@ -32069,6 +32081,7 @@
 /obj/floor_decal/spline/fancy/wood{
 	dir = 5
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "eHt" = (
@@ -32843,6 +32856,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "eMW" = (
@@ -33314,6 +33328,7 @@
 /obj/floor_decal/spline/fancy/wood/corner{
 	dir = 1
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "eQV" = (
@@ -34442,17 +34457,11 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/storage/tech/high_risk)
 "eZQ" = (
-/obj/machinery/atmospherics/omni/filter{
-	tag_east = 2;
-	tag_south = 5;
-	tag_west = 1
-	},
-/obj/floor_decal/techfloor{
-	dir = 1
-	},
-/obj/floor_decal/industrial/outline/green,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/engineering/atmos)
+/obj/machinery/door/firedoor,
+/obj/machinery/navbeacon/sierra/FD_forecentralhallway2,
+/obj/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/firstdeck/center)
 "eZV" = (
 /obj/floor_decal/corner/red,
 /obj/structure/cable/green{
@@ -44140,6 +44149,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "gwL" = (
@@ -44150,9 +44160,6 @@
 	dir = 1
 	},
 /obj/floor_decal/industrial/outline/red,
-/obj/structure/fuel_port{
-	pixel_x = -32
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "gwZ" = (
@@ -46026,12 +46033,12 @@
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/gas)
 "gMR" = (
+/obj/structure/handrail{
+	dir = 8
+	},
 /obj/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /obj/machinery/light/small,
-/obj/structure/handrail{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "gMW" = (
@@ -47513,10 +47520,27 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/fourthdeck/center)
 "gXd" = (
-/obj/paint_stripe/yellow,
-/obj/paint/dark_gunmetal,
-/turf/simulated/floor/plating,
-/area/guppy_hangar/start)
+/obj/machinery/navbeacon/sierra/SD_fore4,
+/obj/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/floor_decal/corner/lime/border{
+	dir = 1
+	},
+/obj/floor_decal/borderfloor/corner2{
+	dir = 1
+	},
+/obj/floor_decal/borderfloor/corner2{
+	dir = 4
+	},
+/obj/floor_decal/corner/lime/bordercorner2{
+	dir = 1
+	},
+/obj/floor_decal/corner/lime/bordercorner2{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/seconddeck/fore)
 "gXf" = (
 /obj/floor_decal/industrial/warning/fulltile,
 /turf/simulated/floor/tiled,
@@ -47578,10 +47602,6 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/structure/sign/warning/pods/south{
-	dir = 4;
-	pixel_x = -32
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/centralstarboard)
 "gYd" = (
@@ -49558,6 +49578,10 @@
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/sleep/bunk)
 "hnq" = (
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -24
+	},
 /obj/machinery/light,
 /obj/floor_decal/borderfloor,
 /obj/floor_decal/corner/lime/border,
@@ -49689,7 +49713,6 @@
 	dir = 8
 	},
 /obj/structure/catwalk,
-/obj/overmap/visitable/ship/landable/graysontug,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/fourthdeck)
 "hof" = (
@@ -51268,10 +51291,6 @@
 /obj/floor_decal/techfloor/hole{
 	dir = 1
 	},
-/obj/machinery/flasher{
-	id_tag = "security_pod_flash";
-	name = "Floor mounted flash"
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/escape_pod/escape_pod5/station)
 "hBo" = (
@@ -56909,18 +56928,18 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{
 	id_tag = "guppy_shuttle_pump_out_external"
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/airlock_sensor/airlock_exterior{
 	frequency = 1331;
 	id_tag = "guppy_shuttle_exterior_sensor";
 	master_tag = "guppy_shuttle";
-	pixel_x = 24;
+	pixel_x = 25;
 	pixel_y = -24
 	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "ivw" = (
@@ -63441,16 +63460,26 @@
 /turf/simulated/wall/prepainted,
 /area/crew_quarters/gym)
 "jtf" = (
-/obj/machinery/door/firedoor,
-/obj/wallframe_spawn/reinforced,
-/obj/machinery/door/blast/regular{
-	dir = 4;
-	id_tag = "guppy_shield_left";
-	name = "Window Shield"
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/paint_stripe/yellow,
-/turf/simulated/wall/r_titanium,
-/area/guppy_hangar/start)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/catwalk_plated,
+/obj/machinery/light/spot{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/hallway/primary/seconddeck/aft)
 "jtg" = (
 /obj/fluid_mapped,
 /obj/item/clothing/under/shorts/grey,
@@ -63519,7 +63548,6 @@
 /obj/floor_decal/corner/lime/border{
 	dir = 1
 	},
-/obj/machinery/navbeacon/sierra/SD_afthallway2,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/aft)
 "jul" = (
@@ -65230,7 +65258,6 @@
 /obj/floor_decal/corner/lime/border,
 /obj/floor_decal/borderfloor/corner2,
 /obj/floor_decal/corner/lime/bordercorner2,
-/obj/machinery/navbeacon/sierra/SD_fore3,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/fore)
 "jJa" = (
@@ -65308,6 +65335,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/aftport)
+"jJG" = (
+/obj/structure/table/woodentable/mahogany,
+/turf/simulated/floor/wood/walnut,
+/area/crew_quarters/cafe/upper)
 "jJY" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/cable/green{
@@ -66881,7 +66912,6 @@
 	icon_state = "0-4"
 	},
 /obj/structure/cable/yellow,
-/obj/structure/bed/chair/shuttle/blue,
 /turf/simulated/floor/tiled,
 /area/guppy_hangar/start)
 "jVo" = (
@@ -71059,6 +71089,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/mob/living/bot/cleanbot{
+	name = "Monro";
+	will_patrol = 1
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
@@ -71514,6 +71548,7 @@
 "kCS" = (
 /obj/machinery/navbeacon/sierra/SD_fore6,
 /obj/floor_decal/steeldecal/steel_decals4,
+/obj/machinery/navbeacon/sierra/SD_fore5,
 /obj/floor_decal/borderfloor{
 	dir = 1
 	},
@@ -72167,20 +72202,14 @@
 /turf/simulated/floor/plating,
 /area/vacant/sauna)
 "kHZ" = (
-/obj/machinery/door/blast/regular{
-	id_tag = "guppy_escape_hatch";
-	name = "escape Hatch";
+/obj/machinery/door/firedoor,
+/obj/machinery/navbeacon/sierra/FD_forecentralhallway1,
+/obj/floor_decal/industrial/hatch/yellow,
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/button/blast_door{
-	id_tag = "guppy_escape_hatch";
-	name = "Escape Hatch Control";
-	req_access = list("ACCESS_GUPPY");
-	pixel_y = -25
-	},
-/obj/floor_decal/industrial/hatch/yellow,
-/turf/simulated/wall/r_titanium,
-/area/guppy_hangar/start)
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/firstdeck/center)
 "kIk" = (
 /turf/simulated/wall/prepainted,
 /area/maintenance/waterstore)
@@ -72854,14 +72883,15 @@
 /turf/simulated/floor/wood/ebony,
 /area/crew_quarters/actor)
 "kML" = (
-/obj/floor_decal/borderfloor,
-/obj/floor_decal/corner/lime/border,
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/machinery/door/firedoor,
+/obj/wallframe_spawn/reinforced/polarized/no_grille{
+	id = "briefing_windows"
 	},
-/obj/machinery/navbeacon/sierra/FD_forecentralhallway1,
-/turf/simulated/floor/tiled,
-/area/hallway/primary/firstdeck/center)
+/obj/item/storage/secure/safe/captain_sierra{
+	pixel_y = 28
+	},
+/turf/simulated/floor/plating,
+/area/bridge/marine_room)
 "kMO" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -76096,8 +76126,13 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/maintenance/firstdeck/centralport)
 "llP" = (
+/obj/structure/handrail{
+	dir = 8
+	},
 /obj/floor_decal/industrial/outline/yellow,
-/obj/structure/handrail,
+/obj/structure/fuel_port{
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "llT" = (
@@ -88340,7 +88375,6 @@
 /obj/machinery/camera/network/first_deck{
 	c_tag = "First Deck - Central Hallway"
 	},
-/obj/machinery/navbeacon/sierra/FD_forecentralhallway2,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/center)
 "ncR" = (
@@ -88736,7 +88770,6 @@
 	dir = 4;
 	pixel_y = 31
 	},
-/obj/machinery/navbeacon/sierra/FD_forecentralhallway2,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/center)
 "ngG" = (
@@ -90645,6 +90678,7 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "ntA" = (
@@ -96789,6 +96823,7 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "oqA" = (
@@ -96831,6 +96866,9 @@
 	dir = 1
 	},
 /obj/catwalk_plated,
+/obj/machinery/light/spot{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/hallway/primary/seconddeck/aft)
 "ora" = (
@@ -96846,10 +96884,10 @@
 /area/medical/virology/atmos)
 "orf" = (
 /obj/machinery/atmospherics/omni/filter{
-	tag_east = 4;
-	tag_north = 3;
-	tag_south = 2;
-	tag_west = 1
+	tag_east = 2;
+	tag_north = 1;
+	tag_south = 3;
+	tag_west = 4
 	},
 /obj/floor_decal/industrial/outline/green,
 /turf/simulated/floor/tiled/techfloor,
@@ -100897,7 +100935,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/navbeacon/sierra/SD_fore5,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/fore)
 "oXz" = (
@@ -103144,14 +103181,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/button/flasher{
-	id_tag = "security_pod_flash";
-	name = "Chamber Flasher";
-	pixel_x = 28;
-	pixel_y = 10;
-	dir = 8;
-	req_access = list("ACCESS_SECURITY")
-	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/shuttle/escape_pod/escape_pod5/station)
 "pmJ" = (
@@ -104616,6 +104645,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/primary/seconddeck/aft)
+"pxk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/table/woodentable/mahogany,
+/turf/simulated/floor/wood/walnut,
+/area/crew_quarters/cafe/upper)
 "pxm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -105012,6 +105051,7 @@
 /obj/floor_decal/spline/fancy/wood{
 	dir = 9
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "pAL" = (
@@ -108531,6 +108571,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "qck" = (
@@ -108876,6 +108917,9 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/center)
 "qfc" = (
+/obj/structure/bed/chair/shuttle/blue{
+	dir = 4
+	},
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 2;
@@ -109573,8 +109617,8 @@
 /obj/machinery/atmospherics/omni/filter{
 	tag_east = 2;
 	tag_north = 1;
-	tag_south = 8;
-	tag_west = 7
+	tag_south = 3;
+	tag_west = 4
 	},
 /obj/floor_decal/techfloor{
 	dir = 1
@@ -114521,6 +114565,7 @@
 /obj/floor_decal/spline/fancy/wood/corner{
 	dir = 4
 	},
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "qXp" = (
@@ -115321,9 +115366,14 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/rnd/canister)
 "rcD" = (
+/mob/living/bot/cleanbot{
+	name = "Balto";
+	will_patrol = 1
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/navbeacon/sierra/SD_afthallway1,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
@@ -116072,9 +116122,6 @@
 	id_tag = "guppy_hatch";
 	name = "Rear Hatch"
 	},
-/obj/floor_decal/techfloor/orange{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "rhT" = (
@@ -123136,6 +123183,7 @@
 	pixel_y = -24;
 	dir = 1
 	},
+/obj/machinery/navbeacon/sierra/SD_fore2,
 /obj/floor_decal/corner_techfloor_grid{
 	dir = 8
 	},
@@ -123832,11 +123880,6 @@
 	dir = 4
 	},
 /obj/floor_decal/steeldecal/steel_decals_central6,
-/obj/machinery/navbeacon/sierra/SD_afthallway1,
-/mob/living/bot/cleanbot{
-	name = "Balto";
-	will_patrol = 1
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/aft)
 "spO" = (
@@ -124255,10 +124298,6 @@
 	c_tag = "First Deck - Aft Hallway Chemistry";
 	dir = 1
 	},
-/mob/living/bot/cleanbot{
-	name = "Monro";
-	will_patrol = 1
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/aft)
 "sta" = (
@@ -126683,6 +126722,10 @@
 "sIS" = (
 /obj/floor_decal/borderfloor,
 /obj/floor_decal/corner/lime/border,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Second Deck - Fore Hallway";
 	dir = 1
@@ -127130,7 +127173,6 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/navbeacon/sierra/FD_forehallway_starboard,
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "sMj" = (
@@ -129686,6 +129728,7 @@
 /turf/simulated/floor/grass/cut,
 /area/crew_quarters/garden_room)
 "tfk" = (
+/obj/machinery/navbeacon/sierra/SD_afthallway2,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -129909,11 +129952,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/navbeacon/sierra/FD_forecentralhallway1,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/center)
 "thy" = (
 /obj/structure/disposalpipe/segment,
+/obj/structure/table/woodentable/mahogany,
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/cafe/upper)
 "thC" = (
@@ -134125,7 +134168,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/navbeacon/sierra/SD_centralhallway2,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/center)
 "tPA" = (
@@ -135215,12 +135257,9 @@
 	id_tag = "guppy_hatch";
 	name = "Rear Hatch Control";
 	req_access = list("ACCESS_GUPPY");
-	pixel_x = 24;
+	pixel_x = 25;
 	pixel_y = 1
 	},
-/obj/floor_decal/techfloor/orange{
-	dir = 4
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "tWW" = (
@@ -137703,6 +137742,7 @@
 	dir = 4;
 	icon_state = "pipe-j2"
 	},
+/obj/machinery/navbeacon/sierra/FD_forehallway2,
 /obj/floor_decal/steeldecal/steel_decals4{
 	dir = 4
 	},
@@ -138957,14 +138997,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/airlock_sensor/airlock_interior{
-	frequency = 1331;
-	id_tag = "guppy_shuttle_interior_sensor";
-	master_tag = "guppy_shuttle";
-	name = "interior access button";
-	pixel_x = 24;
-	req_access = list("ACCESS_GUPPY")
-	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
 "uCk" = (
@@ -143218,6 +143250,7 @@
 /area/maintenance/fourthdeck/foreport)
 "vhK" = (
 /obj/machinery/door/firedoor,
+/obj/machinery/navbeacon/sierra/FD_forecentralhallway1,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -144496,17 +144529,17 @@
 /obj/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/airlock_sensor{
 	frequency = 1331;
 	id_tag = "guppy_shuttle_sensor";
 	master_tag = "guppy_shuttle";
 	pixel_y = 26;
-	pixel_x = 24
+	pixel_x = 25
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/guppy_hangar/start)
@@ -150815,17 +150848,6 @@
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/vacant/dormintories)
-"wmO" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/navbeacon/sierra/SD_fore2,
-/turf/simulated/floor/tiled,
-/area/hallway/primary/seconddeck/fore)
 "wmY" = (
 /obj/floor_decal/corner/grey/three_quarters{
 	dir = 1
@@ -152184,6 +152206,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/escape_pod/escape_pod1/station)
 "wxY" = (
+/obj/machinery/navbeacon/sierra/FD_forehallway_starboard,
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 8;
@@ -153142,16 +153165,11 @@
 /turf/simulated/floor/tiled/white/monotile,
 /area/rnd/office)
 "wIL" = (
-/obj/floor_decal/borderfloor,
-/obj/floor_decal/corner/lime/border,
-/obj/floor_decal/borderfloor/corner2,
-/obj/floor_decal/corner/lime/bordercorner2,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -24
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/seconddeck/fore)
+/obj/machinery/door/firedoor,
+/obj/machinery/navbeacon/sierra/FD_forecentralhallway2,
+/obj/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/firstdeck/aft)
 "wIU" = (
 /obj/floor_decal/borderfloor{
 	dir = 8
@@ -153705,10 +153723,6 @@
 	dir = 8
 	},
 /obj/structure/railing/mapped,
-/obj/structure/sign/warning/pods/south{
-	dir = 8;
-	pixel_x = 32
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/centralstarboard)
 "wNO" = (
@@ -162737,14 +162751,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/port)
 "yel" = (
+/obj/machinery/computer/shuttle_control/explore/guppy{
+	dir = 8
+	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 24;
 	dir = 8
 	},
 /obj/overmap/visitable/ship/landable/guppy,
-/obj/machinery/computer/ship/engines{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/guppy_hangar/start)
 "yen" = (
@@ -187235,14 +187249,14 @@ ltl
 kBm
 btX
 cOL
-kHZ
+aMS
 aMS
 rhB
 rhB
 rhB
 rhB
-jtf
-gXd
+rhB
+caC
 rhB
 goN
 meb
@@ -230641,7 +230655,7 @@ buM
 tbv
 ohW
 aiQ
-eZQ
+qjW
 nUI
 xCA
 pzW
@@ -254696,7 +254710,7 @@ enM
 cFx
 oXp
 pHK
-wmO
+ldV
 kha
 rlQ
 toT
@@ -255098,7 +255112,7 @@ kuI
 sCm
 iWM
 xFL
-qlD
+gXd
 kyx
 wep
 rem
@@ -256918,7 +256932,7 @@ ims
 ims
 efa
 pdu
-wIL
+nfV
 fJD
 meH
 meH
@@ -257120,7 +257134,7 @@ mpT
 ims
 eBw
 kiK
-dAa
+kEJ
 fJD
 meH
 meH
@@ -261959,11 +261973,11 @@ hsw
 hsw
 pAJ
 qXo
-gZv
-gZv
-vvR
-rZr
-gZv
+jJG
+jJG
+pxk
+bGK
+jJG
 vnD
 qfG
 wiH
@@ -262161,8 +262175,8 @@ vkK
 hsw
 ntz
 cxF
-gZv
-gZv
+jJG
+jJG
 dVj
 gwG
 qci
@@ -262363,8 +262377,8 @@ aRn
 hsw
 eHm
 eQR
-gZv
-gZv
+jJG
+jJG
 oqy
 thy
 eMR
@@ -263380,7 +263394,7 @@ hZc
 sWy
 wgR
 fny
-txi
+dAa
 mzv
 txi
 qOv
@@ -267623,7 +267637,7 @@ ont
 hDW
 ucT
 wgN
-fdF
+jtf
 tUE
 vcq
 yfH
@@ -301359,7 +301373,7 @@ pkj
 stL
 ncQ
 kyw
-kML
+nmb
 dPt
 oJs
 pjA
@@ -303781,9 +303795,9 @@ tkt
 wDS
 wXc
 aTK
-fiz
+eZQ
 aAD
-xoZ
+kHZ
 slm
 gVl
 clw
@@ -307821,7 +307835,7 @@ pNp
 eDJ
 aYH
 eNk
-mCs
+wIL
 wqA
 vhK
 fIj
@@ -334887,7 +334901,7 @@ qfW
 rZv
 bkh
 isJ
-ivJ
+kML
 phc
 iRb
 gJG