Skip to content

Commit

Permalink
makes pulling stop if the thing clicked can't be pulled
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
MrStonedOne committed Jan 12, 2016
1 parent 643ce94 commit 89c5b28
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 89c5b28

Please sign in to comment.