cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7263 from mwerezak/hydrotray

Browse Source 
Fixes atoms with no flags set being walkable
This commit is contained in:
PsiOmegaDelta
2014-12-07 22:06:10 +01:00
parent 79cd5f6430 3002de4b50
commit 5b6d3ab55a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/turfs/turf.dm
View File

@@ -86,7 +86,7 @@
//Finally, check objects/mobs to block entry that are not on the border //Finally, check objects/mobs to block entry that are not on the border
for(var/atom/movable/obstacle in src) for(var/atom/movable/obstacle in src)
if(obstacle.flags & ~ON_BORDER) if(!(obstacle.flags & ON_BORDER))
if(!obstacle.CanPass(mover, mover.loc, 1, 0) && (forget != obstacle)) if(!obstacle.CanPass(mover, mover.loc, 1, 0) && (forget != obstacle))
mover.Bump(obstacle, 1) mover.Bump(obstacle, 1)
return 0 return 0