From a9bd03e5b80b12c94da135da8f69b2327dcba427 Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Mon, 2 Oct 2023 21:46:03 +0300 Subject: [PATCH 01/21] Update queue (#1477) --- Content.Server/Connection/ConnectionManager.cs | 2 +- Content.Shared/Corvax/CCCVars/CCCVars.cs | 10 ---------- .../IServerJoinQueueManager.cs | 2 ++ Resources/ConfigPresets/Corvax/athara.toml | 1 + Resources/ConfigPresets/Corvax/echo.toml | 1 + Resources/ConfigPresets/Corvax/elysium.toml | 1 + Resources/ConfigPresets/Corvax/main.toml | 1 + Resources/ConfigPresets/Corvax/nova.toml | 1 + Resources/ConfigPresets/Corvax/solaris.toml | 1 + .../Locale/ru-RU/corvax/join-queue/queue-screen.ftl | 4 ++++ Secrets | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index 2ed28c3a62a..dd6cd5325e1 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -145,7 +145,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e) } // Corvax-Queue-Start - var isQueueEnabled = _cfg.GetCVar(CCCVars.QueueEnabled); + var isQueueEnabled = IoCManager.Instance!.TryResolveType(out var mgr) && mgr.IsEnabled; if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled) // Corvax-Queue-End { diff --git a/Content.Shared/Corvax/CCCVars/CCCVars.cs b/Content.Shared/Corvax/CCCVars/CCCVars.cs index e09bb6f164b..400e7844c20 100644 --- a/Content.Shared/Corvax/CCCVars/CCCVars.cs +++ b/Content.Shared/Corvax/CCCVars/CCCVars.cs @@ -9,16 +9,6 @@ namespace Content.Shared.Corvax.CCCVars; // ReSharper disable once InconsistentNaming public sealed class CCCVars { - /* - * Queue - */ - - /// - /// Controls if the connections queue is enabled. If enabled stop kicking new players after `SoftMaxPlayers` cap and instead add them to queue. - /// - public static readonly CVarDef - QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY); - /** * TTS (Text-To-Speech) */ diff --git a/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs b/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs index 266faaa1b55..ef62ec55b5f 100644 --- a/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs +++ b/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs @@ -2,7 +2,9 @@ public interface IServerJoinQueueManager { + public bool IsEnabled { get; } public int PlayerInQueueCount { get; } public int ActualPlayersCount { get; } public void Initialize(); + public void PostInitialize(); } diff --git a/Resources/ConfigPresets/Corvax/athara.toml b/Resources/ConfigPresets/Corvax/athara.toml index 74ae5df1e03..68fecd83f4e 100644 --- a/Resources/ConfigPresets/Corvax/athara.toml +++ b/Resources/ConfigPresets/Corvax/athara.toml @@ -11,6 +11,7 @@ time = 180.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/ConfigPresets/Corvax/echo.toml b/Resources/ConfigPresets/Corvax/echo.toml index a95cc573b9b..0a687f66bdf 100644 --- a/Resources/ConfigPresets/Corvax/echo.toml +++ b/Resources/ConfigPresets/Corvax/echo.toml @@ -17,6 +17,7 @@ time = 180.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/ConfigPresets/Corvax/elysium.toml b/Resources/ConfigPresets/Corvax/elysium.toml index 9ed4b439036..9be6699d711 100644 --- a/Resources/ConfigPresets/Corvax/elysium.toml +++ b/Resources/ConfigPresets/Corvax/elysium.toml @@ -11,6 +11,7 @@ time = 10.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/ConfigPresets/Corvax/main.toml b/Resources/ConfigPresets/Corvax/main.toml index e42d3d114d9..13950c22180 100644 --- a/Resources/ConfigPresets/Corvax/main.toml +++ b/Resources/ConfigPresets/Corvax/main.toml @@ -11,6 +11,7 @@ time = 180.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/ConfigPresets/Corvax/nova.toml b/Resources/ConfigPresets/Corvax/nova.toml index c4d5a120cc3..8b55e20a06d 100644 --- a/Resources/ConfigPresets/Corvax/nova.toml +++ b/Resources/ConfigPresets/Corvax/nova.toml @@ -17,6 +17,7 @@ time = 10.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/ConfigPresets/Corvax/solaris.toml b/Resources/ConfigPresets/Corvax/solaris.toml index 2486a260205..c57cb825f8c 100644 --- a/Resources/ConfigPresets/Corvax/solaris.toml +++ b/Resources/ConfigPresets/Corvax/solaris.toml @@ -17,6 +17,7 @@ time = 180.0 [queue] enabled = true +alt_servers = true [tts] enabled = true diff --git a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl index ece8a6e9411..99ba8a13dac 100644 --- a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl +++ b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl @@ -3,3 +3,7 @@ queue-quit = Выйти queue-position = Ваша позиция: queue-total = Всего в очереди: queue-priority-join = Приоритетный вход +queue-server-title = Вы можете подключиться к: +queue-server-not-available = Нет доступных серверов +queue-server-online = Онлайн: +queue-server-connect = Подключиться diff --git a/Secrets b/Secrets index 3527f47c1e7..9851c2c6394 160000 --- a/Secrets +++ b/Secrets @@ -1 +1 @@ -Subproject commit 3527f47c1e71cc284ee43a17091120de7016c0c9 +Subproject commit 9851c2c63946c56d9feb4d6d5a92d8c34e23ed65 From 88b56629fe157efff316cbceac31ccb50acc4407 Mon Sep 17 00:00:00 2001 From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Mon, 2 Oct 2023 23:22:46 +0300 Subject: [PATCH 02/21] Translation fixes (#1471) --- .../Locale/ru-RU/administration/managers/admin-manager.ftl | 6 +++--- .../Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl | 2 +- .../ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl | 2 +- Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/administration/managers/admin-manager.ftl b/Resources/Locale/ru-RU/administration/managers/admin-manager.ftl index 04c2ce0e080..f85203d52d2 100644 --- a/Resources/Locale/ru-RU/administration/managers/admin-manager.ftl +++ b/Resources/Locale/ru-RU/administration/managers/admin-manager.ftl @@ -1,9 +1,9 @@ -admin-manager-self-de-admin-message = { $exAdminName } убирает админ права с себя. -admin-manager-self-re-admin-message = { $newAdminName } возвращает админ права себе. +admin-manager-self-de-admin-message = { $exAdminName } снимает с себя права админа. +admin-manager-self-re-admin-message = { $newAdminName } возвращает себе права админа. admin-manager-became-normal-player-message = Теперь вы обычный игрок. admin-manager-became-admin-message = Теперь вы администратор. admin-manager-no-longer-admin-message = Вы больше не администратор. admin-manager-admin-permissions-updated-message = Ваши права администратора были обновлены. admin-manager-admin-logout-message = Админ вышел: { $name } -admin-manager-admin-login-message = Админ зашел: { $name } +admin-manager-admin-login-message = Админ зашёл: { $name } admin-manager-admin-data-host-title = Хост diff --git a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl index 069a0056675..093986d2257 100644 --- a/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl +++ b/Resources/Locale/ru-RU/preferences/ui/humanoid-profile-editor.ftl @@ -1,4 +1,4 @@ -humanoid-profile-editor-randomize-everything-button = Сгенерировать случайного +humanoid-profile-editor-randomize-everything-button = Случайный персонаж humanoid-profile-editor-name-label = Имя: humanoid-profile-editor-name-random-button = Сгенерировать humanoid-profile-editor-appearance-tab = Внешность diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl index 7fb9eb08265..64ff9908e6d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl @@ -7,7 +7,7 @@ ent-ClothingNeckCloakCe = плащ старшего инженера ent-ClothingCloakCmo = плащ главного врача .desc = Стерильный синий плащ с зеленым крестом, излучающий чувство долга и готовность помогать другим. ent-ClothingNeckCloakRd = плащ научного руководителя - .desc = Белый плащ с фиолетовыми полосами, демонстрирующий ваш статус законодателя передовых технологий. + .desc = Фиолетовый плащ с белыми полосами, демонстрирующий ваш статус законодателя передовых технологий. ent-ClothingNeckCloakQm = плащ квартирмейстера .desc = Прочный коричневый плащ со светоотражающей полосой, хотя и не такой модный, как другие, но демонстрирует ваши навыки управления. ent-ClothingNeckCloakHop = плащ главы персонала diff --git a/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl b/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl index 183c608d50c..e179dd1cfaf 100644 --- a/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl +++ b/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl @@ -3,7 +3,7 @@ verb-trigger-timer-set-current = { $time } секунд (сейчас) verb-trigger-timer-cycle = Циклическое переключение задержки examine-trigger-timer = Таймер установлен на { $time } секунд. popup-trigger-timer-set = Таймер установлен на { $time } секунд. -verb-start-detonation = Запутить детонацию +verb-start-detonation = Запустить детонацию verb-toggle-start-on-stick = Переключить автоактивацию popup-start-on-stick-off = Устройство НЕ будет автоматически активировано после установки popup-start-on-stick-on = Устройство будет автоматически активировано после установки From 6e4608bf4fe3773868e5a041739add442240621a Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 01:20:10 +0300 Subject: [PATCH 03/21] [Secret] Add ghost themes (#1479) --- .gitignore | 2 ++ .../IClientSponsorsManager.cs | 4 ---- .../ru-RU/corvax/discord-auth/discord-auth-state.ftl | 6 ------ .../Locale/ru-RU/corvax/join-queue/queue-screen.ftl | 9 --------- Secrets | 2 +- Tools/corvax/setup_secrets.ps1 | 6 ++++-- 6 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 Resources/Locale/ru-RU/corvax/discord-auth/discord-auth-state.ftl delete mode 100644 Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl diff --git a/.gitignore b/.gitignore index 3e8a272a066..739e6a0c82e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ # Secret Resources/Prototypes/CorvaxSecrets Resources/Prototypes/CorvaxSecretsServer +Resources/Textures/CorvaxSecrets +Resources/Locale/ru-RU/corvax-secrets # Build results [Dd]ebug/ diff --git a/Corvax/Content.Corvax.Interfaces.Client/IClientSponsorsManager.cs b/Corvax/Content.Corvax.Interfaces.Client/IClientSponsorsManager.cs index ff582f0e055..f2814999ded 100644 --- a/Corvax/Content.Corvax.Interfaces.Client/IClientSponsorsManager.cs +++ b/Corvax/Content.Corvax.Interfaces.Client/IClientSponsorsManager.cs @@ -1,12 +1,8 @@ using Content.Corvax.Interfaces.Shared; -using Robust.Shared.Maths; namespace Content.Corvax.Interfaces.Client; public interface IClientSponsorsManager : ISharedSponsorsManager { public List Prototypes { get; } - public bool PriorityJoin { get; } - public Color? OocColor { get; } - public int ExtraCharSlots { get; } } diff --git a/Resources/Locale/ru-RU/corvax/discord-auth/discord-auth-state.ftl b/Resources/Locale/ru-RU/corvax/discord-auth/discord-auth-state.ftl deleted file mode 100644 index 12e23797fc3..00000000000 --- a/Resources/Locale/ru-RU/corvax/discord-auth/discord-auth-state.ftl +++ /dev/null @@ -1,6 +0,0 @@ -discord-auth-title = Авторизация Discord -discord-auth-info = Для доступа на сервер вам необходимо связать аккаунт SS14 с Discord -discord-auth-warn = Не волнуйтесь, это всего пару кликов! -discord-auth-link = Ссылка: -discord-auth-browser-btn = Открыть в браузере -discord-auth-quit-btn = Выйти diff --git a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl deleted file mode 100644 index 99ba8a13dac..00000000000 --- a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl +++ /dev/null @@ -1,9 +0,0 @@ -queue-title = Очередь -queue-quit = Выйти -queue-position = Ваша позиция: -queue-total = Всего в очереди: -queue-priority-join = Приоритетный вход -queue-server-title = Вы можете подключиться к: -queue-server-not-available = Нет доступных серверов -queue-server-online = Онлайн: -queue-server-connect = Подключиться diff --git a/Secrets b/Secrets index 9851c2c6394..04ae3deb142 160000 --- a/Secrets +++ b/Secrets @@ -1 +1 @@ -Subproject commit 9851c2c63946c56d9feb4d6d5a92d8c34e23ed65 +Subproject commit 04ae3deb142ff28e20d3f473ac6c03dc2eac75d5 diff --git a/Tools/corvax/setup_secrets.ps1 b/Tools/corvax/setup_secrets.ps1 index 591626d4878..89ec9a4a05d 100644 --- a/Tools/corvax/setup_secrets.ps1 +++ b/Tools/corvax/setup_secrets.ps1 @@ -1,2 +1,4 @@ -New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecrets" -Target "Secrets\Prototypes" -New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecretsServer" -Target "Secrets\ServerPrototypes" +New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecrets" -Target "Secrets\Resources\Prototypes" +New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecretsServer" -Target "Secrets\Resources\ServerPrototypes" +New-Item -ItemType Junction -Path "Resources\Locale\ru-RU\corvax-secrets" -Target "Secrets\Resources\Locale" +New-Item -ItemType Junction -Path "Resources\Textures\CorvaxSecrets" -Target "Secrets\Resources\Textures" From 3af93f83f21a62c6a8353ba78c344ac57be0c4df Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:50:23 +0300 Subject: [PATCH 04/21] Species sponsor (#1480) --- .../Preferences/ClientPreferencesManager.cs | 4 ++-- .../Preferences/UI/HumanoidProfileEditor.xaml.cs | 4 ++++ .../Preferences/Managers/ServerPreferencesManager.cs | 8 ++++---- .../Humanoid/HumanoidCharacterAppearance.cs | 8 ++++---- .../Humanoid/Prototypes/SpeciesPrototype.cs | 8 ++++++++ .../Preferences/HumanoidCharacterProfile.cs | 12 ++++++++++-- Content.Shared/Preferences/ICharacterProfile.cs | 2 +- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs index 03864e4a3bc..557c9aef709 100644 --- a/Content.Client/Preferences/ClientPreferencesManager.cs +++ b/Content.Client/Preferences/ClientPreferencesManager.cs @@ -64,8 +64,8 @@ public void SelectCharacter(int slot) public void UpdateCharacter(ICharacterProfile profile, int slot) { // Corvax-Sponsors-Start - var allowedMarkings = _sponsorsManager?.Prototypes.ToArray() ?? new string[]{}; - profile.EnsureValid(allowedMarkings); + var sponsorPrototypes = _sponsorsManager?.Prototypes.ToArray() ?? new string[]{}; + profile.EnsureValid(sponsorPrototypes); // Corvax-Sponsors-End var characters = new Dictionary(Preferences.Characters) {[slot] = profile}; Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor); diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index 9bf5c88bec0..1d88977bb72 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -185,6 +185,10 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt #region Species _speciesList = prototypeManager.EnumeratePrototypes().Where(o => o.RoundStart).ToList(); + // Corvax-Sponsors-Start + if (_sponsorsMgr != null) + _speciesList = _speciesList.Where(p => !p.SponsorOnly || _sponsorsMgr.Prototypes.Contains(p.ID)).ToList(); + // Corvax-Sponsors-End for (var i = 0; i < _speciesList.Count; i++) { var name = Loc.GetString(_speciesList[i].Name); diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index 2127c0313be..d33e53fa619 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -104,10 +104,10 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message) // Corvax-Sponsors-Start: Ensure removing sponsor markings if client somehow bypassed client filtering // WARN! It's not removing markings from DB! - var allowedMarkings = _sponsors != null && _sponsors.TryGetPrototypes(message.MsgChannel.UserId, out var prototypes) + var sponsorPrototypes = _sponsors != null && _sponsors.TryGetPrototypes(message.MsgChannel.UserId, out var prototypes) ? prototypes.ToArray() : new string[]{}; - profile.EnsureValid(allowedMarkings); + profile.EnsureValid(sponsorPrototypes); // Corvax-Sponsors-End var profiles = new Dictionary(curPrefs.Characters) { @@ -204,10 +204,10 @@ async Task LoadPrefs() // Corvax-Sponsors-Start: Remove sponsor markings from expired sponsors foreach (var (_, profile) in prefs.Characters) { - var allowedMarkings = _sponsors != null && _sponsors.TryGetPrototypes(session.UserId, out var prototypes) + var sponsorPrototypes = _sponsors != null && _sponsors.TryGetPrototypes(session.UserId, out var prototypes) ? prototypes.ToArray() : new string[]{}; - profile.EnsureValid(allowedMarkings); + profile.EnsureValid(sponsorPrototypes); } // Corvax-Sponsors-End prefsData.Prefs = prefs; diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs index 0756affc33b..2ca263c60dd 100644 --- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs +++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs @@ -188,7 +188,7 @@ public static Color ClampColor(Color color) return new(color.RByte, color.GByte, color.BByte); } - public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance, string species, Sex sex, string[] sponsorMarkings) + public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance, string species, Sex sex, string[] sponsorPrototypes) { var hairStyleId = appearance.HairStyleId; var facialHairStyleId = appearance.FacialHairStyleId; @@ -208,7 +208,7 @@ public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearanc // Corvax-Sponsors-Start if (proto.TryIndex(hairStyleId, out MarkingPrototype? hairProto) && hairProto.SponsorOnly && - !sponsorMarkings.Contains(hairStyleId)) + !sponsorPrototypes.Contains(hairStyleId)) { hairStyleId = HairStyles.DefaultHairStyle; } @@ -222,7 +222,7 @@ public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearanc // Corvax-Sponsors-Start if (proto.TryIndex(facialHairStyleId, out MarkingPrototype? facialHairProto) && facialHairProto.SponsorOnly && - !sponsorMarkings.Contains(facialHairStyleId)) + !sponsorPrototypes.Contains(facialHairStyleId)) { facialHairStyleId = HairStyles.DefaultFacialHairStyle; } @@ -242,7 +242,7 @@ public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearanc markingSet.EnsureSpecies(species, skinColor, markingManager); markingSet.EnsureSexes(sex, markingManager); - markingSet.FilterSponsor(sponsorMarkings, markingManager); // Corvax-Sponsors + markingSet.FilterSponsor(sponsorPrototypes, markingManager); // Corvax-Sponsors } return new HumanoidCharacterAppearance( diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 9947d8ef3a0..e05158fb615 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -32,6 +32,14 @@ public sealed class SpeciesPrototype : IPrototype [DataField("roundStart", required: true)] public bool RoundStart { get; private set; } = false; + // Corvax-Sponsors-Start + /// + /// Whether the species is available only for sponsors + /// + [DataField("sponsorOnly")] + public bool SponsorOnly = false; + // Corvax-Sponsors-End + // The below two are to avoid fetching information about the species from the entity // prototype. diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 81cf992800a..f255ed30289 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -370,7 +370,7 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther) return Appearance.MemberwiseEquals(other.Appearance); } - public void EnsureValid(string[] sponsorMarkings) + public void EnsureValid(string[] sponsorPrototypes) { var prototypeManager = IoCManager.Resolve(); @@ -380,6 +380,14 @@ public void EnsureValid(string[] sponsorMarkings) speciesPrototype = prototypeManager.Index(Species); } + // Corvax-Sponsors-Start: Reset to human if player not sponsor + if (speciesPrototype.SponsorOnly && !sponsorPrototypes.Contains(Species)) + { + Species = SharedHumanoidAppearanceSystem.DefaultSpecies; + speciesPrototype = prototypeManager.Index(Species); + } + // Corvax-Sponsors-End + var sex = Sex switch { Sex.Male => Sex.Male, @@ -453,7 +461,7 @@ public void EnsureValid(string[] sponsorMarkings) flavortext = FormattedMessage.RemoveMarkup(FlavorText); } - var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex, sponsorMarkings); + var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex, sponsorPrototypes); var prefsUnavailableMode = PreferenceUnavailable switch { diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs index aeaf7b94950..9c4f87da60e 100644 --- a/Content.Shared/Preferences/ICharacterProfile.cs +++ b/Content.Shared/Preferences/ICharacterProfile.cs @@ -13,6 +13,6 @@ public interface ICharacterProfile /// /// Makes this profile valid so there's no bad data like negative ages. /// - void EnsureValid(string[] sponsorMarkings); // Corvax-Sponsors: Integrated filtering for sponsor markings + void EnsureValid(string[] sponsorPrototypes); // Corvax-Sponsors: Integrated filtering for sponsor prototypes (markings/species/etc) } } From b65eee1b064948047f0d86c852afc75961df2f43 Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:38:47 +0300 Subject: [PATCH 05/21] Public build publish workflow (#1481) --- .github/workflows/publish-publish.yml | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/publish-publish.yml diff --git a/.github/workflows/publish-publish.yml b/.github/workflows/publish-publish.yml new file mode 100644 index 00000000000..2e2293aef9f --- /dev/null +++ b/.github/workflows/publish-publish.yml @@ -0,0 +1,65 @@ +name: Publish Public + +#concurrency: +# group: publish + +on: + workflow_dispatch: + schedule: + - cron: '0 1 * * *' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Check configuration + env: + PUBLIC_PATH: ${{ secrets.BUILDS_PUBLIC_PATH }} + if: ${{ env.PUBLIC_PATH == '' }} + uses: andymckay/cancel-action@0.3 + + - uses: actions/checkout@v3.6.0 + with: + submodules: 'recursive' + + - name: Setup .NET Core + uses: actions/setup-dotnet@v3.2.0 + with: + dotnet-version: 7.0.x + + - name: Get Engine Tag + run: | + cd RobustToolbox + git fetch --depth=1 + + - name: Package all + run: | + Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 + Tools/package_client_build.py + + - name: Update Build Info + run: Tools/gen_build_info.py + + - name: Shuffle files around + run: | + mkdir "release/${{ github.sha }}" + mv release/*.zip "release/${{ github.sha }}" + + - name: Upload files to mothership + uses: burnett01/rsync-deployments@5.2 + with: + switches: -avzr --ignore-existing + path: "release/${{ github.sha }}" + remote_path: ${{ secrets.BUILDS_PUBLIC_PATH }} + remote_host: ${{ secrets.BUILDS_HOST }} + remote_user: ${{ secrets.BUILDS_USERNAME }} + remote_key: ${{ secrets.BUILDS_SSH_KEY }} + + - name: Generate public HTML + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.BUILDS_HOST }} + username: ${{ secrets.BUILDS_USERNAME }} + key: ${{ secrets.BUILDS_SSH_KEY }} + script: node ~/scripts/generate_html_page.js.js -fork syndicate-public -id ${{ github.sha }} From eabed92967c6fe9a8c9928523773f4ec7f5be6b2 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:02:17 +0300 Subject: [PATCH 06/21] Hotfix public publish workflow job --- .github/workflows/publish-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-publish.yml b/.github/workflows/publish-publish.yml index 2e2293aef9f..4a25072243c 100644 --- a/.github/workflows/publish-publish.yml +++ b/.github/workflows/publish-publish.yml @@ -62,4 +62,4 @@ jobs: host: ${{ secrets.BUILDS_HOST }} username: ${{ secrets.BUILDS_USERNAME }} key: ${{ secrets.BUILDS_SSH_KEY }} - script: node ~/scripts/generate_html_page.js.js -fork syndicate-public -id ${{ github.sha }} + script: node ~/scripts/generate_html_page.js -fork syndicate-public -id ${{ github.sha }} From 9782fa644e426ff0a885ead6013bb39979e91768 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:09:34 +0300 Subject: [PATCH 07/21] Run setup secrets ps1 in publish workflow --- .github/workflows/publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 475d0bfc5d0..27ea6168f21 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,6 +22,10 @@ jobs: # Corvax-Secrets-Start - name: Setup secrets + shell: pwsh + run: .\Tools\corvax\setup_secrets.ps1 + + - name: Pull secrets env: SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }} if: ${{ env.SSH_KEY != '' }} @@ -32,8 +36,6 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - cp -R Secrets/Prototypes Resources/Prototypes/CorvaxSecrets - cp -R Secrets/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer # Corvax-Secrets-End - name: Setup .NET Core From 95f43aa02a3b8e0e618eb8cb4d675c3a14f11723 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:13:12 +0300 Subject: [PATCH 08/21] Fix publish workflow jobs order --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 27ea6168f21..f08600918bc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,10 +21,6 @@ jobs: submodules: 'recursive' # Corvax-Secrets-Start - - name: Setup secrets - shell: pwsh - run: .\Tools\corvax\setup_secrets.ps1 - - name: Pull secrets env: SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }} @@ -36,6 +32,10 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init + + - name: Setup secrets + shell: pwsh + run: .\Tools\corvax\setup_secrets.ps1 # Corvax-Secrets-End - name: Setup .NET Core From 27e5c1d8f5522b12ed27e91aa6bd2c6cb5586f12 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:24:25 +0300 Subject: [PATCH 09/21] Add sh setup secrets script --- .github/workflows/publish.yml | 7 ++----- Tools/corvax/setup_secrets.sh | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 Tools/corvax/setup_secrets.sh diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f08600918bc..ba441514046 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: submodules: 'recursive' # Corvax-Secrets-Start - - name: Pull secrets + - name: Setup secrets env: SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }} if: ${{ env.SSH_KEY != '' }} @@ -32,10 +32,7 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - - - name: Setup secrets - shell: pwsh - run: .\Tools\corvax\setup_secrets.ps1 + sh ./Tools/corvax/setup_secrets.sh # Corvax-Secrets-End - name: Setup .NET Core diff --git a/Tools/corvax/setup_secrets.sh b/Tools/corvax/setup_secrets.sh new file mode 100644 index 00000000000..7fe7ccc94d4 --- /dev/null +++ b/Tools/corvax/setup_secrets.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets +ln -s Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer +ln -s Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets +ln -s Secrets/Resources/Textures Resources/Textures/CorvaxSecrets From 718bf6cebad68c68cb7de0ebed585c88d1444d65 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:28:55 +0300 Subject: [PATCH 10/21] Fix sh setup_secret script call --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ba441514046..b2888ecd245 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,7 +32,7 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - sh ./Tools/corvax/setup_secrets.sh + ./Tools/corvax/setup_secrets.sh # Corvax-Secrets-End - name: Setup .NET Core From 23b3f8e4e981933f20cf07ecf07ce9e30c8e8bfe Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:32:17 +0300 Subject: [PATCH 11/21] chmod setup_secrets script --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b2888ecd245..f7aa1a35a02 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,6 +32,7 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init + chmod +x ./Tools/corvax/setup_secrets.sh ./Tools/corvax/setup_secrets.sh # Corvax-Secrets-End From c144a9ee75d5fab9a7d68666ef2a520c97328993 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:34:04 +0300 Subject: [PATCH 12/21] Fix setup_secrets.sh --- .github/workflows/publish.yml | 3 +-- Tools/corvax/setup_secrets.sh | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f7aa1a35a02..ba441514046 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,8 +32,7 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - chmod +x ./Tools/corvax/setup_secrets.sh - ./Tools/corvax/setup_secrets.sh + sh ./Tools/corvax/setup_secrets.sh # Corvax-Secrets-End - name: Setup .NET Core diff --git a/Tools/corvax/setup_secrets.sh b/Tools/corvax/setup_secrets.sh index 7fe7ccc94d4..87e1ac6fa32 100644 --- a/Tools/corvax/setup_secrets.sh +++ b/Tools/corvax/setup_secrets.sh @@ -1,6 +1,4 @@ -#!/bin/sh - -ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets +ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets ln -s Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer ln -s Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets ln -s Secrets/Resources/Textures Resources/Textures/CorvaxSecrets From 05f2b1fd81662abdf7a7de41005a83e8a04ef748 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:40:27 +0300 Subject: [PATCH 13/21] just directly call ln in publish workflow --- .github/workflows/publish.yml | 5 ++++- Tools/corvax/setup_secrets.sh | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 Tools/corvax/setup_secrets.sh diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ba441514046..34f84418b00 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,7 +32,10 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - sh ./Tools/corvax/setup_secrets.sh + ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets + ln -s Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer + ln -s Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets + ln -s Secrets/Resources/Textures Resources/Textures/CorvaxSecrets # Corvax-Secrets-End - name: Setup .NET Core diff --git a/Tools/corvax/setup_secrets.sh b/Tools/corvax/setup_secrets.sh deleted file mode 100644 index 87e1ac6fa32..00000000000 --- a/Tools/corvax/setup_secrets.sh +++ /dev/null @@ -1,4 +0,0 @@ -ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets -ln -s Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer -ln -s Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets -ln -s Secrets/Resources/Textures Resources/Textures/CorvaxSecrets From 6b255e3dcaf6b494981563da015e5b6f5af9a3a8 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:57:30 +0300 Subject: [PATCH 14/21] Remove old corvax secrets locale dir --- .../corvax-secrets/prototypes/roles/antags.ftl | 2 -- .../station-events/events/evil-twin.ftl | 15 --------------- 2 files changed, 17 deletions(-) delete mode 100644 Resources/Locale/ru-RU/corvax-secrets/prototypes/roles/antags.ftl delete mode 100644 Resources/Locale/ru-RU/corvax-secrets/station-events/events/evil-twin.ftl diff --git a/Resources/Locale/ru-RU/corvax-secrets/prototypes/roles/antags.ftl b/Resources/Locale/ru-RU/corvax-secrets/prototypes/roles/antags.ftl deleted file mode 100644 index 746712a6013..00000000000 --- a/Resources/Locale/ru-RU/corvax-secrets/prototypes/roles/antags.ftl +++ /dev/null @@ -1,2 +0,0 @@ -roles-antag-evil-twin-name = Злой двойник -roles-antag-evil-twin-objective = Замените свой оригинал. diff --git a/Resources/Locale/ru-RU/corvax-secrets/station-events/events/evil-twin.ftl b/Resources/Locale/ru-RU/corvax-secrets/station-events/events/evil-twin.ftl deleted file mode 100644 index a7ddf315d3b..00000000000 --- a/Resources/Locale/ru-RU/corvax-secrets/station-events/events/evil-twin.ftl +++ /dev/null @@ -1,15 +0,0 @@ -evil-twin-round-end-result = - { $evil-twin-count -> - [one] Был один - *[other] Было { $evil-twin-count } - } { $evil-twin-count -> - [one] злой двойник - [few] злых двойника - *[other] злых двойников - }. -evil-twin-user-was-an-evil-twin = [color=gray]{ $user }[/color] был злым двойником. -evil-twin-user-was-an-evil-twin-named = [color=white]{ $name }[/color] ([color=gray]{ $user }[/color]) был злым двойником. -evil-twin-was-an-evil-twin-named = [color=white]{ $name }[/color] был злым двойником. -evil-twin-user-was-an-evil-twin-with-objectives = [color=gray]{ $user }[/color] был(а) злым двойником со следующими целями: -evil-twin-user-was-an-evil-twin-with-objectives-named = [color=White]{ $name }[/color] ([color=gray]{ $user }[/color]) был(а) злым двойником со следующими целями: -evil-twin-was-an-evil-twin-with-objectives-named = [color=white]{ $name }[/color] был(а) злым двойником со следующими целями: From 8fa4553bdf38cc48993d3bb4c53d6883a0f7ff67 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:04:17 +0300 Subject: [PATCH 15/21] Use cp instead of ln for publish workflow --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 34f84418b00..8ea5b792dac 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,10 +32,10 @@ jobs: echo "HOST *" > ~/.ssh/config echo "StrictHostKeyChecking no" >> ~/.ssh/config git -c submodule.Secrets.update=checkout submodule update --init - ln -s Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets - ln -s Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer - ln -s Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets - ln -s Secrets/Resources/Textures Resources/Textures/CorvaxSecrets + cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets + cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer + cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets + cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets # Corvax-Secrets-End - name: Setup .NET Core From f4f36726b966a55d56bb537d25ccba36a1b9ad9b Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:27:01 +0200 Subject: [PATCH 16/21] Set smile TTS (#1482) --- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 1efa767af1b..cb7fcd744f0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -679,6 +679,8 @@ attributes: proper: true gender: female + - type: TTS # Corvax-TTS + voice: Dryad - type: entity name: Pun Pun From 833ee6b70604b8bfd6da6596d37769f0a405d447 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:50:05 +0300 Subject: [PATCH 17/21] Hotfix join queue resolve in status shell --- Content.Server/GameTicking/GameTicker.StatusShell.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/GameTicker.StatusShell.cs b/Content.Server/GameTicking/GameTicker.StatusShell.cs index ff1e7e98bf7..41f57603fa9 100644 --- a/Content.Server/GameTicking/GameTicker.StatusShell.cs +++ b/Content.Server/GameTicking/GameTicker.StatusShell.cs @@ -35,7 +35,7 @@ private void GetStatusResponse(JsonNode jObject) lock (_statusShellLock) { // Corvax-Queue-Start - var players = IoCManager.Instance!.TryResolveType(out var joinQueueManager) + var players = IoCManager.Instance?.TryResolveType(out var joinQueueManager) ?? false ? joinQueueManager.ActualPlayersCount : _playerManager.PlayerCount; // Corvax-Queue-End From 9f97ba5bdeedf76be8add07ec51aec19c0677015 Mon Sep 17 00:00:00 2001 From: Zack Backmen Date: Tue, 3 Oct 2023 19:17:23 +0300 Subject: [PATCH 18/21] upd --- .../Backmen/DiscordAuth/DiscordAuthGui.xaml | 4 ++++ .../Backmen/DiscordAuth/DiscordAuthGui.xaml.cs | 6 ++++++ .../Backmen/DiscordAuth/DiscordAuthManager.cs | 14 +++++++++++++- .../Corvax/IClientDiscordAuthManager.cs | 2 ++ .../Backmen/DiscordAuth/DiscordAuthManager.cs | 8 ++++---- .../Backmen/JoinQueue/JoinQueueManager.cs | 15 ++++++++++----- .../Corvax/IServerDiscordAuthManager.cs | 3 ++- Content.Server/Corvax/IServerJoinQueueManager.cs | 3 ++- Content.Server/Entry/EntryPoint.cs | 3 +++ Content.Shared/Backmen/CCVar/CCVars.cs | 9 +++++++++ .../Backmen/DiscordAuth/MsgDiscordAuthRequired.cs | 15 +++++++++++++++ .../IClientSponsorsManager.cs | 4 ---- .../backmen/discord-auth/discord-auth-state.ftl | 7 +++++++ .../ru-RU/backmen/join-queue/queue-screen.ftl | 5 +++++ 14 files changed, 82 insertions(+), 16 deletions(-) create mode 100644 Resources/Locale/ru-RU/backmen/discord-auth/discord-auth-state.ftl create mode 100644 Resources/Locale/ru-RU/backmen/join-queue/queue-screen.ftl diff --git a/Content.Client/Backmen/DiscordAuth/DiscordAuthGui.xaml b/Content.Client/Backmen/DiscordAuth/DiscordAuthGui.xaml index 0edcdc880f5..633823c5d59 100644 --- a/Content.Client/Backmen/DiscordAuth/DiscordAuthGui.xaml +++ b/Content.Client/Backmen/DiscordAuth/DiscordAuthGui.xaml @@ -17,6 +17,10 @@