From 9013a8d0a289de321fb38feaebb2771d9c963372 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 1 Mar 2015 20:53:22 -0500 Subject: [PATCH 1/4] 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 From 301c924f12a4d87f52aa87e9191bb8c45b084500 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Sun, 1 Mar 2015 20:59:13 -0500 Subject: [PATCH 2/4] Changelog for tableclimbing balance pr. --- html/changelogs/Mandurrrh-tableclimbing.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 html/changelogs/Mandurrrh-tableclimbing.yml diff --git a/html/changelogs/Mandurrrh-tableclimbing.yml b/html/changelogs/Mandurrrh-tableclimbing.yml new file mode 100644 index 00000000000..8fd674a954e --- /dev/null +++ b/html/changelogs/Mandurrrh-tableclimbing.yml @@ -0,0 +1,9 @@ + +author: Mandurrrh + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + + +changes: + - rscadd: "Added the ability to stop table climbers by clicking the table if present." From 43f1fc3fd6d51d03e8daa2c5da84316ba33a627f Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Mon, 2 Mar 2015 08:07:52 -0500 Subject: [PATCH 3/4] Adds appropriate message for user and nearby mobs for being knocked off table. Also uses weaken instead of stun to physically knock the player over. --- code/game/objects/structures/tables_racks.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a05f44b2625..ae78d896e37 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -221,8 +221,8 @@ /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!") + 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") /obj/structure/table/attack_tk() // no telehulk sorry @@ -399,7 +399,7 @@ add_logs(user, src, "climbed onto") user.Stun(2) return 1 - tableclimber = null + tableclimber = null return 0 From 2ec53ea6c7eb2a3a02026987e812820377458fb4 Mon Sep 17 00:00:00 2001 From: Mandurrrh Date: Mon, 2 Mar 2015 16:53:15 -0500 Subject: [PATCH 4/4] Adds the second block for table climbing before the first return. --- code/game/objects/structures/tables_racks.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index ae78d896e37..196ce0cbb0b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -398,6 +398,7 @@ "You climb onto [src].") add_logs(user, src, "climbed onto") user.Stun(2) + tableclimber = null return 1 tableclimber = null return 0