cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3551 from Segrain/master

Browse Source 
Pulling fixes.
This commit is contained in:
Zuhayr
2013-08-19 02:08:28 -07:00
parent 4262e6b6bc 18b26c57b7
commit 97a8347e6b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor.dm
+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
code/game/turfs/space/space.dm
+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
code/game/turfs/turf.dm
+1 -1
View File
@@ -181,7 +181,7 @@
M.inertia_dir = 0
return
spawn(5)
if((M && !(M.anchored) && (M.loc == src)))
if((M && !(M.anchored) && !(M.pulledby) && (M.loc == src)))
if(M.inertia_dir)
step(M, M.inertia_dir)
return
code/game/turfs/unsimulated/floor.dm
+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