shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
kevinz000
2020-05-27 21:15:29 -07:00
parent f326c06324
commit c19e00f6c3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/shields.dm
+1
View File
@@ -28,6 +28,7 @@
block_stamina_cost_per_second = 3 block_stamina_cost_per_second = 3
block_start_delay = 3 block_start_delay = 3
block_damage_absorption = 0 block_damage_absorption = 0
block_resting_stamina_penalty_multiplier = 2
/obj/item/shield/examine(mob/user) /obj/item/shield/examine(mob/user)
. = ..() . = ..()
code/modules/mob/living/living_active_block.dm
+1 -1
View File
@@ -165,7 +165,7 @@
multiplier = data.attack_type_list_scan(data.block_resting_stamina_penalty_multiplier_override, attack_type) multiplier = data.attack_type_list_scan(data.block_resting_stamina_penalty_multiplier_override, attack_type)
if(isnull(multiplier)) if(isnull(multiplier))
multiplier = data.block_resting_stamina_penalty_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. /// 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) /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)