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 000000000000..2e938329d8f0 Binary files /dev/null and b/monkestation/sound/effects/miss.ogg differ