cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-28 19:41:16 -04:00
parent 8ed384b38c
commit d3837b76e8
5 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/structures/window.dm
View File

@@ -130,17 +130,7 @@
/obj/structure/window/blob_act()
take_damage(50)
<<<<<<< HEAD
//TODO: Make full windows a separate type of window.
//Once a full window, it will always be a full window, so there's no point
//having the same type for both.
/obj/structure/window/proc/is_full_window()
return (dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
=======
/obj/structure/window/CanPass(atom/movable/mover, turf/target)
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
if(istype(mover) && mover.checkpass(PASSGLASS))
return TRUE
if(is_fulltile())