get that crap outta here (completely rewrites inventorysystem) (#5807)

* some work * equip: done unequip: todo * unequipping done & refactored events * workin * movin * reee namespaces * stun * mobstate * fixes * some work on events * removes serverside itemcomp & misc fixes * work * smol merge fix * ports template to prototype & finishes ui * moves relay & adds containerenumerator * actions & cuffs * my god what is actioncode * more fixes * im loosing my grasp on reality * more fixes * more work * explosions * yes * more work * more fixes * merge master & misc fixed because i forgot to commit before merging master * more fixes * fixes * moar * more work * moar fixes * suffixmap * more work on client * motivation low * no. no containers * mirroring client to server * fixes * move serverinvcomp * serverinventorycomponent is dead * gaming * only strippable & ai left... * only ai and richtext left * fixes ai * fixes * fixes sprite layers * more fixes * resolves optional * yes * stable™️ * fixes * moar fixes * moar * fix some tests * lmao * no comment * good to merge™️ * fixes build but for real * adresses some reviews * adresses some more reviews * nullables, yo * fixes lobbyscreen * timid refactor to differentiate actor & target * adresses more reviews * more * my god what a mess * removed the rest of duplicates * removed duplicate slotflags and renamed shoes to feet * removes another unused one * yes * fixes lobby & makes tryunequip return unequipped item * fixes * some funny renames * fixes * misc improvements to attemptevents * fixes * merge fixes Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
parent 7a5adb47a1
commit 512d6a38c3
199 changed files with 2493 additions and 3300 deletions
--- a/Content.Server/Light/Components/ExpendableLightComponent.cs
+++ b/Content.Server/Light/Components/ExpendableLightComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Clothing.Components;
-using Content.Server.Items;
 using Content.Shared.Interaction;
+using Content.Shared.Item;
 using Content.Shared.Light.Component;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -38,7 +38,7 @@ namespace Content.Server.Light.Components
        {
            base.Initialize();

-            if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
+            if (_entMan.TryGetComponent<SharedItemComponent?>(Owner, out var item))
            {
                item.EquippedPrefix = "unlit";
            }
@@ -55,7 +55,7 @@ namespace Content.Server.Light.Components
        {
            if (!Activated && CurrentState == ExpendableLightState.BrandNew)
            {
-                if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
+                if (_entMan.TryGetComponent<SharedItemComponent?>(Owner, out var item))
                {
                    item.EquippedPrefix = "lit";
                }
@@ -130,7 +130,7 @@ namespace Content.Server.Light.Components

            if (_entMan.TryGetComponent(Owner, out ClothingComponent? clothing))
            {
-                clothing.ClothingEquippedPrefix = on ? "Activated" : string.Empty;
+                clothing.EquippedPrefix = on ? "Activated" : string.Empty;
            }
        }

@@ -163,7 +163,7 @@ namespace Content.Server.Light.Components
                        UpdateSpriteAndSounds(Activated);
                        UpdateVisualizer();

-                        if (_entMan.TryGetComponent<ItemComponent?>(Owner, out var item))
+                        if (_entMan.TryGetComponent<SharedItemComponent?>(Owner, out var item))
                        {
                            item.EquippedPrefix = "unlit";
                        }