From 1c7d46681bd056ced2e3df1bb03243ab7585d3b2 Mon Sep 17 00:00:00 2001
From: chaoko99 <chaoko99@gmail.com>
Date: Fri, 27 Oct 2017 07:47:34 -0700
Subject: [PATCH] Fixes Tesla never deleting itself. (#3752)

It was hilarious, but it's time to stop.
---
 code/modules/power/tesla/energy_ball.dm  |  2 ++
 html/changelogs/chaoko99-infinitesla.yml | 37 ++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 html/changelogs/chaoko99-infinitesla.yml

diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 8fc049b0cac..fc92eecefee 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -58,6 +58,8 @@
 			tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
 	else
 		energy = 0 // ensure we dont have miniballs of miniballs
+	if(energy == 0)
+		qdel(src)
 
 /obj/singularity/energy_ball/examine(mob/user)
 	..()
diff --git a/html/changelogs/chaoko99-infinitesla.yml b/html/changelogs/chaoko99-infinitesla.yml
new file mode 100644
index 00000000000..d9d3ccb25ba
--- /dev/null
+++ b/html/changelogs/chaoko99-infinitesla.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.  
+author: Chaoko99
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixed Tesla Balls never deleting themselves."
\ No newline at end of file