(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -12,7 +12,7 @@ namespace Barotrauma

        public bool CheatsEnabled;

-        const int InitialMoney = 4700;
+        const int InitialMoney = 8700;
        public const int HullRepairCost = 500, ItemRepairCost = 500;

        protected bool watchmenSpawned;
@@ -184,7 +184,7 @@ namespace Barotrauma
            if (CheatsEnabled)
            {
                DebugConsole.CheatsEnabled = true;
-                if (GameMain.Config.UseSteam && !SteamAchievementManager.CheatsEnabled)
+                if (Steam.SteamManager.USE_STEAM && !SteamAchievementManager.CheatsEnabled)
                {
                    SteamAchievementManager.CheatsEnabled = true;
 #if CLIENT