From 9013a8d0a289de321fb38feaebb2771d9c963372 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 1 Mar 2015 20:53:22 -0500 Subject: [PATCH] Balancing out tableclimbing. --- code/game/objects/structures/tables_racks.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 141ad4d5405..a05f44b2625 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -27,6 +27,7 @@ var/busy = 0 var/buildstackamount = 1 var/framestackamount = 2 + var/mob/tableclimber /obj/structure/table/New() ..() @@ -219,6 +220,10 @@ /obj/structure/table/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) + if(tableclimber) + tableclimber.Stun(2) + visible_message("You've been knocked off the table!") + /obj/structure/table/attack_tk() // no telehulk sorry return @@ -383,6 +388,7 @@ var/climb_time = 20 if(user.restrained()) //Table climbing takes twice as long when restrained. climb_time *= 2 + tableclimber = user if(do_mob(user, user, climb_time)) if(src.loc) //Checking if table has been destroyed user.pass_flags += PASSTABLE @@ -393,6 +399,7 @@ add_logs(user, src, "climbed onto") user.Stun(2) return 1 + tableclimber = null return 0