From b897f2b2bfc630d3d6a060513d05a12dec03ed62 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sun, 12 Nov 2017 17:41:00 -0600
Subject: [PATCH] Simple mobs now have a var that can be toggled to make them
 taser immune

---
 .../mob/living/simple_animal/simple_animal.dm  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index f229d537a8b..c21ab59deff 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -90,6 +90,7 @@
 	var/assist_distance = 25		// Radius in which I'll ask my comrades for help.
 	var/supernatural = 0			// If the mob is supernatural (used in null-rod stuff for banishing?)
 	var/grab_resist = 75			// Chance of me resisting a grab attempt.
+	var/taser_kill = 1				// Is the mob weak to tasers
 
 	//Attack ranged settings
 	var/ranged = 0					// Do I attack at range?
@@ -1439,16 +1440,17 @@
 
 //Shot with taser/stunvolver
 /mob/living/simple_animal/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null)
-	var/stunDam = 0
-	var/agonyDam = 0
+	if(taser_kill)
+		var/stunDam = 0
+		var/agonyDam = 0
 
-	if(stun_amount)
-		stunDam += stun_amount * 0.5
-		adjustFireLoss(stunDam)
+		if(stun_amount)
+			stunDam += stun_amount * 0.5
+			adjustFireLoss(stunDam)
 
-	if(agony_amount)
-		agonyDam += agony_amount * 0.5
-		adjustFireLoss(agonyDam)
+		if(agony_amount)
+			agonyDam += agony_amount * 0.5
+			adjustFireLoss(agonyDam)
 
 /mob/living/simple_animal/emp_act(severity)
 	if(!isSynthetic())