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

Fixes vehicle movement blocking (#12501)

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/12470
This commit is contained in:
Leon Friedrich
2022-11-09 19:31:43 +13:00
committed by GitHub
parent 8b9cce64ed
commit e8a8d7bfe9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Buckle/SharedBuckleSystem.cs
View File

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