diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 649e19ba29..dd137c97c0 100644
--- a/code/modules/mob/living/living.dm
+++ b/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
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 144fec4a4a..a7bab7ee26 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -271,11 +271,19 @@
 
 
 /mob/living/simple_animal/movement_delay()
+<<<<<<< HEAD
 	. = ..()
 
 	. = speed
 
 	. += config.animal_delay
+=======
+	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
+>>>>>>> 3fb8828... Movement delay fixes and optimization (#31037)
 
 /mob/living/simple_animal/Stat()
 	..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index f768cbe2d2..159b3f5ad1 100644
--- a/code/modules/mob/mob.dm
+++ b/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()