Merge branch 'master' into moRags

2017-12-17 22:41:45 +03:00
parent 141214eadc 62bb5119ab
commit 1e5b25bd1a
81 changed files with 770 additions and 256 deletions
@@ -242,7 +242,7 @@ namespace Barotrauma
                    string focusName = character.FocusedCharacter.SpeciesName;
                    if (character.FocusedCharacter.Info != null)
                    {
-                        focusName = character.FocusedCharacter.Info.Name;
+                        focusName = character.FocusedCharacter.Info.DisplayName;
                    }
                    Vector2 textPos = startPos;
                    textPos -= new Vector2(GUI.Font.MeasureString(focusName).X / 2, 20);