Merge branch 'master' into offmed-staging

2025-10-11 00:10:57 -04:00
parent 469aec2a01 8bfaccb741
commit 61f0b79a6d
123 changed files with 1923 additions and 1031 deletions
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -516,11 +516,12 @@ public sealed class NPCUtilitySystem : EntitySystem
                {
                    foreach (var comp in compFilter.Components)
                    {
-                        if (HasComp(ent, comp.Value.Component.GetType()))
-                            continue;
-
-                        _entityList.Add(ent);
-                        break;
+                        var hasComp = HasComp(ent, comp.Value.Component.GetType());
+                        if (!compFilter.RetainWithComp == hasComp)
+                        {
+                            _entityList.Add(ent);
+                            break;
+                        }
                    }
                }