mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 20:43:10 +01:00
Implement Bay's SSmachinery and power usage updates, further unclogging the toilet (#13910)
This commit is contained in:
@@ -32,7 +32,7 @@ var/global/datum/ntnet/ntnet_global = new()
|
||||
/datum/ntnet/New()
|
||||
if(ntnet_global && (ntnet_global != src))
|
||||
ntnet_global = src // There can be only one.
|
||||
for(var/obj/machinery/ntnet_relay/R in SSmachinery.all_machines)
|
||||
for(var/obj/machinery/ntnet_relay/R in SSmachinery.machinery)
|
||||
relays.Add(R)
|
||||
R.NTNet = src
|
||||
build_software_lists()
|
||||
@@ -163,4 +163,4 @@ var/global/datum/ntnet/ntnet_global = new()
|
||||
add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.")
|
||||
if(NTNET_SYSTEMCONTROL)
|
||||
setting_systemcontrol = !setting_systemcontrol
|
||||
add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.")
|
||||
add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.")
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/obj/machinery/ntnet_relay
|
||||
name = "NTNet Quantum Relay"
|
||||
desc = "A very complex router and transmitter capable of connecting electronic devices together. Looks fragile."
|
||||
use_power = 2
|
||||
use_power = POWER_USE_ACTIVE
|
||||
active_power_usage = 20000 //20kW, appropriate for machine that keeps massive cross-Zlevel wireless network operational.
|
||||
idle_power_usage = 100
|
||||
icon_state = "ntnet"
|
||||
@@ -48,11 +48,11 @@
|
||||
else
|
||||
add_overlay("ntnet_o_ok")
|
||||
|
||||
/obj/machinery/ntnet_relay/machinery_process()
|
||||
/obj/machinery/ntnet_relay/process()
|
||||
if(operable())
|
||||
use_power = 2
|
||||
update_use_power(POWER_USE_ACTIVE)
|
||||
else
|
||||
use_power = 1
|
||||
update_use_power(POWER_USE_IDLE)
|
||||
|
||||
if(dos_overload)
|
||||
dos_overload = max(0, dos_overload - dos_dissipate)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
power_usage += tesla_link.passive_charging_rate
|
||||
battery_module.battery.give(tesla_link.passive_charging_rate * CELLRATE)
|
||||
|
||||
A.use_power(power_usage, EQUIP)
|
||||
A.use_power_oneoff(power_usage, EQUIP)
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -62,4 +62,4 @@
|
||||
power_has_failed = FALSE
|
||||
update_icon()
|
||||
return
|
||||
power_failure()
|
||||
power_failure()
|
||||
|
||||
@@ -385,7 +385,7 @@ Command action procs
|
||||
|
||||
|
||||
/proc/is_relay_online()
|
||||
for(var/obj/machinery/bluespacerelay/M in SSmachinery.all_machines)
|
||||
for(var/obj/machinery/bluespacerelay/M in SSmachinery.machinery)
|
||||
if(M.stat == 0)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
return TRUE
|
||||
|
||||
else if(href_list["toggledoor"])
|
||||
for(var/obj/machinery/door/blast/M in SSmachinery.all_machines)
|
||||
for(var/obj/machinery/door/blast/M in SSmachinery.machinery)
|
||||
if(M.id == href_list["toggledoor"])
|
||||
if(M.density)
|
||||
M.open()
|
||||
|
||||
Reference in New Issue
Block a user