Merge pull request #266 from TGRCdev/cyborg-self-exploding-fix

Fixed cyborgs being able to explode by clicking on themselves

Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs

@@ -16,26 +16,12 @@ public sealed partial class TriggerSystem
     private void InitializeOnUse()
     {
         SubscribeLocalEvent<OnUseTimerTriggerComponent, UseInHandEvent>(OnTimerUse);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, UserActivateInWorldEvent>(OnUseSelf);
         SubscribeLocalEvent<OnUseTimerTriggerComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<OnUseTimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
         SubscribeLocalEvent<OnUseTimerTriggerComponent, EntityStuckEvent>(OnStuck);
         SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomTimerTriggerMapInit);
     }
 
-    private void OnUseSelf(EntityUid uid, OnUseTimerTriggerComponent comp, UserActivateInWorldEvent args)
-    {
-        // Allow grenades to activate themselves (if they're posessed or ghost role)
-
-        if (args.Handled)
-            return;
-
-        if (args.Target != uid)
-            return;
-
-        StartTimer((uid, comp), uid);
-    }
-
     private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, ref EntityStuckEvent args)
     {
         if (!component.StartOnStick)

Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/StartTimerOperator.cs

@@ -0,0 +1,35 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Explosion.Components;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
+
+public sealed partial class StartTimerOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField("idleKey")]
+    public string IdleKey = "IdleTime";
+
+    public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard, CancellationToken cancelToken)
+    {
+        return new(true, new Dictionary<string, object>()
+        {
+            { IdleKey, 1f }
+        });
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        var trigger = _entManager.System<TriggerSystem>();
+        if (!_entManager.TryGetComponent<OnUseTimerTriggerComponent>(owner, out var timer))
+            return HTNOperatorStatus.Failed;
+
+        trigger.StartTimer((owner, timer), owner);
+        blackboard.SetValue(IdleKey, timer.Delay);
+
+        return HTNOperatorStatus.Finished;
+    }
+}

Resources/Prototypes/NPCs/Animated/grenades.yml

@@ -37,7 +37,7 @@
             - !type:TargetInRangePrecondition
               targetKey: Target
               rangeKey: MeleeRange
-          operator: !type:InteractionActivateSelfOperator
+          operator: !type:StartTimerOperator
     - tasks:
         - !type:HTNCompoundTask
           task: IdleCompound