From 066a36487be17bfb6ba6302604a1dc0a728db58c Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Thu, 15 Oct 2020 10:41:34 +0100
Subject: [PATCH 1/2] Make the tesla ball eventually run out of energy (#7703)

Currently the tesla ball only loses energy until it runs out of orbiting mini-balls, then sticks around forever.  This makes it keep losing energy until it dissipates.
---
 code/modules/power/tesla/energy_ball.dm              | 6 +++---
 html/changelogs/Meghan Rossi - tesla dissipation.yml | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/Meghan Rossi - tesla dissipation.yml

diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index b2a23126c05..cf28f3f15b8 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -112,7 +112,7 @@
 		var/Orchiectomy_target = pick(orbiting_balls)
 		qdel(Orchiectomy_target)
 
-	else if(orbiting_balls.len)
+	else
 		dissipate() //sing code has a much better system.
 
 /obj/singularity/energy_ball/proc/new_mini_ball()
@@ -140,14 +140,14 @@
 	if (istype(target))
 		target.orbiting_balls += src
 		//TODO-LESH-DEL global.poi_list -= src
-		target.dissipate_strength = target.orbiting_balls.len
+		target.dissipate_strength = target.orbiting_balls.len + 1
 
 	. = ..()
 /obj/singularity/energy_ball/stop_orbit()
 	if (orbiting && istype(orbiting.orbiting, /obj/singularity/energy_ball))
 		var/obj/singularity/energy_ball/orbitingball = orbiting.orbiting
 		orbitingball.orbiting_balls -= src
-		orbitingball.dissipate_strength = orbitingball.orbiting_balls.len
+		orbitingball.dissipate_strength = orbitingball.orbiting_balls.len + 1
 	..()
 	if (!loc && !QDELETED(src))
 		qdel(src)
diff --git a/html/changelogs/Meghan Rossi - tesla dissipation.yml b/html/changelogs/Meghan Rossi - tesla dissipation.yml
new file mode 100644
index 00000000000..2ee721ad9a6
--- /dev/null
+++ b/html/changelogs/Meghan Rossi - tesla dissipation.yml	
@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - tweak: "The tesla energy ball will now eventually disappear if not kept charged with the particle accelerator"
\ No newline at end of file