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

[MIRROR] Adds a modular computer subsystem to shift modPCs away from radios [MDB IGNORE] (#17942)

Browse Source 
* Adds a modular computer subsystem to shift modPCs away from radios (#71732)

## About The Pull Request

Adds the modular computer subsystem which is meant to replace mod PC's
reliance on networks and radios, specifically the network subsystem, the
ntnet interface, and /datum/ntnet. This PR removes station_root ntnets
entirely, but I tried to keep it small.

This PR also removes a ton of unused vars and defines, such as NTNet
channels that were unused (peer2peer and systemcontrol), atmos networks
(as they were removed a while ago) and NTNet var on relays (its stated
purpose is so admins can see it through varedits, but that's useless now
that it's a subsystem)

I also removed ``setting_disabled`` as a thing the RD can do, it turned
off ALL ntnet systems. However, this was when there were 4 different
ones, now that there's only 2 I thought it was redundant and he could
just click 2 buttons to close them.

## Why It's Good For The Game

``/datum/ntnet``, ``/datum/component/ntnet_interface``, and
``/datum/controller/subsystem/networks`` are all old-code messes that
depend on eachother and is hard for people to understand what exactly it
adds to the game. 90% of its features is allowing the Wirecarp app to
see all the ruins that spawned in-game, which I don't think is something
that we even WANT (why does the RD need to know that oldstation spawned?
Why should they know this anyway??)

This hopefully starts to simplify networks/ntnet to make it easier to
remove in the future, because surely there are better alternatives than
**this**

## Changelog

🆑
refactor: Modular computers NTnet and applications run on its own
subsystem, please report any new bugs you may find.
/🆑

* Adds a modular computer subsystem to shift modPCs away from radios

* Fixed contractor uplink

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-12-13 00:36:54 +01:00
committed by GitHub
parent 919b1bc253
commit 86e811f782
18 changed files with 205 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/networks.dm
+9 -42
View File
@@ -5,20 +5,9 @@ SUBSYSTEM_DEF(networks)
flags = SS_KEEP_TIMING
init_order = INIT_ORDER_NETWORKS
var/list/relays = list()
/// Legacy ntnet lookup for software. Should be changed latter so don't rely on this
/// being here.
var/datum/ntnet/station_root/station_network
var/datum/ntnet/station_root/syndie_network
var/list/network_initialize_queue = list()
/// all interfaces by their hardware address.
/// Do NOT use to verify a reciver_id is valid, use the network.root_devices for that
var/list/interfaces_by_hardware_id = list()
/// Area to network, network to area list
/// This is an associated list to quickly find an area using either its id or network
/// Used mainly to make sure all area id's are unique even if a mapper uses the same
/// area many times
var/list/area_network_lookup = list()
/// List of networks using their fully qualified network name. Used for quick lookups
/// of networks for sending packets
@@ -27,8 +16,6 @@ SUBSYSTEM_DEF(networks)
/// network tress
var/list/root_networks = list()
// Why not list? Because its a Copy() every time we add a packet, and thats stupid.
var/datum/netdata/first = null // start of the queue. Pulled off in fire.
var/datum/netdata/last = null // end of the queue. pushed on by transmit
@@ -36,7 +23,6 @@ SUBSYSTEM_DEF(networks)
// packet stats
var/count_broadcasts_packets = 0 // count of broadcast packets sent
var/count_failed_packets = 0 // count of message fails
var/count_good_packets = 0
// Logs moved here
// Amount of logs the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly.
// High values make displaying logs much laggier.
@@ -53,8 +39,8 @@ SUBSYSTEM_DEF(networks)
/datum/controller/subsystem/networks/PreInit()
/// Limbo network needs to be made at boot up for all error devices
new/datum/ntnet(LIMBO_NETWORK_ROOT)
station_network = new(STATION_NETWORK_ROOT)
syndie_network = new(SYNDICATE_NETWORK_ROOT)
new/datum/ntnet(STATION_NETWORK_ROOT)
new/datum/ntnet(SYNDICATE_NETWORK_ROOT)
/// As well as the station network incase something funny goes during startup
new/datum/ntnet(CENTCOM_NETWORK_ROOT)
@@ -64,12 +50,7 @@ SUBSYSTEM_DEF(networks)
return ..()
/datum/controller/subsystem/networks/Initialize()
station_network.register_map_supremecy() // sigh
assign_areas_root_ids(get_sorted_areas()) // setup area names before Initialize
station_network.build_software_lists()
syndie_network.build_software_lists()
// At round start, fix the network_id's so the station root is on them
initialized = TRUE
// Now when the objects Initialize they will join the right network
return SS_INIT_SUCCESS
@@ -127,7 +108,6 @@ SUBSYSTEM_DEF(networks)
// All is good, send the packet then send an ACK to the sender
if(!QDELETED(sending_interface))
SEND_SIGNAL(sending_interface.parent, COMSIG_COMPONENT_NTNET_ACK, data)
count_good_packets++
/// Helper define to make sure we pop the packet and qdel it
#define POP_PACKET(CURRENT) first = CURRENT.next; packet_count--; if(!first) { last = null; packet_count = 0; }; qdel(CURRENT);
@@ -188,21 +168,6 @@ SUBSYSTEM_DEF(networks)
// We do error checking when the packet is sent
return NETWORK_ERROR_OK
/datum/controller/subsystem/networks/proc/check_relay_operation(zlevel=0) //can be expanded later but right now it's true/false.
for(var/i in relays)
var/obj/machinery/ntnet_relay/n = i
if(zlevel && n.z != zlevel)
continue
if(n.is_operational)
return TRUE
return FALSE
/datum/controller/subsystem/networks/proc/log_data_transfer( datum/netdata/data)
logs += "[station_time_timestamp()] - [data.generate_netlog()]"
if(logs.len > setting_maxlogcount)
logs = logs.Copy(logs.len - setting_maxlogcount, 0)
/**
* Records a message into the station logging system for the network
*
@@ -239,7 +204,6 @@ SUBSYSTEM_DEF(networks)
if(logs.len > setting_maxlogcount)
logs = logs.Copy(logs.len-setting_maxlogcount,0)
/**
* Removes all station logs for the current game
*/
@@ -247,7 +211,10 @@ SUBSYSTEM_DEF(networks)
logs = list()
add_log("-!- LOGS DELETED BY SYSTEM OPERATOR -!-")
/datum/controller/subsystem/networks/proc/log_data_transfer( datum/netdata/data)
logs += "[station_time_timestamp()] - [data.generate_netlog()]"
if(logs.len > setting_maxlogcount)
logs = logs.Copy(logs.len - setting_maxlogcount, 0)
/**
* Updates the maximum amount of logs and purges those that go beyond that number
@@ -324,9 +291,9 @@ SUBSYSTEM_DEF(networks)
if(!(A.area_flags & UNIQUE_AREA)) // if we aren't a unique area, make sure our name is different
A.network_area_id = SSnetworks.assign_random_name(5, A.network_area_id + "_") // tack on some garbage incase there are two area types
/datum/controller/subsystem/networks/proc/assign_areas_root_ids(list/areas, datum/map_template/M=null)
for(var/area/A in areas)
assign_area_network_id(A, M)
/datum/controller/subsystem/networks/proc/assign_areas_root_ids(list/areas, datum/map_template/map_template)
for(var/area/area as anything in areas)
assign_area_network_id(area, map_template)
/**
* Converts a list of string's into a full network_id