(a01a93af6) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-07 16:24:58 +03:00
parent cc22268f0e
commit 96a5875b9a
8 changed files with 33 additions and 13 deletions
@@ -1355,7 +1355,7 @@ namespace Barotrauma
                if (sub.HasTag(SubmarineTag.Shuttle))
                {
                    var shuttleText = new GUITextBlock(new RectTransform(new Vector2(0.2f, 1.0f), textBlock.RectTransform, Anchor.CenterRight),
-                        TextManager.Get("Shuttle"), font: GUI.SmallFont)
+                        TextManager.Get("Shuttle", fallBackTag: "RespawnShuttle"), font: GUI.SmallFont)
                        {
                            TextColor = textBlock.TextColor * 0.8f,
                            ToolTip = textBlock.ToolTip