From 93464d16db7e7f482380db652b9449184e3f0c4f Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 28 Oct 2017 15:30:49 -0500
Subject: [PATCH 1/2] Adjusts simple mobs

---
 .../mob/living/simple_animal/simple_animal.dm   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 32a5a9cb35..e1208f644c 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -108,6 +108,8 @@
 	var/attack_sound = null			// Sound to play when I attack
 	var/environment_smash = 0		// How much environment damage do I do when I hit stuff?
 	var/melee_miss_chance = 25		// percent chance to miss a melee attack.
+	var/melee_attack_minDelay = 5		// How long between attacks at least
+	var/melee_attack_maxDelay = 10		// How long between attacks at most
 
 	//Special attacks
 	var/spattack_prob = 0			// Chance of the mob doing a special attack (0 for never)
@@ -1168,7 +1170,7 @@
 	if(!Adjacent(target_mob))
 		return
 	if(!client)
-		sleep(rand(8) + 8)
+		sleep(rand(melee_attack_minDelay, melee_attack_maxDelay))
 	if(isliving(target_mob))
 		var/mob/living/L = target_mob
 
@@ -1448,6 +1450,19 @@
 		agonyDam += agony_amount * 0.5
 		adjustFireLoss(agonyDam)
 
+/mob/living/simple_animal/emp_act(severity)
+	if(!isSynthetic())
+		return
+	switch(severity)
+		if(1)
+			adjustFireLoss(rand(15, 25))
+		if(2)
+			adjustFireLoss(10, 18)
+		if(3)
+			adjustFireLoss(rand(5, 12))
+		if(4)
+			adjustFireLoss(rand(1, 6))
+
 // Force it to target something
 /mob/living/simple_animal/proc/taunt(var/mob/living/new_target, var/forced = FALSE)
 	if(intelligence_level == SA_HUMANOID && !forced)

From 67792ad5b5654364aabd7a21d49f5dd4ebdfeb33 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Wed, 1 Nov 2017 21:59:43 -0500
Subject: [PATCH 2/2] Adds a necessary rand

---
 code/modules/mob/living/simple_animal/simple_animal.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index eb3d691c66..f229d537a8 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -1457,7 +1457,7 @@
 		if(1)
 			adjustFireLoss(rand(15, 25))
 		if(2)
-			adjustFireLoss(10, 18)
+			adjustFireLoss(rand(10, 18))
 		if(3)
 			adjustFireLoss(rand(5, 12))
 		if(4)