From 172fe663c3dddac55f001754057b88c799631825 Mon Sep 17 00:00:00 2001
From: raspy-on-osu <email.jack.avery@gmail.com>
Date: Thu, 27 Aug 2020 02:46:19 -0400
Subject: [PATCH] remove redundant separate tesla log and merge it into the
 singulo log

also formatting because i hate inconsistent whitespace
---
 code/__DEFINES/logging.dm               | 1 -
 code/modules/power/tesla/energy_ball.dm | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm
index 2a8f39766b..ecb58f1291 100644
--- a/code/__DEFINES/logging.dm
+++ b/code/__DEFINES/logging.dm
@@ -6,7 +6,6 @@
 #define INVESTIGATE_GRAVITY			"gravity"
 #define INVESTIGATE_RECORDS			"records"
 #define INVESTIGATE_SINGULO			"singulo"
-#define INVESTIGATE_TESLA			"tesla"
 #define INVESTIGATE_SUPERMATTER		"supermatter"
 #define INVESTIGATE_TELESCI			"telesci"
 #define INVESTIGATE_WIRES			"wires"
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index ce0bc27461..89c5aa3316 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -61,7 +61,6 @@
 		return //don't annnounce miniballs
 	..()
 
-
 /obj/singularity/energy_ball/process()
 	if(!orbiting)
 		handle_energy()
@@ -90,7 +89,6 @@
 	if(orbiting_balls.len)
 		. += "There are [orbiting_balls.len] mini-balls orbiting it."
 
-
 /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
 	var/move_bias = pick(GLOB.alldirs)
@@ -113,7 +111,6 @@
 			for(var/mob/living/carbon/C in loc)
 				dust_mobs(C)
 
-
 /obj/singularity/energy_ball/proc/determine_containment()
 	contained=0
 	var/found
@@ -129,7 +126,6 @@
 			tiletocheck=get_step(tiletocheck,direction)
 	contained=1
 
-
 /obj/singularity/energy_ball/proc/handle_energy()
 	if(energy >= energy_to_raise)
 		energy_to_lower = energy_to_raise - 20
@@ -149,7 +145,7 @@
 		dissipate() //sing code has a much better system.
 
 		if(energy<=0)
-			investigate_log("fizzled.", INVESTIGATE_TESLA)
+			investigate_log("fizzled.", INVESTIGATE_SINGULO)
 			qdel(src)
 
 /obj/singularity/energy_ball/proc/new_mini_ball()
@@ -165,7 +161,6 @@
 
 	EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
 
-
 /obj/singularity/energy_ball/Bump(atom/A)
 	dust_mobs(A)
 
@@ -197,7 +192,6 @@
 	if (!QDELETED(src))
 		qdel(src)
 
-
 /obj/singularity/energy_ball/proc/dust_mobs(atom/A)
 	if(isliving(A))
 		var/mob/living/L = A