From 3921590a4b4325866d49960dc3a7bb0af102bfd8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 29 Apr 2018 18:42:17 -0400 Subject: [PATCH] Update life.dm --- code/modules/mob/living/carbon/monkey/life.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index be2c6364b7..879aa82750 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -18,13 +18,8 @@ if(..()) if(!client) -<<<<<<< HEAD if(stat == CONSCIOUS) - if(on_fire || buckled || restrained() || (resting && canmove)) -======= - if(stat == CONSCIOUS) - if(on_fire || buckled || restrained()) ->>>>>>> 98f8ca7... Moves several clothing-specific flags from /atom to their proper type (#37486) + if(on_fire || buckled || restrained() || (resting && canmove)) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting if(!resisting && prob(MONKEY_RESIST_PROB)) resisting = TRUE walk_to(src,0) @@ -188,4 +183,4 @@ #undef COLD_DAMAGE_LEVEL_1 #undef COLD_DAMAGE_LEVEL_2 -#undef COLD_DAMAGE_LEVEL_3 \ No newline at end of file +#undef COLD_DAMAGE_LEVEL_3