From 94bd7308aee6d3c0e9e669b7e48d0262c842ae25 Mon Sep 17 00:00:00 2001
From: bunny232 <bunnyracer23@yahoo.com>
Date: Fri, 14 May 2021 17:38:55 -0400
Subject: [PATCH] Update DeltaStation2.dmm

---
 .../map_files/Deltastation/DeltaStation2.dmm  | 108 ++++++------------
 1 file changed, 33 insertions(+), 75 deletions(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 39688c1db8..71cbc4cf98 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -72141,24 +72141,6 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
-"exg" = (
-/obj/structure/chair/office/light{
-	dir = 8
-	},
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel{
-	heat_capacity = 1e+006
-	},
-/area/command/heads_quarters/ce)
 "exo" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -79857,20 +79839,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
-"hkJ" = (
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel{
-	heat_capacity = 1e+006
-	},
-/area/command/heads_quarters/ce)
 "hkK" = (
 /obj/structure/table/reinforced,
 /obj/item/electronics/firelock,
@@ -87017,24 +86985,10 @@
 /turf/closed/wall/r_wall,
 /area/security/office)
 "jxc" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
-	desc = "It looks really dirty.";
-	name = "maintenance microwave";
-	pixel_y = 5
-	},
-/obj/structure/sign/poster/official/help_others{
-	pixel_x = -32
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
+/obj/machinery/power/apc{
+	areastring = "/area/command/heads_quarters/ce";
+	name = "Chief Engineer's APC";
+	pixel_y = -26
 	},
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
@@ -91661,6 +91615,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/cable/white{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "laA" = (
@@ -92991,9 +92948,6 @@
 /area/engineering/break_room)
 "lCx" = (
 /obj/structure/table/reinforced,
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
 /obj/item/clipboard,
 /obj/item/toy/figure/ce,
 /obj/effect/turf_decal/tile/neutral{
@@ -93526,9 +93480,6 @@
 /area/service/abandoned_gambling_den)
 "lLv" = (
 /obj/structure/table/reinforced,
-/obj/structure/cable/white{
-	icon_state = "2-4"
-	},
 /obj/item/folder/blue{
 	pixel_x = 3;
 	pixel_y = 3
@@ -109352,12 +109303,6 @@
 /turf/open/floor/plasteel,
 /area/service/hydroponics)
 "rts" = (
-/obj/structure/cable/white,
-/obj/machinery/power/apc{
-	areastring = "/area/command/heads_quarters/ce";
-	name = "Chief Engineer's APC";
-	pixel_y = -26
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -109368,6 +109313,11 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/firealarm{
+	dir = 0;
+	pixel_x = 0;
+	pixel_y = -26
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "rtx" = (
@@ -110258,6 +110208,11 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/power/apc{
+	areastring = "/area/command/heads_quarters/ce";
+	name = "Chief Engineer's APC";
+	pixel_y = -26
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "rJr" = (
@@ -111856,6 +111811,15 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/power/apc{
+	areastring = "/area/command/heads_quarters/ce";
+	dir = 1;
+	name = "Chief Engineer's APC";
+	pixel_y = 23
+	},
+/obj/structure/cable/white{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "sjL" = (
@@ -117812,9 +117776,6 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/structure/cable/white{
-	icon_state = "1-8"
-	},
 /obj/machinery/light{
 	dir = 4
 	},
@@ -117829,6 +117790,10 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "uiv" = (
@@ -121250,9 +121215,6 @@
 /area/service/chapel/office)
 "vBq" = (
 /obj/structure/table/reinforced,
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
 /obj/item/cartridge/engineering{
 	pixel_x = 6
 	},
@@ -124083,10 +124045,6 @@
 /obj/item/cartridge/atmos,
 /obj/item/cartridge/atmos,
 /obj/item/cartridge/atmos,
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
 /obj/item/stamp/ce,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -151717,7 +151675,7 @@ xKr
 lLv
 lCx
 vBq
-hkJ
+ikP
 rts
 qjg
 ine
@@ -151971,7 +151929,7 @@ kkO
 nZq
 jpC
 ivQ
-exg
+tbI
 tbI
 ilG
 hbc
@@ -152485,7 +152443,7 @@ kkO
 jKf
 prr
 qPW
-xSN
+kkO
 sSa
 jry
 pTd