From 1c3682cd1594d943abf9a5c45ef7023aee645c7a Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 17 Dec 2019 00:03:39 +0100
Subject: [PATCH] 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 a982273c86..eef170cea9 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 241bc15b60..8e9c787b6b 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 ..()
\ No newline at end of file