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

Renames vars on pdas and removes ntnet_relays glob (#79595)

Browse Source 
## About The Pull Request

- replaces the ntnet_relays global list with ``get_machines_by_type``
- renames ``transfer_access`` var on PDA to ``download_access`` &
``required_access`` to ``run_access`` to better describe what they do,
because on more than one ocassion I've confused myself with the two
terms and ended up doing something unintentional (see:
https://github.com/tgstation/tgstation/pull/74269)

## Why It's Good For The Game

Kills a useless global list and makes pda code a little less confusing.

## Changelog

Nothing player-facing.
This commit is contained in:
John Willard
2023-11-12 19:35:58 -05:00
committed by GitHub
parent 67ad491337
commit 78f04be9f8
21 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/airestorer.dm
+1 -1
View File
@@ -7,7 +7,7 @@
size = 12
requires_ntnet = FALSE
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
transfer_access = list(ACCESS_RD)
download_access = list(ACCESS_RD)
available_on_ntnet = TRUE
tgui_id = "NtosAiRestorer"
program_icon = "laptop-code"
code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+2 -2
View File
@@ -42,7 +42,7 @@
/datum/computer_file/program/ntnet_dos/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
switch(action)
if("PRG_target_relay")
for(var/obj/machinery/ntnet_relay/relays as anything in GLOB.ntnet_relays)
for(var/obj/machinery/ntnet_relay/relays as anything in SSmachines.get_machines_by_type(/obj/machinery/ntnet_relay))
if(relays.uid == params["targid"])
target = relays
break
@@ -76,7 +76,7 @@
else
data["target"] = FALSE
data["relays"] = list()
for(var/obj/machinery/ntnet_relay/relays as anything in GLOB.ntnet_relays)
for(var/obj/machinery/ntnet_relay/relays as anything in SSmachines.get_machines_by_type(/obj/machinery/ntnet_relay))
data["relays"] += list(list("id" = relays.uid))
data["focus"] = target ? target.uid : null
code/modules/modular_computers/file_system/programs/borg_monitor.dm
+2 -2
View File
@@ -6,7 +6,7 @@
program_icon_state = "generic"
extended_desc = "This program allows for remote monitoring of station cyborgs."
requires_ntnet = TRUE
transfer_access = list(ACCESS_ROBOTICS)
download_access = list(ACCESS_ROBOTICS)
size = 5
tgui_id = "NtosCyborgRemoteMonitor"
program_icon = "project-diagram"
@@ -155,7 +155,7 @@
requires_ntnet = FALSE
available_on_ntnet = FALSE
available_on_syndinet = TRUE
transfer_access = list()
download_access = list()
/datum/computer_file/program/borg_monitor/syndicate/evaluate_borg(mob/living/silicon/robot/R)
if(!is_valid_z_level(get_turf(computer), get_turf(R)))
code/modules/modular_computers/file_system/programs/card.dm
+1 -1
View File
@@ -4,7 +4,7 @@
category = PROGRAM_CATEGORY_CREW
program_icon_state = "id"
extended_desc = "Program for programming employee ID cards to access parts of the station."
transfer_access = list(ACCESS_COMMAND)
download_access = list(ACCESS_COMMAND)
requires_ntnet = 0
size = 8
tgui_id = "NtosCard"
code/modules/modular_computers/file_system/programs/crewmanifest.dm
+1 -1
View File
@@ -4,7 +4,7 @@
category = PROGRAM_CATEGORY_CREW
program_icon_state = "id"
extended_desc = "Program for viewing and printing the current crew manifest"
transfer_access = list(ACCESS_SECURITY, ACCESS_COMMAND)
download_access = list(ACCESS_SECURITY, ACCESS_COMMAND)
requires_ntnet = TRUE
size = 4
tgui_id = "NtosCrewManifest"
code/modules/modular_computers/file_system/programs/frontier.dm
+1 -1
View File
@@ -8,7 +8,7 @@
program_icon_state = "research"
tgui_id = "NtosScipaper"
program_icon = "paper-plane"
transfer_access = list(ACCESS_ORDNANCE)
download_access = list(ACCESS_ORDNANCE)
var/datum/techweb/linked_techweb
/// Unpublished, temporary paper datum.
code/modules/modular_computers/file_system/programs/jobmanagement.dm
+1 -1
View File
@@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
category = PROGRAM_CATEGORY_CREW
program_icon_state = "id"
extended_desc = "Program for viewing and changing job slot availability."
transfer_access = list(ACCESS_COMMAND)
download_access = list(ACCESS_COMMAND)
requires_ntnet = TRUE
size = 4
tgui_id = "NtosJobManager"
code/modules/modular_computers/file_system/programs/newscasterapp.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/computer_file/program/newscaster
filename = "newscasterapp"
filedesc = "Newscaster"
transfer_access = list(ACCESS_LIBRARY)
download_access = list(ACCESS_LIBRARY)
category = PROGRAM_CATEGORY_CREW
program_icon_state = "bountyboard"
extended_desc = "This program allows any user to access the Newscaster network from anywhere."
code/modules/modular_computers/file_system/programs/ntdownloader.dm
+1 -1
View File
@@ -143,7 +143,7 @@
"installed" = !!computer.find_file_by_name(programs.filename),
"compatible" = check_compatibility(programs),
"size" = programs.size,
"access" = programs.can_run(user, transfer = TRUE, access = access),
"access" = programs.can_run(user, downloading = TRUE, access = access),
"verifiedsource" = programs.available_on_ntnet,
))
code/modules/modular_computers/file_system/programs/portrait_printer.dm
+1 -1
View File
@@ -15,7 +15,7 @@
category = PROGRAM_CATEGORY_CREW
program_icon_state = "dummy"
extended_desc = "This program connects to a Spinward Sector community art site for viewing and printing art."
transfer_access = list(ACCESS_LIBRARY)
download_access = list(ACCESS_LIBRARY)
usage_flags = PROGRAM_CONSOLE
requires_ntnet = TRUE
size = 9
code/modules/modular_computers/file_system/programs/powermonitor.dm
+1 -1
View File
@@ -7,7 +7,7 @@
program_icon_state = "power_monitor"
extended_desc = "This program connects to sensors around the station to provide information about electrical systems"
ui_header = "power_norm.gif"
transfer_access = list(ACCESS_ENGINEERING)
download_access = list(ACCESS_ENGINEERING)
usage_flags = PROGRAM_CONSOLE
requires_ntnet = FALSE
size = 8
code/modules/modular_computers/file_system/programs/radar.dm
+2 -2
View File
@@ -220,7 +220,7 @@
filedesc = "Lifeline"
extended_desc = "This program allows for tracking of crew members via their suit sensors."
requires_ntnet = TRUE
transfer_access = list(ACCESS_MEDICAL)
download_access = list(ACCESS_MEDICAL)
available_on_ntnet = TRUE
program_icon = "heartbeat"
@@ -260,7 +260,7 @@
filedesc = "Custodial Locator"
extended_desc = "This program allows for tracking of custodial equipment."
requires_ntnet = TRUE
transfer_access = list(ACCESS_JANITOR)
download_access = list(ACCESS_JANITOR)
available_on_ntnet = TRUE
program_icon = "broom"
size = 2
code/modules/modular_computers/file_system/programs/records.dm
+2 -2
View File
@@ -18,7 +18,7 @@
filename = "medrecords"
program_icon = "book-medical"
extended_desc = "Allows the user to view several basic medical records from the crew."
transfer_access = list(ACCESS_MEDICAL, ACCESS_FLAG_COMMAND)
download_access = list(ACCESS_MEDICAL, ACCESS_FLAG_COMMAND)
available_on_ntnet = TRUE
mode = "medical"
@@ -26,7 +26,7 @@
filedesc = "Security Records"
filename = "secrecords"
extended_desc = "Allows the user to view several basic security records from the crew."
transfer_access = list(ACCESS_SECURITY, ACCESS_FLAG_COMMAND)
download_access = list(ACCESS_SECURITY, ACCESS_FLAG_COMMAND)
available_on_ntnet = TRUE
mode = "security"
code/modules/modular_computers/file_system/programs/secureye.dm
+2 -2
View File
@@ -8,7 +8,7 @@
program_icon_state = "generic"
extended_desc = "This program allows access to standard security camera networks."
requires_ntnet = TRUE
transfer_access = list(ACCESS_SECURITY)
download_access = list(ACCESS_SECURITY)
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
size = 5
tgui_id = "NtosSecurEye"
@@ -39,7 +39,7 @@
filename = "syndeye"
filedesc = "SyndEye"
extended_desc = "This program allows for illegal access to security camera networks."
transfer_access = list()
download_access = list()
available_on_ntnet = FALSE
available_on_syndinet = TRUE
requires_ntnet = FALSE
code/modules/modular_computers/file_system/programs/sm_monitor.dm
+1 -1
View File
@@ -6,7 +6,7 @@
program_icon_state = "smmon_0"
extended_desc = "Crystal Integrity Monitoring System, connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines."
requires_ntnet = TRUE
transfer_access = list(ACCESS_CONSTRUCTION)
download_access = list(ACCESS_CONSTRUCTION)
size = 5
tgui_id = "NtosSupermatter"
program_icon = "radiation"
code/modules/modular_computers/file_system/programs/techweb.dm
+2 -2
View File
@@ -8,8 +8,8 @@
size = 10
tgui_id = "NtosTechweb"
program_icon = "atom"
required_access = list(ACCESS_COMMAND, ACCESS_RESEARCH)
transfer_access = list(ACCESS_RESEARCH)
run_access = list(ACCESS_COMMAND, ACCESS_RESEARCH)
download_access = list(ACCESS_RESEARCH)
/// Reference to global science techweb
var/datum/techweb/stored_research
/// Access needed to lock/unlock the console
code/modules/modular_computers/file_system/programs/wirecarp.dm
+3 -3
View File
@@ -6,7 +6,7 @@
extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes"
size = 12
requires_ntnet = TRUE
required_access = list(ACCESS_NETWORK) //NETWORK CONTROL IS A MORE SECURE PROGRAM.
run_access = list(ACCESS_NETWORK) //NETWORK CONTROL IS A MORE SECURE PROGRAM.
available_on_ntnet = TRUE
tgui_id = "NtosNetMonitor"
program_icon = "network-wired"
@@ -20,7 +20,7 @@
SSmodular_computers.intrusion_detection_enabled = !SSmodular_computers.intrusion_detection_enabled
return TRUE
if("toggle_relay")
var/obj/machinery/ntnet_relay/target_relay = locate(params["ref"]) in GLOB.ntnet_relays
var/obj/machinery/ntnet_relay/target_relay = locate(params["ref"]) in SSmachines.get_machines_by_type(/obj/machinery/ntnet_relay)
if(!istype(target_relay))
return
target_relay.set_relay_enabled(!target_relay.relay_enabled)
@@ -39,7 +39,7 @@
var/list/data = list()
data["ntnetrelays"] = list()
for(var/obj/machinery/ntnet_relay/relays as anything in GLOB.ntnet_relays)
for(var/obj/machinery/ntnet_relay/relays as anything in SSmachines.get_machines_by_type(/obj/machinery/ntnet_relay))
var/list/relay_data = list()
relay_data["is_operational"] = !!relays.is_operational
relay_data["name"] = relays.name