keybindings

code/modules/keybindings/keybind/__defines.dm

@@ -8,6 +8,7 @@
 #define CATEGORY_MISC "MISC"
 #define CATEGORY_MOVEMENT "MOVEMENT"
 #define CATEGORY_TARGETING "TARGETING"
+#define CATEGORY_COMBAT "combat"
 
 #define WEIGHT_HIGHEST 0
 #define WEIGHT_ADMIN 10

code/modules/keybindings/keybind/combat.dm

@@ -0,0 +1,42 @@
+/datum/keybinding/living/toggle_combat_mode
+	hotkey_keys = list("C")
+	name = "toggle_combat_mode"
+	full_name = "Toggle combat mode"
+	category = CATEGORY_COMBAT
+	description = "Toggles whether or not you're in combat mode."
+
+/datum/keybinding/living/toggle_combat_mode/can_use(client/user)
+	return iscarbon(user.mob)		// for now, only carbons should be using combat mode, although all livings have combat mode implemented.
+
+/datum/keybinding/living/toggle_combat_mode/down(client/user)
+	var/mob/living/carbon/C = user.mob
+	C.user_toggle_intentional_combat_mode()
+	return TRUE
+
+/datum/keybinding/living/active_block
+	hotkey_keys = list("Northwest", "F") // HOME
+	name = "active_block"
+	full_name = "Block"
+	category = CATEGORY_COMBAT
+	description = "Hold down to actively block with your currently in-hand object."
+
+/datum/keybinding/living/active_block/down(client/user)
+	var/mob/living/L = user.mob
+	L.keybind_start_active_blocking()
+	return TRUE
+
+/datum/keybinding/living/active_block/up(client/user)
+	var/mob/living/L = user.mob
+	L.keybind_start_active_blocking()
+
+/datum/keybinding/living/active_parry
+	hotkey_keys = list("Insert", "G")
+	name = "active_parry"
+	full_name = "Parry"
+	category = CATEGORY_COMBAT
+	description = "Press to initiate a parry sequence with your currently in-hand object."
+
+/datum/keybinding/living/active_parry/down(client/user)
+	var/mob/living/L = user.mob
+	L.keybind_parry()
+	return TRUE

code/modules/keybindings/keybind/living.dm

@@ -16,20 +16,6 @@
 	L.resist()
 	return TRUE
 
-/datum/keybinding/living/toggle_combat_mode
-	hotkey_keys = list("C")
-	name = "toggle_combat_mode"
-	full_name = "Toggle combat mode"
-	description = "Toggles whether or not you're in combat mode."
-
-/datum/keybinding/living/toggle_combat_mode/can_use(client/user)
-	return iscarbon(user.mob)		// for now, only carbons should be using combat mode, although all livings have combat mode implemented.
-
-/datum/keybinding/living/toggle_combat_mode/down(client/user)
-	var/mob/living/carbon/C = user.mob
-	C.user_toggle_intentional_combat_mode()
-	return TRUE
-
 /datum/keybinding/living/toggle_resting
 	hotkey_keys = list("V")
 	name = "toggle_resting"

code/modules/keybindings/keybind/mob.dm

@@ -17,7 +17,6 @@
 	return TRUE
 
 /datum/keybinding/mob/cycle_intent_right
-	hotkey_keys = list("Northwest", "F") // HOME
 	name = "cycle_intent_right"
 	full_name = "Cycle Action Intent Right"
 	description = ""
@@ -28,7 +27,6 @@
 	return TRUE
 
 /datum/keybinding/mob/cycle_intent_left
-	hotkey_keys = list("Insert", "G")
 	name = "cycle_intent_left"
 	full_name = "Cycle Action Intent Left"
 	description = ""