Patched Actions Rework (#6899)

* Rejig Actions

* fix merge errors

* lambda-b-gon

* fix PAI, add innate actions

* Revert "fix PAI, add innate actions"

This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.

* Just fix by making nullable.

if only require: true actually did something somehow.

* Make AddActions() ensure an actions component

and misc comments

* misc cleanup

* Limit range even when not checking for obstructions

* remove old guardian code

* rename function and make EntityUid nullable

* fix magboot bug

* fix action search menu

* make targeting toggle all equivalent actions

* fix combat popups (enabling <-> disabling)

* fix networking

* Allow action locking

* prevent telepathy

Content.Server/Guardian/GuardianSystem.cs

@@ -1,9 +1,7 @@
-using Content.Server.Actions;
 using Content.Server.DoAfter;
 using Content.Server.Hands.Components;
 using Content.Server.Popups;
 using Content.Shared.Actions;
-using Content.Shared.Actions.Components;
 using Content.Shared.Audio;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -13,10 +11,6 @@ using Content.Shared.MobState;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
@@ -30,6 +24,7 @@ namespace Content.Server.Guardian
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly DamageableSystem _damageSystem = default!;
+        [Dependency] private readonly SharedActionsSystem _actionSystem = default!;
 
         public override void Initialize()
         {
@@ -50,9 +45,22 @@ namespace Content.Server.Guardian
             SubscribeLocalEvent<GuardianHostComponent, MobStateChangedEvent>(OnHostStateChange);
             SubscribeLocalEvent<GuardianHostComponent, ComponentShutdown>(OnHostShutdown);
 
+            SubscribeLocalEvent<GuardianHostComponent, GuardianToggleActionEvent>(OnPerformAction);
+
             SubscribeLocalEvent<GuardianComponent, AttackAttemptEvent>(OnGuardianAttackAttempt);
         }
 
+        private void OnPerformAction(EntityUid uid, GuardianHostComponent component, GuardianToggleActionEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (component.HostedGuardian != null)
+                ToggleGuardian(component);
+
+            args.Handled = true;
+        }
+
         private void OnGuardianUnplayer(EntityUid uid, GuardianComponent component, PlayerDetachedEvent args)
         {
             var host = component.Host;
@@ -74,12 +82,14 @@ namespace Content.Server.Guardian
         private void OnHostInit(EntityUid uid, GuardianHostComponent component, ComponentInit args)
         {
             component.GuardianContainer = uid.EnsureContainer<ContainerSlot>("GuardianContainer");
+            _actionSystem.AddAction(uid, component.Action, null);
         }
 
         private void OnHostShutdown(EntityUid uid, GuardianHostComponent component, ComponentShutdown args)
         {
             if (component.HostedGuardian == null) return;
             EntityManager.QueueDeleteEntity(component.HostedGuardian.Value);
+            _actionSystem.RemoveAction(uid, component.Action);
         }
 
         private void OnGuardianAttackAttempt(EntityUid uid, GuardianComponent component, AttackAttemptEvent args)
@@ -151,9 +161,6 @@ namespace Content.Server.Guardian
                 return;
             }
 
-            // Can't work without actions
-            EntityManager.EnsureComponent<ServerActionsComponent>(target);
-
             if (component.Injecting) return;
 
             component.Injecting = true;
@@ -175,8 +182,7 @@ namespace Content.Server.Guardian
                 comp.Used ||
                 !TryComp<HandsComponent>(ev.User, out var hands) ||
                 !hands.IsHolding(comp.Owner) ||
-                HasComp<GuardianHostComponent>(ev.Target) ||
-                !TryComp<SharedActionsComponent>(ev.Target, out var actions))
+                HasComp<GuardianHostComponent>(ev.Target))
             {
                 comp.Injecting = false;
                 return;
@@ -194,8 +200,6 @@ namespace Content.Server.Guardian
             {
                 guardianComponent.Host = ev.Target;
 
-                // Grant the user the recall action and notify them
-                actions.Grant(ActionType.ManifestGuardian);
                 SoundSystem.Play(Filter.Entities(ev.Target), "/Audio/Effects/guardian_inject.ogg", ev.Target);
 
                 _popupSystem.PopupEntity(Loc.GetString("guardian-created"), ev.Target, Filter.Entities(ev.Target));