Revert "Actions Rework" (#6888)

Content.Shared/CombatMode/SharedCombatModeComponent.cs

@@ -1,11 +1,10 @@
 using System;
-using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
-using Content.Shared.Sound;
 using Content.Shared.Targeting;
+using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.Players;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.CombatMode
 {
@@ -15,50 +14,6 @@ namespace Content.Shared.CombatMode
         private bool _isInCombatMode;
         private TargetingZone _activeZone;
 
-        [DataField("disarmFailChance")]
-        public readonly float DisarmFailChance = 0.4f;
-
-        [DataField("pushChance")]
-        public readonly float DisarmPushChance = 0.4f;
-
-        [DataField("disarmFailSound")]
-        public readonly SoundSpecifier DisarmFailSound = new SoundPathSpecifier("/Audio/Weapons/punchmiss.ogg");
-
-        [DataField("disarmSuccessSound")]
-        public readonly SoundSpecifier DisarmSuccessSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg");
-
-        // These are chonky default definitions for combat actions. But its a pain to add a yaml version of this for
-        // every entity that wants combat mode, especially given that they're currently all identical... so ummm.. yeah.
-        [DataField("disarmAction")]
-        public readonly EntityTargetAction DisarmAction = new()
-        {
-            Icon = new SpriteSpecifier.Texture(new ResourcePath("Interface/Actions/disarmOff.png")),
-            IconOn = new SpriteSpecifier.Texture(new ResourcePath("Interface/Actions/disarm.png")),
-            Name = "action-name-disarm",
-            Description = "action-description-disarm",
-            Repeat = true,
-            UseDelay = TimeSpan.FromSeconds(1.5f),
-            InteractOnMiss = true,
-            Event = new DisarmActionEvent(),
-            CanTargetSelf = false,
-            Whitelist = new()
-            {
-                Components = new[] { "Hands", "StatusEffects" },
-            },
-        };
-
-        [DataField("combatToggleAction")]
-        public readonly InstantAction CombatToggleAction = new()
-        {
-            Icon = new SpriteSpecifier.Texture(new ResourcePath("Interface/Actions/harmOff.png")),
-            IconOn = new SpriteSpecifier.Texture(new ResourcePath("Interface/Actions/harm.png")),
-            UserPopup = "action-popup-combat",
-            PopupToggleSuffix = "-disabling",
-            Name = "action-name-combat",
-            Description = "action-description-combat",
-            Event = new ToggleCombatActionEvent(),
-        };
-
         [ViewVariables(VVAccess.ReadWrite)]
         public virtual bool IsInCombatMode
         {
@@ -67,7 +22,6 @@ namespace Content.Shared.CombatMode
             {
                 if (_isInCombatMode == value) return;
                 _isInCombatMode = value;
-                EntitySystem.Get<SharedActionsSystem>().SetToggled(CombatToggleAction, _isInCombatMode);
                 Dirty();
 
                 // Regenerate physics contacts -> Can probably just selectively check