From 46bec76f41a4c5f095aacccde531b3b21f86f610 Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Tue, 25 Aug 2020 00:46:04 -0400 Subject: [PATCH] tesla can now be contained for whatever reason, the contained variable was unused for teslas, but now it is unintentional side-effect may be that grounding rods for tesla containments with a larger than 1x1 tile space might get eaten (untested but assumed) --- code/modules/power/tesla/energy_ball.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 38a4e4b0a2..ac16941aeb 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -91,6 +91,7 @@ /obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount) //we face the last thing we zapped, so this lets us favor that direction a bit + contained=0 var/move_bias = pick(GLOB.alldirs) var/move_dir for(var/rod in GLOB.grounding_rods) // grounding rods pull the tesla ball, picks the nearest one @@ -110,6 +111,8 @@ setDir(move_dir) for(var/mob/living/carbon/C in loc) dust_mobs(C) + else + contained=1 /obj/singularity/energy_ball/proc/handle_energy()