cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3409 from Yoshax/missfix

Browse Source 
Simple fix for #3374
This commit is contained in:
Anewbe
2017-05-03 20:45:36 -05:00
committed by GitHub
parent 0c848e2fd7 eda674eca0
commit b12a46ffb7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -207,7 +207,7 @@
miss_type = 1 miss_type = 1
if(prob(80)) 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(prob(15) && hit_zone != BP_TORSO) // Missed!
if(!src.lying) if(!src.lying)
attack_message = "[H] attempted to strike [src], but missed!" attack_message = "[H] attempted to strike [src], but missed!"
@@ -248,13 +248,13 @@
rand_damage *= 2 rand_damage *= 2
real_damage = max(1, real_damage) real_damage = max(1, real_damage)
var/armour = run_armor_check(affecting, "melee") var/armour = run_armor_check(hit_zone, "melee")
var/soaked = get_armor_soak(affecting, "melee") var/soaked = get_armor_soak(hit_zone, "melee")
// Apply additional unarmed effects. // Apply additional unarmed effects.
attack.apply_effects(H, src, armour, rand_damage, hit_zone) attack.apply_effects(H, src, armour, rand_damage, hit_zone)
// Finally, apply damage to target // 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) if(I_DISARM)
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>") M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>")