From b19b0b92ced61fae88208638bc6e97dfd0abdb89 Mon Sep 17 00:00:00 2001 From: Olive <49600480+zeskorion@users.noreply.github.com> Date: Thu, 11 Dec 2025 04:12:59 -0800 Subject: [PATCH] nerfs pulled punches (#18860) Co-authored-by: Cameron Lennox --- code/modules/mob/living/carbon/human/human_attackhand.dm | 6 +++++- .../mob/living/carbon/human/species/species_attack.dm | 3 +++ code/modules/mob/living/carbon/human/unarmed_attack.dm | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index cabe7b22a9..721dac95b5 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -389,8 +389,12 @@ var/obj/item/clothing/accessory/G = H.gloves real_damage += G.punch_force hit_dam_type = G.punch_damtype - if(HAS_TRAIT(H, TRAIT_NONLETHAL_BLOWS) && !attack.sharp && !attack.edge) //SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN, BUT YOU CAN'T "PULL" A KNIFE + if(HAS_TRAIT(H, TRAIT_NONLETHAL_BLOWS) && !attack.sharp && !attack.edge && !H.get_feralness()) //SO IT IS DECREED: PULLING PUNCHES WILL PREVENT THE ACTUAL DAMAGE FROM RINGS AND KNUCKLES, BUT NOT THE ADDED PAIN, BUT YOU CAN'T "PULL" A KNIFE hit_dam_type = HALLOSS + if(species)// if you're more resistant to physical blows, pulling punches won't make them more likely to down you. This makes species with both brute and pain modifiers double-dip, but I think that's fine + real_damage *= species.brute_mod + rand_damage *= species.brute_mod + real_damage *= damage_multiplier rand_damage *= damage_multiplier if(HULK in H.mutations) diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index 3fcc0c2bea..339654c538 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -165,8 +165,11 @@ SK.shadekin_adjust_energy(attack_damage) /datum/unarmed_attack/claws/chimera //special feral attack that gets stronger as they get angrier + sparring_variant_type = /datum/unarmed_attack/claws/chimera /datum/unarmed_attack/claws/chimera/get_unarmed_damage(var/mob/living/carbon/human/user) + if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS) && !user.get_feralness())//don't add extra species strength when pulling punches, but can't pull punches when feral + return damage return user.species.unarmed_bonus + (user.get_feralness()/5) /datum/unarmed_attack/claws/chimera/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 8ad616b14b..709b8f4b64 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -39,6 +39,8 @@ return FALSE /datum/unarmed_attack/proc/get_unarmed_damage(var/mob/living/carbon/human/user) + if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS))//don't add extra species strength when pulling punches + return damage return damage + user.species.unarmed_bonus /datum/unarmed_attack/proc/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone) @@ -208,6 +210,8 @@ var/obj/item/clothing/shoes = user.shoes if(!istype(shoes)) return user.species.unarmed_bonus + damage + if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS))//don't add extra species strength when pulling punches + return damage + (shoes ? shoes.force : 0) return user.species.unarmed_bonus + damage + (shoes ? shoes.force : 0) /datum/unarmed_attack/kick/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) @@ -253,6 +257,8 @@ /datum/unarmed_attack/stomp/get_unarmed_damage(var/mob/living/carbon/human/user) var/obj/item/clothing/shoes = user.shoes + if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS))//don't add extra species strength when pulling punches + return damage + (shoes ? shoes.force : 0) return user.species.unarmed_bonus + damage + (shoes ? shoes.force : 0) /datum/unarmed_attack/stomp/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) @@ -270,6 +276,6 @@ attack_name = "light hit" attack_noun = list("tap","light strike") attack_verb = list("tapped", "lightly struck") - damage = 3 + damage = 0 damage_type = HALLOSS is_punch = TRUE