From e617f9e47b4a5f6a7c0ddbc6b3cfb7fd10f18714 Mon Sep 17 00:00:00 2001 From: Mek Date: Wed, 23 Feb 2022 18:10:11 -0500 Subject: [PATCH 1/2] Biiiig Block --- code/datums/martial/cqc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 478c3729ecad..e0b03a8da52d 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -26,7 +26,7 @@ name = "CQC" id = MARTIALART_CQC help_verb = /mob/living/carbon/human/proc/CQC_help - block_chance = 75 + block_chance = 90 //Don't get into melee with someone specifically trained for melee and prepared for your attacks nonlethal = TRUE //all attacks deal solely stamina damage or knock out before dealing lethal amounts of damage ///whether the art checks for being inside the kitchen for use var/just_a_cook = FALSE From d216dc0c9dc491c3574e8820c37b792d6fa3479c Mon Sep 17 00:00:00 2001 From: Mek Date: Sat, 19 Mar 2022 23:28:50 -0400 Subject: [PATCH 2/2] +Stamina cost --- code/datums/martial/cqc.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index e0b03a8da52d..eef37136a878 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -318,6 +318,7 @@ I.forceMove(get_turf(attacker)) attacker.Paralyze(20) attacker.Knockdown(60) + user.adjustStaminaLoss(10) //Can't block forever. Really, if this becomes a problem you're already screwed. /** * CQC help proc @@ -342,4 +343,4 @@ to_chat(usr, "[span_notice("Pressure")]: Disarm Grab. Disables the targetted limb or a random limb if the head or chest are targetted, as well as forcing the target to drop anything they are holding.") to_chat(usr, "[span_notice("Consecutive CQC")]: Harm Harm Harm Harm Harm. Offensive move, deals bonus stamina damage and knocking down on the last hit.") - to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to counter attacks done to you.") + to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to counter attacks done to you. Beware, counter-attacks are tiring and you won't be able to defend yourself forever!")