Refactor telecomms and consoles to operate on logical zlevels

This commit is contained in:
Atermonera
2020-04-28 14:55:04 -07:00
committed by VirgoBot
parent c66c3cec86
commit eb6eb7bcd6
13 changed files with 736 additions and 1 deletions

View File

@@ -111,7 +111,11 @@
var/z = get_z(nano_host())
for(var/datum/alarm_handler/AH in alarm_handlers)
categories[++categories.len] = list("category" = AH.category, "alarms" = list())
<<<<<<< HEAD
for(var/datum/alarm/A in AH.visible_alarms(z))
=======
for(var/datum/alarm/A in AH.major_alarms(z))
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
var/cameras[0]
var/lost_sources[0]

View File

@@ -44,9 +44,13 @@
if(!data["map_levels"].len)
to_chat(user, "<span class='warning'>The crew monitor doesn't seem like it'll work here.</span>")
<<<<<<< HEAD
if(program)
program.kill_program()
else if(ui)
=======
if(ui)
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
ui.close()
return