shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626

Browse Source 
[MIRROR] Fixes borg cell recharging runtime
This commit is contained in:
deathride58
2018-01-19 19:36:47 +00:00
committed by GitHub
parent 5751c601f2 7ee374f6a3
commit 98cc937b40
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/robot/robot_items.dm
View File

@@ -294,7 +294,7 @@
if(iscyborg(user))
var/mob/living/silicon/robot/R = user
if(R.cell.charge < 1200)
if(!R.cell || R.cell.charge < 1200)
to_chat(user, "<font color='red'>You don't have enough charge to do this!</font>")
return
R.cell.charge -= 1000
@@ -652,7 +652,7 @@
else
energy = CLAMP(energy + energy_recharge, 0, maxenergy)
return
if((host.cell.charge >= (host.cell.maxcharge * cyborg_cell_critical_percentage)) && (energy < maxenergy))
if(host.cell && (host.cell.charge >= (host.cell.maxcharge * cyborg_cell_critical_percentage)) && (energy < maxenergy))
host.cell.use(energy_recharge*energy_recharge_cyborg_drain_coefficient)
energy += energy_recharge

2
code/modules/tgui/states.dm
View File

@@ -70,7 +70,7 @@
return ..()
/mob/living/silicon/robot/shared_ui_interaction(src_object)
if(cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
if(!cell || cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
return UI_DISABLED
return ..()