diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 6dcb9e06ef..5e1c8497d6 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -17,7 +17,7 @@ var/atk_verb = pick("left hook","right hook","straight punch") - var/extra_damage = base_damage + var/extra_damage = damage_base if(extra_damage == A.dna.species.punchdamagelow) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) D.visible_message("[A] has attempted to [atk_verb] [D]!", \ diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index dc0ea1a2b4..56f6a1969a 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -63,11 +63,11 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if((D.mobility_flags & MOBILITY_STAND)) D.apply_damage(damage_base, BRUTE, BODY_ZONE_HEAD) - D.DefaultCombatKnockdown(50) + D.DefaultCombatKnockdown(50, override_hardstun = 0.01, override_stamdmg = 0) D.apply_damage(damage_base + 35, STAMINA, BODY_ZONE_HEAD) //A cit specific change form the tg port to really punish anyone who tries to stand up D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - if(!(D.mobility_flags & MOBILITY_STAND)) + else if(!(D.mobility_flags & MOBILITY_STAND)) D.apply_damage(damage_base*0.5, BRUTE, BODY_ZONE_HEAD) D.apply_damage(damage_base + 35, STAMINA, BODY_ZONE_HEAD) D.drop_all_held_items()