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:
26
Content.Shared/Wires/Events.cs
Normal file
26
Content.Shared/Wires/Events.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using Content.Shared.DoAfter;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Wires;
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class WireDoAfterEvent : DoAfterEvent
|
||||
{
|
||||
[DataField("action", required: true)]
|
||||
public readonly WiresAction Action;
|
||||
|
||||
[DataField("id", required: true)]
|
||||
public readonly int Id;
|
||||
|
||||
private WireDoAfterEvent()
|
||||
{
|
||||
}
|
||||
|
||||
public WireDoAfterEvent(WiresAction action, int id)
|
||||
{
|
||||
Action = action;
|
||||
Id = id;
|
||||
}
|
||||
|
||||
public override DoAfterEvent Clone() => this;
|
||||
}
|
||||
@@ -1,9 +1,15 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Content.Shared.DoAfter;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Wires
|
||||
{
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class WirePanelDoAfterEvent : SimpleDoAfterEvent
|
||||
{
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public enum WiresVisuals : byte
|
||||
{
|
||||
|
||||
@@ -20,12 +20,6 @@ public sealed class WiresPanelComponent : Component
|
||||
[ViewVariables]
|
||||
public bool Visible = true;
|
||||
|
||||
/// <summary>
|
||||
/// Marks if maintenance panel being open/closed by someone with a screwdriver.
|
||||
/// Prevents do after spam.
|
||||
/// </summary>
|
||||
public bool IsScrewing;
|
||||
|
||||
[DataField("screwdriverOpenSound")]
|
||||
public SoundSpecifier ScrewdriverOpenSound = new SoundPathSpecifier("/Audio/Machines/screwdriveropen.ogg");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user