From 45449da433c4324d90c359f01e0f091bf85b228a Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Fri, 18 Jun 2021 21:00:27 +0100 Subject: [PATCH] table climbing fix (#16203) * table climbing fix * TRUE/FALSE --- code/game/objects/structures/tables_racks.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 28e61e90e58..63db6501f74 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -108,25 +108,27 @@ /obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0) if(height == 0) - return 1 + return TRUE if(istype(mover,/obj/item/projectile)) return (check_cover(mover,target)) if(ismob(mover)) var/mob/M = mover if(M.flying) - return 1 + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 + return TRUE if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover)) - return 1 + var/obj/structure/table/T = locate(/obj/structure/table) in get_turf(mover) + if(!T.flipped) + return TRUE if(flipped) if(get_dir(loc, target) == dir) return !density else - return 1 - return 0 + return TRUE + return FALSE /obj/structure/table/CanAStarPass(ID, dir, caller) . = !density