diff --git a/_maps/RandomZLevels/away_mission/TheBeach.dmm b/_maps/RandomZLevels/away_mission/TheBeach.dmm
index 80a649bcc8..2c65f2dd8a 100644
--- a/_maps/RandomZLevels/away_mission/TheBeach.dmm
+++ b/_maps/RandomZLevels/away_mission/TheBeach.dmm
@@ -272,7 +272,7 @@
 /obj/structure/mirror{
 	pixel_y = 28
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/wood_diagonal,
 /area/awaymission/beach)
 "bd" = (
 /turf/open/floor/wood,
@@ -312,7 +312,7 @@
 	pixel_x = 24;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/wood_diagonal,
 /area/awaymission/beach)
 "bj" = (
 /obj/machinery/button/door{
@@ -322,7 +322,7 @@
 	pixel_x = -24;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/wood_diagonal,
 /area/awaymission/beach)
 "bk" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
@@ -392,14 +392,14 @@
 	id_tag = "changlinhut2";
 	name = "changing room"
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/wood_diagonal,
 /area/awaymission/beach)
 "bt" = (
 /obj/machinery/door/airlock/sandstone{
 	id_tag = "changlinhut1";
 	name = "changing room"
 	},
-/turf/open/floor/wood,
+/turf/open/floor/wood/wood_diagonal,
 /area/awaymission/beach)
 "bu" = (
 /obj/item/reagent_containers/food/drinks/bottle/wine,
@@ -477,9 +477,9 @@
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "bF" = (
-/obj/structure/bedsheetbin,
 /obj/effect/turf_decal/sand,
 /obj/structure/table/wood,
+/obj/structure/bedsheetbin/towel,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "bG" = (
@@ -773,7 +773,7 @@
 /area/awaymission/beach)
 "cv" = (
 /obj/effect/turf_decal/stripes/white/corner{
-	dir = 4
+	dir = 1
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
@@ -1001,6 +1001,16 @@
 /obj/item/clothing/glasses/heat,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
+"iv" = (
+/obj/structure/dresser{
+	density = 0;
+	pixel_y = 18
+	},
+/turf/open/floor/wood/wood_diagonal,
+/area/awaymission/beach)
+"kr" = (
+/turf/open/floor/wood/wood_diagonal,
+/area/awaymission/beach)
 "np" = (
 /obj/machinery/shower{
 	dir = 8
@@ -7586,8 +7596,8 @@ ak
 ak
 ak
 aX
-bb
-bd
+iv
+kr
 aX
 ak
 ba
@@ -8442,7 +8452,7 @@ aJ
 aE
 ak
 aX
-bb
+iv
 bj
 bt
 ba
@@ -8550,7 +8560,7 @@ ak
 aS
 aX
 bc
-bd
+kr
 aX
 ak
 ba
@@ -9090,7 +9100,7 @@ ak
 ak
 ba
 ba
-ak
+bF
 ak
 ak
 ak
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 83a42bbf58..6922ad9244 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2055,12 +2055,12 @@
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAP)
 "afd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "afe" = (
@@ -2076,6 +2076,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "aff" = (
@@ -2091,6 +2094,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "afg" = (
@@ -2108,14 +2114,18 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
 "afh" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
@@ -2127,24 +2137,21 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAS)
 "afj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAS)
 "afk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -2155,15 +2162,21 @@
 	c_tag = "MiniSat Maintenance Starboard Aft";
 	network = list("minisat")
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAS)
 "afl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/AIsatextAS)
 "afm" = (
@@ -8592,7 +8605,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
+/area/command/bridge)
 "atN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -9642,7 +9655,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
+/area/command/bridge)
 "avR" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -9748,7 +9761,7 @@
 	req_access_txt = "10;13"
 	},
 /turf/open/floor/plating,
-/area/ai_monitored/turret_protected/aisat_interior)
+/area/command/bridge)
 "awd" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -10369,7 +10382,7 @@
 	},
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/hallway/primary/fore)
+/area/security/brig)
 "axF" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-10"
@@ -10572,7 +10585,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
+/area/command/bridge)
 "ayf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -22904,7 +22917,7 @@
 	req_access_txt = "10;13"
 	},
 /turf/open/floor/plating,
-/area/ai_monitored/turret_protected/aisat_interior)
+/area/command/bridge)
 "baI" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -41311,7 +41324,7 @@
 	req_access_txt = "23"
 	},
 /turf/open/floor/plating,
-/area/engineering/storage/tech)
+/area/maintenance/department/engine)
 "bPG" = (
 /obj/machinery/light{
 	dir = 8
@@ -54552,6 +54565,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
+"geL" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/ai_monitored/turret_protected/AIsatextAS)
 "geN" = (
 /obj/machinery/igniter{
 	id = "xenoigniter";
@@ -58628,7 +58647,6 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 2;
 	name = "Waste to Space"
 	},
 /turf/open/floor/plasteel/dark,
@@ -58841,7 +58859,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/science/explab)
+/area/maintenance/department/cargo)
 "peE" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -60699,7 +60717,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/science/explab)
+/area/maintenance/department/cargo)
 "tix" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -97182,7 +97200,7 @@ aek
 aek
 aek
 aeA
-adF
+geL
 afk
 ael
 afS