From 61c150c5d5cd31655b2c01f61ede500df52615f2 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Tue, 17 Dec 2013 23:42:18 -0500
Subject: [PATCH] Monkey pull fixes

---
 code/modules/mob/living/carbon/monkey/life.dm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index e477abbc6fb..80144a4539a 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -71,7 +71,14 @@
 
 	if(!client && stat == CONSCIOUS)
 		if(prob(33) && canmove && isturf(loc))
-			step(src, pick(cardinal))
+			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))
 		if(prob(1))
 			emote(pick("scratch","jump","roll","tail"))