Skip to content

фикс доп кодов #449

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

Merged
Alexnov33X merged 13 commits into from
Sep 13, 2026
+13 −8
Merged

фикс доп кодов #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86ed33b
Добавлена поддержка дополнительных кодов угрозы
endennss Sep 7, 2026
667a04a
Исправлена логика дополнительных кодов угрозы
endennss Sep 8, 2026
8ff1574
Уточнены дополнительные коды консоли ЦК
endennss Sep 8, 2026
1b28df4
Добавлен выбор станции на консоли ЦК
endennss Sep 8, 2026
11bf9fa
Гамма возвращена в основные коды угрозы
endennss Sep 8, 2026
e0cf7b3
Исправлены замечания ревью дополнительных кодов
endennss Sep 9, 2026
59400ce
Добавлена консоль ДСО с кодом Эпсилон
endennss Sep 11, 2026
ceef536
Исправлены замечания по дополнительным кодам
endennss Sep 11, 2026
6a5ed75
Исправлено снятие доступов дополнительных кодов
endennss Sep 11, 2026
d51159a
Разделены задержки выдачи доступов по кодам
endennss Sep 12, 2026
7611917
фикс
endennss Sep 13, 2026
e12af85
Merge origin/master into features/codes-fish-station
endennss Sep 13, 2026
3c1c10a
Исправлены сигнатуры обработчиков консоли связи
endennss Sep 13, 2026
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
14 changes: 7 additions & 7 deletions Content.Server/Communications/CommunicationsConsoleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ public override void Update(float frameTime)
base.Update(frameTime);
}

public void OnCommunicationsConsoleMapInit(EntityUid uid, CommunicationsConsoleComponent comp, MapInitEvent args)
public void OnCommunicationsConsoleMapInit(Entity<CommunicationsConsoleComponent> entity, ref MapInitEvent args)
{
comp.AnnouncementCooldownRemaining = comp.InitialDelay;
EnsureAlertStation((uid, comp)); // Sunrise-Edit
UpdateCommsConsoleInterface(uid, comp);
entity.Comp.AnnouncementCooldownRemaining = entity.Comp.InitialDelay;
EnsureAlertStation(entity); // Sunrise-Edit
UpdateCommsConsoleInterface(entity.Owner, entity.Comp);
}

/// <summary>
Expand Down Expand Up @@ -265,13 +265,13 @@ private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
return !(left.TotalSeconds / expected.TotalSeconds < recallThreshold);
}

private void OnSelectAlertLevelMessage(EntityUid uid, CommunicationsConsoleComponent comp, CommunicationsConsoleSelectAlertLevelMessage message)
private void OnSelectAlertLevelMessage(Entity<CommunicationsConsoleComponent> entity, ref CommunicationsConsoleSelectAlertLevelMessage message)
{
if (message.Actor is not { Valid: true } user)
return;

TrySetPrimaryAlertLevel((uid, comp), message.Level, user); // Sunrise-Edit
UpdateCommsConsoleInterface(uid, comp); // Sunrise-Edit - отправляем состояние после установки force cooldown.
TrySetPrimaryAlertLevel((entity.Owner, entity.Comp), message.Level, user); // Sunrise-Edit
UpdateCommsConsoleInterface(entity.Owner, entity.Comp); // Sunrise-Edit - отправляем состояние после установки force cooldown.
}

private void OnAnnounceMessage(EntityUid uid, CommunicationsConsoleComponent comp,
Expand Down
7 changes: 6 additions & 1 deletion Content.Shared/_Sunrise/Access/Systems/AccessReaderSystem.AlertLevels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ public void UpdateAccess(
IReadOnlyList<string> activeLevels,
IReadOnlyCollection<ProtoId<AccessGroupPrototype>>? globalGroups = null)
{
ent.Comp.Group = ent.Comp.AlertAccesses.GetValueOrDefault(primaryLevel);
// FIsh edit start - отсутствие группы кода не должно создавать пустой ProtoId.
if (ent.Comp.AlertAccesses.TryGetValue(primaryLevel, out var primaryGroup))
ent.Comp.Group = primaryGroup;
else
ent.Comp.Group = null;
// FIsh edit end
Comment thread
Alexnov33X marked this conversation as resolved.
ent.Comp.AdditionalGroups.Clear();

foreach (var level in activeLevels)
Expand Down
Loading