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.

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

No vocal emotes when muzzled #1101

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
9 changes: 7 additions & 2 deletions Content.Server/Speech/EntitySystems/VocalSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,15 @@ private void OnEmote(EntityUid uid, VocalComponent component, ref EmoteEvent arg
{
if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Vocal))
return;


// SS220 no_vocal_with_muzzle begin
if (_entities.TryGetComponent<ReplacementAccentComponent>(uid, out var accentComp) && accentComp.Accent == "mumble")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

хардкод убери, сделай через константую переменную лучше где-то в классе

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

хардкод убери, сделай через константую переменную лучше где-то в классе

там ещё при сне это работает, я думаю на уровне Чата перенести

return;
// SS220 no_vocal_with_muzzle end

// SS220 Chat-Special-Emote begin
//Will play special emote if it exists
if(CheckSpecialSounds(uid, component, args.Emote))
if (CheckSpecialSounds(uid, component, args.Emote))
{
args.Handled = true;
return;
Expand Down
Loading