try revert "upstream"

This reverts commit 756904a, reversing
changes made to 2ff04d1.

.vscode/launch.json

@@ -52,4 +52,4 @@
             "preLaunchTask": "build"
         }
     ]
-}
+}

Content.Client/Actions/ActionsSystem.cs

@@ -51,29 +51,6 @@ public override void Initialize()
             SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
-        public override void FrameUpdate(float frameTime)
-        {
-            base.FrameUpdate(frameTime);
-
-            var worldActionQuery = EntityQueryEnumerator<WorldTargetActionComponent>();
-            while (worldActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-
-            var instantActionQuery = EntityQueryEnumerator<InstantActionComponent>();
-            while (instantActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-
-            var entityActionQuery = EntityQueryEnumerator<EntityTargetActionComponent>();
-            while (entityActionQuery.MoveNext(out var uid, out var action))
-            {
-                UpdateAction(uid, action);
-            }
-        }
-
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
         {
             if (args.Current is not InstantActionComponentState state)
@@ -118,8 +95,6 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.Icon = state.Icon;
             component.IconOn = state.IconOn;
             component.IconColor = state.IconColor;
-            component.OriginalIconColor = state.OriginalIconColor;
-            component.DisabledIconColor = state.DisabledIconColor;
             component.Keywords.Clear();
             component.Keywords.UnionWith(state.Keywords);
             component.Enabled = state.Enabled;
@@ -150,8 +125,6 @@ public override void UpdateAction(EntityUid? actionId, BaseActionComponent? acti
             if (!ResolveActionData(actionId, ref action))
                 return;
 
-            action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor;
-
             base.UpdateAction(actionId, action);
             if (_playerManager.LocalEntity != action.AttachedEntity)
                 return;

Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs

@@ -1,12 +1,14 @@
-using System.Linq;
 using System.Numerics;
-using Content.Shared.Preferences.Loadouts;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Administration.UI.SetOutfit
@@ -63,18 +65,9 @@ private void SearchBarOnOnTextChanged(LineEdit.LineEditEventArgs obj)
             PopulateByFilter(SearchBar.Text);
         }
 
-        private IEnumerable<StartingGearPrototype> GetPrototypes()
-        {
-            // Filter out any StartingGearPrototypes that belong to loadouts
-            var loadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>();
-            var loadoutGears = loadouts.Select(l => l.StartingGear);
-            return _prototypeManager.EnumeratePrototypes<StartingGearPrototype>()
-                .Where(p => !loadoutGears.Contains(p.ID));
-        }
-
         private void PopulateList()
         {
-            foreach (var gear in GetPrototypes())
+            foreach (var gear in _prototypeManager.EnumeratePrototypes<StartingGearPrototype>())
             {
                 OutfitList.Add(GetItem(gear, OutfitList));
             }
@@ -83,7 +76,7 @@ private void PopulateList()
         private void PopulateByFilter(string filter)
         {
             OutfitList.Clear();
-            foreach (var gear in GetPrototypes())
+            foreach (var gear in _prototypeManager.EnumeratePrototypes<StartingGearPrototype>())
             {
                 if (!string.IsNullOrEmpty(filter) &&
                     gear.ID.ToLowerInvariant().Contains(filter.Trim().ToLowerInvariant()))

Content.Client/Buckle/BuckleSystem.cs

@@ -3,6 +3,7 @@
 using Content.Shared.Buckle.Components;
 using Content.Shared.Rotation;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameStates;
 
 namespace Content.Client.Buckle;
 
@@ -14,6 +15,7 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<BuckleComponent, ComponentHandleState>(OnHandleState);
         SubscribeLocalEvent<BuckleComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
     }
@@ -55,6 +57,21 @@ private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveE
         }
     }
 
+    private void OnHandleState(Entity<BuckleComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not BuckleState state)
+            return;
+
+        ent.Comp.DontCollide = state.DontCollide;
+        ent.Comp.BuckleTime = state.BuckleTime;
+        var strapUid = EnsureEntity<BuckleComponent>(state.BuckledTo, ent);
+
+        SetBuckledTo(ent, strapUid == null ? null : new (strapUid.Value, null));
+
+        var (uid, component) = ent;
+
+    }
+
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
         if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))