(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -63,6 +63,15 @@ namespace Barotrauma.Steam
            return instance.client.SteamId;
        }

+        public static string GetUsername()
+        {
+            if (instance == null || !instance.isInitialized)
+            {
+                return "";
+            }
+            return instance.client.Username;
+        }
+
        public static ulong GetWorkshopItemIDFromUrl(string url)
        {
            try