From 9e291334761e1c861d9f6f66332d47aa092b0fa2 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 6 Jul 2024 14:16:46 -0400 Subject: [PATCH] Slight visual/flavor tweaks to Sleeping Carp dodging (+ cqc spellcheck) (#2541) * Slight visual/flavor tweaks to Sleeping Carp dodging (+ cqc spellcheck) * lol balloon alert * Weh --- code/datums/martial/cqc.dm | 4 ++++ code/datums/martial/sleeping_carp.dm | 6 ++++++ .../code/modules/antagonists/cult/blood_magic.dm | 6 +++++- monkestation/sound/effects/miss.ogg | Bin 0 -> 7736 bytes 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 monkestation/sound/effects/miss.ogg diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 0b08df57518c..e982f6488de0 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -30,10 +30,14 @@ return if(!can_use(cqc_user)) return + // monkestation edit: improved messaging cqc_user.visible_message( span_danger("[cqc_user] twists [attacker]'s arm, sending their [attack_weapon] back towards them!"), span_userdanger("Making sure to avoid [attacker]'s [attack_weapon], you twist their arm to send it right back at them!"), + ignored_mobs = list(attacker), ) + to_chat(attacker, span_userdanger("[cqc_user] swiftly grabs and twists your arm, hitting you with your own [attack_weapon]!"), type = MESSAGE_TYPE_COMBAT) + // monkestation end var/obj/item/melee/touch_attack/touch_weapon = attack_weapon var/datum/action/cooldown/spell/touch/touch_spell = touch_weapon.spell_which_made_us?.resolve() if(!touch_spell) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index fd5fc5b16239..ec6920edf310 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -197,10 +197,16 @@ if(!istype(attack_weapon, /obj/item/melee/touch_attack) || !can_deflect(carp_user)) return var/obj/item/melee/touch_attack/touch_weapon = attack_weapon + // monkestation edit: flavor tweaks carp_user.visible_message( span_danger("[carp_user] carefully dodges [attacker]'s [touch_weapon]!"), span_userdanger("You take great care to remain untouched by [attacker]'s [touch_weapon]!"), + ignored_mobs = list(attacker), ) + to_chat(attacker, span_userdanger("[carp_user] carefully dodges your [touch_weapon], remaining completely untouched!"), type = MESSAGE_TYPE_COMBAT) + carp_user.balloon_alert(attacker, "miss!") + playsound(carp_user, 'monkestation/sound/effects/miss.ogg', vol = 50, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + // monkestation end return COMPONENT_NO_AFTERATTACK /// Verb added to humans who learn the art of the sleeping carp. diff --git a/monkestation/code/modules/antagonists/cult/blood_magic.dm b/monkestation/code/modules/antagonists/cult/blood_magic.dm index 91c091fb9a88..051bf95ca9b1 100644 --- a/monkestation/code/modules/antagonists/cult/blood_magic.dm +++ b/monkestation/code/modules/antagonists/cult/blood_magic.dm @@ -85,7 +85,7 @@ span_userdanger("Making sure to avoid [user]'s [src], you twist [user.p_their()] arm to send it right back at [user.p_them()]!"), ignored_mobs = list(user) ) - to_chat(user, span_userdanger("As you attempt to stun [target] with the spell, [target.p_they()] twist your arm and send the spell back at you!"), type = MESSAGE_TYPE_COMBAT) + to_chat(user, span_userdanger("As you attempt to stun [target] with the spell, [target.p_they()] twist[target.p_s()] your arm and send[target.p_s()] the spell back at you!"), type = MESSAGE_TYPE_COMBAT) effect_weakened(user, silent = TRUE) return TRUE else if(istype(martial_art, /datum/martial_art/the_sleeping_carp)) @@ -94,6 +94,10 @@ target.visible_message( span_danger("[target] carefully dodges [user]'s [src]!"), span_userdanger("You take great care to remain untouched by [user]'s [src]!"), + ignored_mobs = list(user), ) + to_chat(user, span_userdanger("[target] carefully dodges your [src], remaining completely untouched!"), type = MESSAGE_TYPE_COMBAT) + target.balloon_alert(user, "miss!") + playsound(target, 'monkestation/sound/effects/miss.ogg', vol = 50, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) return TRUE return FALSE diff --git a/monkestation/sound/effects/miss.ogg b/monkestation/sound/effects/miss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2e938329d8f06a8e1de6a807debfe7ae0b04241e GIT binary patch literal 7736 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 literal 0 HcmV?d00001