Patch 170125

Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs

@@ -11,12 +11,12 @@ public abstract partial class SharedPuddleSystem
     private const string WaterDirty = "WaterDirty";
     [ValidatePrototypeId<ReagentPrototype>]
     private const string WaterIrradiated = "WaterIrradiated";
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string WastelandBlood = "WastelandBlood";
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Blood = "Blood";
+//    [ValidatePrototypeId<ReagentPrototype>]
+//    private const string WastelandBlood = "WastelandBlood";
+//    [ValidatePrototypeId<ReagentPrototype>]
+//    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)
     {

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.
+language-Tribal-description = You can understand and speak the local Tribal language. Whether through learning or backstory.
+chat-language-Tribal-name = T

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.

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