Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm

_maps/map_files/MetaStation/MetaStation.dmm

@@ -317,7 +317,7 @@
 	dir = 8;
 	icon_state = "diagonalWall3"
 	},
-/area/space)
+/area/security/prison)
 "aaV" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/pod_2)
@@ -327,7 +327,7 @@
 	dir = 1;
 	icon_state = "diagonalWall3"
 	},
-/area/space)
+/area/security/prison)
 "aaY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -22505,7 +22505,7 @@
 	req_access_txt = "10"
 	},
 /turf/open/floor/plating,
-/area/engine/engineering)
+/area/maintenance/starboard)
 "aVh" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -27482,7 +27482,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/janitor)
+/area/maintenance/central)
 "bfo" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -34724,7 +34724,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/engine/break_room)
+/area/maintenance/starboard)
 "btA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
@@ -36212,7 +36212,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/heads/captain/private)
+/area/maintenance/central)
 "bwH" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 4
@@ -45468,7 +45468,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/gateway)
+/area/maintenance/central)
 "bQy" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -46700,7 +46700,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/kitchen)
+/area/maintenance/starboard)
 "bTa" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -52046,7 +52046,7 @@
 	req_one_access_txt = "0"
 	},
 /turf/open/floor/plating,
-/area/hydroponics)
+/area/maintenance/starboard/aft)
 "cdV" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -55242,7 +55242,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/space,
-/area/space)
+/area/maintenance/disposal/incinerator)
 "ckD" = (
 /obj/machinery/doorButtons/access_button{
 	idDoor = "incinerator_airlock_exterior";
@@ -56225,7 +56225,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/science/research)
+/area/maintenance/starboard/aft)
 "cmN" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
@@ -58078,7 +58078,7 @@
 	req_access_txt = "40"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/heads/cmo)
+/area/maintenance/aft)
 "cqq" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -58752,7 +58752,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/medical/chemistry)
+/area/maintenance/aft)
 "crF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/item/device/radio/intercom{
@@ -59473,7 +59473,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/science/research)
+/area/maintenance/aft)
 "csV" = (
 /obj/structure/disposalpipe/junction{
 	dir = 8
@@ -59789,7 +59789,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/medical/genetics)
+/area/maintenance/aft)
 "ctD" = (
 /obj/structure/sign/directions/evac,
 /turf/closed/wall,
@@ -59848,7 +59848,7 @@
 	req_one_access_txt = "7;47;29"
 	},
 /turf/open/floor/plating,
-/area/science/misc_lab/range)
+/area/maintenance/aft)
 "ctN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/light{
@@ -60841,7 +60841,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/science/robotics/mechbay)
+/area/maintenance/aft)
 "cvJ" = (
 /obj/structure/sign/nosmoking_2{
 	pixel_x = -29
@@ -67721,7 +67721,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/science/lab)
+/area/maintenance/aft)
 "cJn" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -78755,7 +78755,7 @@
 	pixel_x = 32
 	},
 /turf/open/floor/plating,
-/area/science/research)
+/area/maintenance/starboard/aft)
 "diI" = (
 /obj/item/poster/random_contraband,
 /obj/item/poster/random_contraband,
@@ -79516,7 +79516,7 @@
 	req_access_txt = "12"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/locker)
+/area/maintenance/starboard/fore)
 "dtP" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -80743,6 +80743,20 @@
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/plating,
 /area/engine/atmos)
+"EDx" = (
+/turf/open/space,
+/turf/closed/wall/mineral/plastitanium{
+	dir = 8;
+	icon_state = "diagonalWall3"
+	},
+/area/hallway/secondary/entry)
+"EDy" = (
+/turf/open/space,
+/turf/closed/wall/mineral/plastitanium{
+	dir = 1;
+	icon_state = "diagonalWall3"
+	},
+/area/hallway/secondary/entry)
 
 (1,1,1) = {"
 aaa
@@ -89844,8 +89858,8 @@ aaa
 aaa
 aaa
 aaa
-aaU
-blx
+EDx
+aRA
 aRA
 aRA
 aRA
@@ -90872,13 +90886,8 @@ aaa
 aaa
 aaf
 aaa
-<<<<<<< HEAD
-aaX
-blx
-=======
-EDx
+EDy
 aRA
->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860)
 aRA
 aRA
 aRA
@@ -100955,7 +100964,7 @@ coE
 cpZ
 coB
 csp
-ctp
+csr
 duH
 dyg
 ceu
@@ -118598,7 +118607,7 @@ aaa
 aaa
 aaf
 aaa
-blx
+acP
 adl
 bih
 adl
@@ -118855,11 +118864,7 @@ aaa
 aaa
 aaf
 aaa
-<<<<<<< HEAD
-blx
-=======
-EDB
->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860)
+acP
 adl
 aQf
 adl