From b26492e66d56fca7fddbd92a19e8a0290f8583f6 Mon Sep 17 00:00:00 2001 From: RavingManiac Date: Sat, 21 Dec 2013 13:51:06 +0800 Subject: [PATCH] Simplified the monkey pulling check as per Giacom's suggestion. --- code/modules/mob/living/carbon/monkey/life.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index b2dcfb5d2ca..04c36b230ac 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -68,16 +68,9 @@ if(!client && stat == CONSCIOUS) - if(prob(33) && canmove && isturf(loc)) + if(prob(33) && canmove && isturf(loc) && !pulledby) //won't move if being pulled - var/isBeingPulled = 0 - - for(var/mob/M in range(src, 1)) //won't move if being pulled - if(M.pulling == src) - isBeingPulled = 1 - - if(isBeingPulled == 0) - step(src, pick(cardinal)) + step(src, pick(cardinal)) if(prob(1)) emote(pick("scratch","jump","roll","tail"))