mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 05:27:01 +01:00
Fiber Garrote now mutes all emotes when garroting target (#20393)
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent
* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"
This reverts commit bc093ba01f.
* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds
* comments update, status set function standartisation
* Update code/datums/emote.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -593,6 +593,10 @@
|
||||
return FALSE
|
||||
if((emote_type & EMOTE_MOUTH) && !can_vocalize_emotes(user))
|
||||
return FALSE
|
||||
if(isliving(user))
|
||||
var/mob/living/liveuser = user
|
||||
if(liveuser.has_status_effect(STATUS_EFFECT_ABSSILENCED))
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
/datum/emote/proc/remove_ending_punctuation(msg)
|
||||
|
||||
@@ -674,6 +674,9 @@
|
||||
. = ..()
|
||||
REMOVE_TRAIT(owner, TRAIT_MUTE, id)
|
||||
|
||||
/datum/status_effect/transient/silence/absolute // this one will mute all emote sounds including gasps
|
||||
id = "abssilenced"
|
||||
|
||||
/datum/status_effect/transient/jittery
|
||||
id = "jittering"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user