From 4b8301725a98b92bcae1b24c06b7bd7ebfa8b1e7 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 13 Jan 2026 03:04:20 -0700 Subject: [PATCH] [MIRROR] Fixes not being able to fall onto tables (#12245) Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> --- code/datums/elements/vore/spontaneous_vore.dm | 5 +++++ code/modules/tables/interactions.dm | 2 ++ 2 files changed, 7 insertions(+) diff --git a/code/datums/elements/vore/spontaneous_vore.dm b/code/datums/elements/vore/spontaneous_vore.dm index 2f3059264d..72fc4dca20 100644 --- a/code/datums/elements/vore/spontaneous_vore.dm +++ b/code/datums/elements/vore/spontaneous_vore.dm @@ -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 diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 01a8302edd..efb9ef3a73 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -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