Merge pull request #4969 from Citadel-Station-13/upstream-merge-34605

[MIRROR] Fixes some kinetic accelerator runtimes
This commit is contained in:
LetterJay
2018-01-20 13:15:53 -06:00
committed by GitHub
@@ -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)