From 7ea7172fb27a1c1f0205dfbcf89a8355e514cd2b Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 19 Aug 2024 14:34:43 +0200 Subject: [PATCH] You can no longer parry while dead (#26529) * You can no longer parry while dead * Update code/datums/components/parry.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Adrer --------- Signed-off-by: Adrer Co-authored-by: adrermail@gmail.com Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/datums/components/parry.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm index 285353bd841..b2e55c3b020 100644 --- a/code/datums/components/parry.dm +++ b/code/datums/components/parry.dm @@ -79,6 +79,8 @@ /datum/component/parry/proc/start_parry(mob/living/L) SIGNAL_HANDLER var/time_since_parry = world.time - time_parried + if(L.stat != CONSCIOUS) + return if(requires_two_hands && !HAS_TRAIT(parent, TRAIT_WIELDED)) // If our item has special conditions before being able to parry. return if(requires_activation && !HAS_TRAIT(parent, TRAIT_ITEM_ACTIVE)) // If our item requires an activation to be able to parry. [E-sword / Teleshield, etc.]