From 0d65351d3f70e0c8b81f45def0c73a08cd9511d3 Mon Sep 17 00:00:00 2001
From: AndrewJacksonThe2nd <championofthecommonman@gmail.com>
Date: Sat, 19 Dec 2015 17:51:11 -0800
Subject: [PATCH] fixes

---
 code/game/gamemodes/gang/dominator.dm         | 3 +++
 code/modules/mob/living/carbon/carbon.dm      | 8 +++++---
 code/modules/mob/living/carbon/human/human.dm | 4 ++--
 code/modules/power/tesla/energy_ball.dm       | 8 ++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm
index baabea8b204..6f32e5c427c 100644
--- a/code/game/gamemodes/gang/dominator.dm
+++ b/code/game/gamemodes/gang/dominator.dm
@@ -12,6 +12,9 @@
 	var/operating = 0	//-1=broken, 0=standby, 1=takeover
 	var/warned = 0	//if this device has set off the warning at <3 minutes yet
 
+/obj/machinery/dominator/tesla_act()
+	qdel(src)
+
 /obj/machinery/dominator/New()
 	..()
 	SetLuminosity(2)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 004b361b859..380a373e5ac 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -98,11 +98,13 @@
 	jitteriness += 1000 //High numbers for violent convulsions
 	do_jitter_animation(jitteriness)
 	stuttering += 2
-	Stun(2)
+	if(!tesla_act || (tesla_act && siemens_coeff > 0.5)
+		Stun(2)
 	spawn(20)
 		jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less
-		Stun(3)
-		Weaken(3)
+		if(!tesla_act || (tesla_act && siemens_coeff > 0.5)
+			Stun(3)
+			Weaken(3)
 	if(override)
 		return override
 	else
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 889d08a4484..5c7cc41006e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -289,7 +289,7 @@
 		if(wear_suit)
 			var/obj/item/clothing/suit/S = wear_suit
 			if(S.siemens_coefficient <= 0)
-				total_coeff = 0
+				total_coeff -= 0.95
 		siemens_coeff = total_coeff
 	else if(!safety)
 		var/gloves_siemens_coeff = 1
@@ -305,7 +305,7 @@
 			heart_attack = 0
 			if(stat == CONSCIOUS)
 				src << "<span class='notice'>You feel your heart beating again!</span>"
-	. = ..(shock_damage,source,siemens_coeff,safety,override)
+	. = ..(shock_damage,source,siemens_coeff,safety,override,tesla_shock)
 	if(.)
 		electrocution_animation(40)
 
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index e2a75c223a8..96a4d27e1df 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -60,10 +60,10 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
 
 /obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
 	for(var/i = 0, i < move_amount, i++)
-	var/move_dir = pick(alldirs)
-	var/turf/T = get_step(src,move_dir)
-	if(can_move(T))
-		loc = get_step(src,move_dir)
+		var/move_dir = pick(alldirs)
+		var/turf/T = get_step(src,move_dir)
+		if(can_move(T))
+			loc = get_step(src,move_dir)
 
 /obj/singularity/energy_ball/proc/handle_energy()
 	if(energy >= 300)