(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:45:37 +03:00
parent 04997cd2f3
commit 68ced76e1b
53 changed files with 791 additions and 243 deletions
@@ -50,7 +50,7 @@ namespace Barotrauma
                    Job.Name, textColor: Job.Prefab.UIColor, font: font);
            }

-            if (personalityTrait != null)
+            if (personalityTrait != null && TextManager.Language == "English")
            {
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), headerTextArea.RectTransform),
                    TextManager.Get("PersonalityTrait") + ": " + personalityTrait.Name, font: font);