Merge pull request #3002 from Citadel-Station-13/upstream-merge-31037

[MIRROR] Movement delay fixes and optimization

code/modules/mob/living/living.dm

@@ -460,7 +460,7 @@
 		makeTrail(newloc, T, old_direction)
 
 /mob/living/movement_delay(ignorewalk = 0)
-	. = ..()
+	. = 0
 	if(isopenturf(loc) && !is_flying())
 		var/turf/open/T = loc
 		. += T.slowdown

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -271,14 +271,11 @@
 
 
 /mob/living/simple_animal/movement_delay()
-	. = ..()
-
-	. = speed
-
 	var/static/config_animal_delay
 	if(isnull(config_animal_delay))
 		config_animal_delay = CONFIG_GET(number/animal_delay)
 	. += config_animal_delay
+	return ..() + speed + config_animal_delay
 
 /mob/living/simple_animal/Stat()
 	..()

code/modules/mob/mob.dm

@@ -162,7 +162,7 @@
 	for(var/mob/M in get_hearers_in_view(range, src))
 		M.show_message( message, 2, deaf_message, 1)
 
-/mob/proc/movement_delay()
+/mob/proc/movement_delay()	//update /living/movement_delay() if you change this
 	return 0
 
 /mob/proc/Life()