(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
@@ -280,7 +280,7 @@ namespace Barotrauma
                    {
                        IsFixedSize = false
                    },
-                        TextManager.Get("Shuttle"), textAlignment: Alignment.Right, font: GUI.SmallFont)
+                        TextManager.Get("Shuttle", fallBackTag: "RespawnShuttle"), textAlignment: Alignment.Right, font: GUI.SmallFont)
                    {
                        TextColor = textBlock.TextColor * 0.8f,
                        ToolTip = textBlock.ToolTip