-
Notifications
You must be signed in to change notification settings - Fork 153
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
base: master
Are you sure you want to change the base?
No vocal emotes when muzzled #1101
Conversation
Нужно будет согласование/возможно какие-то идеи от других. |
а во сне? я мог плакать, свистеть и тд во сне |
эт, вроде фиксили уже с ноктюрином, но посмотрю. |
бля, охуенно, там чисто на кнопку ограничения |
|
||
|
||
// SS220 no_vocal_with_muzzle begin | ||
if (_entities.TryGetComponent<ReplacementAccentComponent>(uid, out var accentComp) && accentComp.Accent == "mumble") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
хардкод убери, сделай через константую переменную лучше где-то в классе
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
хардкод убери, сделай через константую переменную лучше где-то в классе
там ещё при сне это работает, я думаю на уровне Чата перенести
[RegisterComponent, NetworkedComponent()] | ||
[Access(typeof(SharedMuzzleSystem))] | ||
/// <summary> | ||
/// Added to entities when they have to block entityes vocal emotions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/// Added to entities when they have to block entityes vocal emotions | |
/// Added to entities that are blocking other entity's vocal emotions |
SubscribeLocalEvent<MuzzleComponent, ClothingGotUnequippedEvent>(OnGotUnequipped); | ||
} | ||
|
||
private void OnGotUnequipped(EntityUid uid, MuzzleComponent component, ref ClothingGotUnequippedEvent args) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
по новой форме обработки ивентов оформь
т. е.
private void Func(Entity<Comp> ent, ref EventClass args) {}
|
||
namespace Content.Shared.SS220.Muzzle; | ||
|
||
[RegisterComponent, NetworkedComponent()] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[RegisterComponent, NetworkedComponent()] | |
[RegisterComponent, NetworkedComponent] |
|
||
namespace Content.Shared.SS220.Muzzle; | ||
|
||
[RegisterComponent, NetworkedComponent()] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[RegisterComponent, NetworkedComponent()] | |
[RegisterComponent, NetworkedComponent] |
[Dependency] private readonly IEntityManager _entities = default!;// SS220 No vocal emotes when muzzled | ||
[Dependency] private readonly IPrototypeManager _proto = default!;// SS220 No vocal emotes when muzzled |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
на это пометки можно не ставить
@DexlerXD ну, крч, я пофиксил всё, кроме переноса в Server. При попытке переноса туда у меня почему-то ломаются голопроекторы атмосские. |
я посмотрю сегодня |
@SkaldetSkaeg добавь в описание PR следующую строчку - fixes #1181 чтобы github сам закрыл issue при мердже PR. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Описание PR
Увидел на стриме у Никиты, что игроки спокойно кричат эмоционируют, с кляпом во рту, а так же спящие.
Это явно баг. Чтобы сделать систему со звуками приглушенными была мысль, но идей особо нету, как это сделать адекватно, так как сама VocalSystem отсосная.
fixes #1181
Медиа
Проверки
Изменения
🆑