Release v0.15.13.0

2021-11-02 13:19:48 +02:00
parent a52a23f8c2
commit 3a35dbfe6c
77 changed files with 509 additions and 224 deletions
@@ -291,7 +291,7 @@ namespace Barotrauma
            husk.SetStun(5);
            yield return new WaitForSeconds(5, false);
 #if CLIENT
-            husk.PlaySound(CharacterSound.SoundType.Idle);
+            husk?.PlaySound(CharacterSound.SoundType.Idle);
 #endif
            yield return CoroutineStatus.Success;
        }
@@ -844,6 +844,8 @@ namespace Barotrauma
            FaceTint = DefaultFaceTint;
            BodyTint = Color.TransparentBlack;

+            if (!(Character?.Params?.Health.ApplyAfflictionColors ?? false)) { return; }
+
            for (int i = 0; i < limbHealths.Count; i++)
            {
                for (int j = limbHealths[i].Afflictions.Count - 1; j >= 0; j--)