]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix Loadout Requirements Only Displaying One Requirement (#28994)
authorThomas <87614336+Aeshus@users.noreply.github.com>
Fri, 14 Jun 2024 20:32:39 +0000 (15:32 -0500)
committerGitHub <noreply@github.com>
Fri, 14 Jun 2024 20:32:39 +0000 (16:32 -0400)
Collect all group effects failed instead of only first one failed

Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs

index 1be75f7dbc81dc11b7c0d4ee6eeee273a8ee666e..258d9a4dbb232f70645790c0932fbb3e93197569 100644 (file)
@@ -17,13 +17,16 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect
     {
         var effectsProto = collection.Resolve<IPrototypeManager>().Index(Proto);
 
+        var reasons = new List<string>();
         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;
     }
 }