Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Emergency revert for pulling (#24923)

Browse Source 
Revert "Pulling rework (#20906)"

This reverts commit 0d8254b2a2.
This commit is contained in:
Jezithyr
2024-02-03 10:32:30 -08:00
committed by GitHub
parent 914bab19e8
commit c15b0691ec
53 changed files with 1359 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
View File

@@ -1,13 +0,0 @@
using Robust.Shared.Physics.Components;
namespace Content.Shared.Movement.Pulling.Events;
/// <summary>
/// Raised directed on puller and pullable to determine if it can be pulled.
/// </summary>
public sealed class PullAttemptEvent : PullMessage
{
public PullAttemptEvent(EntityUid pullerUid, EntityUid pullableUid) : base(pullerUid, pullableUid) { }
public bool Cancelled { get; set; }
}

10
Content.Shared/Movement/Pulling/Events/AttemptStopPullingEvent.cs
View File

@@ -1,10 +0,0 @@
namespace Content.Shared.Pulling.Events;
/// <summary>
/// Raised when a request is made to stop pulling an entity.
/// </summary>
public record struct AttemptStopPullingEvent(EntityUid? User = null)
{
public readonly EntityUid? User = User;
public bool Cancelled;
}

17
Content.Shared/Movement/Pulling/Events/BeingPulledAttemptEvent.cs
View File

@@ -1,17 +0,0 @@
namespace Content.Shared.Pulling.Events
{
/// <summary>
/// Directed event raised on the pulled to see if it can be pulled.
/// </summary>
public sealed class BeingPulledAttemptEvent : CancellableEntityEventArgs
{
public BeingPulledAttemptEvent(EntityUid puller, EntityUid pulled)
{
Puller = puller;
Pulled = pulled;
}
public EntityUid Puller { get; }
public EntityUid Pulled { get; }
}
}

13
Content.Shared/Movement/Pulling/Events/PullMessage.cs
View File

@@ -1,13 +0,0 @@
namespace Content.Shared.Movement.Pulling.Events;
public abstract class PullMessage : EntityEventArgs
{
public readonly EntityUid PullerUid;
public readonly EntityUid PulledUid;
protected PullMessage(EntityUid pullerUid, EntityUid pulledUid)
{
PullerUid = pullerUid;
PulledUid = pulledUid;
}
}

9
Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
View File

@@ -1,9 +0,0 @@
namespace Content.Shared.Movement.Pulling.Events;
public sealed class PullStartedMessage : PullMessage
{
public PullStartedMessage(EntityUid pullerUid, EntityUid pullableUid) :
base(pullerUid, pullableUid)
{
}
}

13
Content.Shared/Movement/Pulling/Events/PullStoppedMessage.cs
View File

@@ -1,13 +0,0 @@
using Robust.Shared.Physics.Components;
namespace Content.Shared.Movement.Pulling.Events;
/// <summary>
/// Raised directed on both puller and pullable.
/// </summary>
public sealed class PullStoppedMessage : PullMessage
{
public PullStoppedMessage(EntityUid pullerUid, EntityUid pulledUid) : base(pullerUid, pulledUid)
{
}
}

17
Content.Shared/Movement/Pulling/Events/StartPullAttemptEvent.cs
View File

@@ -1,17 +0,0 @@
namespace Content.Shared.Pulling.Events
{
/// <summary>
/// Directed event raised on the puller to see if it can start pulling something.
/// </summary>
public sealed class StartPullAttemptEvent : CancellableEntityEventArgs
{
public StartPullAttemptEvent(EntityUid puller, EntityUid pulled)
{
Puller = puller;
Pulled = pulled;
}
public EntityUid Puller { get; }
public EntityUid Pulled { get; }
}
}