cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 02:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
PsiOmegaDelta
2015-12-20 11:22:08 +01:00
parent 1190f5fe4b 1cb2239938
commit 5d3d0c5dc3
10 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+1 -1
View File
@@ -136,7 +136,7 @@
return 1
if(is_full_window())
return 0 //full tile window, you can't move into it!
if(get_dir(loc, target) == dir)
if(get_dir(loc, target) & dir)
return !density
else
return 1