cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-21 18:16:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

runtime maploading: fifth time is the charm (#5524)

Browse Source 
Co-authored-by: VM_USER <VM_USER>
Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-06-15 19:21:14 +02:00
committed by GitHub
co-authored by VM_USER <VM_USER> silicons
parent c1ad8f4ce0
commit fd5e67ff71
406 changed files with 4655 additions and 5602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
+2 -2
View File
@@ -67,7 +67,7 @@
data["all_sensors"] = sensors
if(focus)
data["focus"] = focus.return_reading_data()
data["map_levels"] = GLOB.using_map.get_map_levels(T.z)
data["map_levels"] = (LEGACY_MAP_DATUM).get_map_levels(T.z)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
@@ -90,7 +90,7 @@
if(!T) // Safety check
return
if(T)
levels += GLOB.using_map.get_map_levels(T.z, FALSE)
levels += (LEGACY_MAP_DATUM).get_map_levels(T.z, FALSE)
for(var/obj/machinery/power/sensor/S in GLOB.machines)
if(T && (S.loc.z == T.z) || (S.loc.z in levels) || (S.long_range)) // Consoles have range on their Z-Level. Sensors with long_range var will work between Z levels.
if(S.name_tag == "#UNKN#") // Default name. Shouldn't happen!
code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
+1 -1
View File
@@ -44,7 +44,7 @@
var/turf/T = get_turf(nano_host())
if(!T)
return
var/valid_z_levels = (GetConnectedZlevels(T.z) & GLOB.using_map.station_levels)
var/valid_z_levels = (GetConnectedZlevels(T.z) & (LEGACY_MAP_DATUM).station_levels)
for(var/obj/machinery/power/supermatter/S in GLOB.machines)
// Delaminating, not within coverage, not on a tile.
if(S.grav_pulling || S.exploded || !(S.z in valid_z_levels) || !istype(S.loc, /turf/))
code/modules/modular_computers/file_system/programs/generic/camera.dm
+2 -2
View File
@@ -2,7 +2,7 @@
/proc/get_camera_access(var/network)
if(!network)
return 0
. = GLOB.using_map.get_network_access(network)
. = (LEGACY_MAP_DATUM).get_network_access(network)
if(.)
return
@@ -16,7 +16,7 @@
if(NETWORK_ERT)
return ACCESS_CENTCOM_ERT
if(network in GLOB.using_map.station_networks)
if(network in (LEGACY_MAP_DATUM).station_networks)
return ACCESS_SECURITY_EQUIPMENT // Default for all other station networks
else
return 999 //Inaccessible if not a station network and not mentioned above
code/modules/modular_computers/file_system/programs/generic/uav.dm
+2 -2
View File
@@ -171,8 +171,8 @@
else
return 0
var/list/zlevels_in_range = GLOB.using_map.get_map_levels(their_z, FALSE)
var/list/zlevels_in_long_range = GLOB.using_map.get_map_levels(their_z, TRUE) - zlevels_in_range
var/list/zlevels_in_range = (LEGACY_MAP_DATUM).get_map_levels(their_z, FALSE)
var/list/zlevels_in_long_range = (LEGACY_MAP_DATUM).get_map_levels(their_z, TRUE) - zlevels_in_range
var/their_signal = 0
for(var/relay in ntnet_global.relays)
var/obj/machinery/ntnet_relay/R = relay
code/modules/modular_computers/file_system/programs/research/email_administration.dm
+1 -1
View File
@@ -125,7 +125,7 @@
return 1
if(href_list["newaccount"])
var/newdomain = sanitize(input(user,"Pick domain:", "Domain name") as null|anything in GLOB.using_map.usable_email_tlds)
var/newdomain = sanitize(input(user,"Pick domain:", "Domain name") as null|anything in (LEGACY_MAP_DATUM).usable_email_tlds)
if(!newdomain)
return 1
var/newlogin = sanitize(input(user,"Pick account name (@[newdomain]):", "Account name"), 100)