This commit is contained in:
Segrain
2013-08-19 13:05:00 +03:00
parent 4262e6b6bc
commit cd4eaecf21
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -188,7 +188,7 @@ turf/simulated/floor/proc/update_icon()
update_icon()
if ((!( user.canmove ) || user.restrained() || !( user.pulling )))
return
if (user.pulling.anchored)
if (user.pulling.anchored || !isturf(user.pulling.loc))
return
if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
return
+1 -1
View File
@@ -17,7 +17,7 @@
/turf/space/attack_hand(mob/user as mob)
if ((user.restrained() || !( user.pulling )))
return
if (user.pulling.anchored)
if (user.pulling.anchored || !isturf(user.pulling.loc))
return
if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
return
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/unsimulated/floor/attack_hand(var/mob/user as mob)
if ((!( user.canmove ) || user.restrained() || !( user.pulling )))
return
if (user.pulling.anchored)
if (user.pulling.anchored || !isturf(user.pulling.loc))
return
if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
return