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

2019-04-25 18:14:20 +03:00
parent eb7ac2bfbe
commit 4f746b04ea
12 changed files with 86 additions and 26 deletions
@@ -259,7 +259,7 @@ namespace Barotrauma.Items.Components
            int clockDir = (int)Math.Round((angle / MathHelper.TwoPi) * 12);
            if (clockDir == 0) clockDir = 12;

-            return TextManager.Get("SubDirOClock").Replace("[dir]", clockDir.ToString());
+            return TextManager.Get("roomname.subdiroclock").Replace("[dir]", clockDir.ToString());
        }

        private Vector2 GetTransducerCenter()