Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Voice mask fixes (#11638)

Browse Source
This commit is contained in:
Flipp Syder
2022-10-03 18:14:07 -07:00
committed by GitHub
parent ee20611147
commit 26b413d24b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Clothing/MaskSystem.cs
View File

@@ -103,7 +103,7 @@ namespace Content.Server.Clothing
identity.Enabled = !mask.IsToggled; identity.Enabled = !mask.IsToggled;
// toggle voice masking // toggle voice masking
if (TryComp<VoiceMaskComponent>(uid, out var voiceMask)) if (TryComp<VoiceMaskComponent>(wearer, out var voiceMask))
voiceMask.Enabled = !mask.IsToggled; voiceMask.Enabled = !mask.IsToggled;
// toggle breath tool connection (skip during equip since that is handled in LungSystem) // toggle breath tool connection (skip during equip since that is handled in LungSystem)

2
Content.Server/Headset/HeadsetComponent.cs
View File

@@ -64,7 +64,7 @@ namespace Content.Server.Headset
if (_entMan.TryGetComponent(source, out VoiceMaskComponent? mask) && mask.Enabled) if (_entMan.TryGetComponent(source, out VoiceMaskComponent? mask) && mask.Enabled)
{ {
name = Identity.Name(source, _entMan); name = mask.VoiceName;
} }
message = _chatSystem.TransformSpeech(source, message); message = _chatSystem.TransformSpeech(source, message);