From d9b341f2ac9a4d0c5d61d045206f4aff00ac0b6c Mon Sep 17 00:00:00 2001
From: Mr Potato Shaman <Penguaro@users.noreply.github.com>
Date: Fri, 24 Mar 2017 09:28:39 -0500
Subject: [PATCH] Modular Computer Tweak for #22637 (#25374)

---
 .../map_files/Deltastation/DeltaStation2.dmm  | 23 ++++++++++++----
 _maps/map_files/MetaStation/MetaStation.dmm   |  4 +--
 _maps/map_files/OmegaStation/OmegaStation.dmm | 26 ++++++++++++++-----
 _maps/map_files/PubbyStation/PubbyStation.dmm |  4 +--
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index e57de83bd57..e05b93216be 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -38444,10 +38444,13 @@
 /turf/closed/wall/r_wall,
 /area/engine/break_room)
 "bvt" = (
-/obj/machinery/computer/atmos_control,
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
+/obj/structure/cable/white{
+	icon_state = "0-4"
+	},
+/obj/machinery/modular_computer/console/preset/engineering,
 /turf/open/floor/plasteel/caution{
 	dir = 8
 	},
@@ -38467,6 +38470,9 @@
 	name = "Atmospheric Technician"
 	},
 /obj/effect/turf_decal/bot,
+/obj/structure/cable/white{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel,
 /area/atmos)
 "bvw" = (
@@ -57271,9 +57277,6 @@
 /turf/open/floor/plating,
 /area/engine/engineering)
 "cde" = (
-/obj/machinery/computer/monitor{
-	name = "Engineering Power Monitoring Console"
-	},
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = -24;
@@ -57290,6 +57293,7 @@
 	dir = 1;
 	name = "engineering camera"
 	},
+/obj/machinery/modular_computer/console/preset/engineering,
 /turf/open/floor/plasteel/vault,
 /area/engine/engineering)
 "cdf" = (
@@ -112887,6 +112891,15 @@
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
+"ehz" = (
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/atmos)
 
 (1,1,1) = {"
 aaa
@@ -139730,7 +139743,7 @@ bqf
 brq
 bsD
 aZq
-bvu
+ehz
 bvu
 byX
 aIZ
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d28d8ef2dac..c26ba78c62c 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -23791,9 +23791,6 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/computer/monitor{
-	name = "Engineering Power Monitoring Console"
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -23805,6 +23802,7 @@
 	dir = 2;
 	network = list("SS13")
 	},
+/obj/machinery/modular_computer/console/preset/engineering,
 /turf/open/floor/plasteel/vault,
 /area/engine/engineering)
 "aPX" = (
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 5a1b933d94c..acc7e47806a 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -776,9 +776,10 @@
 	tag = "icon-0-2";
 	icon_state = "0-2"
 	},
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/turf/open/floor/plating,
+/obj/machinery/modular_computer/console/preset/command,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
 /area/bridge)
 "abo" = (
 /turf/open/floor/plasteel/vault{
@@ -21889,12 +21890,12 @@
 	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/bot,
+/obj/structure/cable/white{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "aIx" = (
-/obj/machinery/computer/monitor{
-	name = "Engineering Power Monitoring Console"
-	},
 /obj/machinery/light_switch{
 	pixel_x = 38;
 	pixel_y = 24
@@ -21907,6 +21908,7 @@
 	req_access_txt = "10"
 	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/modular_computer/console/preset/engineering,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "aIy" = (
@@ -41983,6 +41985,16 @@
 	},
 /turf/open/floor/circuit/green,
 /area/engine/engineering)
+"buW" = (
+/obj/structure/cable/white{
+	tag = "icon-0-2";
+	icon_state = "0-2"
+	},
+/obj/machinery/modular_computer/console/preset/research,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/bridge)
 
 (1,1,1) = {"
 aaa
@@ -84210,7 +84222,7 @@ aav
 aaH
 aaQ
 abb
-abn
+buW
 abF
 ack
 adc
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 13827c71fde..94b70c5c371 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -45713,13 +45713,11 @@
 	},
 /area/engine/engineering)
 "bME" = (
-/obj/machinery/computer/monitor{
-	name = "Engineering Power Monitoring Console"
-	},
 /obj/structure/cable{
 	icon_state = "0-2";
 	d2 = 2
 	},
+/obj/machinery/modular_computer/console/preset/engineering,
 /turf/open/floor/plasteel/yellow/side{
 	dir = 1
 	},