From 945358fbfdc634a9a81d26bf05a71bf987f2dd9b Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 19 Jan 2018 23:47:15 -0200 Subject: [PATCH] Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes Fixes some kinetic accelerator runtimes --- .../modules/projectiles/guns/energy/kinetic_accelerator.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index c65e518383..3eec556c95 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -87,7 +87,7 @@ /obj/item/gun/energy/kinetic_accelerator/dropped() . = ..() - if(!holds_charge) + if(!QDELING(src) && !holds_charge) // Put it on a delay because moving item from slot to hand // calls dropped(). addtimer(CALLBACK(src, .proc/empty_if_not_held), 2) @@ -97,10 +97,13 @@ empty() /obj/item/gun/energy/kinetic_accelerator/proc/empty() - cell.use(cell.charge) + if(cell) + cell.use(cell.charge) update_icon() /obj/item/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) + if(!cell) + return if(overheat) return if(!recharge_time)