diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 64ffea2115c..88c836189ad 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -29,7 +29,7 @@ /datum/martial_art/proc/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D) A.do_attack_animation(D) - var/damage = rand(0,9) + A.dna.species.punchmod + var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh) var/atk_verb = A.dna.species.attack_verb if(D.lying) @@ -98,7 +98,7 @@ var/atk_verb = pick("left hook","right hook","straight punch") - var/damage = rand(5,8) + A.dna.species.punchmod + var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!") diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2f00d7f0024..069e7d30025 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -50,7 +50,9 @@ var/burnmod = 1 // multiplier for burn damage var/coldmod = 1 // multiplier for cold damage var/heatmod = 1 // multiplier for heat damage - var/punchmod = 0 // adds to the punch damage + var/punchdamagelow = 0 //lowest possible punch damage + var/punchdamagehigh = 9 //highest possible punch damage + var/punchstunthreshold = 9//damage at which punches from this race will stun var/siemens_coeff = 1 //base electrocution coefficient var/invis_sight = SEE_INVISIBLE_LIVING @@ -928,7 +930,7 @@ if(H.lying) atk_verb = "kick" - var/damage = rand(0, 9) + M.dna.species.punchmod + var/damage = rand(M.dna.species.punchdamagelow, M.dna.species.punchdamagehigh) if(!damage) playsound(H.loc, M.dna.species.miss_sound, 25, 1, -1) @@ -946,7 +948,7 @@ H.apply_damage(damage, BRUTE, affecting, armor_block) add_logs(M, H, "punched") - if((H.stat != DEAD) && damage >= 9) + if((H.stat != DEAD) && damage >= M.dna.species.punchstunthreshold) H.visible_message("[M] has weakened [H]!", \ "[M] has weakened [H]!") H.apply_effect(4, WEAKEN, armor_block) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 700182d9253..893819623e3 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -343,7 +343,8 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) speedmod = 3 armor = 55 siemens_coeff = 0 - punchmod = 5 + punchdamagelow = 5 + punchdamagehigh = 14 blacklisted = 1 no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform) nojumpsuit = 1 @@ -567,7 +568,8 @@ var/global/list/synth_flesh_disguises = list() name = "Military Synth" id = "military_synth" armor = 25 - punchmod = 10 + punchdamagelow = 10 + punchdamagehigh = 19 disguise_fail_health = 50