Vehicles (#7336)

Content.Server/Buckle/Components/BuckleComponent.cs

@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Server.Hands.Components;
 using Content.Server.Pulling;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Vehicle.Components;
 using Content.Shared.Alert;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Interaction;
@@ -288,6 +289,10 @@ namespace Content.Server.Buckle.Components
                 {
                     return false;
                 }
+                // If the strap is a vehicle and the rider is not the person unbuckling, return.
+                if (_entMan.TryGetComponent<VehicleComponent>(oldBuckledTo.Owner, out var vehicle) &&
+                        vehicle.Rider != user)
+                    return false;
             }
 
             BuckledTo = null;

Content.Server/Buckle/Components/StrapComponent.cs

@@ -34,7 +34,7 @@ namespace Content.Server.Buckle.Components
         /// If this offset it too big, it will be clamped to <see cref="MaxBuckleDistance"/>
         /// </summary>
         [DataField("buckleOffset", required: false)]
-        private Vector2 _buckleOffset = Vector2.Zero;
+        public Vector2 BuckleOffsetUnclamped = Vector2.Zero;
 
         private bool _enabled = true;
 
@@ -57,7 +57,7 @@ namespace Content.Server.Buckle.Components
         /// Don't change it unless you really have to
         /// </summary>
         [DataField("maxBuckleDistance", required: false)]
-        public float MaxBuckleDistance = 0.5f;
+        public float MaxBuckleDistance = 0.1f;
 
         /// <summary>
         /// You can specify the offset the entity will have after unbuckling.
@@ -69,7 +69,7 @@ namespace Content.Server.Buckle.Components
         /// Gets and clamps the buckle offset to MaxBuckleDistance
         /// </summary>
         public Vector2 BuckleOffset => Vector2.Clamp(
-            _buckleOffset,
+            BuckleOffsetUnclamped,
             Vector2.One * -MaxBuckleDistance,
             Vector2.One * MaxBuckleDistance);