From 438d8d8047a41091a88986a1df81e2e383fa800f Mon Sep 17 00:00:00 2001
From: PKPenguin321 <pkpenguin321.git@gmail.com>
Date: Wed, 24 Aug 2016 19:23:18 -0700
Subject: [PATCH] a few tweaks - makes tesla bomb immune so it wont destroy
 itself - makes lights spew fire when they explode instead of the regular
 explosion - makes cameras with EMP immunity also have tesla immunity tesla
 can now keep itself fully contained (at least on box)

---
 code/game/machinery/camera/camera.dm    | 4 ++++
 code/modules/power/lighting.dm          | 4 ++++
 code/modules/power/tesla/energy_ball.dm | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 7c935e85a5d..0bc318a5494 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -105,6 +105,10 @@
 					O << "The screen bursts into static."
 			..()
 
+/obj/machinery/camera/tesla_act(var/power)//EMP proof upgrade also makes it tesla immune
+	if(isEmpProof())
+		return
+	..()
 
 /obj/machinery/camera/blob_act(obj/effect/blob/B)
 	if(B && B.loc == loc)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 7b2f9cab0f8..68c06b4cb51 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -535,6 +535,10 @@
 	else
 		flicker()
 
+/obj/machinery/light/tesla_act(var/power)
+	explosion(src.loc,0,0,0,flame_range = 5, adminlog = 0)
+	qdel(src)
+
 // called when area power state changes
 /obj/machinery/light/power_change()
 	var/area/A = get_area(src)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 1b7e68f0d0c..ee835dac8fb 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -38,6 +38,9 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
 	var/energy_to_raise = 32
 	var/energy_to_lower = -20
 
+/obj/singularity/energy_ball/ex_act(severity, target)
+	return
+
 /obj/singularity/energy_ball/Destroy()
 	if(orbiting && istype(orbiting, /obj/singularity/energy_ball))
 		var/obj/singularity/energy_ball/EB = orbiting