From ea7bff0779bb6340dd78568a2be748f15b9aa14a Mon Sep 17 00:00:00 2001
From: Octus <62493359+OctusGit@users.noreply.github.com>
Date: Wed, 18 Jan 2023 21:45:22 -0600
Subject: [PATCH] not gonna sugar coat it (#20155)

---
 code/__DEFINES/dcs/signals.dm    | 2 ++
 code/datums/components/parry.dm  | 8 ++++----
 code/datums/keybindings/human.dm | 7 +++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 9d52a478f62..1c66c6ab458 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -682,6 +682,8 @@
 	#define COMSIG_HUMAN_NO_CHANGE_APPEARANCE (1<<0)
 /// From mob/living/carbon/human/change_head_accessory(): (mob/living/carbon/human/H, head_accessory_style)
 #define COMSIG_HUMAN_CHANGE_HEAD_ACCESSORY "human_change_head_accessory"
+//sent from living mobs when they parry
+#define COMSIG_HUMAN_PARRY "human_parry"
 
 // /datum/species signals
 
diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm
index d01eeb309b8..c9c03359543 100644
--- a/code/datums/components/parry.dm
+++ b/code/datums/components/parry.dm
@@ -30,7 +30,7 @@
 	UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
 	var/obj/item/I = parent
 	if(ismob(I.loc))
-		UnregisterSignal(I.loc, COMSIG_LIVING_RESIST)
+		UnregisterSignal(I.loc, COMSIG_HUMAN_PARRY)
 
 /datum/component/parry/Initialize(_stamina_constant = 0, _stamina_coefficient = 0, _parry_time_out_time = PARRY_DEFAULT_TIMEOUT, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = 2 SECONDS, _no_parry_sound = FALSE)
 	if(!isitem(parent))
@@ -62,13 +62,13 @@
 /datum/component/parry/proc/equipped(datum/source, mob/user, slot)
 	SIGNAL_HANDLER
 	if(slot in list(slot_l_hand, slot_r_hand))
-		RegisterSignal(user, COMSIG_LIVING_RESIST, PROC_REF(start_parry))
+		RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry))
 	else
-		UnregisterSignal(user, COMSIG_LIVING_RESIST)
+		UnregisterSignal(user, COMSIG_HUMAN_PARRY)
 
 /datum/component/parry/proc/dropped(datum/source, mob/user)
 	SIGNAL_HANDLER
-	UnregisterSignal(user, COMSIG_LIVING_RESIST)
+	UnregisterSignal(user, COMSIG_HUMAN_PARRY)
 
 /datum/component/parry/proc/start_parry(mob/living/L)
 	SIGNAL_HANDLER
diff --git a/code/datums/keybindings/human.dm b/code/datums/keybindings/human.dm
index 93156b24a5f..e8299531469 100644
--- a/code/datums/keybindings/human.dm
+++ b/code/datums/keybindings/human.dm
@@ -42,3 +42,10 @@
 		return
 	var/obj/item/clothing/accessory/holster/H = locate() in M.w_uniform
 	H?.holster_verb()
+
+/datum/keybinding/human/parry
+	name = "Parry"
+
+/datum/keybinding/human/parry/down(client/C)
+	. = ..()
+	SEND_SIGNAL(C.mob, COMSIG_HUMAN_PARRY)