Kills off (hopefully) the last hardcoded zlevel ID (#13669)

* Kills off (hopefully) the last hardcoded zlevel ID

* Also removes duplicate blackboxes
This commit is contained in:
AffectedArc07
2020-06-23 09:49:09 -06:00
committed by GitHub
parent d84e10aac4
commit 747b183207
3 changed files with 11 additions and 13 deletions
@@ -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
+1 -7
View File
@@ -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
+9 -1
View File
@@ -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)