(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components
                {                    
                    hullInfoFrame.RectTransform.ScreenSpaceOffset = hullFrame.Rect.Center;
                    hullInfoFrame.Visible = true;
-                    hullNameText.Text = hull.RoomName;
+                    hullNameText.Text = hull.DisplayName;

                    foreach (Hull linkedHull in hullData.LinkedHulls)
                    {