From 6810aa0a94b6e3860da799f38102474459d251f6 Mon Sep 17 00:00:00 2001 From: Lin Date: Thu, 19 Dec 2019 23:42:06 +0000 Subject: [PATCH] Merge pull request #10214 from Ghommie/Ghommie-cit472 Brings carbon action intent hotkeys down to living. --- code/modules/keybindings/bindings_carbon.dm | 12 ------------ code/modules/keybindings/bindings_living.dm | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/code/modules/keybindings/bindings_carbon.dm b/code/modules/keybindings/bindings_carbon.dm index a982273c..eef170ce 100644 --- a/code/modules/keybindings/bindings_carbon.dm +++ b/code/modules/keybindings/bindings_carbon.dm @@ -3,18 +3,6 @@ if("R", "Southwest") // Southwest is End toggle_throw_mode() return - if("1") - a_intent_change("help") - return - if("2") - a_intent_change("disarm") - return - if("3") - a_intent_change("grab") - return - if("4") - a_intent_change("harm") - return if("C") toggle_combat_mode() return diff --git a/code/modules/keybindings/bindings_living.dm b/code/modules/keybindings/bindings_living.dm index 7ae8b996..0a9a7ef8 100644 --- a/code/modules/keybindings/bindings_living.dm +++ b/code/modules/keybindings/bindings_living.dm @@ -3,5 +3,22 @@ if("B") resist() return + if("1") + if(possible_a_intents) + a_intent_change(INTENT_HELP) + return + if("2") + if(possible_a_intents) + a_intent_change(INTENT_DISARM) + return + if("3") + if(possible_a_intents) + a_intent_change(INTENT_GRAB) + return + if("4") + if(possible_a_intents) + a_intent_change(INTENT_HARM) + return + return ..()