From cb0e8ce9983dbf2059a8b25e27f0dbdb57288b6b Mon Sep 17 00:00:00 2001
From: Lularian <aesopfan@gmail.com>
Date: Sun, 7 Aug 2016 00:56:08 -0500
Subject: [PATCH] my god

---
 _maps/map_files/MiniStation/MiniStation.dmm | 34 ++++++++++++++-------
 _maps/map_files/MiniStation/telecomms.dm    | 18 -----------
 _maps/ministation.dm                        |  1 -
 3 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 _maps/map_files/MiniStation/telecomms.dm

diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm
index e9add6ca877..206757c0d8c 100644
--- a/_maps/map_files/MiniStation/MiniStation.dmm
+++ b/_maps/map_files/MiniStation/MiniStation.dmm
@@ -8201,6 +8201,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/telecomms/server/presets/common/birdstation,
 /turf/open/floor/plasteel/black{
 	name = "Mainframe Floor";
 	initial_gas_mix = "n2=100;TEMP=80"
@@ -14358,7 +14359,7 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/syndicate)
 "GP" = (
-/obj/machinery/telecomms/processor/preset_one,
+/obj/machinery/telecomms/processor/preset_one/birdstation,
 /turf/open/floor/plasteel/black{
 	name = "Mainframe Floor";
 	initial_gas_mix = "n2=100;TEMP=80"
@@ -14577,8 +14578,12 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "Ht" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/escape)
+/obj/machinery/telecomms/broadcaster/preset_left/birdstation,
+/turf/open/floor/plasteel/black{
+	name = "Mainframe Floor";
+	initial_gas_mix = "n2=100;TEMP=80"
+	},
+/area/tcommsat/computer)
 "Hu" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/mineral/titanium,
@@ -14681,9 +14686,12 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "HJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/shuttle/escape)
+/obj/machinery/telecomms/bus/preset_one/birdstation,
+/turf/open/floor/plasteel/black{
+	name = "Mainframe Floor";
+	initial_gas_mix = "n2=100;TEMP=80"
+	},
+/area/tcommsat/computer)
 "HK" = (
 /obj/machinery/door/airlock/glass_medical{
 	id_tag = null;
@@ -14924,8 +14932,12 @@
 /turf/open/floor/plating,
 /area/shuttle/transport)
 "Iw" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/transport)
+/obj/machinery/telecomms/receiver/preset_left/birdstation,
+/turf/open/floor/plasteel/black{
+	name = "Mainframe Floor";
+	initial_gas_mix = "n2=100;TEMP=80"
+	},
+/area/tcommsat/computer)
 "Ix" = (
 /turf/open/floor/mineral/titanium/blue,
 /turf/closed/wall/mineral/titanium/interior,
@@ -59249,11 +59261,11 @@ Eg
 Ea
 Eh
 Ew
-EV
+Ht
 Fk
 Fy
 FN
-EV
+Iw
 Gr
 Eh
 Ea
@@ -60020,7 +60032,7 @@ Eh
 Eu
 Eh
 Ew
-EV
+HJ
 EV
 EV
 EV
diff --git a/_maps/map_files/MiniStation/telecomms.dm b/_maps/map_files/MiniStation/telecomms.dm
deleted file mode 100644
index a69320ae98a..00000000000
--- a/_maps/map_files/MiniStation/telecomms.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/obj/machinery/telecomms/receiver/preset_left/ministation
-	name = "Receiver"
-	freq_listening = list()
-
-/obj/machinery/telecomms/bus/preset_one/ministation
-	name = "Bus"
-	autolinkers = list("processor1", "common")
-	freq_listening = list()
-
-/obj/machinery/telecomms/processor/preset_one/ministation
-	name = "Processor"
-
-/obj/machinery/telecomms/server/presets/common/ministation/New()
-	..()
-	freq_listening = list()
-
-/obj/machinery/telecomms/broadcaster/preset_left/ministation
-	name = "Broadcaster"
diff --git a/_maps/ministation.dm b/_maps/ministation.dm
index 268439050ad..efe6a8b067f 100644
--- a/_maps/ministation.dm
+++ b/_maps/ministation.dm
@@ -74,7 +74,6 @@ Changes to the uplinks were made to discourage murderboning, the rest is the sam
 				#define MAP_OVERRIDE_FILES
 				#include "map_files\MiniStation\misc.dm"
 		        #include "map_files\MiniStation\cargopacks.dm"
-		        #include "map_files\MiniStation\telecomms.dm"
 		        #include "map_files\MiniStation\uplink_item.dm"
 		        #include "map_files\MiniStation\job\jobs.dm"
 		        #include "map_files\MiniStation\job\removed.dm"