From 591fc167476e45b8a5cb3539459f47899846fd3f Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Mon, 24 Aug 2020 23:20:28 -0400 Subject: [PATCH] oops! no grounding rods now it (hopefully) won't delete rods from within containment --- code/modules/power/tesla/energy_ball.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 2e0b8ad451..11bbca3431 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -346,9 +346,9 @@ var/obj/singularity/energy_ball/tesla = source if(istype(tesla)) - if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13) - qdel(closest_atom) - tesla.energy = round(tesla.energy/1.5) + if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained) + qdel(closest_atom) // each rod deletes two miniballs, + tesla.energy = round(tesla.energy/1.5625) // if there are no miniballs the rod stays and continues to pull the ball in if(prob(20))//I know I know tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets) tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)