cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source 
This one made a lynx cry.
This commit is contained in:
Unknown
2019-03-28 13:19:19 -04:00
parent 3256202407
commit cf39c61c2d
27 changed files with 96 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
-7
View File
@@ -131,17 +131,10 @@
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
<<<<<<< HEAD
return 1
if(is_fulltile())
return 0 //full tile window, you can't move into it!
if(get_dir(loc, target) & dir)
=======
return TRUE
if(is_fulltile())
return FALSE //full tile window, you can't move into it!
if((get_dir(loc, target) & dir) || (get_dir(mover, target) == turn(dir, 180)))
>>>>>>> 9ff8103... Merge pull request #5636 from kevinz000/pixel_projectiles
return !density
else
return TRUE