From 747b183207283e7161e416d9bc7acea95aa1bbac Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Tue, 23 Jun 2020 16:49:09 +0100
Subject: [PATCH] Kills off (hopefully) the last hardcoded zlevel ID (#13669)

* Kills off (hopefully) the last hardcoded zlevel ID

* Also removes duplicate blackboxes
---
 _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm |  6 +-----
 _maps/map_files/cyberiad/z2.dmm                        |  8 +-------
 code/modules/research/message_server.dm                | 10 +++++++++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index 392592e56a5..8bb87d2026e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -591,10 +591,6 @@
 	},
 /turf/simulated/floor/light,
 /area/ruin/unpowered)
-"bq" = (
-/obj/machinery/blackbox_recorder,
-/turf/simulated/floor/plasteel,
-/area/ruin/unpowered)
 "br" = (
 /obj/structure/cable{
 	icon_state = "0-4";
@@ -2575,8 +2571,8 @@ ac
 bg
 bj
 ac
-bq
 bx
+ar
 bG
 bO
 bU
diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 7abe416f576..a6d9fd22a18 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -8419,12 +8419,6 @@
 	icon_state = "gcircuit"
 	},
 /area/centcom/control)
-"ux" = (
-/obj/machinery/blackbox_recorder,
-/turf/unsimulated/floor{
-	icon_state = "gcircuit"
-	},
-/area/centcom/control)
 "uy" = (
 /obj/machinery/computer/card/centcom,
 /turf/unsimulated/floor{
@@ -37334,7 +37328,7 @@ nD
 tR
 ud
 su
-ux
+uv
 tR
 tR
 tR
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 22b18534dbc..df3a7945e92 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -228,7 +228,15 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
 	GLOB.blackbox = src
 
 /obj/machinery/blackbox_recorder/Destroy()
-	var/turf/T = locate(1,1,2)
+	// If the blackbox on station is destroyed, it is moved to the admin level
+	// It is very clear that the person who made this doesnt know what a datum is
+	// and thinks that an object which is vital for backend logging of when rounds end and begin
+	// should not only be destroyable, but also an on-station. Whoever designed this needs to be educated
+	// Thank you for coming to my ted talk, -aa
+
+	// Hardcoded Zlevel numbers are bad, so we use the level name to grab the admin Z level
+	var/admin_zlevel = level_name_to_num(CENTCOMM)
+	var/turf/T = locate(1, 1, admin_zlevel)
 	if(T)
 		GLOB.blackbox = null
 		var/obj/machinery/blackbox_recorder/BR = new/obj/machinery/blackbox_recorder(T)