Merge pull request #11285 from Fox-McCloud/elecrocution-refactor

Refactors Electrocution

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -393,6 +393,11 @@
 									break
 			return
 
+/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+	if(!tesla_shock)
+		return FALSE
+	return ..()
+
 /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(var/obj/machinery/target)
 	do_attack_animation(target)
 	to_chat(src, "<span class='info'>We begin to dismantle this machine. We will need to be uninterrupted.</span>")
@@ -513,7 +518,7 @@
 		var/mob/living/L = AM
 		if(!istype(L, /mob/living/simple_animal/hostile/swarmer))
 			playsound(loc,'sound/effects/snap.ogg',50, 1, -1)
-			L.electrocute_act(0, src, 1, 1)
+			L.electrocute_act(0, src, 1, TRUE, TRUE)
 			if(isrobot(L) || L.isSynthetic())
 				L.Weaken(5)
 			qdel(src)

code/game/gamemodes/miniantags/guardian/types/lightning.dm

@@ -99,7 +99,6 @@
 				if(istype(G) && G.summoner == summoner)
 					continue
 				if(successfulshocks > 4)
-					//L.electrocute_act(30, src) //shocks for 30 burn damage
 					L.visible_message(
 						"<span class='danger'>[L] was shocked by the lightning chain!</span>", \
 						"<span class='userdanger'>You are shocked by the lightning chain!</span>", \

code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

@@ -215,11 +215,11 @@
 						if(!L.on) //wait, wait, don't shock me
 							return
 						flick("[L.base_state]2", L)
-						for(var/mob/living/carbon/human/M in view(shock_range, L))
+						for(var/mob/living/M in view(shock_range, L))
 							if(M == user)
 								return
 							M.Beam(L,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5)
-							M.electrocute_act(shock_damage, "[L.name]", safety=1)
+							M.electrocute_act(shock_damage, L, safety = TRUE)
 							do_sparks(4, 0, M)
 							playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)