mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 14:47:50 +01:00
[MIRROR] Fixes not being able to fall onto tables (#12245)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
This commit is contained in:
co-authored by
SatinIsle
parent
c656a9c530
commit
4b8301725a
@@ -51,6 +51,11 @@
|
||||
if(!drop_mob || drop_mob == source)
|
||||
return
|
||||
|
||||
if((drop_mob.status_flags & HIDING))
|
||||
var/obj/structure/table/is_there_a_table = locate() in landing //Don't eat people hiding under tables
|
||||
if(is_there_a_table)
|
||||
return
|
||||
|
||||
//pred = drop_mob
|
||||
//prey = source
|
||||
//result: source is eaten by drop_mob
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
/obj/structure/table/CanPass(atom/movable/mover, turf/target)
|
||||
if(istype(mover,/obj/item/projectile))
|
||||
return (check_cover(mover,target))
|
||||
if(mover.z > z)
|
||||
return TRUE //This allows mobs to drop down onto tables from above
|
||||
if(flipped == 1)
|
||||
if(get_dir(mover, target) == GLOB.reverse_dir[dir]) // From elsewhere to here, can't move against our dir
|
||||
return !density
|
||||
|
||||
Reference in New Issue
Block a user