From adbc74a942e2bb8b893bfc8bcd657c6cbf38655d Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 17 Aug 2012 05:37:11 +0000 Subject: [PATCH] - Fixes issue 748. Pulling restrained monkeys now behaves as it's supposed to. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4462 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/monkey/monkey.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 50de0446040..fe4ac78eea7 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -413,8 +413,8 @@ if (restrained()) for(var/mob/M in range(src, 1)) if ((M.pulling == src && M.stat == 0 && !( M.restrained() ))) - return 0 - if ((t7 && pulling && get_dist(src, pulling) <= 1)) + t7 = null + if (t7 && (pulling && get_dist(src, pulling) <= 1)) if (pulling.anchored) stop_pulling() var/T = loc @@ -422,7 +422,7 @@ if (!( isturf(pulling.loc) )) stop_pulling() return - if (!( restrained() )) + if (!buckled) var/diag = get_dir(src, pulling) if ((diag - 1) & diag) else