Unstable v0.19.3.0

2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -271,20 +271,17 @@ namespace Barotrauma
                tags.Add("wall".ToIdentifier());
            }

-            if (Description.IsNullOrEmpty())
+            if (!descriptionIdentifier.IsEmpty)
            {
-                if (!descriptionIdentifier.IsEmpty)
-                {
-                    Description = TextManager.Get($"EntityDescription.{descriptionIdentifier}");
-                }
-                else if (nameIdentifier.IsEmpty)
-                {
-                    Description = TextManager.Get($"EntityDescription.{Identifier}");
-                }
-                else
-                {
-                    Description = TextManager.Get($"EntityDescription.{nameIdentifier}");
-                }
+                Description = TextManager.Get($"EntityDescription.{descriptionIdentifier}").Fallback(Description);
+            }
+            else if (nameIdentifier.IsEmpty)
+            {
+                Description = TextManager.Get($"EntityDescription.{Identifier}").Fallback(Description);
+            }
+            else
+            {
+                Description = TextManager.Get($"EntityDescription.{nameIdentifier}").Fallback(Description);
            }

            //backwards compatibility