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

Rewrites Atmospherics

Browse Source
This commit is contained in:
Anewbe
2019-02-10 17:32:39 -06:00
committed by Novacat
parent 6d4ea26332
commit 8ed384b38c
49 changed files with 633 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,25 @@
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height, air_group)
<<<<<<< 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)
if (get_dir(loc, target) == dir)
return !density
else
return 1
return TRUE
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
return TRUE
if(locate(/obj/structure/table/bench) in get_turf(mover))
return 0
return FALSE
var/obj/structure/table/table = locate(/obj/structure/table) in get_turf(mover)
if(table && !table.flipped)
return 1
return 0
return TRUE
return FALSE
//checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops.
/obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from)