From 9ebfb1d64fd5e2d8594897e557bf6c4ff7f33c4e Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:32:39 -0500 Subject: [PATCH] Fix Loadout Requirements Only Displaying One Requirement (#28994) Collect all group effects failed instead of only first one failed --- .../Loadouts/Effects/GroupLoadoutEffect.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs index 1be75f7dbc..258d9a4dbb 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs @@ -17,13 +17,16 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect { var effectsProto = collection.Resolve().Index(Proto); + var reasons = new List(); foreach (var effect in effectsProto.Effects) { - if (!effect.Validate(profile, loadout, session, collection, out reason)) - return false; + if (effect.Validate(profile, loadout, session, collection, out reason)) + continue; + + reasons.Add(reason.ToMarkup()); } - reason = null; - return true; + reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkup(string.Join('\n', reasons)); + return reason == null; } } -- 2.51.2