From d9f4b82a46ccc19100ce7749dfb9365f37221548 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Thu, 4 Oct 2018 13:30:36 -0300
Subject: [PATCH] Fix shock causing slowdown to species that suffer no pain.
 (#5353)

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

diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 7f7db247165..cfd588e6a7b 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -51,8 +51,8 @@
 			else if(E.status & ORGAN_BROKEN)
 				tally += 1.5
 
-	if(shock_stage >= 10) tally += 3
-
+	if (!(species && (species.flags & NO_PAIN)))
+		if(shock_stage >= 10) tally += 3
 
 	if(aiming && aiming.aiming_at) tally += 5 // Iron sights make you slower, it's a well-known fact.