cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted some changes, apparently it was already fixed.

Browse Source
This commit is contained in:
Marina Gryphon
2017-11-08 09:28:29 -06:00
parent 5af691093e
commit 8b311ac237
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/integrated_electronics/subtypes/power.dm
View File

@@ -37,12 +37,12 @@
amount_to_move = 20000
/obj/item/integrated_circuit/power/transmitter/do_work()
set_pin_data(IC_OUTPUT, 1, null)
set_pin_data(IC_OUTPUT, 2, null)
set_pin_data(IC_OUTPUT, 3, null)
var/atom/movable/AM = get_pin_data_as_type(IC_INPUT, 1, /atom/movable)
if(AM)
if(!assembly)
set_pin_data(IC_OUTPUT, 1, null)
set_pin_data(IC_OUTPUT, 2, null)
set_pin_data(IC_OUTPUT, 3, null)
return FALSE // Pointless to do everything else if there's no battery to draw from.
var/obj/item/weapon/cell/cell = null
@@ -62,10 +62,6 @@
transfer_amount *= 0.8 // Losses due to distance.
if(cell.fully_charged())
set_pin_data(IC_OUTPUT, 1, cell.charge)
set_pin_data(IC_OUTPUT, 2, cell.maxcharge)
set_pin_data(IC_OUTPUT, 3, cell.percent())
push_data()
return FALSE
if(transfer_amount && assembly.draw_power(amount_to_move)) // CELLRATE is already handled in draw_power()
@@ -75,12 +71,8 @@
set_pin_data(IC_OUTPUT, 1, cell.charge)
set_pin_data(IC_OUTPUT, 2, cell.maxcharge)
set_pin_data(IC_OUTPUT, 3, cell.percent())
push_data()
activate_pin(2)
return TRUE
set_pin_data(IC_OUTPUT, 1, null)
set_pin_data(IC_OUTPUT, 2, null)
set_pin_data(IC_OUTPUT, 3, null)
return FALSE
/obj/item/integrated_circuit/power/transmitter/large/do_work()