From c19e00f6c326b1f92ddc110768df034f8a7716f0 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 27 May 2020 21:15:29 -0700 Subject: [PATCH] fixes --- code/game/objects/items/shields.dm | 1 + code/modules/mob/living/living_active_block.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 5aa42b7b85..a2660b1bfb 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -28,6 +28,7 @@ block_stamina_cost_per_second = 3 block_start_delay = 3 block_damage_absorption = 0 + block_resting_stamina_penalty_multiplier = 2 /obj/item/shield/examine(mob/user) . = ..() diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm index d7e07beb9c..da2070b467 100644 --- a/code/modules/mob/living/living_active_block.dm +++ b/code/modules/mob/living/living_active_block.dm @@ -165,7 +165,7 @@ multiplier = data.attack_type_list_scan(data.block_resting_stamina_penalty_multiplier_override, attack_type) if(isnull(multiplier)) multiplier = data.block_resting_stamina_penalty_multiplier - return (damage_blocked / efficiency) + return (damage_blocked / efficiency) * multiplier /// Apply the stamina damage to our user, notice how damage argument is stamina_amount. /obj/item/proc/active_block_do_stamina_damage(mob/living/owner, atom/object, stamina_amount, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)