cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +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

6
code/modules/tables/interactions.dm
View File

@@ -1,10 +1,4 @@
<<<<<<< HEAD
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
=======
/obj/structure/table/CanPass(atom/movable/mover, turf/target)
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target))
if (flipped == 1)