From e8a8d7bfe9c9c0563d762d4ec0a2ab696fb6b82c Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 9 Nov 2022 19:31:43 +1300
Subject: [PATCH] Fixes vehicle movement blocking (#12501)

Fixes https://github.com/space-wizards/space-station-14/issues/12470
---
 Content.Shared/Buckle/SharedBuckleSystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs
index 55969b1140..bf51e33eaf 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Movement;
 using Content.Shared.Movement.Events;
 using Content.Shared.Standing;
 using Content.Shared.Throwing;
+using Content.Shared.Vehicle.Components;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
@@ -81,7 +82,8 @@ namespace Content.Shared.Buckle
             if (component.LifeStage > ComponentLifeStage.Running)
                 return;
 
-            if (component.Buckled)
+            if (component.Buckled &&
+                !HasComp<VehicleComponent>(Transform(uid).ParentUid)) // buckle+vehicle shitcode
                 args.Cancel();
         }