cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fiber Garrote now mutes all emotes when garroting target (#20393)

Browse Source 
* 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:
HMBGERDO
2023-02-25 01:12:56 -06:00
committed by GitHub
co-authored by Luc
parent 8d9df5ec62
commit e491aa9c2e
5 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_status_procs.dm
+9
View File
@@ -416,6 +416,15 @@ STATUS EFFECTS
/mob/living/proc/SetSilence(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_SILENCED, amount)
/mob/living/proc/AmountAbsoluteSilenced()
RETURN_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_ABSSILENCED)
/mob/living/proc/AbsoluteSilence(amount)
SetAbsoluteSilence(max(amount, AmountAbsoluteSilenced()))
/mob/living/proc/SetAbsoluteSilence(amount)
SET_STATUS_EFFECT_STRENGTH(STATUS_EFFECT_ABSSILENCED, amount)
/mob/living/proc/AdjustSilence(amount, bound_lower = 0, bound_upper = INFINITY)
SetSilence(directional_bounded_sum(AmountSilenced(), amount, bound_lower, bound_upper))