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

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 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()