More DoAfter Changes (#14609)
* DoAfters * Compact Clone() * Fix mice and cuffables * Try generalize attempt events * moves climbabledoafter event to shared, fixes issue with climbable target * Fix merge (cuffing) * Make all events netserializable * handful of doafter events moved * moves the rest of the events to their respective shared folders * Changes all mentions of server doafter to shared * stop stripping cancellation * fix merge errors * draw paused doafters * handle unpausing * missing netserializable ref * removes break on stun reference * removes cuffing state reference * Fix tools * Fix door prying. * Fix construction * Fix dumping * Fix wielding assert * fix rev * Fix test * more test fixes --------- Co-authored-by: keronshb <keronshb@live.com>
This commit is contained in:
@@ -1,7 +1,14 @@
|
||||
using System.Threading;
|
||||
using Content.Shared.DoAfter;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Storage.Components
|
||||
{
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class DumpableDoAfterEvent : SimpleDoAfterEvent
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Lets you dump this container on the ground using a verb,
|
||||
/// or when interacting with it on a disposal unit or placeable surface.
|
||||
@@ -12,13 +19,11 @@ namespace Content.Shared.Storage.Components
|
||||
/// <summary>
|
||||
/// How long each item adds to the doafter.
|
||||
/// </summary>
|
||||
[DataField("delayPerItem")]
|
||||
public TimeSpan DelayPerItem = TimeSpan.FromSeconds(0.2);
|
||||
[DataField("delayPerItem")] public TimeSpan DelayPerItem = TimeSpan.FromSeconds(0.2);
|
||||
|
||||
/// <summary>
|
||||
/// The multiplier modifier
|
||||
/// </summary>
|
||||
[DataField("multiplier")]
|
||||
public float Multiplier = 1.0f;
|
||||
[DataField("multiplier")] public float Multiplier = 1.0f;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
using Content.Shared.DoAfter;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Storage.EntitySystems;
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class BluespaceLockerDoAfterEvent : SimpleDoAfterEvent
|
||||
{
|
||||
}
|
||||
22
Content.Shared/Storage/Events.cs
Normal file
22
Content.Shared/Storage/Events.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using Content.Shared.DoAfter;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Storage;
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class AreaPickupDoAfterEvent : DoAfterEvent
|
||||
{
|
||||
[DataField("entities", required: true)]
|
||||
public readonly IReadOnlyList<EntityUid> Entities = default!;
|
||||
|
||||
private AreaPickupDoAfterEvent()
|
||||
{
|
||||
}
|
||||
|
||||
public AreaPickupDoAfterEvent(List<EntityUid> entities)
|
||||
{
|
||||
Entities = entities;
|
||||
}
|
||||
|
||||
public override DoAfterEvent Clone() => this;
|
||||
}
|
||||
Reference in New Issue
Block a user