From e3f6f07e738edf717401410c787036d045eede9f Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Wed, 11 Mar 2020 15:26:21 +1100 Subject: [PATCH] some adjustments for now --- code/datums/martial/rising_bass.dm | 4 +--- code/datums/martial/sleeping_carp.dm | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 3b143817ce..8055bd54e9 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -187,10 +187,8 @@ return BULLET_ACT_HIT if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS! return BULLET_ACT_HIT - A.visible_message("[A] dodges the bullet cleanly, they're immune to ranged weapons!", "You dodge out of the way of the projectile!") + A.visible_message("[A] dodges the projectile cleanly, they're immune to ranged weapons!", "You dodge out of the way of the projectile!") playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) - P.firer = A - P.setAngle(rand(0, 360))//SHING return BULLET_ACT_FORCE_PIERCE /mob/living/carbon/human/proc/rising_bass_help() diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index b5157857e2..2b7d9e0a09 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -63,7 +63,7 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if((D.mobility_flags & MOBILITY_STAND)) D.apply_damage(10, BRUTE, BODY_ZONE_HEAD) - D.DefaultCombatKnockdown(50) //Not much can really be done about the knockdown being so strong without a refactor + D.DefaultCombatKnockdown(50) D.adjustStaminaLoss(40) //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) @@ -117,7 +117,7 @@ if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS! return BULLET_ACT_HIT if(A.in_throw_mode) - A.visible_message("[A] effortlessly swats the projectile aside! They can block bullets with their bare hands!", "You deflect the projectile!") + A.visible_message("[A] effortlessly swats the projectile aside! They can deflect projectile with their bare hands!", "You deflect the projectile!") playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) P.firer = A P.setAngle(rand(0, 360))//SHING