cleanup and carrying refactor (#2466)

* remove evil file * clean up fugi emag lines * clean up barrel/keg yml and meta * surface-level refactor of deep fryer component * move carrying to shared and fully refactor --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
DeltaV-Station · Dec 18, 2024 · ee4fca4 · ee4fca4
1 parent 94b2542
commit ee4fca4
Show file tree

Hide file tree

Showing 27 changed files with 701 additions and 852 deletions.
diff --git a/Content.Packaging/Properties/launchSettings.json b/Content.Packaging/Properties/launchSettings.json
diff --git a/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs b/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
+using Content.Shared.DeltaV.Carrying;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Systems;
@@ -11,7 +12,6 @@
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Content.Server.NPC.Components;
-using Content.Server.Carrying;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;

diff --git a/Content.Server/Nyanotrasen/Carrying/BeingCarriedComponent.cs b/Content.Server/Nyanotrasen/Carrying/BeingCarriedComponent.cs
diff --git a/Content.Server/Nyanotrasen/Carrying/CarriableComponent.cs b/Content.Server/Nyanotrasen/Carrying/CarriableComponent.cs
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingComponent.cs b/Content.Server/Nyanotrasen/Carrying/CarryingComponent.cs