fix telecom filtering additions and nanomap autoscaling (#15899)

* fix telecom filtering additions and nanomap autoscaling

* .

* fix flowrate on omniMixer

* fix omni filter
This commit is contained in:
Kashargul
2024-04-07 10:33:26 +10:00
committed by GitHub
parent 93a6c722b8
commit ce7a2da466
11 changed files with 39 additions and 27 deletions
+4 -3
View File
@@ -51,7 +51,7 @@
. = ..()
var/z = get_z(user)
var/list/map_levels = using_map.get_map_levels(z)
var/list/map_levels = using_map.get_map_levels(z)
// TODO: Move these to a cache, similar to cameras
var/alarms[0]
@@ -68,12 +68,13 @@
"y" = alarm.y,
"z" = alarm.z)
.["alarms"] = alarms
.["zoomScale"] = world.maxx + world.maxy
/datum/tgui_module/atmos_control/tgui_data(mob/user)
var/list/data = list()
var/z = get_z(user)
var/list/map_levels = using_map.get_map_levels(z)
var/list/map_levels = using_map.get_map_levels(z)
data["map_levels"] = map_levels
return data
@@ -112,4 +113,4 @@
/datum/tgui_module/atmos_control/robot
/datum/tgui_module/atmos_control/robot/tgui_state(mob/user)
return GLOB.tgui_self_state
return GLOB.tgui_self_state
+6 -3
View File
@@ -10,7 +10,7 @@
/datum/tgui_module/crew_monitor/tgui_act(action, params, datum/tgui/ui)
if(..())
return TRUE
if(action && !issilicon(usr))
playsound(tgui_host(), "terminal_type", 50, 1)
@@ -34,7 +34,7 @@
/datum/tgui_module/crew_monitor/tgui_interact(mob/user, datum/tgui/ui = null)
var/z = get_z(user)
var/list/map_levels = using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE)
if(!map_levels.len)
to_chat(user, "<span class='warning'>The crew monitor doesn't seem like it'll work here.</span>")
if(ui)
@@ -47,6 +47,9 @@
ui.autoupdate = TRUE
ui.open()
/datum/tgui_module/crew_monitor/tgui_static_data(mob/user)
. = ..()
.["zoomScale"] = world.maxx + world.maxy
/datum/tgui_module/crew_monitor/tgui_data(mob/user)
var/data[0]
@@ -64,7 +67,7 @@
// This is apparently necessary, because the above loop produces an emergent behavior
// of telling you what coordinates someone is at even without sensors on,
// because it strictly sorts by zlevel from bottom to top, and by coordinates from top left to bottom right.
shuffle_inplace(crewmembers)
shuffle_inplace(crewmembers)
data["crewmembers"] = crewmembers
return data