Merge pull request #9221 from VOREStation/upstream-merge-7703

[MIRROR] Make the tesla ball eventually run out of energy

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()
@@ -143,14 +143,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)

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"