Temporarily Revert Changelings

Content.Benchmarks/SpawnEquipDeleteBenchmark.cs

@@ -58,7 +58,7 @@ await _pair.Server.WaitPost(() =>
             for (var i = 0; i < N; i++)
             {
                 _entity = server.EntMan.SpawnAttachedTo(Mob, _coords);
-                _spawnSys.EquipStartingGear(_entity, _gear);
+                _spawnSys.EquipStartingGear(_entity, _gear, null);
                 server.EntMan.DeleteEntity(_entity);
             }
         });

Content.Client/Actions/ActionsSystem.cs

@@ -248,10 +248,7 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
             if (action.ClientExclusive)
             {
                 if (instantAction.Event != null)
-                {
                     instantAction.Event.Performer = user;
-                    instantAction.Event.Action = actionId;
-                }
 
                 PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime);
             }

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -118,11 +118,8 @@ private void SetLayerData(
     ///     This should not be used if the entity is owned by the server. The server will otherwise
     ///     override this with the appearance data it sends over.
     /// </remarks>
-    public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile, HumanoidAppearanceComponent? humanoid = null)
+    public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile, HumanoidAppearanceComponent? humanoid = null)
     {
-        if (profile == null)
-            return;
-
         if (!Resolve(uid, ref humanoid))
         {
             return;

Content.Client/UserInterface/Systems/Actions/ActionUIController.cs

@@ -215,7 +215,6 @@ private bool TryTargetWorld(in PointerInputCmdArgs args, EntityUid actionId, Wor
             {
                 action.Event.Target = coords;
                 action.Event.Performer = user;
-                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
@@ -250,7 +249,6 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En
             {
                 action.Event.Target = entity;
                 action.Event.Performer = user;
-                action.Event.Action = actionId;
             }
 
             _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);

Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs

@@ -281,19 +281,10 @@ public void UpdateIcons()
 
         _controller ??= UserInterfaceManager.GetUIController<ActionUIController>();
         _spriteSys ??= _entities.System<SpriteSystem>();
-        if ((_controller.SelectingTargetFor == ActionId || _action.Toggled))
-        {
-            if (_action.IconOn != null)
-                SetActionIcon(_spriteSys.Frame0(_action.IconOn));
-
-            if (_action.BackgroundOn != null)
-                _buttonBackgroundTexture = _spriteSys.Frame0(_action.BackgroundOn);
-        }
+        if ((_controller.SelectingTargetFor == ActionId || _action.Toggled) && _action.IconOn != null)
+            SetActionIcon(_spriteSys.Frame0(_action.IconOn));
         else
-        {
             SetActionIcon(_action.Icon != null ? _spriteSys.Frame0(_action.Icon) : null);
-            _buttonBackgroundTexture = Theme.ResolveTexture("SlotBackground");
-        }
     }
 
     public void UpdateBackground()

Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs

@@ -1,6 +1,5 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Commands;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.CCVar;

Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs

@@ -17,7 +17,6 @@ public async Task TestSecretStarts()
 
         var server = pair.Server;
         await server.WaitIdleAsync();
-        var entMan = server.ResolveDependency<IEntityManager>();
         var gameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
 
         await server.WaitAssertion(() =>
@@ -33,7 +32,10 @@ await server.WaitAssertion(() =>
 
         await server.WaitAssertion(() =>
         {
-            Assert.That(gameTicker.GetAddedGameRules().Count(), Is.GreaterThan(1), $"No additional rules started by secret rule.");
+            foreach (var rule in gameTicker.GetAddedGameRules())
+            {
+                Assert.That(gameTicker.GetActiveGameRules(), Does.Contain(rule));
+            }
 
             // End all rules
             gameTicker.ClearGameRules();

Content.Server/Actions/ActionOnInteractSystem.cs

@@ -47,10 +47,7 @@ private void OnActivate(EntityUid uid, ActionOnInteractComponent component, Acti
 
         var (actId, act) = _random.Pick(options);
         if (act.Event != null)
-        {
             act.Event.Performer = args.User;
-            act.Event.Action = actId;
-        }
 
         _actions.PerformAction(args.User, null, actId, act, act.Event, _timing.CurTime, false);
         args.Handled = true;
@@ -78,7 +75,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
                 if (entAct.Event != null)
                 {
                     entAct.Event.Performer = args.User;
-                    entAct.Event.Action = entActId;
                     entAct.Event.Target = args.Target.Value;
                 }
 
@@ -104,7 +100,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
         if (act.Event != null)
         {
             act.Event.Performer = args.User;
-            act.Event.Action = actId;
             act.Event.Target = args.ClickLocation;
         }
 

Content.Server/Administration/ServerApi.cs

@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Maps;