diff --git a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs index ee3afa44c0..0542b13d19 100644 --- a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs +++ b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs @@ -29,16 +29,12 @@ public sealed partial class CP14RoundEndSystem : EntitySystem InitCbt(); SubscribeLocalEvent(OnFinisherMagicEnergyLevelChange); - SubscribeNetworkEvent(OnRoundEndMessage); + SubscribeLocalEvent(OnRoundRestartCleanup); } - private void OnRoundEndMessage(RoundEndMessageEvent ev) + private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev) { _roundEndMoment = TimeSpan.Zero; //Reset timer, so it cant affect next round in any case - _demiplane.DeleteAllDemiplanes(safe: false); - - _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end"), - announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); } public override void Update(float frameTime) @@ -53,6 +49,9 @@ public sealed partial class CP14RoundEndSystem : EntitySystem if (_roundEndMoment > _timing.CurTime) return; + _demiplane.DeleteAllDemiplanes(safe: false); + _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end"), + announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); _roundEnd.EndRound(); } diff --git a/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs b/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs index dd485daa37..1f51f54d1a 100644 --- a/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs +++ b/Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Server.GameTicking.Events; using Content.Shared._CP14.UniqueLoot; using Content.Shared.GameTicking; using Content.Shared.Tag; @@ -35,9 +34,6 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem if (!Deleted(ent)) SpawnAtPosition(loot, Transform(ent).Coordinates); - - if (!TerminatingOrDeleted(ent) && Exists(ent)) - QueueDel(ent); } diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index cdfeca62dc..d1ab35aa4e 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - public const string Culture = "en-US"; - //public const string Culture = "ru-RU"; + //public const string Culture = "en-US"; + public const string Culture = "ru-RU"; /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. @@ -29,9 +29,9 @@ namespace Content.Shared.Localizations var culture = new CultureInfo(Culture); _loc.LoadCulture(culture); // Uncomment for Ru localization - //var fallbackCulture = new CultureInfo("en-US"); - //_loc.LoadCulture(fallbackCulture); - //_loc.SetFallbackCluture(fallbackCulture); + var fallbackCulture = new CultureInfo("en-US"); + _loc.LoadCulture(fallbackCulture); + _loc.SetFallbackCluture(fallbackCulture); // _loc.AddFunction(culture, "PRESSURE", FormatPressure); diff --git a/Resources/ConfigPresets/_CP14/Dev.toml b/Resources/ConfigPresets/_CP14/Dev.toml index c2df5c6956..5a52f1e5a5 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -1,5 +1,5 @@ [whitelist] -enabled = false +enabled = true [log] path = "logs" @@ -14,13 +14,13 @@ bindto = "::,0.0.0.0" max_connections = 100 [game] -hostname = "⚔️ CrystallEdge Alpha [EN] ⚔️ Status: Open playtest" +hostname = "⚔️ CrystallEdge Alpha [RU] ⚔️ Status: Whitelist only" desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style" lobbyenabled = true soft_max_players = 40 maxplayers = 80 lobbyduration = 300 -role_timers = false +role_timers = true [server] rules_file = "CP14SandboxRU" @@ -61,4 +61,4 @@ enable_during_round = true [cp14] discord_auth_enabled = true -closet_beta_test = false \ No newline at end of file +closet_beta_test = true \ No newline at end of file