From 8fde63e016f8bc0d65288c7020b4fb64242758e9 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 18 Dec 2017 15:15:34 -0600 Subject: [PATCH] Update simple_animal.dm --- code/modules/mob/living/simple_animal/simple_animal.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 020e105d9a..04735178d3 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -88,12 +88,8 @@ //domestication var/tame = 0 - -<<<<<<< HEAD no_vore = TRUE -======= var/my_z // I don't want to confuse this with client registered_z ->>>>>>> d03e4ef... Advanced mob laziness (#33574) /mob/living/simple_animal/Initialize() . = ..() @@ -576,4 +572,4 @@ ..() if (AIStatus == AI_Z_OFF) SSidlenpcpool[old_z] -= src - toggle_ai(initial(AIStatus)) \ No newline at end of file + toggle_ai(initial(AIStatus))