From 0745219d06b70ee48ae8d0c449edf4682a3aa182 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 29 Mar 2015 23:57:47 +0200 Subject: [PATCH] Fixes tableclimber knocking themself off the table when clicking it mid-climb. --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index da22c57e321..9b751df0eb3 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -220,7 +220,7 @@ /obj/structure/table/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) - if(tableclimber) + if(tableclimber && tableclimber != user) tableclimber.Weaken(2) tableclimber.visible_message("[tableclimber.name] has been knocked off the table", "You've been knocked off the table", "You see [tableclimber.name] get knocked off the table")