From 5ed3d6b39c396eaa4b2c52bb75edee1f4abb2b83 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Fri, 23 Nov 2018 13:00:04 +0100 Subject: [PATCH] Added block_chance on living level --- code/modules/mob/living/carbon/human/human_defense.dm | 2 +- code/modules/mob/living/living_defense.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index ae5fe905735..a7d04c7f0c4 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -156,7 +156,7 @@ emp_act return 1 return 0 -/mob/living/carbon/human/proc/check_block() +/mob/living/carbon/human/check_block() if(martial_art && prob(martial_art.block_chance) && martial_art.can_use(src) && in_throw_mode && !incapacitated(FALSE, TRUE)) return TRUE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 92a9a6b7b47..f766a1f53ce 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -337,3 +337,7 @@ if(INTENT_DISARM) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) return TRUE + +//defined here, overridden for humans in human_defense. By default, living mobs don't get to block anything +/mob/living/proc/check_block() + return FALSE \ No newline at end of file