TriggerSystem improvements (#35762)

* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* fix triggers

* atomize PR

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>

Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs

@@ -0,0 +1,18 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Polymorph.Components;
+
+/// <summary>
+/// Intended for use with the trigger system.
+/// Polymorphs the user of the trigger.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PolymorphOnTriggerComponent : Component
+{
+    /// <summary>
+    /// Polymorph settings.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Polymorph;
+}

Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs

@@ -1,65 +0,0 @@
-using Content.Server.Polymorph.Components;
-using Content.Shared.Polymorph;
-using Content.Shared.Projectiles;
-using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Systems;
-
-public partial class PolymorphSystem
-{
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-
-    /// <summary>
-    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
-    /// an entity we're colliding with
-    /// </summary>
-    private Queue<PolymorphQueuedData> _queuedPolymorphUpdates = new();
-
-    private void InitializeCollide()
-    {
-        SubscribeLocalEvent<PolymorphOnCollideComponent, StartCollideEvent>(OnPolymorphCollide);
-    }
-
-    public void UpdateCollide()
-    {
-        while (_queuedPolymorphUpdates.TryDequeue(out var data))
-        {
-            if (Deleted(data.Ent))
-                continue;
-
-            var ent = PolymorphEntity(data.Ent, data.Polymorph);
-            if (ent != null)
-                _audio.PlayPvs(data.Sound, ent.Value);
-        }
-    }
-
-    private void OnPolymorphCollide(EntityUid uid, PolymorphOnCollideComponent component, ref StartCollideEvent args)
-    {
-        if (args.OurFixtureId != SharedProjectileSystem.ProjectileFixture)
-            return;
-
-        var other = args.OtherEntity;
-        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, other) ||
-            _whitelistSystem.IsBlacklistPass(component.Blacklist, other))
-            return;
-
-        _queuedPolymorphUpdates.Enqueue(new (other, component.Sound, component.Polymorph));
-    }
-}
-
-public struct PolymorphQueuedData
-{
-    public EntityUid Ent;
-    public SoundSpecifier Sound;
-    public ProtoId<PolymorphPrototype> Polymorph;
-
-    public PolymorphQueuedData(EntityUid ent, SoundSpecifier sound, ProtoId<PolymorphPrototype> polymorph)
-    {
-        Ent = ent;
-        Sound = sound;
-        Polymorph = polymorph;
-    }
-}

Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs

@@ -0,0 +1,41 @@
+using Content.Shared.Polymorph;
+using Content.Server.Polymorph.Components;
+using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Polymorph.Systems;
+
+public sealed partial class PolymorphSystem
+{
+    /// <summary>
+    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
+    /// an entity we're colliding with in case of TriggerOnCollide.
+    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
+    /// </summary>
+    private Queue<(EntityUid Ent, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
+
+    private void InitializeTrigger()
+    {
+        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.User == null)
+            return;
+
+        _queuedPolymorphUpdates.Enqueue((args.User.Value, ent.Comp.Polymorph));
+        args.Handled = true;
+    }
+
+    public void UpdateTrigger()
+    {
+        while (_queuedPolymorphUpdates.TryDequeue(out var data))
+        {
+            if (TerminatingOrDeleted(data.Item1))
+                continue;
+
+            PolymorphEntity(data.Item1, data.Item2);
+        }
+    }
+}

Content.Server/Polymorph/Systems/PolymorphSystem.cs

@@ -60,8 +60,8 @@ public sealed partial class PolymorphSystem : EntitySystem
         SubscribeLocalEvent<PolymorphedEntityComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
         SubscribeLocalEvent<PolymorphedEntityComponent, DestructionEventArgs>(OnDestruction);
 
-        InitializeCollide();
         InitializeMap();
+        InitializeTrigger();
     }
 
     public override void Update(float frameTime)
@@ -89,7 +89,7 @@ public sealed partial class PolymorphSystem : EntitySystem
             }
         }
 
-        UpdateCollide();
+        UpdateTrigger();
     }
 
     private void OnComponentStartup(Entity<PolymorphableComponent> ent, ref ComponentStartup args)