From eda674eca0b8492e09af35ea0a7d606c8355a2a6 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Thu, 4 May 2017 01:18:53 +0100 Subject: [PATCH] Attack fix --- code/modules/mob/living/carbon/human/human_attackhand.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 5c895d43ae..963bab6367 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -207,7 +207,7 @@ miss_type = 1 if(prob(80)) - hit_zone = ran_zone(hit_zone) + hit_zone = ran_zone(hit_zone, 70) //70% chance to hit what you're aiming at seems fair? if(prob(15) && hit_zone != BP_TORSO) // Missed! if(!src.lying) attack_message = "[H] attempted to strike [src], but missed!" @@ -248,13 +248,13 @@ rand_damage *= 2 real_damage = max(1, real_damage) - var/armour = run_armor_check(affecting, "melee") - var/soaked = get_armor_soak(affecting, "melee") + var/armour = run_armor_check(hit_zone, "melee") + var/soaked = get_armor_soak(hit_zone, "melee") // Apply additional unarmed effects. attack.apply_effects(H, src, armour, rand_damage, hit_zone) // Finally, apply damage to target - apply_damage(real_damage, (attack.deal_halloss ? HALLOSS : BRUTE), affecting, armour, soaked, sharp=attack.sharp, edge=attack.edge) + apply_damage(real_damage, (attack.deal_halloss ? HALLOSS : BRUTE), hit_zone, armour, soaked, sharp=attack.sharp, edge=attack.edge) if(I_DISARM) M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])")