From 5fd85edfb1a8b3fe3e27e1db220fd7743d9c0408 Mon Sep 17 00:00:00 2001
From: AndrewJacksonThe2nd <championofthecommonman@gmail.com>
Date: Sat, 19 Dec 2015 13:04:16 -0800
Subject: [PATCH] Energy ball no longer claims it is a singularity.

---
 code/modules/power/tesla/coil.dm        |  2 +-
 code/modules/power/tesla/energy_ball.dm | 15 ++++++++-------
 code/modules/power/tesla/generator.dm   |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 18e65662a0d..43adbc22978 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -1,5 +1,5 @@
 /obj/machinery/power/tesla_coil
-	name = "Tesla Coil"
+	name = "tesla coil"
 	desc = "For the union!"
 	icon = 'icons/obj/tesla_engine/tesla_coil.dmi'
 	icon_state = "coil"
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index ef3f211ad98..b07feb4a0f7 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -16,7 +16,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 										/obj/structure/disposalpipe)
 
 /obj/singularity/energy_ball
-	name = "Energy Ball"
+	name = "energy eall"
+	desc = "An energy ball."
 	icon = 'icons/obj/tesla_engine/energy_ball.dmi'
 	icon_state = "energy_ball"
 	pixel_x = -32
@@ -76,18 +77,18 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 
 
 /obj/singularity/energy_ball/Bump(atom/A)
-	if(istype(A, /mob/living/carbon))
-		var/mob/living/carbon/C = A
-		C.dust()
-	return
+	dust_mobs(A)
 
 /obj/singularity/energy_ball/Bumped(atom/A)
+	dust_mobs(A)
+
+/obj/singularity/energy_ball/proc/dust_mobs(atom/A)
 	if(istype(A, /mob/living/carbon))
 		var/mob/living/carbon/C = A
 		C.dust()
 	return
 
-proc/get_closest_atom(var/type, var/list, var/source)
+/proc/get_closest_atom(type, list, source)
 	var/closest_atom
 	var/closest_distance
 	for(var/A in list)
@@ -103,7 +104,7 @@ proc/get_closest_atom(var/type, var/list, var/source)
 				closest_atom = A
 	return closest_atom
 
-proc/tesla_zap(var/atom/source, var/zap_range = 3, var/power)
+/proc/tesla_zap(var/atom/source, zap_range = 3, power)
 	if(power < 1000)
 		return
 	var/list/tesla_coils = list()
diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm
index 649483609ad..f511c650c8c 100644
--- a/code/modules/power/tesla/generator.dm
+++ b/code/modules/power/tesla/generator.dm
@@ -1,6 +1,6 @@
 /obj/machinery/the_singularitygen/tesla
-	name = "Energy Ball Generator"
-	desc = "Makes the wardenclyffe look like a child's plaything when shot with a Particle Accelerator."
+	name = "energy ball generator"
+	desc = "Makes the wardenclyffe look like a child's plaything when shot with a particle accelerator."
 	icon = 'icons/obj/tesla_engine/tesla_generator.dmi'
 	icon_state = "TheSingGen"
 	creation_type = /obj/singularity/energy_ball
\ No newline at end of file