cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds more multiz support [MDB IGNORE] (#15957)

Browse Source 
* Adds more multiz support (#69420)

* Adds more multiz support by making use of ``is_valid_z_level`` instead of simply checking if z is the same.

* Adds more multiz support

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-09-04 04:48:50 +02:00
committed by GitHub
parent 3d4d92127a
commit c05d5838ef
18 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/borg_monitor.dm
+2 -2
View File
@@ -144,7 +144,7 @@
///This proc is used to determin if a borg should be shown in the list (based on the borg's scrambledcodes var). Syndicate version overrides this to show only syndicate borgs.
/datum/computer_file/program/borg_monitor/proc/evaluate_borg(mob/living/silicon/robot/R)
if((get_turf(computer)).z != (get_turf(R)).z)
if(!is_valid_z_level(get_turf(computer), get_turf(R)))
return FALSE
if(R.scrambledcodes)
return FALSE
@@ -176,7 +176,7 @@
return FALSE
/datum/computer_file/program/borg_monitor/syndicate/evaluate_borg(mob/living/silicon/robot/R)
if((get_turf(computer)).z != (get_turf(R)).z)
if(!is_valid_z_level(get_turf(computer), get_turf(R)))
return FALSE
if(!R.scrambledcodes)
return FALSE
code/modules/modular_computers/file_system/programs/robocontrol.dm
+2 -3
View File
@@ -24,7 +24,6 @@
/datum/computer_file/program/robocontrol/ui_data(mob/user)
var/list/data = get_header_data()
var/turf/current_turf = get_turf(ui_host())
var/zlevel = current_turf.z
var/list/botlist = list()
var/list/mulelist = list()
@@ -37,7 +36,7 @@
botcount = 0
for(var/mob/living/simple_animal/bot/simple_bot as anything in GLOB.bots_list)
if(simple_bot.z != zlevel || !(simple_bot.bot_mode_flags & BOT_MODE_REMOTE_ENABLED)) //Only non-emagged bots on the same Z-level are detected!
if(!is_valid_z_level(current_turf, get_turf(simple_bot)) || !(simple_bot.bot_mode_flags & BOT_MODE_REMOTE_ENABLED)) //Only non-emagged bots on the same Z-level are detected!
continue
if(computer && !simple_bot.check_access(user)) // Only check Bots we can access)
continue
@@ -69,7 +68,7 @@
for(var/mob/living/simple_animal/drone/all_drones as anything in GLOB.drones_list)
if(all_drones.hacked)
continue
if(all_drones.z != zlevel)
if(!is_valid_z_level(current_turf, get_turf(all_drones)))
continue
var/list/drone_data = list(
"name" = all_drones.name,