Nubody (1/3) - Ipc removal (DeltaV-Station#5840)

* Reapply "Nubody Merge" (DeltaV-Station#5807)

This reverts commit d62f7ce.

* Revert "Nubody Merge (DeltaV-Station#5670)"

This reverts commit b465cfb.

* Revert "IPC fibers (DeltaV-Station#4968)"

This reverts commit c2b4221.

* Revert "IPC Polymorph fix (DeltaV-Station#4545)"

This reverts commit fa03d8c.

* Revert "fix IPC not having humanoid emotes (DeltaV-Station#4445)"

This reverts commit 216fdf9.

* Revert "ipc heat/cold (DeltaV-Station#4306)"

This reverts commit fafd5cf.

* Revert "ipc cables (DeltaV-Station#4283)"

This reverts commit 5495803.

* Revert "feat: ipcs now have dynamic power draw based off movement speed (DeltaV-Station#3917)"

This reverts commit 71e8b7e.

* Revert "fix ipcs not being able to disarm (DeltaV-Station#3374)"

This reverts commit 764c4dc.

* Revert "make steel heal caustic for ipcs (DeltaV-Station#3206)"

This reverts commit 450ac82.

* Revert "add missing ipc survival boxes (DeltaV-Station#3065)"

This reverts commit 888c9cd.

* Revert "make borgs use ipc repairing (DeltaV-Station#3064)"

This reverts commit f77a49d.

* Revert "added ipc plushie (batteries not included) (DeltaV-Station#3023)"

This reverts commit 743cdbb.

* Revert "Update hud.yml to add ipcs to diagnostic hud (DeltaV-Station#3019)"

This reverts commit 7220643.

* Revert "Tweak IPCs (DeltaV-Station#2979)"

This reverts commit 98b4747.

* Revert "fix nukies ipc test fail (DeltaV-Station#2957)"

This reverts commit 4a1acbf.

* Revert "fix ipc nukies not getting comms (DeltaV-Station#2884)"

This reverts commit 8a22547.

* Revert "fix ipc encryption key mispredict (DeltaV-Station#2879)"

This reverts commit f08726e.

* remove oil

* Revert "Merge pull request DeltaV-Station#2800 from Spielern/port-ipc"

This reverts commit 822fa43, reversing
changes made to fe4c23c.

* Remove and Fix rest of IPC Hangons causing crashes

* Integration test Errors

* Expand migration file with removed IPC stuff

* IPC Leg was found and migrated to naught

* motorkinds need to inherit an actual species base

* forgot the alerts

* irrelevant coscult code

* excess casualties

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>

Author: Coryler

Content.Client/Clothing/ClientClothingSystem.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Content.Client.DisplacementMap;
 using Content.Client.Inventory;
-using Content.Shared._DV.Silicon.IPC; // DeltaV - IPC Snouts
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
@@ -103,12 +102,8 @@ private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVis
 
         List<PrototypeLayerData>? layers = null;
 
-        // Begin DeltaV Additions - IPC snouts
         var speciesId = inventory.SpeciesId;
 
-        if (TryComp(args.Equipee, out SnoutHelmetComponent? helmetComponent) && helmetComponent.EnableAlternateHelmet)
-            speciesId = helmetComponent.ReplacementRace;
-
         // first attempt to get species specific data.
         if (speciesId != null)
             item.ClothingVisuals.TryGetValue($"{args.Slot}-{speciesId}", out layers);
@@ -120,7 +115,6 @@ private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVis
             if (!TryGetDefaultVisuals(uid, item, args.Slot, speciesId, out layers))
                 return;
         }
-        // End DeltaV Additions
 
         // add each layer to the visuals
         var i = 0;

Content.Client/_DV/Silicon/IPC/SnoutHelmetSystem.cs

@@ -87,12 +87,8 @@ static AlertsUI FindAlertsUI(Control control)
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
-                // Goobstation - IPC have BorgHealth instead of HumanHealth
-                var expectedDebugIDs = new[] { "Debug1", "Debug2" };
-                var expectedHealthIDs = new[] { "BorgHealth", "HumanHealth" };
-
-                Assert.That(alertIDs, Is.SupersetOf(expectedDebugIDs));
-                Assert.That(alertIDs, Has.Some.Matches<string>(item => expectedHealthIDs.Contains(item)));
+                var expectedIDs = new[] { "HumanHealth", "Debug1", "Debug2" };
+                Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 
             await server.WaitAssertion(() =>
@@ -108,12 +104,8 @@ await client.WaitAssertion(() =>
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
-                // Goobstation - IPC have BorgHealth instead of HumanHealth
-                var expectedDebugIDs = new[] { "Debug2" };
-                var expectedHealthIDs = new[] { "BorgHealth", "HumanHealth" };
-
-                Assert.That(alertIDs, Is.SupersetOf(expectedDebugIDs));
-                Assert.That(alertIDs, Has.Some.Matches<string>(item => expectedHealthIDs.Contains(item)));
+                var expectedIDs = new[] { "HumanHealth", "Debug2" };
+                Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 
             await pair.CleanReturnAsync();

Content.Client/_DV/Silicons/Charge/SiliconChargeSystem.cs

@@ -24,7 +24,6 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map.Components;
-using Content.Shared._EE.Silicon.Components; // Goobstation
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.GameRules;
@@ -230,15 +229,12 @@ void CheckDummy(int i)
         var totalSeconds = 30;
         var totalTicks = (int) Math.Ceiling(totalSeconds / server.Timing.TickPeriod.TotalSeconds);
         var increment = 5;
+        var resp = entMan.GetComponent<RespiratorComponent>(player);
         var damage = entMan.GetComponent<DamageableComponent>(player);
         for (var tick = 0; tick < totalTicks; tick += increment)
         {
             await pair.RunTicksSync(increment);
-            if (!entMan.HasComponent<SiliconComponent>(player)) // Goobstation - IPC
-            {
-                var resp = entMan.GetComponent<RespiratorComponent>(player);
-                Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
-            }
+            Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
             Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
         }
 

Content.Client/_DV/Silicons/Charge/SiliconDrainSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Ghost;
-using Content.Shared._EE.Silicon.Components; // EE
 using Content.Server.Hands.Systems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Chat;
@@ -173,10 +172,7 @@ private void OnDamageableSuicide(Entity<DamageableComponent> victim, ref Suicide
             return;
         }
 
-        if (HasComp<SiliconComponent>(victim)) // Goobstation
-            args.DamageType ??= "Shock";
-        else
-            args.DamageType ??= "Bloodloss";
+        args.DamageType ??= "Bloodloss";
         _suicide.ApplyLethalDamage(victim, args.DamageType);
         args.Handled = true;
     }

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs

@@ -8,7 +8,6 @@
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Shared._DV.Psionics.Components; // DeltaV
-using Content.Shared._EE.Silicon.Components; // Goobstation
 using Content.Shared.Atmos;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Components;
@@ -163,9 +162,6 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
         if (!TryComp<PhysicsComponent>(bodyToClone, out var physics))
             return false;
 
-        if (HasComp<SiliconComponent>(bodyToClone))
-            return false; // Goobstation: Don't clone IPCs.
-
         var cloningCost = (int)Math.Round(physics.FixturesMass);
 
         if (_configManager.GetCVar(CCVars.BiomassEasyMode))

Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs

@@ -13,8 +13,6 @@
 using Content.Shared.Station;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared._DV.Silicon.IPC; // DeltaV
-using Content.Shared.Radio.Components; // Goobstation
 
 namespace Content.Server.Clothing.Systems;
 
@@ -109,14 +107,6 @@ public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid
             _spawningSystem.EquipRoleLoadout(target, roleLoadout, jobProto);
         }
 
-        // Begin DeltaV/Goob Additions
-        if (EntityManager.HasComponent<EncryptionKeyHolderComponent>(target))
-        {
-            var encryption = EntityManager.System<InternalEncryptionKeySpawner>();
-            encryption.TryInsertEncryptionKey(target, startingGear);
-        }
-        // End DeltaV/Goob Additions
-
         return true;
     }
 }

Content.Server/Chat/SuicideSystem.cs

@@ -299,7 +299,7 @@ public override bool TryDoElectrocution(
             || !DoCommonElectrocution(uid, sourceUid, shockDamage, time, refresh, siemensCoefficient, statusEffects))
             return false;
 
-        RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient, shockDamage), true); // Goobstation
+        RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient), true);
         return true;
     }
 
@@ -349,7 +349,7 @@ private bool TryDoElectrocutionPowered(
         electrocutionComponent.Electrocuting = uid;
         electrocutionComponent.Source = sourceUid;
 
-        RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient, shockDamage), true); // Goobstation
+        RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient), true);
 
         return true;
     }