Merge pull request #641 from Citadel-Station-13/upstream-merge-26541

[MIRROR] Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -44697,9 +44697,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/turf/open/floor/plating{
-	icon_state = "plating_warn_side"
-	},
+/turf/open/floor/plating,
 /area/maintenance/starboard)
 "bGN" = (
 /obj/effect/decal/cleanable/dirt,

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -72622,11 +72622,11 @@ aHl
 aIi
 aJs
 aKz
-buW
+buX
 aMR
 buZ
-buZ
-buW
+bva
+bvb
 aQL
 aRI
 aSS
@@ -72883,7 +72883,7 @@ aLP
 aMS
 aMS
 aOC
-buW
+bvc
 aQM
 aRJ
 aST
@@ -73911,7 +73911,7 @@ aLT
 aMW
 aMW
 aOD
-buW
+bve
 aQQ
 aRN
 aSX
@@ -74164,11 +74164,11 @@ aHr
 aIo
 aJw
 aKE
-buW
+buY
 aMX
 aMX
 aMX
-buW
+bvf
 aQR
 aRO
 aSY

_maps/map_files/OmegaStation/OmegaStation.dmm.rej

@@ -0,0 +1,60 @@
+diff a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm	(rejected hunks)
+@@ -41755,58 +41743,6 @@
+ "bvf" = (
+ /turf/closed/wall/r_wall,
+ /area/engine/supermatter)
+-"bvg" = (
+-/obj/machinery/light{
+-	dir = 1
+-	},
+-/turf/open/floor/plasteel/neutral/side{
+-	dir = 1
+-	},
+-/area/shuttle/escape)
+-"bvh" = (
+-/obj/structure/chair{
+-	dir = 8
+-	},
+-/obj/effect/turf_decal/bot,
+-/obj/machinery/light/small{
+-	dir = 4
+-	},
+-/turf/open/floor/plasteel,
+-/area/shuttle/escape)
+-"bvi" = (
+-/obj/structure/chair{
+-	dir = 4
+-	},
+-/obj/effect/turf_decal/bot,
+-/obj/machinery/light/small{
+-	dir = 8
+-	},
+-/turf/open/floor/plasteel,
+-/area/shuttle/escape)
+-"bvj" = (
+-/obj/structure/chair{
+-	dir = 8
+-	},
+-/obj/effect/turf_decal/bot,
+-/obj/machinery/light/small{
+-	dir = 4
+-	},
+-/turf/open/floor/plasteel,
+-/area/shuttle/escape)
+-"bvk" = (
+-/obj/structure/chair{
+-	dir = 4
+-	},
+-/obj/effect/turf_decal/bot,
+-/obj/machinery/light/small{
+-	dir = 8
+-	},
+-/turf/open/floor/plasteel,
+-/area/shuttle/escape)
+-"bvl" = (
+-/obj/machinery/light,
+-/turf/open/floor/plasteel/neutral/side,
+-/area/shuttle/escape)
+ 
+ (1,1,1) = {"
+ aaa

_maps/map_files/generic/Centcomm.dmm

@@ -14883,6 +14883,20 @@
 /obj/machinery/computer/emergency_shuttle,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
+"Me" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"Mf" = (
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -64444,7 +64458,7 @@ Fa
 Fh
 Fh
 Fh
-Fh
+Me
 Fh
 Fh
 Fa
@@ -65729,7 +65743,7 @@ Fa
 Md
 Fp
 FC
-Fh
+Mf
 Fh
 Fh
 Fa