Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] sec-hailers no longer apply filters on TTS when pushed out of the way. #2085

Merged
merged 1 commit into from
Feb 22, 2024
Merged

[MIRROR] sec-hailers no longer apply filters on TTS when pushed out of the way. #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/clothing/masks/_masks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
strip_delay = 40
equip_delay_other = 40
var/modifies_speech = FALSE
///Whether the mask is pushed out of the food hole or not.
var/mask_adjusted = FALSE
var/adjusted_flags = null
///Did we install a filtering cloth?
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/masks/gasmask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
///Cigarette in the mask
var/obj/item/clothing/mask/cigarette/cig
voice_filter = "lowpass=f=750,volume=2"

/datum/armor/mask_gas
bio = 100

Expand Down
11 changes: 6 additions & 5 deletions code/modules/mob/living/living_say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,12 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
var/mob/living/carbon/human/human_speaker = src
if(istype(human_speaker.wear_mask, /obj/item/clothing/mask))
var/obj/item/clothing/mask/worn_mask = human_speaker.wear_mask
if(worn_mask.voice_override)
voice_to_use = worn_mask.voice_override
if(worn_mask.voice_filter)
filter += worn_mask.voice_filter
use_radio = worn_mask.use_radio_beeps_tts
if(!worn_mask.mask_adjusted)
if(worn_mask.voice_override)
voice_to_use = worn_mask.voice_override
if(worn_mask.voice_filter)
filter += worn_mask.voice_filter
use_radio = worn_mask.use_radio_beeps_tts
if(use_radio)
special_filter += TTS_FILTER_RADIO
if(issilicon(src))
Expand Down
Loading