Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs

Subsurface/Source/Characters/Animation/FishAnimController.cs

@@ -77,7 +77,7 @@ namespace Barotrauma
                 {
                     UpdateSineAnim(deltaTime);
                 }
-                else
+                else if (currentHull != null && CanEnterSubmarine)
                 {
                     UpdateWalkAnim(deltaTime);
                 }
@@ -119,7 +119,6 @@ namespace Barotrauma
                 }
             }
             
-            //if (stunTimer > gameTime.TotalGameTime.TotalMilliseconds) return;
             if (!flip) return;
 
             flipTimer += deltaTime;

Subsurface/Source/Characters/HuskInfection.cs

@@ -99,14 +99,6 @@ namespace Barotrauma
             }
 
             character.AddDamage(CauseOfDeath.Husk, 0.5f*deltaTime, null);
-
-            if (character.AnimController.limbJoints[0].LimitEnabled &&
-                (character.AnimController.CurrentHull == null ||
-                character.AnimController.CurrentHull.LethalPressure > 50.0f))
-            {
-                character.BreakJoints();
-                character.AnimController.limbJoints.Last().LimitEnabled = true;
-            }
         }
 
 
@@ -142,11 +134,10 @@ namespace Barotrauma
             }
 
             var torso = character.AnimController.GetLimb(LimbType.Torso);
-            torso.body.SetTransform(torso.SimPosition, 0.0f);
 
             var newLimb = new Limb(character, limbElement);
             newLimb.body.Submarine = character.Submarine;
-            newLimb.body.SetTransform(torso.SimPosition, 0.0f);
+            newLimb.body.SetTransform(torso.SimPosition, torso.Rotation);
             
             character.AnimController.AddLimb(newLimb);
             character.AnimController.AddJoint(jointElement);