diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index fe4b57915877..2dc696c9b253 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -160,7 +160,12 @@ /mob/living/carbon/human/proc/check_block() if(mind) - if(mind.martial_art && prob(mind.martial_art.block_chance) && mind.martial_art.can_use(src) && in_throw_mode && !incapacitated(FALSE, TRUE)) + var/sane_mod = 0 //dripstation edit + var/datum/component/mood/mood = GetComponent(/datum/component/mood) //dripstation edit + if(mood) //dripstation edit + sane_mod = min(30, 30 - 0.32 * mood.sanity) //dripstation edit + sane_mod = max(10, sane_mod) //dripstation edit + if(mind.martial_art && prob(mind.martial_art.block_chance - sane_mod) && mind.martial_art.can_use(src) && in_throw_mode && !incapacitated(FALSE, TRUE)) //dripstation edit return mind.martial_art //need to use this where blocks are handled to handle counters since check_block doesn't reference the attacker return FALSE diff --git a/modular_dripstation/code/datums/martial/sleeping_carp.dm b/modular_dripstation/code/datums/martial/sleeping_carp.dm index db47c4673162..3659ec8b4e3b 100644 --- a/modular_dripstation/code/datums/martial/sleeping_carp.dm +++ b/modular_dripstation/code/datums/martial/sleeping_carp.dm @@ -1,4 +1,4 @@ -block_chance = 100 //Carp evades freak shit like shoves and hands, 50% dodges other unarmed attacks +block_chance = 90 //Carp evades freak shit like shoves and hands, 50% dodges other unarmed attacks ///Carp conter: carp evades freak shit like shoves and hands, 50% dodges other unarmed attacks /datum/martial_art/the_sleeping_carp/handle_counter(mob/living/carbon/human/user, mob/living/carbon/human/attacker)