cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-30 08:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pulling rework v2 (#24936)

Browse Source 
* Pulling rework

Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.

* More pulling cleanup

* stats

* More cleanup

* First draft

* More pulling

* weh

* Fix puller

* Pulling working

* Fix merge

* Dunked

* Self-merge time

* Fix hotkey

* Fix container changes

* oop

* Fix multi-pulling

* Move alerts cleanup.

* pulling fixes

(cherry picked from commit c584f6444a)
This commit is contained in:
metalgearsloth
2024-03-24 00:03:20 +01:00
committed by NullWanderer
parent 5cd69c7356
commit 4bacc02a0e
53 changed files with 805 additions and 1358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Shared/Administration/AdminFrozenSystem.cs
+6 -9
View File
@@ -1,13 +1,10 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction.Events;
using Content.Shared.Item;
using Content.Shared.Movement;
using Content.Shared.Movement.Events;
using Content.Shared.Physics.Pull;
using Content.Shared.Pulling;
using Content.Shared.Pulling.Components;
using Content.Shared.Pulling.Events;
using Content.Shared.Stunnable;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Events;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Throwing;
namespace Content.Shared.Administration;
@@ -15,7 +12,7 @@ namespace Content.Shared.Administration;
public sealed class AdminFrozenSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
[Dependency] private readonly SharedPullingSystem _pulling = default!;
[Dependency] private readonly PullingSystem _pulling = default!;
public override void Initialize()
{
@@ -45,9 +42,9 @@ public sealed class AdminFrozenSystem : EntitySystem
private void OnStartup(EntityUid uid, AdminFrozenComponent component, ComponentStartup args)
{
if (TryComp<SharedPullableComponent>(uid, out var pullable))
if (TryComp<PullableComponent>(uid, out var pullable))
{
_pulling.TryStopPull(pullable);
_pulling.TryStopPull(uid, pullable);
}
UpdateCanMove(uid, component, args);