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
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
using Content.Shared.Actions;
|
||||
using Content.Shared.Actions.Components;
|
||||
using Content.Shared.Actions.Prototypes;
|
||||
using Content.Shared.Chemistry.Reagent;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Serialization.Manager.Attributes;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
|
||||
|
||||
namespace Content.Server.Chemistry.ReagentEffects;
|
||||
|
||||
/// <summary>
|
||||
/// Forces someone to do a certain action, if they have it.
|
||||
/// </summary>
|
||||
public sealed class DoAction : ReagentEffect
|
||||
{
|
||||
[DataField("action", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<ActionPrototype>))]
|
||||
public string Action = default!;
|
||||
|
||||
public override void Effect(ReagentEffectArgs args)
|
||||
{
|
||||
if (args.EntityManager.TryGetComponent(args.SolutionEntity, out SharedActionsComponent? actions))
|
||||
{
|
||||
if (!IoCManager.Resolve<IPrototypeManager>().TryIndex<ActionPrototype>(Action, out var proto))
|
||||
return;
|
||||
|
||||
if (actions.IsGranted(proto.ActionType))
|
||||
{
|
||||
var attempt = new ActionAttempt(proto);
|
||||
attempt.DoInstantAction(args.SolutionEntity);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
15
Content.Server/Chemistry/ReagentEffects/Scream.cs
Normal file
15
Content.Server/Chemistry/ReagentEffects/Scream.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using Content.Server.Speech;
|
||||
using Content.Shared.Chemistry.Reagent;
|
||||
|
||||
namespace Content.Server.Chemistry.ReagentEffects;
|
||||
|
||||
/// <summary>
|
||||
/// Forces someone to scream their lungs out.
|
||||
/// </summary>
|
||||
public sealed class Scream : ReagentEffect
|
||||
{
|
||||
public override void Effect(ReagentEffectArgs args)
|
||||
{
|
||||
EntitySystem.Get<VocalSystem>().TryScream(args.SolutionEntity);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user