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

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs

@@ -403,7 +403,7 @@ namespace Barotrauma
             if (campaign.CheatsEnabled)
             {
                 DebugConsole.CheatsEnabled = true;
-                if (GameMain.Config.UseSteam && !SteamAchievementManager.CheatsEnabled)
+                if (Steam.SteamManager.USE_STEAM && !SteamAchievementManager.CheatsEnabled)
                 {
                     SteamAchievementManager.CheatsEnabled = true;
                     new GUIMessageBox("Cheats enabled", "Cheat commands have been enabled on the campaign. You will not receive Steam Achievements until you restart the game.");

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs

@@ -70,7 +70,13 @@ namespace Barotrauma.Tutorials
             }
         }
 
-        public string Name
+        public string Identifier
+        {
+            get;
+            protected set;
+        }
+
+        public string DisplayName
         {
             get;
             protected set;
@@ -159,8 +165,9 @@ namespace Barotrauma.Tutorials
         public Tutorial(XElement element)
         {
             configElement = element;
-            Name = element.GetAttributeString("name", "Unnamed");
-            completed = GameMain.Config.CompletedTutorialNames.Contains(Name);
+            Identifier = element.GetAttributeString("identifier", "unknown");
+            DisplayName = TextManager.Get(Identifier);
+            completed = GameMain.Config.CompletedTutorialNames.Contains(Identifier);
             playableContentPath = element.GetAttributeString("playablecontentpath", "");
 
             segments = new List<TutorialSegment>();