From b9e3e0e57e3f853f61c63df1c8dbef601f3fca3d Mon Sep 17 00:00:00 2001 From: Cyantime Date: Sun, 6 Aug 2017 02:36:23 -0400 Subject: [PATCH 1/3] Nerfs tabling --- code/modules/tables/interactions.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 1b287294b1..5614a1b8c2 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -106,9 +106,9 @@ else user << "You need a better grip to do that!" return - else - G.affecting.loc = src.loc - G.affecting.Weaken(5) + else if(!M.Check_Shoegrip() && do_mob(user, M, 5+(M.getarmor(BP_TORSO,"melee")/4))) + M.forceMove(get_turf(src)) + M.Weaken(round(5-(M.getarmor(null, "melee")/20))) visible_message("[G.assailant] puts [G.affecting] on \the [src].") qdel(W) return From 5b9cf75355dca4539f4fdc3a1b8b52b823727312 Mon Sep 17 00:00:00 2001 From: Cyantime Date: Mon, 7 Aug 2017 21:34:34 -0400 Subject: [PATCH 2/3] Tabling nerf reduction(?) --- code/modules/tables/interactions.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 5614a1b8c2..19764b2997 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -85,6 +85,8 @@ if(occupied) user << "There's \a [occupied] in the way." return + if(!user.Adjacent(M)) + return if (G.state < 2) if(user.a_intent == I_HURT) if (prob(15)) M.Weaken(5) @@ -106,9 +108,9 @@ else user << "You need a better grip to do that!" return - else if(!M.Check_Shoegrip() && do_mob(user, M, 5+(M.getarmor(BP_TORSO,"melee")/4))) + else if(G.state > GRAB_AGGRESSIVE || world.time >= (G.last_action + UPGRADE_COOLDOWN)) M.forceMove(get_turf(src)) - M.Weaken(round(5-(M.getarmor(null, "melee")/20))) + M.Weaken(5) visible_message("[G.assailant] puts [G.affecting] on \the [src].") qdel(W) return From 958806f68a4c8f60199753f556a2b22cd0e18b3d Mon Sep 17 00:00:00 2001 From: Cyantime Date: Sat, 26 Aug 2017 22:45:32 -0400 Subject: [PATCH 3/3] Changelog --- html/changelogs/Cyantime-Tabling.yml | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Cyantime-Tabling.yml diff --git a/html/changelogs/Cyantime-Tabling.yml b/html/changelogs/Cyantime-Tabling.yml new file mode 100644 index 0000000000..ebb8d00c11 --- /dev/null +++ b/html/changelogs/Cyantime-Tabling.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Cyantime + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Tabling now requires a completed aggressive grab."