Merge pull request #774 from Citadel-Station-13/upstream-merge-26805

[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
2017-05-06 14:24:08 -07:00
parent 8e3b375bae 1da6f676f0
commit d43e64bcc3
1 changed files with 5 additions and 0 deletions
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -59,6 +59,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp

 	. = ..()

+/obj/singularity/energy_ball/admin_investigate_setup()
+	if(istype(loc, /obj/singularity/energy_ball))
+		return
+	..()
+
 /obj/singularity/energy_ball/process()
 	if(!orbiting)
 		handle_energy()