cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 08:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

PDA Charging Tweak (#19942)

Browse Source 
* PDAs and other modular devices now charge from APCs even when turned
off.
This commit is contained in:
Geeves
2024-09-28 12:47:26 +02:00
committed by GitHub
parent c34c0b3f1d
commit be08270531
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/modular_computer/core.dm
+2 -2
View File
@@ -1,10 +1,10 @@
/obj/item/modular_computer/process()
handle_power() // Handles all computer power interaction
if(!enabled) // The computer is turned off
last_power_usage = 0
return FALSE
handle_power() // Handles all computer power interaction
if(damage > broken_damage)
shutdown_computer()
return FALSE
code/modules/modular_computers/computers/modular_computer/power.dm
+12 -3
View File
@@ -13,25 +13,30 @@
// Tries to use power from battery. Passing false as parameter results in this proc returning whether battery is functional or not.
/obj/item/modular_computer/proc/battery_power(var/power_usage = FALSE)
apc_powered = FALSE
if(!battery_module || !battery_module.check_functionality() || battery_module.battery.charge <= 0)
return FALSE
if(battery_module.battery.use(power_usage * CELLRATE) || ((power_usage == 0) && battery_module.battery.charge))
if(power_usage <= 0 || battery_module.battery.use(power_usage * CELLRATE))
return TRUE
return FALSE
// Tries to use power from APC, if present.
/obj/item/modular_computer/proc/apc_power(var/power_usage = 0)
apc_powered = TRUE
// Tesla link was originally limited to machinery only, but this probably works too, and the benefit of being able to power all devices from an APC outweights
// the possible minor performance loss.
if(!tesla_link || !tesla_link.check_functionality())
return FALSE
var/area/A = get_area(src)
if(!istype(A) || !A.powered(EQUIP))
return FALSE
// At this point, we know that APC can power us for this tick. Check if we also need to charge our battery, and then actually use the power.
if(battery_module && (battery_module.battery.charge < battery_module.battery.maxcharge) && (power_usage > 0))
if(battery_module && (battery_module.battery.charge < battery_module.battery.maxcharge))
power_usage += tesla_link.passive_charging_rate
battery_module.battery.give(tesla_link.passive_charging_rate * CELLRATE)
@@ -50,8 +55,11 @@
// Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged
/obj/item/modular_computer/proc/handle_power()
var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
var/power_usage = 0
if(enabled)
power_usage = screen_on ? base_active_power_usage : base_idle_power_usage
for(var/obj/item/computer_hardware/H in get_all_components())
if(H.enabled)
power_usage += H.power_usage
@@ -62,4 +70,5 @@
power_has_failed = FALSE
update_icon()
return
power_failure()