Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

2021-11-02 11:31:46 -03:00
parent f4d6c686fe a49decc2ed
commit 2048389896
77 changed files with 508 additions and 224 deletions
@@ -867,6 +867,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--)