From c345f317ac44800b3d7748a8ca60f526b1cc7a1f Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 20 May 2015 17:10:18 +0100 Subject: [PATCH] Fixes structure climbing --- code/game/objects/structures.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 4b0501a2d1..1f2025ca07 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -78,8 +78,8 @@ else return ..() -/obj/structure/proc/can_climb(var/mob/living/user) - if (!can_touch(user) || !climbable || (user in climbers)) +/obj/structure/proc/can_climb(var/mob/living/user, post_climb_check=0) + if (!can_touch(user) || !climbable || (!post_climb_check && (user in climbers))) return 0 if (!user.Adjacent(src)) @@ -115,7 +115,7 @@ climbers -= user return - if (!can_climb(user)) + if (!can_climb(user, post_climb_check=1)) climbers -= user return