From 2a7be3c8783bb4ab7136c655eca69b860ced0051 Mon Sep 17 00:00:00 2001
From: Bjorn Neergaard <bjorn@neersighted.com>
Date: Tue, 1 Dec 2015 07:30:20 -0500
Subject: [PATCH] Fix swapped check

---
 code/modules/mob/living/living.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index a30bf3a2208..a75fa2bf332 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -160,10 +160,10 @@ Sorry Giacom. Please don't be mad :(
 	set name = "Pull"
 	set category = "Object"
 
-	if(AM.Adjacent(src))
-		src.start_pulling(AM)
 	if(pulling == AM)
 		stop_pulling()
+	if(AM.Adjacent(src))
+		src.start_pulling(AM)
 	return
 
 //same as above