From f6dfbcdf2d36ab0f6d14481be7898eda0eb20e52 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:51:08 +0000 Subject: [PATCH] Patch 170125 (#785) --- .../Fluids/SharedPuddleSystem.Evaporation.cs | 10 +++++----- Resources/Locale/en-US/_Nuclear14/traits.ftl | 5 ++++- Resources/Locale/en-US/language/languages.ftl | 4 ++-- Resources/Prototypes/_Nuclear14/Languages/english.yml | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs index 8f3eff46a4c..ce80ea80f43 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs @@ -11,12 +11,12 @@ public abstract partial class SharedPuddleSystem private const string WaterDirty = "WaterDirty"; [ValidatePrototypeId] private const string WaterIrradiated = "WaterIrradiated"; - [ValidatePrototypeId] - private const string WastelandBlood = "WastelandBlood"; - [ValidatePrototypeId] - private const string Blood = "Blood"; +// [ValidatePrototypeId] +// private const string WastelandBlood = "WastelandBlood"; +// [ValidatePrototypeId] +// private const string Blood = "Blood"; - public static readonly string[] EvaporationReagents = [Water, WaterDirty, WaterIrradiated, WastelandBlood, Blood]; + public static readonly string[] EvaporationReagents = [Water, WaterDirty, WaterIrradiated]; public bool CanFullyEvaporate(Solution solution) { diff --git a/Resources/Locale/en-US/_Nuclear14/traits.ftl b/Resources/Locale/en-US/_Nuclear14/traits.ftl index ffa39794852..dc6d77d9a14 100644 --- a/Resources/Locale/en-US/_Nuclear14/traits.ftl +++ b/Resources/Locale/en-US/_Nuclear14/traits.ftl @@ -5,7 +5,10 @@ trait-description-Chinese = You can understand and speak the Chinese language. W language-English-name = English language-English-description = The common language of the Wasteland. +chat-language-English-name = EN language-Chinese-name = Chinese language-Chinese-description = You can understand and speak the Chinese language. Whether through learning or backstory. +chat-language-Chinese-name = CN language-Tribal-name = Tribal -language-Tribal-description = You can understand and speak the local Tribal language. Whether through learning or backstory. \ No newline at end of file +language-Tribal-description = You can understand and speak the local Tribal language. Whether through learning or backstory. +chat-language-Tribal-name = T \ No newline at end of file diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl index fb3b1a1d046..523b63c95c5 100644 --- a/Resources/Locale/en-US/language/languages.ftl +++ b/Resources/Locale/en-US/language/languages.ftl @@ -58,8 +58,8 @@ language-Moffic-description = The language of the mothpeople borders on complete language-RobotTalk-name = RobotTalk language-RobotTalk-description = A language consisting of harsh binary chirps, whistles, hisses, and whines. Organic tongues cannot speak it without aid from special translators. -language-Sign-name = Tau-Ceti Basic Sign Language -language-Sign-description = TCB-SL for short, this sign language is prevalent among mute and deaf people. +language-Sign-name = Basic Sign Language +language-Sign-description = BSL - This sign language is prevalent among mute and deaf people. language-Marish-name = Marish language-Marish-description = An inherently empathetic language, conveying emotions with a single word; spoken effortlessly by Shadowkins, though nearly impossible to learn or replicate. diff --git a/Resources/Prototypes/_Nuclear14/Languages/english.yml b/Resources/Prototypes/_Nuclear14/Languages/english.yml index 7be8dca3eda..0b007eb7f64 100644 --- a/Resources/Prototypes/_Nuclear14/Languages/english.yml +++ b/Resources/Prototypes/_Nuclear14/Languages/english.yml @@ -2,7 +2,7 @@ id: English # Freespeak Modified isVisibleLanguage: true speech: - color: "#597d35" + color: "#c0c0c0" obfuscation: !type:SyllableObfuscation minSyllables: 1