diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index 5d2ce82016f4..3ef2a0b21c8c 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -289,9 +289,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/bed/chair/sofa/black/right{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "ang" = (
@@ -4818,18 +4815,6 @@
 "ddZ" = (
 /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
 /area/rift/surfacebase/outside/outside2)
-"dek" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/lightgrey/border{
-	dir = 8
-	},
-/obj/structure/bed/chair/sofa/black/right{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
 "dep" = (
 /turf/simulated/wall/prepainted/security,
 /area/security/range)
@@ -12069,7 +12054,6 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
-/obj/structure/bed/chair/sofa/black/corner,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "hMP" = (
@@ -14505,7 +14489,6 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
-/obj/structure/bed/chair/sofa/black/right,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "jmn" = (
@@ -14675,9 +14658,6 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
-/obj/structure/bed/chair/sofa/black/corner{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "jrD" = (
@@ -20457,9 +20437,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-4"
 	},
-/obj/structure/bed/chair/sofa/black/left{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "mMZ" = (
@@ -27306,9 +27283,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/bed/chair/sofa/black/left{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "rib" = (
@@ -28261,9 +28235,6 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
-/obj/structure/bed/chair/sofa/black/right{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "rMB" = (
@@ -28843,7 +28814,6 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
-/obj/structure/bed/chair/sofa/black/left,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "sfC" = (
@@ -30169,7 +30139,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "teZ" = (
@@ -31885,7 +31854,6 @@
 /obj/effect/floor_decal/corner/purple/bordercorner2{
 	dir = 9
 	},
-/obj/machinery/media/jukebox,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "unz" = (
@@ -33094,7 +33062,6 @@
 	},
 /obj/effect/floor_decal/borderfloor/corner2,
 /obj/effect/floor_decal/corner/purple/bordercorner2,
-/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "uZq" = (
@@ -34617,10 +34584,6 @@
 /obj/effect/overlay/snow/floor,
 /turf/simulated/floor/plating,
 /area/rift/surfacebase/outside/outside2)
-"weh" = (
-/obj/structure/table/carbon/reinforced,
-/turf/simulated/floor/glass/reinforced,
-/area/hallway/primary/surfacetwo)
 "wek" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/simulated/floor/wood,
@@ -36260,7 +36223,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/table/carbon/reinforced,
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/surfacetwo)
 "xpI" = (
@@ -36364,18 +36326,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/sleep)
-"xqT" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/lightgrey/border{
-	dir = 4
-	},
-/obj/structure/bed/chair/sofa/black/left{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
 "xrI" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
@@ -53087,7 +53037,7 @@ xUe
 xUe
 emT
 jru
-dek
+xLE
 mDz
 bgP
 bgP
@@ -53281,7 +53231,7 @@ rCo
 rCo
 xUe
 sfB
-weh
+bgP
 bgP
 bgP
 bgP
@@ -53669,7 +53619,7 @@ rCo
 rCo
 xUe
 jmj
-weh
+bgP
 bgP
 bgP
 bgP
@@ -53863,7 +53813,7 @@ xUe
 xUe
 emT
 hLX
-xqT
+sJl
 iru
 bgP
 bgP
diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
index 10e988b3f85c..6e215f9fe44b 100644
--- a/maps/rift/levels/rift-06-surface3.dmm
+++ b/maps/rift/levels/rift-06-surface3.dmm
@@ -401,9 +401,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/captain)
 "abq" = (
-/obj/machinery/camera/network/exploration{
-	dir = 6
-	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/exploration/courser_dock)
 "abr" = (
@@ -5230,7 +5228,7 @@
 /area/shuttle/excursion/general)
 "aoV" = (
 /obj/machinery/camera/network/exploration{
-	dir = 10
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/exploration/courser_dock)
@@ -7447,6 +7445,9 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/explorer_prep)
 "auU" = (
@@ -8456,6 +8457,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "axf" = (
@@ -10216,9 +10221,7 @@
 "aCt" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/camera/network/exploration{
-	dir = 6
-	},
+/obj/machinery/camera/network/exploration,
 /turf/simulated/floor/tiled/steel,
 /area/exploration/courser_dock)
 "aCu" = (
@@ -10641,6 +10644,10 @@
 /obj/effect/floor_decal/corner/beige/border{
 	dir = 10
 	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/pathfinder_office)
 "aDL" = (
@@ -11352,6 +11359,11 @@
 /obj/effect/floor_decal/corner/beige/bordercorner2{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	layer = 3.3;
+	pixel_x = 26
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "aFL" = (
@@ -12625,12 +12637,12 @@
 "aJm" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/beige/border,
-/obj/machinery/camera/network/exploration{
-	dir = 10
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/camera/network/exploration{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration)
 "aJn" = (
@@ -15826,6 +15838,9 @@
 /area/bridge/bridge_hallway)
 "aSj" = (
 /obj/effect/floor_decal/spline/plain,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/wood,
 /area/exploration/meeting)
 "aSk" = (
@@ -16619,7 +16634,7 @@
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
-/obj/item/multitool/ai_detector,
+/obj/item/multitool,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "aUr" = (
@@ -17864,6 +17879,10 @@
 /obj/effect/floor_decal/corner/beige/bordercorner2{
 	dir = 10
 	},
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled/steel,
 /area/exploration/excursion_dock)
 "aXW" = (
@@ -21483,6 +21502,13 @@
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/bar)
+"jew" = (
+/obj/structure/table/bench/standard,
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/steel,
+/area/exploration/courser_dock)
 "jil" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
@@ -23330,6 +23356,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/docking_hallway2)
+"orx" = (
+/obj/machinery/firealarm{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/exploration/courser_dock)
 "oti" = (
 /obj/structure/bed/chair/bay/chair{
 	dir = 1
@@ -25363,6 +25395,25 @@
 /obj/effect/paint/commandblue,
 /turf/simulated/wall/r_wall/prepainted/command,
 /area/bridge)
+"uAA" = (
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals9,
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/turf/simulated/floor/tiled,
+/area/exploration/explorer_prep)
 "uCG" = (
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -44658,7 +44709,7 @@ qnv
 pnT
 jNZ
 dIa
-asy
+uAA
 aTd
 aTd
 aTd
@@ -46029,7 +46080,7 @@ cvI
 aJN
 aVX
 cvI
-aYe
+orx
 aNv
 aHS
 aHp
@@ -46409,7 +46460,7 @@ aQr
 asV
 ahq
 hXj
-axm
+jew
 axm
 ciu
 mXd