From 5eb0e5b9dd1a1267a6a52e66fca9833f702e6df7 Mon Sep 17 00:00:00 2001 From: Olive <49600480+zeskorion@users.noreply.github.com> Date: Wed, 14 Jan 2026 10:57:35 -0800 Subject: [PATCH] caps chimera punches (#12256) --- .../mob/living/carbon/human/species/station/species_attack.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm index 9d0d6675ec..2727289fa8 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm @@ -2,12 +2,12 @@ damage = 3 /datum/unarmed_attack/punch/chimera/get_unarmed_damage(var/mob/living/carbon/human/user) - return damage + user.species.unarmed_bonus + (user.get_feralness() / 5) + return damage + user.species.unarmed_bonus + min((user.get_feralness() / 5), 40) /datum/unarmed_attack/punch/chimera/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone) ..() if(user.get_feralness() && !(target == user)) - var/selfdamage = ((user.get_feralness() / 10)- 15) + var/selfdamage = (min((user.get_feralness() / 10), 20) - 10) if(selfdamage > 0) var/selfdamagezone = null if (user.hand)