From 495bbb010158a259fd177a0d89a5318dfc67ce71 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 19 Jan 2018 10:00:06 -0500 Subject: [PATCH 1/2] Merge pull request #34626 from ShizCalev/borg-recharge-runtime Fixes borg cell recharging runtime --- code/game/objects/items/robot/robot_items.dm | 4 ++-- code/modules/tgui/states.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index aae0937bb7..0764e437ca 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -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, "You don't have enough charge to do this!") 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 diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 831f829154..dc1e11635a 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -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 ..()