diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index e455ed33d7c..205d3500e0c 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -1370,6 +1370,16 @@
 "bsJ" = (
 /turf/simulated/mineral/cave,
 /area/groundbase/level1/se)
+"bsO" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/floor_decal/milspec/color/orange/half{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/atmos_personal,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
 "btM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -7453,7 +7463,7 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/atmos_personal,
+/obj/machinery/vending/wardrobe/engidrobe,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "gYH" = (
@@ -22171,10 +22181,10 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/atmos_personal,
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 10
 	},
+/obj/machinery/vending/wardrobe/atmosdrobe,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "uch" = (
@@ -38782,7 +38792,7 @@ wws
 pNE
 wSp
 wSp
-wSp
+bsO
 gYs
 uby
 wAO
diff --git a/maps/groundbase/rp-z4.dmm b/maps/groundbase/rp-z4.dmm
index d8f36317def..7d6824f4663 100644
--- a/maps/groundbase/rp-z4.dmm
+++ b/maps/groundbase/rp-z4.dmm
@@ -993,9 +993,6 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/engineering/satellite/breakroom)
 "Ba" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/engineering/satellite/breakroom)
 "Bq" = (
@@ -1005,6 +1002,7 @@
 /obj/structure/mirror{
 	pixel_y = 37
 	},
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/engineering/satellite/breakroom)
 "BR" = (
@@ -1229,7 +1227,6 @@
 	dir = 9
 	},
 /obj/item/device/radio/intercom{
-	broadcasting = 1;
 	dir = 8;
 	name = "Common Channel";
 	pixel_x = -21