cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kills _globalvars/misc.dm (#60358)

Browse Source
This commit is contained in:
tralezab
2021-07-26 16:58:18 -07:00
committed by GitHub
parent b1041fed0b
commit 43fd840b2f
22 changed files with 107 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer_power.dm
+2 -2
View File
@@ -13,10 +13,10 @@
if(battery_module && battery_module.battery && battery_module.battery.charge)
var/obj/item/stock_parts/cell/cell = battery_module.battery
if(cell.use(amount * GLOB.CELLRATE))
if(cell.use(amount JOULES))
return TRUE
else // Discharge the cell anyway.
cell.use(min(amount*GLOB.CELLRATE, cell.charge))
cell.use(min(amount JOULES, cell.charge))
return FALSE
return FALSE
code/modules/modular_computers/hardware/recharger.dm
+1 -1
View File
@@ -20,7 +20,7 @@
return
if(use_power(charge_rate, charging=1))
holder.give_power(charge_rate * GLOB.CELLRATE)
holder.give_power(charge_rate JOULES)
/obj/item/computer_hardware/recharger/apc_recharger