v0.13.0.11

Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs

@@ -24,7 +24,7 @@ namespace Barotrauma.Networking
 
         //items created during respawn
         //any respawn items left in the shuttle are removed when the shuttle despawns
-        private List<Item> respawnItems = new List<Item>();
+        private readonly List<Item> respawnItems = new List<Item>();
 
         public bool UsingShuttle
         {
@@ -55,6 +55,14 @@ namespace Barotrauma.Networking
 
         public State CurrentState { get; private set; }
 
+        public bool UseRespawnPrompt
+        {
+            get
+            {
+                return GameMain.GameSession?.GameMode is CampaignMode && Level.Loaded != null && Level.Loaded?.Type != LevelData.LevelType.Outpost;
+            }
+        }
+
         private float maxTransportTime;
 
         private float updateReturnTimer;
@@ -70,6 +78,8 @@ namespace Barotrauma.Networking
             {
                 RespawnShuttle = new Submarine(shuttleInfo, true);
                 RespawnShuttle.PhysicsBody.FarseerBody.OnCollision += OnShuttleCollision;
+                //set crush depth slightly deeper than the main sub's
+                RespawnShuttle.RealWorldCrushDepth = Math.Max(RespawnShuttle.RealWorldCrushDepth, Submarine.MainSub.RealWorldCrushDepth * 1.2f);
 
                 //prevent wifi components from communicating between the respawn shuttle and other subs
                 List<WifiComponent> wifiComponents = new List<WifiComponent>();
@@ -293,10 +303,10 @@ namespace Barotrauma.Networking
             RespawnShuttle.Velocity = Vector2.Zero;
         }
 
-        partial void RespawnCharactersProjSpecific();
-        public void RespawnCharacters()
+        partial void RespawnCharactersProjSpecific(Vector2? shuttlePos);
+        public void RespawnCharacters(Vector2? shuttlePos)
         {
-            RespawnCharactersProjSpecific();
+            RespawnCharactersProjSpecific(shuttlePos);
         }
         
         public Vector2 FindSpawnPos()