?

code/modules/keybindings/bindings_client.dm

@@ -91,11 +91,6 @@
 	if(!(next_move_dir_add & movement))
 		next_move_dir_sub |= movement
 
-	if(prefs.modless_key_bindings[_key])
-		var/datum/keybinding/kb = GLOB.keybindings_by_name[prefs.modless_key_bindings[_key]]
-		if(kb.can_use(src))
-			kb.up(src)
-
 	// We don't do full key for release, because for mod keys you
 	// can hold different keys and releasing any should be handled by the key binding specifically
 	for (var/kb_name in prefs.key_bindings[_key])

code/modules/keybindings/keybind/__defines.dm

@@ -8,7 +8,6 @@
 #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

@@ -1,49 +0,0 @@
-/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/down(client/user)
-	SEND_SIGNAL(user.mob, COMSIG_TOGGLE_COMBAT_MODE)
-	return TRUE
-
-/datum/keybinding/living/active_block
-	hotkey_keys = list("Northwest", "F") // HOME
-	name = "active_block"
-	full_name = "Block (Hold)"
-	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_stop_active_blocking()
-
-/datum/keybinding/living/active_block_toggle
-	name = "active_block_toggle"
-	full_name = "Block (Toggle)"
-	category = CATEGORY_COMBAT
-	description = "Toggles active blocking system using currenet in hand object, or any found object if applicable."
-
-/datum/keybinding/living/active_block_toggle/down(client/user)
-	var/mob/living/L = user.mob
-	L.keybind_toggle_active_blocking()
-	return TRUE
-
-/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,6 +16,16 @@
 	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/down(client/user)
+	SEND_SIGNAL(user.mob, COMSIG_TOGGLE_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,7 @@
 	return TRUE
 
 /datum/keybinding/mob/cycle_intent_right
-	hotkey_keys = list("Unbound")
+	hotkey_keys = list("Northwest", "F") // HOME
 	name = "cycle_intent_right"
 	full_name = "Cycle Action Intent Right"
 	description = ""
@@ -28,7 +28,7 @@
 	return TRUE
 
 /datum/keybinding/mob/cycle_intent_left
-	hotkey_keys = list("Unbound")
+	hotkey_keys = list("Insert", "G")
 	name = "cycle_intent_left"
 	full_name = "Cycle Action Intent Left"
 	description = ""