Update simple_animal.dm

2017-09-30 01:45:46 -05:00
parent 7621d1da91
commit ee0c45751b
1 changed files with 0 additions and 8 deletions
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -271,19 +271,11 @@


 /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()
 	..()