(df7ca4c53) updated doors + merge fix

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -149,7 +149,6 @@ namespace Barotrauma
                             character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
                         }
                     }
-
                 }
 
                 if (character.MemState.Count < 1) return;

Barotrauma/BarotraumaServer/Source/GameMain.cs

@@ -162,31 +162,6 @@ namespace Barotrauma
             }
         }
 
-        /// <summary>
-        /// Returns the file paths of all files of the given type in the content packages.
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="searchAllContentPackages">If true, also returns files in content packages that are installed but not currently selected.</param>
-        public IEnumerable<string> GetFilesOfType(ContentType type, bool searchAllContentPackages = false)
-        {
-            if (searchAllContentPackages)
-            {
-                return ContentPackage.GetFilesOfType(ContentPackage.List, type);
-            }
-            else
-            {
-                return ContentPackage.GetFilesOfType(SelectedPackages, type);
-            }
-        }
-
-        /// <summary>
-        /// Returns the file paths of all files of the given type in the currently selected content packages.
-        /// </summary>
-        public IEnumerable<string> GetFilesOfType(ContentType type)
-        {
-            return ContentPackage.GetFilesOfType(SelectedPackages, type);
-        }
-
         public void StartServer()
         {
             string name = "Server";

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -368,8 +368,6 @@ namespace Barotrauma
                 default:
                     throw new NotImplementedException();
             }
-            
-            SwarmBehavior?.Update(deltaTime);
 
             LatchOntoAI?.Update(this, deltaTime);
             IsSteeringThroughGap = false;
@@ -799,7 +797,6 @@ namespace Barotrauma
             {
                 UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance);
             }
-            return false;
         }
 
         public bool IsSteeringThroughGap { get; private set; }

Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs

@@ -733,8 +733,6 @@ namespace Barotrauma
 
                 limb.body.ApplyForce(diff * (float)(Math.Sin(WalkPos) * Math.Sqrt(limb.Mass)) * 30.0f * animStrength, maxVelocity: 10.0f);
             }
-
-            limb?.body.SmoothRotate(angle, torque, wrapAngle: false);
         }
 
         private void SmoothRotateWithoutWrapping(Limb limb, float angle, Limb referenceLimb, float torque)