diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
index 7951bcf8e..bcf133b30 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
@@ -150,63 +150,34 @@ namespace Barotrauma
                         }
                     }
 
-                    if (localPos.Animation != serverPos.Animation)
-                    {
-                        if (serverPos.Animation == AnimController.Animation.CPR)
-                        {
-                            character.AnimController.Anim = AnimController.Animation.CPR;
-                        }
-                        else if (character.AnimController.Anim == AnimController.Animation.CPR) 
-                        {
-                            character.AnimController.Anim = AnimController.Animation.None;
-                        }
-                    }
-
-                    Hull serverHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(serverPos.Position), character.CurrentHull, serverPos.Position.Y < lowestSubPos);
-                    Hull clientHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(localPos.Position), serverHull, localPos.Position.Y < lowestSubPos);
-                    
-                    if (serverHull != null && clientHull != null && serverHull.Submarine != clientHull.Submarine)
-                    {
-                        //hull subs don't match => teleport the camera to the other sub
-                        character.Submarine = serverHull.Submarine;
-                        character.CurrentHull = currentHull = serverHull;
-                        SetPosition(serverPos.Position);
-                        character.MemLocalState.Clear();
-                    }
-                    else
-                    {
-                        Vector2 positionError = serverPos.Position - localPos.Position;
-                        float rotationError = serverPos.Rotation.HasValue && localPos.Rotation.HasValue ?
-                            serverPos.Rotation.Value - localPos.Rotation.Value :
-                            0.0f;
-
-                        for (int i = localPosIndex; i < character.MemLocalState.Count; i++)
-                        {
-                            Hull pointHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(character.MemLocalState[i].Position), clientHull, character.MemLocalState[i].Position.Y < lowestSubPos);
-                            if (pointHull != clientHull && ((pointHull == null) || (clientHull == null) || (pointHull.Submarine == clientHull.Submarine))) break;
-                            character.MemLocalState[i].Translate(positionError, rotationError);
-                        }
-
-                        float errorMagnitude = positionError.Length();
-                        if (errorMagnitude > 0.01f)
-                        {
-                            Collider.TargetPosition = Collider.SimPosition + positionError;
-                            Collider.TargetRotation = Collider.Rotation + rotationError;
-                            Collider.MoveToTargetPosition(lerp: true);
-                            if (errorMagnitude > 0.5f)
-                            {
-                                character.MemLocalState.Clear();                 
-                                foreach (Limb limb in Limbs)
-                                {
-                                    limb.body.TargetPosition = limb.body.SimPosition + positionError;
-                                    limb.body.MoveToTargetPosition(lerp: true);
-                                }
-                            }
-                        }
-                    }
-
                 }
 
+                if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
+                character.MemState.Clear();
+            }
+        }
+        
+        partial void ImpactProjSpecific(float impact, Body body)
+        {
+            float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
+
+            if (body.UserData is Limb limb && character.Stun <= 0f)
+            {
+                if (impact > 3.0f) { PlayImpactSound(limb); }
+            }
+            else if (body.UserData is Limb || body == Collider.FarseerBody)
+            {
+                if (!character.IsRemotePlayer && impact > ImpactTolerance)
+                {
+                    SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+                }
+            }
+            if (Character.Controlled == character)
+            {
+                GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
+            }
+        }
+
                 if (character.MemState.Count < 1) return;
 
                 overrideTargetMovement = Vector2.Zero;
diff --git a/Barotrauma/BarotraumaClient/Source/GameMain.cs b/Barotrauma/BarotraumaClient/Source/GameMain.cs
index b2e3fa53a..7ddb42f09 100644
--- a/Barotrauma/BarotraumaClient/Source/GameMain.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameMain.cs
@@ -521,11 +521,20 @@ namespace Barotrauma
         }
 
         /// <summary>
-        /// Returns the file paths of all files of the given type in the currently selected content packages.
+        /// Returns the file paths of all files of the given type in the content packages.
         /// </summary>
-        public IEnumerable<string> GetFilesOfType(ContentType type)
+        /// <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)
         {
-            return ContentPackage.GetFilesOfType(SelectedPackages, type);
+            if (searchAllContentPackages)
+            {
+                return ContentPackage.GetFilesOfType(ContentPackage.List, type);
+            }
+            else
+            {
+                return ContentPackage.GetFilesOfType(SelectedPackages, type);
+            }
         }
 
         /// <summary>
diff --git a/Barotrauma/BarotraumaServer/Source/GameMain.cs b/Barotrauma/BarotraumaServer/Source/GameMain.cs
index 279693165..ebf4486e2 100644
--- a/Barotrauma/BarotraumaServer/Source/GameMain.cs
+++ b/Barotrauma/BarotraumaServer/Source/GameMain.cs
@@ -145,6 +145,23 @@ 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>
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
index d3dcbc16b..ef144932c 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
@@ -853,7 +853,7 @@ namespace Barotrauma
             {
                 if (characterConfigFiles == null)
                 {
-                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character);
+                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true);
                 }
                 return characterConfigFiles;
             }