From c8929d5bdbd8d19fdc8fc1f759ea09bb3aacb13e Mon Sep 17 00:00:00 2001 From: Leshana Date: Sun, 21 Jan 2018 00:17:37 -0500 Subject: [PATCH] Add checks to allow Tesla to fully dissipate once it runs out of energy. --- code/modules/power/tesla/energy_ball.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 9b89e35b77..71cb8a35e7 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -55,7 +55,8 @@ /obj/singularity/energy_ball/process(var/wait = 20) set waitfor = FALSE if(!orbiting) - handle_energy() + if (handle_energy()) + return move_the_basket_ball(max(wait - 5, 4 + orbiting_balls.len * 1.5)) @@ -91,6 +92,11 @@ sleep(1) // So movement is smooth /obj/singularity/energy_ball/proc/handle_energy() + if (energy <= 0) + investigate_log("collapsed.", I_SINGULO) + qdel(src) + return TRUE + if(energy >= energy_to_raise) energy_to_lower = energy_to_raise - 20 energy_to_raise = energy_to_raise * 1.25