From 23d00ea671db36992fed397956ae7fca70f21090 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Tue, 7 Jul 2020 01:44:28 +0100
Subject: [PATCH] stops double applied damage and stuns

---
 code/modules/mob/living/carbon/human/human_defense.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 5fc08518a5..a3705ef53c 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -397,22 +397,21 @@
 				informed = TRUE
 			switch(severity)
 				if(1)
-					Stun(200)
 					if(!isrobotic(src))
 						L.receive_damage(0,10)
 						Stun(200)
 					else
-						// robotic species take far less damage and get combat mode lock instead of stuns
+						// robotic species take far less damage and get combat mode lock over longer stuns
 						// this is to stop emps outright killing them, and also because their organs have emp acts
 						L.receive_damage(0,5)
+						Stun(50)
 				if(2)
-					L.receive_damage(0,5)
-					Stun(100)
 					if(!isrobotic(src))
 						L.receive_damage(0,5)
 						Stun(100)
 					else
 						L.receive_damage(0,3)
+						Stun(25) //4x shorter stun because every limb is robotic, and their organs get emp'd, and they get a combat lock
 
 /mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit)
 	var/list/damaged = list()