fix ipc nukies not getting comms

Content.Server/Administration/Commands/SetOutfitCommand.cs

@@ -16,7 +16,7 @@
 using Robust.Shared.Console;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Server._EE.Silicon.IPC; // Goobstation
+using Content.Shared._DV.Silicon.IPC; // DeltaV
 using Content.Shared.Radio.Components; // Goobstation
 
 namespace Content.Server.Administration.Commands
@@ -165,12 +165,14 @@ public static bool SetOutfit(EntityUid target, string gear, IEntityManager entit
                 var stationSpawning = entityManager.System<SharedStationSpawningSystem>();
                 stationSpawning.EquipRoleLoadout(target, roleLoadout, jobProto);
             }
-
+
+            // Begin DeltaV/Goob Additions
             if (entityManager.HasComponent<EncryptionKeyHolderComponent>(target))
             {
                 var encryption = entityManager.System<InternalEncryptionKeySpawner>();
-                encryption.TryInsertEncryptionKey(target, startingGear, entityManager);
+                encryption.TryInsertEncryptionKey(target, startingGear);
             }
+            // End DeltaV/Goob Additions
             return true;
         }
     }

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -28,7 +28,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using Content.Server._EE.Silicon.IPC; // Goobstation
 
 namespace Content.Server.Station.Systems;
 
@@ -51,7 +50,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly PdaSystem _pdaSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly InternalEncryptionKeySpawner _internalEncryption = default!; // Goobstation
     private bool _randomizeCharacters;
 
     /// <inheritdoc/>
@@ -179,7 +177,6 @@ public EntityUid SpawnPlayerMob(
         {
             var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
             EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
-            _internalEncryption.TryInsertEncryptionKey(entity.Value, startingGear, EntityManager); // Goobstation
         }
 
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);

Content.Shared/Station/SharedStationSpawningSystem.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared._DV.Silicon.IPC; // DeltaV
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Inventory;
@@ -23,6 +24,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
+    [Dependency] private readonly InternalEncryptionKeySpawner _internalEncryption = default!; // DeltaV
 
     private EntityQuery<HandsComponent> _handsQuery;
     private EntityQuery<InventoryComponent> _inventoryQuery;
@@ -99,6 +101,12 @@ public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>?
     /// </summary>
     public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
     {
+        // Begin DeltaV Additions: Fix nukie IPCs not having comms
+        if (startingGear is not {} proto)
+            return;
+
+        _internalEncryption.TryInsertEncryptionKey(entity, proto);
+        // End DeltaV Additions
         EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent);
     }
 
@@ -174,4 +182,4 @@ public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear,
             RaiseLocalEvent(entity, ref ev);
         }
     }
-}
+}

Content.Shared/_DV/Silicon/IPC/InternalEncryptionKeySpawner.cs

@@ -0,0 +1,40 @@
+using Content.Shared.Containers;
+using Content.Shared.Radio.Components;
+using Content.Shared.Roles;
+using Robust.Shared.Containers;
+
+namespace Content.Shared._DV.Silicon.IPC;
+
+public sealed class InternalEncryptionKeySpawner : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
+    /// <summary>
+    /// Inserts an IPC's encryption key from starting gear headset.
+    /// </summary>
+    /// <remarks>
+    /// Doesn't support a profile's loadouts, have fun.
+    /// </remarks>
+    public void TryInsertEncryptionKey(EntityUid target, StartingGearPrototype startingGear)
+    {
+        if (!TryComp<EncryptionKeyHolderComponent>(target, out var keyHolder)
+            || !startingGear.Equipment.TryGetValue("ears", out var headsetId)
+            || string.IsNullOrEmpty(headsetId))
+            return;
+
+        var headset = Spawn(headsetId, Transform(target).Coordinates);
+        if (!HasComp<EncryptionKeyHolderComponent>(headset)
+            || !TryComp<ContainerFillComponent>(headset, out var fillComp)
+            || !fillComp.Containers.TryGetValue(EncryptionKeyHolderComponent.KeyContainerName, out var defaultKeys))
+            return;
+
+        _container.CleanContainer(keyHolder.KeyContainer);
+
+        foreach (var key in defaultKeys)
+        {
+            SpawnInContainerOrDrop(key, target, keyHolder.KeyContainer.ID);
+        }
+
+        Del(headset);
+    }
+}