From ee0c45751b41448fe6d28da5b72e723f2a14effe Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 01:45:46 -0500 Subject: [PATCH] Update simple_animal.dm --- code/modules/mob/living/simple_animal/simple_animal.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index a7bab7ee26..4e988c482c 100644 --- 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() ..()