From 89c5b288b36a5a1bdb36d24e81a9b3328d217cff Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Tue, 12 Jan 2016 15:22:47 -0800 Subject: [PATCH] makes pulling stop if the thing clicked can't be pulled This is better then making it a toggle, as people spam click or may think that the pull didn't go thru clicking again, and this causes the pull to stop. --- code/modules/mob/living/living.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1a2091e1680..6af067cc65c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -162,10 +162,10 @@ Sorry Giacom. Please don't be mad :( set name = "Pull" set category = "Object" - if(pulling == AM) + if(AM.Adjacent(src)) + start_pulling(AM) + else stop_pulling() - else if(AM.Adjacent(src)) - src.start_pulling(AM) //same as above /mob/living/pointed(atom/A as mob|obj|turf in view())