diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 2409a2179c..df1f6151b0 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,9 +10,7 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "ru-RU"; // CrystallPunk-Localization - private const string FallbackCulture = "en-US"; // CrystallPunk-Localization - //Creating an English CrystallPunk server? Set Culture to "en-US" + private const string Culture = "en-US"; // CrystallPunk-Localization. "ru-RU" or "en-US" /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. @@ -28,11 +26,8 @@ namespace Content.Shared.Localizations public void Initialize() { var culture = new CultureInfo(Culture); - var fallbackCulture = new CultureInfo(FallbackCulture); _loc.LoadCulture(culture); - _loc.LoadCulture(fallbackCulture); // CrystallPunk-Localization - _loc.SetFallbackCluture(fallbackCulture); // CrystallPunk-Localization _loc.AddFunction(culture, "PRESSURE", FormatPressure); _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts); _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules); diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl index 774b9307a9..ee9e39a460 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -25,5 +25,11 @@ cp14-reagent-desc-basic-satiate-thirst = A liquid that tastes very much like wat cp14-reagent-name-basic-emote-cough = Coughing solution cp14-reagent-desc-basic-emote-cough = Coughs profusely, but harmlessly. +cp14-reagent-name-basic-heal-cold = Warming Solution +cp14-reagent-desc-basic-heal-cold = Capable of healing even serious frostbite. + +cp14-reagent-name-basic-damage-cold = Ice solution +cp14-reagent-desc-basic-damage-cold = Dangerous substance that causes severe frostbite. + cp14-reagent-name-basic-vomit = Vomit solution cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index bd967c9d5b..28d59d8835 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -23,6 +23,7 @@ - CP14BaseSickle - CP14BaseThrowableSpear - CP14BaseTwoHandedSword + - CP14TwoHandedSwordScythe - CP14BaseLightCrossbow - CP14Crossbolt - CP14Crossbolt