Some map fixes (#25082)

* Some map fixes

* @Tofa1 here is a step-by-step guide to fixing map conflicts without blowing up other people's changes
step one; copy your changes off into a dmm
step two; update the map to 'theirs'
step three; prepare maps
step four; copy your changes in
step five; mapmerge and you're done

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -214,6 +214,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_1)
 "aaA" = (
@@ -234,6 +237,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_2)
 "aaB" = (
@@ -266,6 +272,9 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_1)
 "aaF" = (
@@ -284,6 +293,9 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_2)
 "aaG" = (
@@ -27232,7 +27244,7 @@
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
-/turf/open/space,
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_3)
 "aXH" = (
 /obj/structure/chair{
@@ -27249,6 +27261,9 @@
 	dir = 2
 	},
 /obj/machinery/light/small,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_3)
 "aXI" = (
@@ -27269,6 +27284,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/pod_3)
 "aXJ" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -12582,6 +12582,7 @@
 	pixel_y = -26;
 	req_access_txt = "1"
 	},
+/obj/machinery/light,
 /turf/open/floor/mineral/plastitanium/brig,
 /area/shuttle/labor)
 "avW" = (
@@ -87841,6 +87842,10 @@
 	pixel_x = 24;
 	pixel_y = -8
 	},
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/supply)
 "cUZ" = (
@@ -90673,6 +90678,7 @@
 	},
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/turf_decal/bot,
+/obj/machinery/light/small,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dax" = (
@@ -95582,6 +95588,55 @@
 	},
 /turf/open/floor/mineral/plastitanium/brig,
 /area/shuttle/escape)
+"dlA" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/labor)
+"dlB" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"dlC" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"dlD" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"dlE" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"dlF" = (
+/obj/machinery/light/small,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"dlG" = (
+/obj/machinery/light,
+/turf/open/floor/pod/light,
+/area/shuttle/transport)
+"dlH" = (
+/obj/machinery/sleeper{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aaa
@@ -100486,16 +100541,16 @@ aaa
 aae
 cTV
 dkp
-dks
-dkw
+dkp
+dkp
 dky
 aae
-cTZ
+dkx
 cTJ
-dhm
-dhm
+dkf
+dkf
 cUy
-dhm
+dkf
 dbx
 cUK
 cUO
@@ -100741,11 +100796,11 @@ aaa
 aaa
 aaa
 aae
-dkl
-dkq
-dhm
-dhm
-dhm
+dkf
+dkf
+dkf
+dkf
+dkf
 dkE
 cUk
 cTJ
@@ -100998,16 +101053,16 @@ cTM
 aaa
 aaa
 aae
-dkm
-dhm
-dhm
-dhm
-dhm
+dkf
+dkf
+dkf
+dkf
+dkf
 aae
 cUc
 cTJ
 dkM
-dkX
+dku
 cUA
 aae
 aae
@@ -101263,8 +101318,8 @@ dkz
 aae
 cUl
 cTJ
-dkN
-dkY
+dkM
+dku
 cUE
 aae
 aaa
@@ -101769,16 +101824,16 @@ dke
 cTP
 dkg
 dki
-dkn
-dkr
+dkg
+dkg
 cUg
-dhm
-dhm
-dhm
-dhm
+dkf
+dkf
+dkf
+dkf
 dkI
-dkO
-dkZ
+dkM
+dku
 cTJ
 cUg
 cUK
@@ -102024,18 +102079,18 @@ bPB
 cTJ
 cTN
 dkf
-dkh
-dkj
-dko
-dhm
+dka
+dka
+dka
+dkf
 cTU
-dhm
-dkA
-dkF
-dkH
-dkJ
-dkP
-dla
+dkf
+dka
+dka
+dka
+dka
+dkM
+dku
 cTJ
 cUJ
 cUK
@@ -102277,7 +102332,7 @@ aaa
 aaa
 aPc
 cTG
-dkb
+dka
 cTJ
 aae
 cTQ
@@ -102286,13 +102341,13 @@ dkk
 cTS
 cTS
 cUg
-dhm
-dhm
-dhm
-dhm
+dkf
+dkf
+dkf
+dkf
 dkK
-dkQ
-dlb
+dkM
+dku
 cTJ
 cUg
 cUK
@@ -102800,13 +102855,13 @@ aaa
 aaa
 aae
 dkt
-dhm
+dkf
 dkB
 aae
 cUo
 cTJ
-dkR
-dlc
+dkM
+dku
 cUD
 aae
 aaa
@@ -103057,13 +103112,13 @@ aaa
 aaa
 cTl
 dku
-dhm
-dkC
+dkf
+dkB
 aae
 cUn
 cTJ
-dkS
-dld
+dkM
+dku
 cUC
 aae
 aae
@@ -103314,15 +103369,15 @@ aaa
 aaa
 cTv
 dkv
-dhm
+dkf
 dkD
-dkG
+dke
 cUq
 cTJ
 dkT
 dle
 cUB
-dhm
+dkf
 abd
 cUK
 cUP
@@ -103576,10 +103631,10 @@ aae
 aae
 cUp
 cTJ
-dhm
-dhm
+dkf
+dkf
 dlf
-dhm
+dkf
 dbA
 cUK
 cUO
@@ -103836,7 +103891,7 @@ cTJ
 dkU
 cUj
 dlg
-dlh
+dkK
 abd
 cUK
 cUQ
@@ -105222,7 +105277,7 @@ aWU
 aRA
 aaa
 cVn
-cVv
+dlF
 cVn
 aaa
 aRA
@@ -106249,7 +106304,7 @@ aVu
 bxu
 aRA
 cVn
-cVv
+dlE
 cVv
 cVv
 cVn
@@ -106765,7 +106820,7 @@ aWS
 cVn
 cVv
 cVv
-cVv
+dlG
 cVn
 aWS
 bKU
@@ -110326,7 +110381,7 @@ aaa
 awN
 ayg
 azh
-azh
+dlB
 azi
 aDe
 awN
@@ -110336,7 +110391,7 @@ cUV
 cUV
 cUV
 cUV
-cUV
+dlD
 cUV
 cUV
 cUV
@@ -110846,7 +110901,7 @@ aDg
 awN
 aaa
 cUS
-cUV
+dlC
 cUV
 cUV
 cUV
@@ -118805,7 +118860,7 @@ atJ
 auS
 avV
 auQ
-ayt
+dlA
 ayt
 ayt
 aCi
@@ -119939,7 +119994,7 @@ dlr
 cYO
 cYO
 cYO
-dlu
+dlr
 cZK
 cZe
 cZD
@@ -121998,7 +122053,7 @@ cZi
 cYO
 cZo
 cYF
-cZN
+dlH
 cZN
 cYO
 cZs

_maps/map_files/generic/Centcomm.dmm

@@ -8039,7 +8039,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/centcom/control)
+/area/centcom/evac)
 "tI" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
@@ -14252,7 +14252,7 @@
 	dir = 1
 	},
 /turf/open/floor/grass,
-/area/centcom/control)
+/area/centcom/evac)
 "Kr" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/sparsegrass,
@@ -14275,7 +14275,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid,
-/area/centcom/control)
+/area/centcom/evac)
 "Kt" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -14394,7 +14394,7 @@
 /obj/structure/flora/ausbushes/palebush,
 /obj/machinery/light,
 /turf/open/floor/plating/asteroid,
-/area/centcom/control)
+/area/centcom/evac)
 "KH" = (
 /obj/effect/light_emitter{
 	set_cap = 1;
@@ -14562,7 +14562,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/centcom/control)
+/area/centcom/evac)
 "Ld" = (
 /obj/machinery/light{
 	dir = 1
@@ -14848,7 +14848,7 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/open/floor/grass,
-/area/space)
+/area/centcom/evac)
 "LL" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -14857,17 +14857,17 @@
 	dir = 1
 	},
 /turf/open/floor/grass,
-/area/space)
+/area/centcom/evac)
 "LM" = (
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/open/floor/grass,
-/area/space)
+/area/centcom/evac)
 "LN" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/open/floor/grass,
-/area/centcom/control)
+/area/centcom/evac)
 "LO" = (
 /obj/structure/fluff/arc,
 /turf/open/floor/grass,
@@ -14876,7 +14876,7 @@
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass,
-/area/centcom/control)
+/area/centcom/evac)
 "LQ" = (
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -14922,6 +14922,48 @@
 	dir = 8
 	},
 /area/centcom/evac)
+"LX" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/palebush,
+/turf/open/floor/plating/asteroid,
+/area/centcom/evac)
+"LY" = (
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/centcom/evac)
+"LZ" = (
+/obj/machinery/ai_status_display,
+/turf/closed/indestructible/riveted,
+/area/centcom/evac)
+"Ma" = (
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/centcom/evac)
+"Mb" = (
+/obj/machinery/door/airlock/centcom{
+	name = "Centcom Security";
+	opacity = 1;
+	req_access_txt = "101"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/centcom/evac)
+"Mc" = (
+/turf/closed/indestructible/fakedoor{
+	name = "Centcom"
+	},
+/area/centcom/evac)
 
 (1,1,1) = {"
 aa
@@ -62633,12 +62675,12 @@ kq
 iH
 ox
 it
-it
-it
-it
-lB
-iu
-it
+qk
+qk
+qk
+qQ
+LZ
+qk
 it
 ir
 jc
@@ -62890,28 +62932,28 @@ ks
 ks
 oy
 is
-it
-pe
-iz
-qP
-iz
+qk
+LX
+ql
+LY
+ql
 KG
-it
+qk
 tH
 tH
 tH
 tH
 tH
-it
+qk
 Ks
-iz
-qP
-kT
-iH
+ql
+Ma
+Mb
+yS
 Lc
-jB
-iH
-kM
+yC
+yS
+Mc
 aa
 aa
 aa
@@ -63147,8 +63189,8 @@ ks
 ks
 LJ
 it
-it
-it
+qk
+qk
 qk
 qQ
 qk
@@ -63404,8 +63446,8 @@ ks
 ks
 oy
 it
-lW
-pw
+xX
+xW
 qk
 qR
 rT
@@ -63661,8 +63703,8 @@ iH
 iH
 kk
 it
-pw
-lW
+xW
+xX
 qk
 qS
 rU
@@ -63919,7 +63961,7 @@ jc
 is
 it
 Kq
-lW
+xX
 ql
 qU
 rU
@@ -64175,8 +64217,8 @@ iH
 iH
 ly
 it
-lW
-pw
+xX
+xW
 qm
 qT
 rU
@@ -64432,8 +64474,8 @@ kr
 kr
 kq
 it
-lW
-pw
+xX
+xW
 qk
 qT
 rU
@@ -64688,9 +64730,9 @@ nB
 mw
 ks
 oA
-ab
 it
-iz
+qk
+ql
 qk
 KD
 rU
@@ -65204,7 +65246,7 @@ ks
 oC
 it
 LL
-LO
+LF
 LH
 qS
 rU
@@ -65717,8 +65759,8 @@ ks
 ks
 oE
 it
-it
-iz
+qk
+ql
 qk
 KD
 rU
@@ -65974,8 +66016,8 @@ mw
 ks
 oF
 is
-pw
-lW
+xW
+xX
 qk
 qT
 rU
@@ -65993,9 +66035,9 @@ xq
 qk
 ql
 qk
-ab
-ab
-ab
+qk
+qk
+qk
 aa
 aa
 aa
@@ -66231,8 +66273,8 @@ mw
 ks
 oC
 it
-lW
-pw
+xX
+xW
 qm
 qT
 rU
@@ -66489,7 +66531,7 @@ ks
 oB
 it
 Kq
-lW
+xX
 ql
 qX
 rU
@@ -66745,8 +66787,8 @@ mw
 ks
 kd
 it
-pw
-lW
+xW
+xX
 qk
 qS
 rU
@@ -67002,8 +67044,8 @@ kr
 kr
 oG
 it
-pw
-lW
+xW
+xX
 qk
 qZ
 rV
@@ -67259,8 +67301,8 @@ nT
 ok
 kh
 it
-it
-it
+qk
+qk
 qk
 LS
 HV
@@ -67516,8 +67558,8 @@ it
 it
 it
 it
-it
-it
+qk
+qk
 qk
 ra
 ra