Moves buckling and vehicles to shared, some cleanup (#15923)

2023-05-01 03:04:23 -04:00
parent 2343dd1d3c
commit 878c7c0b85
33 changed files with 1451 additions and 1405 deletions
--- a/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
+++ b/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
@@ -64,7 +64,7 @@ namespace Content.Shared.Pulling
            if (EntityManager.TryGetComponent<BuckleComponent?>(puller, out var buckle))
            {
                // Prevent people pulling the chair they're on, etc.
-                if (buckle.Buckled && (buckle.LastEntityBuckledTo == pulled))
+                if (buckle is { PullStrap: false, Buckled: true } && (buckle.LastEntityBuckledTo == pulled))
                {
                    return false;
                }