makes pull punches work (#16824)

This commit is contained in:
tacoguy7765093
2025-01-06 06:45:27 +10:00
committed by GitHub
parent 941bbd54b8
commit d53224f8f2
2 changed files with 2 additions and 2 deletions
@@ -277,7 +277,7 @@
real_damage += G.punch_force
hit_dam_type = G.punch_damtype
if(H.pulling_punches && !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
hit_dam_type = AGONY
hit_dam_type = HALLOSS
real_damage *= damage_multiplier
rand_damage *= damage_multiplier
if(HULK in H.mutations)
@@ -278,7 +278,7 @@ var/global/list/sparring_attack_cache = list()
attack_noun = list("tap","light strike")
attack_verb = list("tapped", "lightly struck")
damage = 3
damage_type = AGONY
damage_type = HALLOSS
shredding = 0
damage = 0
sharp = FALSE