Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

Subsurface/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs

@@ -283,7 +283,7 @@ namespace Barotrauma.Tutorials
 
             infoBox = CreateInfoFrame("Steer the submarine downwards, heading further into the cavern.");
 
-            while (Submarine.MainSub.WorldPosition.Y > 36500.0f)
+            while (Submarine.MainSub.WorldPosition.Y > 40000.0f)
             {
                 yield return CoroutineStatus.Running;
             }
@@ -293,7 +293,7 @@ namespace Barotrauma.Tutorials
                 "Content/Characters/Moloch/moloch.xml", 
                 steering.Item.WorldPosition + new Vector2(3000.0f, -500.0f));
 
-            moloch.PlaySound(AIController.AiState.Attack);
+            moloch.PlaySound(CharacterSound.SoundType.Attack);
 
             yield return new WaitForSeconds(1.0f);
 
@@ -349,7 +349,7 @@ namespace Barotrauma.Tutorials
                     if (isWindow)
                     {
                         //decrease window damage to slow down the leaking
-                        w.AddDamage(i, -w.SectionDamage(i) * 0.495f);
+                        w.AddDamage(i, -w.SectionDamage(i) * 0.48f);
                     }
                     else
                     {

Subsurface/Source/GameSession/GameModes/Tutorials/TutorialType.cs

@@ -39,7 +39,7 @@ namespace Barotrauma.Tutorials
             GameMain.GameSession = new GameSession(Submarine.MainSub, "", GameModePreset.list.Find(gm => gm.Name.ToLowerInvariant() == "tutorial"));
             (GameMain.GameSession.gameMode as TutorialMode).tutorialType = this;
 
-            GameMain.GameSession.StartShift("tuto2");
+            GameMain.GameSession.StartShift("tuto");
 
             GameMain.GameSession.TaskManager.Tasks.Clear();