From fa8afbc09ec9425e9e16b5ede060d68732741790 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 23 Jul 2014 00:41:17 -0500 Subject: [PATCH] Tasers will now cause movement slow downs on the first hit Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit. After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly) Conflicts: code/modules/mob/living/carbon/human/human_movement.dm --- code/modules/mob/living/carbon/human/human_movement.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index de417434b13..021c3bf80b3 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -21,9 +21,12 @@ if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything - var/health_deficiency = (100 - health + halloss) + var/health_deficiency = (100 - health) + if(health_deficiency >= 40) tally += (health_deficiency / 25) + if(halloss >= 10) tally += (halloss / 10) + var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80 if (hungry >= 70) tally += hungry/50