diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 4a3415be2c..03cbe581ca 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 d35100ff19..1023f6144d 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -1,5 +1,5 @@ [whitelist] -enabled = true +enabled = false [log] path = "logs" diff --git a/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl b/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl index fe7ded7fd8..23c7f24fe0 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl @@ -4,6 +4,6 @@ cp14-demiplan-cannot-open = You can't use {$name} here. cp14-demiplan-cannot-open-end-round = The demiplane link crystal is inactive. Rift creation is impossible. cp14-round-end-monolith-50 = The demiplane link crystal is half discharged. -cp14-round-end-monolith-discharged = You feel the connection to the other worlds begin to break.... The demiplane link crystal power will run out in { $time } { $units } if you don't charge it with mana... +cp14-round-end-monolith-discharged = You feel the connection to the other worlds begin to break.... The demiplane link crystal power will run out in { $time } { $units } if you don't charge it with mana completely... cp14-round-end-monolith-recharged = Contact with the other worlds is being re-established. The demiplane link crystal is fully charged. cp14-round-end = The demiplane link crystal was completely discharged. The connection to the other worlds has been severed. The "interesting" part of the story is over here.... diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl index cb59656a1d..b3100ab263 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl @@ -4,6 +4,6 @@ cp14-demiplan-cannot-open = Вы не можете использовать {$na cp14-demiplan-cannot-open-end-round = Кристалл связи с демипланами неактивен. Открытие прохода невозможно. cp14-round-end-monolith-50 = Кристалл связи с демипланами разряжен на половину. -cp14-round-end-monolith-discharged = Вы чувствуете, что связь с другими мирами начинает рваться... Сила кристалла связи иссякнет через { $time } { $units }, если не зарядить его маной... +cp14-round-end-monolith-discharged = Вы чувствуете, что связь с другими мирами начинает рваться... Сила кристалла связи иссякнет через { $time } { $units }, если не запитать его маной полностью... cp14-round-end-monolith-recharged = Связь с другими мирами восстанавливается. Энергия кристалла связи восстановлена. cp14-round-end = Кристалл связи с демипланами окончательно разрядился. Связь с другими мирами оборвалась. "Интересная" часть этой истории окончена... diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml index 1c20c98d3f..e5db1f2943 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml @@ -41,11 +41,6 @@ - id: CP14BaseSharpeningStone - id: CP14GlassShard - id: CP14Paper - - !type:AllSelector - children: - - id: CP14Crossbolt - - id: CP14Crossbolt - - id: CP14Crossbolt # Rare - !type:GroupSelector weight: 25