revenant cleanup (#10662)

Content.Server/Revenant/EntitySystems/RevenantSystem.cs

@@ -16,6 +16,8 @@ using Robust.Shared.Prototypes;
 using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Tag;
 using Content.Server.Polymorph.Systems;
+using Content.Server.Store.Components;
+using Content.Server.Store.Systems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Player;
 using Content.Shared.Movement.Systems;
@@ -42,6 +44,7 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
+    [Dependency] private readonly StoreSystem _store = default!;
 
     public override void Initialize()
     {
@@ -49,13 +52,13 @@ public sealed partial class RevenantSystem : EntitySystem
 
         SubscribeLocalEvent<RevenantComponent, ComponentStartup>(OnStartup);
 
+        SubscribeLocalEvent<RevenantComponent, RevenantShopActionEvent>(OnShop);
         SubscribeLocalEvent<RevenantComponent, DamageChangedEvent>(OnDamage);
         SubscribeLocalEvent<RevenantComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RevenantComponent, StatusEffectAddedEvent>(OnStatusAdded);
         SubscribeLocalEvent<RevenantComponent, StatusEffectEndedEvent>(OnStatusEnded);
 
         InitializeAbilities();
-        InitializeShop();
     }
 
     private void OnStartup(EntityUid uid, RevenantComponent component, ComponentStartup args)
@@ -72,10 +75,6 @@ public sealed partial class RevenantSystem : EntitySystem
         if (TryComp(component.Owner, out EyeComponent? eye))
             eye.VisibilityMask |= (uint) (VisibilityFlags.Ghost);
 
-        //get all the abilities
-        foreach (var listing in _proto.EnumeratePrototypes<RevenantStoreListingPrototype>())
-            component.Listings.Add(listing, true);
-
         var shopaction = new InstantAction(_proto.Index<InstantActionPrototype>("RevenantShop"));
         _action.AddAction(uid, shopaction, null);
     }
@@ -133,7 +132,8 @@ public sealed partial class RevenantSystem : EntitySystem
             _polymorphable.PolymorphEntity(uid, "Ectoplasm");
         }
 
-        UpdateUserInterface(component);
+        if (TryComp<StoreComponent>(uid, out var store))
+            _store.UpdateUserInterface(uid, store);
         return true;
     }
 
@@ -163,6 +163,13 @@ public sealed partial class RevenantSystem : EntitySystem
         return true;
     }
 
+    private void OnShop(EntityUid uid, RevenantComponent component, RevenantShopActionEvent args)
+    {
+        if (!TryComp<StoreComponent>(uid, out var store))
+            return;
+        _store.ToggleUi(uid, store);
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);