Telecrystals (and a bit more ECS) (#4775)

Content.Client/Entry/IgnoredComponents.cs

@@ -115,6 +115,7 @@ namespace Content.Client.Entry
             "SurgeryTool",
             "EmitSoundOnThrow",
             "Flash",
+            "Telecrystal",
             "TrashSpawner",
             "RCD",
             "RCDDeconstructWhitelist",

Content.Server/Entry/EntryPoint.cs

@@ -11,7 +11,6 @@ using Content.Server.GameTicking;
 using Content.Server.Holiday.Interfaces;
 using Content.Server.IoC;
 using Content.Server.NodeContainer.NodeGroups;
-using Content.Server.PDA.Managers;
 using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
 using Content.Server.Speech;
@@ -87,7 +86,6 @@ namespace Content.Server.Entry
             IoCManager.Resolve<ActionManager>().Initialize();
             IoCManager.Resolve<BlackboardManager>().Initialize();
             IoCManager.Resolve<ConsiderationsManager>().Initialize();
-            IoCManager.Resolve<IUplinkManager>().Initialize();
             IoCManager.Resolve<IAdminManager>().Initialize();
             IoCManager.Resolve<INpcBehaviorManager>().Initialize();
             IoCManager.Resolve<IAfkManager>().Initialize();

Content.Server/GameTicking/Presets/PresetSuspicion.cs

@@ -3,13 +3,12 @@ using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
-using Content.Server.PDA.Managers;
 using Content.Server.Players;
 using Content.Server.Suspicion;
 using Content.Server.Suspicion.Roles;
 using Content.Server.Traitor.Uplink;
+using Content.Server.Traitor.Uplink.Account;
 using Content.Server.Traitor.Uplink.Components;
-using Content.Server.Traitor.Uplink.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Inventory;
 using Content.Shared.Roles;
@@ -34,7 +33,6 @@ namespace Content.Server.GameTicking.Presets
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] protected readonly IEntityManager EntityManager = default!;
-        [Dependency] private readonly IUplinkManager _uplinkManager = default!;
 
         public int MinPlayers { get; set; }
         public int MinTraitors { get; set; }
@@ -117,8 +115,9 @@ namespace Content.Server.GameTicking.Presets
                 // creadth: we need to create uplink for the antag.
                 // PDA should be in place already, so we just need to
                 // initiate uplink account.
-                var uplinkAccount = new UplinkAccount(mind.OwnedEntity!.Uid, TraitorStartingBalance);
+                var uplinkAccount = new UplinkAccount(TraitorStartingBalance, mind.OwnedEntity!.Uid);
-                _uplinkManager.AddNewAccount(uplinkAccount);
+                var accounts = EntityManager.EntitySysManager.GetEntitySystem<UplinkAccountsSystem>();
+                accounts.AddNewAccount(uplinkAccount);
 
                 // try to place uplink
                 if (!EntityManager.EntitySysManager.GetEntitySystem<UplinkSystem>()

Content.Server/GameTicking/Presets/PresetTraitor.cs

@@ -7,12 +7,11 @@ using Content.Server.Inventory.Components;
 using Content.Server.Items;
 using Content.Server.Objectives.Interfaces;
 using Content.Server.PDA;
-using Content.Server.PDA.Managers;
 using Content.Server.Players;
 using Content.Server.Traitor;
 using Content.Server.Traitor.Uplink;
+using Content.Server.Traitor.Uplink.Account;
 using Content.Server.Traitor.Uplink.Components;
-using Content.Server.Traitor.Uplink.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Dataset;
 using Content.Shared.Inventory;
@@ -38,7 +37,6 @@ namespace Content.Server.GameTicking.Presets
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] protected readonly IEntityManager EntityManager = default!;
-        [Dependency] private readonly IUplinkManager _uplinkManager = default!;
 
         public override string ModeTitle => Loc.GetString("traitor-title");
 
@@ -124,8 +122,9 @@ namespace Content.Server.GameTicking.Presets
                 // initiate uplink account.
                 DebugTools.AssertNotNull(mind.OwnedEntity);
 
-                var uplinkAccount = new UplinkAccount(mind.OwnedEntity!.Uid, StartingBalance);
+                var uplinkAccount = new UplinkAccount(StartingBalance, mind.OwnedEntity!.Uid);
-                _uplinkManager.AddNewAccount(uplinkAccount);
+                var accounts = EntityManager.EntitySysManager.GetEntitySystem<UplinkAccountsSystem>();
+                accounts.AddNewAccount(uplinkAccount);
 
                 if (!EntityManager.EntitySysManager.GetEntitySystem<UplinkSystem>()
                     .AddUplink(mind.OwnedEntity, uplinkAccount))

Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs

@@ -27,10 +27,9 @@ using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Content.Server.Traitor.Uplink.Components;
 using Content.Shared.Traitor.Uplink;
-using Content.Server.PDA.Managers;
 using Content.Server.Traitor.Uplink;
-using Content.Server.Traitor.Uplink.Systems;
 using Content.Shared.Damage.Prototypes;
+using Content.Server.Traitor.Uplink.Account;
 
 namespace Content.Server.GameTicking.Presets
 {
@@ -43,7 +42,6 @@ namespace Content.Server.GameTicking.Presets
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IUplinkManager _uplinkManager = default!;
 
         public string PDAPrototypeName => "CaptainPDA";
         public string BeltPrototypeName => "ClothingBeltJanitorFilled";
@@ -106,8 +104,10 @@ namespace Content.Server.GameTicking.Presets
                 inventory.Equip(EquipmentSlotDefines.Slots.BACKPACK, newTmp.GetComponent<ItemComponent>());
 
                 // Like normal traitors, they need access to a traitor account.
-                var uplinkAccount = new UplinkAccount(mind.OwnedEntity.Uid, startingBalance);
+                var uplinkAccount = new UplinkAccount(startingBalance, mind.OwnedEntity.Uid);
-                _uplinkManager.AddNewAccount(uplinkAccount);
+                var accounts = _entityManager.EntitySysManager.GetEntitySystem<UplinkAccountsSystem>();
+                accounts.AddNewAccount(uplinkAccount);
+
                 _entityManager.EntitySysManager.GetEntitySystem<UplinkSystem>()
                     .AddUplink(mind.OwnedEntity, uplinkAccount, newPDA);
 

Content.Server/IoC/ServerContentIoC.cs

@@ -16,7 +16,6 @@ using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.Objectives;
 using Content.Server.Objectives.Interfaces;
-using Content.Server.PDA.Managers;
 using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
 using Content.Server.Speech;
@@ -42,7 +41,6 @@ namespace Content.Server.IoC
             IoCManager.Register<RecipeManager, RecipeManager>();
             IoCManager.Register<AlertManager, AlertManager>();
             IoCManager.Register<ActionManager, ActionManager>();
-            IoCManager.Register<IUplinkManager,UplinkManager>();
             IoCManager.Register<INodeGroupFactory, NodeGroupFactory>();
             IoCManager.Register<BlackboardManager, BlackboardManager>();
             IoCManager.Register<ConsiderationsManager, ConsiderationsManager>();

Content.Server/PDA/PDASystem.cs

@@ -4,7 +4,6 @@ using Content.Server.Light.EntitySystems;
 using Content.Server.Light.Events;
 using Content.Server.Traitor.Uplink;
 using Content.Server.Traitor.Uplink.Components;
-using Content.Server.Traitor.Uplink.Systems;
 using Content.Server.UserInterface;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;

Content.Server/Traitor/Uplink/Account/UplinkAccountEvents.cs

@@ -0,0 +1,31 @@
+using Content.Shared.Traitor.Uplink;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Traitor.Uplink.Account
+{
+    /// <summary>
+    /// Invokes when one of the UplinkAccounts changed its TC balance
+    /// </summary>
+    public class UplinkAccountBalanceChanged : EntityEventArgs
+    {
+        public readonly UplinkAccount Account;
+
+        /// <summary>
+        /// Difference between NewBalance - OldBalance
+        /// </summary>
+        public readonly int Difference;
+
+        public readonly int NewBalance;
+        public readonly int OldBalance;
+
+        public UplinkAccountBalanceChanged(UplinkAccount account, int difference)
+        {
+            Account = account;
+            Difference = difference;
+
+            NewBalance = account.Balance;
+            OldBalance = account.Balance - difference;
+
+        }
+    }
+}

Content.Server/Traitor/Uplink/Account/UplinkAccountsSystem.cs

@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.Mind.Components;
+using Content.Shared.Traitor.Uplink;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+
+namespace Content.Server.Traitor.Uplink.Account
+{
+    /// <summary>
+    ///     Manage all registred uplink accounts and their balance
+    /// </summary>
+    public class UplinkAccountsSystem : EntitySystem
+    {
+        [Dependency]
+        private readonly UplinkListingSytem _listingSystem = default!;
+
+        private readonly HashSet<UplinkAccount> _accounts = new();
+
+        public bool AddNewAccount(UplinkAccount acc)
+        {
+            return _accounts.Add(acc);
+        }
+
+
+        /// <summary>
+        /// Add TC to uplinks account balance
+        /// </summary>
+        public bool AddToBalance(UplinkAccount account, int toAdd)
+        {
+            account.Balance += toAdd;
+
+            RaiseLocalEvent(new UplinkAccountBalanceChanged(account, toAdd));
+            return true;
+        }
+
+        /// <summary>
+        /// Charge TC from uplinks account balance
+        /// </summary>
+        public bool RemoveFromBalance(UplinkAccount account, int price)
+        {
+            if (account.Balance - price < 0)
+                return false;
+
+            account.Balance -= price;
+
+            RaiseLocalEvent(new UplinkAccountBalanceChanged(account, -price));
+            return true;
+        }
+
+        /// <summary>
+        /// Force-set TC uplinks account balance to a new value
+        /// </summary>
+        public bool SetBalance(UplinkAccount account, int newBalance)
+        {
+            if (newBalance < 0)
+                return false;
+
+            var dif = newBalance - account.Balance;
+            account.Balance = newBalance;
+            RaiseLocalEvent(new UplinkAccountBalanceChanged(account, dif));
+            return true;
+
+        }
+
+        public bool TryPurchaseItem(UplinkAccount acc, string itemId, EntityCoordinates spawnCoords, [NotNullWhen(true)] out IEntity? purchasedItem)
+        {
+            purchasedItem = null;
+
+            if (!_listingSystem.TryGetListing(itemId, out var listing))
+            {
+                return false;
+            }
+
+            if (acc.Balance < listing.Price)
+            {
+                return false;
+            }
+
+            if (!RemoveFromBalance(acc, listing.Price))
+            {
+                return false;
+            }
+
+            purchasedItem = EntityManager.SpawnEntity(listing.ItemId, spawnCoords);
+            return true;
+        }
+    }
+}

Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs

@@ -1,7 +1,5 @@
 using Content.Server.Administration;
-using Content.Server.PDA.Managers;
+using Content.Server.Traitor.Uplink.Account;
-using Content.Server.Traitor.Uplink.Components;
-using Content.Server.Traitor.Uplink.Systems;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Traitor.Uplink;
@@ -70,16 +68,9 @@ namespace Content.Server.Traitor.Uplink.Commands
             var tcCount = configManager.GetCVar(CCVars.TraitorStartingBalance);
 
             // Get account
-            var uplinkManager = IoCManager.Resolve<IUplinkManager>();
+            var uplinkAccount = new UplinkAccount(tcCount, user.Uid);
-            if (!uplinkManager.TryGetAccount(user.Uid, out UplinkAccount? uplinkAccount))
+            var accounts = entityManager.EntitySysManager.GetEntitySystem<UplinkAccountsSystem>();
-            {
+            accounts.AddNewAccount(uplinkAccount);
-                uplinkAccount = new UplinkAccount(user.Uid, tcCount);
-                if (!uplinkManager.AddNewAccount(uplinkAccount))
-                {
-                    shell.WriteLine(Loc.GetString("Can't create new uplink account"));
-                    return;
-                }
-            }
 
             // Finally add uplink
             if (!entityManager.EntitySysManager.GetEntitySystem<UplinkSystem>()

Content.Server/Traitor/Uplink/Managers/IUplinkManager.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.PDA;
-using Content.Shared.Traitor.Uplink;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-
-namespace Content.Server.PDA.Managers
-{
-    public interface IUplinkManager
-    {
-        public IReadOnlyDictionary<string, UplinkListingData> FetchListings { get; }
-
-        void Initialize();
-
-        public bool AddNewAccount(UplinkAccount acc);
-
-        public bool ChangeBalance(UplinkAccount acc, int amt);
-
-        public bool TryGetAccount(EntityUid owner, out UplinkAccount? acc);
-
-        public bool TryPurchaseItem(
-            UplinkAccount? acc,
-            string itemId,
-            EntityCoordinates spawnCoords,
-            [NotNullWhen(true)] out IEntity? purchasedItem);
-
-    }
-}

Content.Server/Traitor/Uplink/Managers/UplinkManager.cs

@@ -1,117 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Mind.Components;
-using Content.Shared.PDA;
-using Content.Shared.Traitor.Uplink;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using System.Linq;
-
-namespace Content.Server.PDA.Managers
-{
-    public class UplinkManager : IUplinkManager
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-
-        private readonly Dictionary<EntityUid, UplinkAccount> _accounts = new();
-        private readonly Dictionary<string, UplinkListingData> _listings = new();
-
-        public IReadOnlyDictionary<string, UplinkListingData> FetchListings => _listings;
-
-        public void Initialize()
-        {
-            foreach (var item in _prototypeManager.EnumeratePrototypes<UplinkStoreListingPrototype>())
-            {
-                var newListing = new UplinkListingData(item.ListingName, item.ItemId, item.Price, item.Category,
-                    item.Description);
-
-                RegisterUplinkListing(newListing);
-            }
-        }
-
-        private void RegisterUplinkListing(UplinkListingData listing)
-        {
-            if (!ContainsListing(listing))
-            {
-                _listings.Add(listing.ItemId, listing);
-            }
-        }
-
-        private bool ContainsListing(UplinkListingData listing)
-        {
-            return _listings.ContainsKey(listing.ItemId);
-        }
-
-        public bool AddNewAccount(UplinkAccount acc)
-        {
-            var entity = _entityManager.GetEntity(acc.AccountHolder);
-
-            if (entity.TryGetComponent(out MindComponent? mindComponent) && !mindComponent.HasMind)
-            {
-                return false;
-            }
-
-            if (_accounts.ContainsKey(acc.AccountHolder))
-            {
-                return false;
-            }
-
-            _accounts.Add(acc.AccountHolder, acc);
-            return true;
-        }
-
-        public bool TryGetAccount(EntityUid owner, out UplinkAccount? acc)
-        {
-            return _accounts.TryGetValue(owner, out acc);
-        }
-
-        public bool ChangeBalance(UplinkAccount acc, int amt)
-        {
-            var account = _accounts.GetValueOrDefault(acc.AccountHolder);
-
-            if (account == null)
-            {
-                return false;
-            }
-
-            if (account.Balance + amt < 0)
-            {
-                return false;
-            }
-
-            account.ModifyAccountBalance(account.Balance + amt);
-
-            return true;
-        }
-
-        public bool TryPurchaseItem(UplinkAccount? acc, string itemId, EntityCoordinates spawnCoords, [NotNullWhen(true)] out IEntity? purchasedItem)
-        {
-            purchasedItem = null;
-            if (acc == null)
-            {
-                return false;
-            }
-
-            if (!_listings.TryGetValue(itemId, out var listing))
-            {
-                return false;
-            }
-
-            if (acc.Balance < listing.Price)
-            {
-                return false;
-            }
-
-            if (!ChangeBalance(acc, -listing.Price))
-            {
-                return false;
-            }
-
-            purchasedItem = _entityManager.SpawnEntity(listing.ItemId, spawnCoords);
-            return true;
-        }
-    }
-}

Content.Server/Traitor/Uplink/Telecrystal/TelecrystalComponent.cs

@@ -0,0 +1,10 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Traitor.Uplink.Telecrystal
+{
+    [RegisterComponent]
+    public class TelecrystalComponent : Component
+    {
+        public override string Name => "Telecrystal";
+    }
+}

Content.Server/Traitor/Uplink/Telecrystal/TelecrystalSystem.cs

@@ -0,0 +1,55 @@
+using Content.Server.Traitor.Uplink.Account;
+using Content.Server.Traitor.Uplink.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Stacks;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using System;
+
+namespace Content.Server.Traitor.Uplink.Telecrystal
+{
+    public class TelecrystalSystem : EntitySystem
+    {
+        [Dependency]
+        private readonly UplinkAccountsSystem _accounts = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<TelecrystalComponent, AfterInteractEvent>(OnAfterInteract);
+        }
+
+        private void OnAfterInteract(EntityUid uid, TelecrystalComponent component, AfterInteractEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (args.Target == null || !EntityManager.TryGetComponent(args.Target.Uid, out UplinkComponent? uplink))
+                return;
+
+            // TODO: when uplink will have some auth logic (like PDA ringtone code)
+            // check if uplink open before adding TC
+            // No metagaming by using this on every PDA around just to see if it gets used up.
+
+            var acc = uplink.UplinkAccount;
+            if (acc == null)
+                return;
+
+            EntityManager.TryGetComponent(uid, out SharedStackComponent? stack);
+
+            var tcCount = stack != null ? stack.Count : 1;
+            if (!_accounts.AddToBalance(acc, tcCount))
+                return;
+
+            EntityManager.DeleteEntity(uid);
+
+            var msg = Loc.GetString("telecrystal-component-sucs-inserted",
+                ("source", args.Used), ("target", args.Target));
+            args.User.PopupMessage(args.User, msg);
+
+            args.Handled = true;
+        }
+    }
+}

Content.Server/Traitor/Uplink/UplinkListingSytem.cs

@@ -0,0 +1,56 @@
+using Content.Shared.PDA;
+using Content.Shared.Traitor.Uplink;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.Traitor.Uplink
+{
+    /// <summary>
+    ///     Contains and controls all items in traitors uplink shop
+    /// </summary>
+    public class UplinkListingSytem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        private readonly Dictionary<string, UplinkListingData> _listings = new();
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            foreach (var item in _prototypeManager.EnumeratePrototypes<UplinkStoreListingPrototype>())
+            {
+                var newListing = new UplinkListingData(item.ListingName, item.ItemId,
+                    item.Price, item.Category, item.Description);
+
+                RegisterUplinkListing(newListing);
+            }
+        }
+
+        private void RegisterUplinkListing(UplinkListingData listing)
+        {
+            if (!ContainsListing(listing))
+            {
+                _listings.Add(listing.ItemId, listing);
+            }
+        }
+
+        public bool ContainsListing(UplinkListingData listing)
+        {
+            return _listings.ContainsKey(listing.ItemId);
+        }
+
+        public bool TryGetListing(string itemID, [NotNullWhen(true)] out UplinkListingData? data)
+        {
+            return _listings.TryGetValue(itemID, out data);
+        }
+
+        public IReadOnlyDictionary<string, UplinkListingData> GetListings()
+        {
+            return _listings;
+        }
+    }
+}

Content.Server/Traitor/Uplink/UplinkSystem.cs

@@ -2,7 +2,7 @@ using Content.Server.Hands.Components;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
 using Content.Server.PDA;
-using Content.Server.PDA.Managers;
+using Content.Server.Traitor.Uplink.Account;
 using Content.Server.Traitor.Uplink.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Traitor.Uplink;
@@ -16,11 +16,14 @@ using Robust.Shared.Player;
 using System;
 using System.Linq;
 
-namespace Content.Server.Traitor.Uplink.Systems
+namespace Content.Server.Traitor.Uplink
 {
     public class UplinkSystem : EntitySystem
     {
-        [Dependency] private readonly IUplinkManager _uplinkManager = default!;
+        [Dependency]
+        private readonly UplinkAccountsSystem _accounts = default!;
+        [Dependency]
+        private readonly UplinkListingSytem _listing = default!;
 
         public override void Initialize()
         {
@@ -28,6 +31,10 @@ namespace Content.Server.Traitor.Uplink.Systems
 
             SubscribeLocalEvent<UplinkComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<UplinkComponent, ComponentRemove>(OnRemove);
+            SubscribeLocalEvent<UplinkComponent, UplinkBuyListingMessage>(OnBuy);
+            SubscribeLocalEvent<UplinkComponent, UplinkRequestUpdateInterfaceMessage>(OnRequestUpdateUI);
+
+            SubscribeLocalEvent<UplinkAccountBalanceChanged>(OnBalanceChangedBroadcast);
         }
 
         public void SetAccount(UplinkComponent component, UplinkAccount account)
@@ -39,19 +46,10 @@ namespace Content.Server.Traitor.Uplink.Systems
             }
 
             component.UplinkAccount = account;
-            component.UplinkAccount.BalanceChanged += (acc) =>
-            {
-                UpdateUserInterface(component);
-            };
-
         }
 
         private void OnInit(EntityUid uid, UplinkComponent component, ComponentInit args)
         {
-            var ui = component.Owner.GetUIOrNull(UplinkUiKey.Key);
-            if (ui != null)
-                ui.OnReceiveMessage += (msg) => OnUIMessage(component, msg);
-
             RaiseLocalEvent(uid, new UplinkInitEvent(component));
         }
 
@@ -60,33 +58,35 @@ namespace Content.Server.Traitor.Uplink.Systems
             RaiseLocalEvent(uid, new UplinkRemovedEvent());
         }
 
-        public void ToggleUplinkUI(UplinkComponent component, IPlayerSession session)
+        private void OnBalanceChangedBroadcast(UplinkAccountBalanceChanged ev)
         {
-            var ui = component.Owner.GetUIOrNull(UplinkUiKey.Key);
+            foreach (var uplink in EntityManager.EntityQuery<UplinkComponent>())
-            ui?.Toggle(session);
+            {
-
+                if (uplink.UplinkAccount == ev.Account)
-            UpdateUserInterface(component);
+                {
+                    UpdateUserInterface(uplink);
+                }
+            }    
         }
 
-        private void OnUIMessage(UplinkComponent uplink, ServerBoundUserInterfaceMessage message)
+        private void OnRequestUpdateUI(EntityUid uid, UplinkComponent uplink, UplinkRequestUpdateInterfaceMessage args)
         {
-            switch (message.Message)
-            {
-                case UplinkRequestUpdateInterfaceMessage _:
             UpdateUserInterface(uplink);
-                    break;
+        }
-                case UplinkBuyListingMessage buyMsg:
+
+        private void OnBuy(EntityUid uid, UplinkComponent uplink, UplinkBuyListingMessage message)
         {
             var player = message.Session.AttachedEntity;
-                        if (player == null) break;
+            if (player == null) return;
+            if (uplink.UplinkAccount == null) return;
 
-                        if (!_uplinkManager.TryPurchaseItem(uplink.UplinkAccount, buyMsg.ItemId,
+            if (!_accounts.TryPurchaseItem(uplink.UplinkAccount, message.ItemId,
                 player.Transform.Coordinates, out var entity))
             {
                 SoundSystem.Play(Filter.SinglePlayer(message.Session), uplink.InsufficientFundsSound.GetSound(),
                     uplink.Owner, AudioParams.Default);
                 RaiseNetworkEvent(new UplinkInsufficientFundsMessage(), message.Session.ConnectedClient);
-                            break;
+                return;
             }
 
             if (player.TryGetComponent(out HandsComponent? hands) &&
@@ -99,10 +99,14 @@ namespace Content.Server.Traitor.Uplink.Systems
                 uplink.Owner, AudioParams.Default.WithVolume(-2f));
 
             RaiseNetworkEvent(new UplinkBuySuccessMessage(), message.Session.ConnectedClient);
-                        break;
         }
 
-            }
+        public void ToggleUplinkUI(UplinkComponent component, IPlayerSession session)
+        {
+            var ui = component.Owner.GetUIOrNull(UplinkUiKey.Key);
+            ui?.Toggle(session);
+
+            UpdateUserInterface(component);
         }
 
         private void UpdateUserInterface(UplinkComponent component)
@@ -111,7 +115,7 @@ namespace Content.Server.Traitor.Uplink.Systems
             if (ui == null)
                 return;
 
-            var listings = _uplinkManager.FetchListings.Values.ToArray();
+            var listings = _listing.GetListings().Values.ToArray();
             var acc = component.UplinkAccount;
 
             UplinkAccountData accData;

Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs

@@ -2,11 +2,13 @@ using System.Threading.Tasks;
 using Content.Server.Inventory.Components;
 using Content.Server.Mind.Components;
 using Content.Server.PDA;
+using Content.Server.Traitor.Uplink.Account;
 using Content.Server.Traitor.Uplink.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
 namespace Content.Server.TraitorDeathMatch.Components
@@ -104,9 +106,10 @@ namespace Content.Server.TraitorDeathMatch.Components
             }
 
             // 4 is the per-PDA bonus amount.
+            var accounts = Owner.EntityManager.EntitySysManager.GetEntitySystem<UplinkAccountsSystem>();
             var transferAmount = victimAccount.Balance + 4;
-            victimAccount.ModifyAccountBalance(0);
+            accounts.SetBalance(victimAccount, 0);
-            userAccount.ModifyAccountBalance(userAccount.Balance + transferAmount);
+            accounts.AddToBalance(userAccount, transferAmount);
 
             victimUplink.Owner.Delete();
 

Content.Shared/Traitor/Uplink/UplinkAccount.cs

@@ -1,32 +1,16 @@
 using Robust.Shared.GameObjects;
-using Robust.Shared.ViewVariables;
-using System;
 
 namespace Content.Shared.Traitor.Uplink
 {
     public class UplinkAccount
     {
-        public event Action<UplinkAccount>? BalanceChanged;
+        public readonly EntityUid? AccountHolder;
-        public EntityUid AccountHolder;
+        public int Balance;
-        private int _balance;
-        [ViewVariables]
-        public int Balance => _balance;
 
-        public UplinkAccount(EntityUid uid, int startingBalance)
+        public UplinkAccount(int startingBalance, EntityUid? accountHolder = null)
         {
-            AccountHolder = uid;
+            AccountHolder = accountHolder;
-            _balance = startingBalance;
+            Balance = startingBalance;
-        }
-
-        public bool ModifyAccountBalance(int newBalance)
-        {
-            if (newBalance < 0)
-            {
-                return false;
-            }
-            _balance = newBalance;
-            BalanceChanged?.Invoke(this);
-            return true;
         }
     }
 }

Content.Shared/Traitor/Uplink/UplinkListingData.cs

@@ -8,11 +8,11 @@ namespace Content.Shared.Traitor.Uplink
     [Serializable, NetSerializable]
     public class UplinkListingData : ComponentState, IEquatable<UplinkListingData>
     {
-        public string ItemId;
+        public readonly string ItemId;
-        public int Price;
+        public readonly int Price;
-        public UplinkCategory Category;
+        public readonly UplinkCategory Category;
-        public string Description;
+        public readonly string Description;
-        public string ListingName;
+        public readonly string ListingName;
 
         public UplinkListingData(string listingName, string itemId,
             int price, UplinkCategory category,

Resources/Locale/en-US/traitor/uplink/telecrystal-component.ftl

@@ -0,0 +1 @@
+telecrystal-component-sucs-inserted = You slot {$source} into the {$target}.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -217,11 +217,33 @@
   itemId: lanternextrabright
   price: 2
 
-#- type: uplinkListing
+- type: uplinkListing
-#  id: UplinkTelecrystal
+  id: UplinkTelecrystal
-#  category: Misc
+  category: Misc
-#  itemId: Telecrystal
+  itemId: Telecrystal1
-#  price: 1
+  price: 1
+  listingName: telecrystal [1]
+
+- type: uplinkListing
+  id: UplinkTelecrystal5
+  category: Misc
+  itemId: Telecrystal5
+  price: 5
+  listingName: telecrystal [5]
+
+- type: uplinkListing
+  id: UplinkTelecrystal10
+  category: Misc
+  itemId: Telecrystal10
+  price: 10
+  listingName: telecrystal [10]
+
+- type: uplinkListing
+  id: UplinkTelecrystal20
+  category: Misc
+  itemId: Telecrystal
+  price: 20
+  listingName: telecrystal [20]
 
 # Pointless
 

Resources/Prototypes/Entities/Objects/Specific/syndicate.yml

@@ -0,0 +1,42 @@
+- type: entity
+  name: telecrystal
+  parent: BaseItem
+  id: Telecrystal
+  suffix: Twenty
+  description: It seems to be pulsing with suspiciously enticing energies.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Syndicate/telecrystal.rsi
+    netsync: false
+    state: telecrystal
+  - type: Item
+    sprite: Objects/Specific/Syndicate/telecrystal.rsi
+  - type: Stack
+    count: 20
+    max: 20
+    stackType: Telecrystal
+  - type: Telecrystal
+
+- type: entity
+  parent: Telecrystal
+  id: Telecrystal1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
+- type: entity
+  parent: Telecrystal
+  id: Telecrystal5
+  suffix: Five
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  parent: Telecrystal
+  id: Telecrystal10
+  suffix: Ten
+  components:
+  - type: Stack
+    count: 10

Resources/Prototypes/Stacks/Materials/crystals.yml

@@ -0,0 +1,5 @@
+- type: stack
+  id: Telecrystal
+  name: telecrystal
+  icon: Objects/Specific/Syndicate/telecrystal.rsi
+  spawn: Telecrystal1

Resources/Textures/Objects/Specific/Syndicate/telecrystal.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+    "states": [
+        {
+            "name": "telecrystal"
+        },
+		{
+		  "name": "inhand-left",
+		  "directions": 4
+		},
+		{
+		  "name": "inhand-right",
+		  "directions": 4
+		}
+    ]
+}