This commit is contained in:
rhailrake
2023-09-09 17:02:13 +06:00
committed by Aviu00
parent ab24dea19d
commit 0f94fb5b81
2 changed files with 7 additions and 2 deletions

View File

@@ -3,6 +3,8 @@ using Content.Shared.Actions;
using Content.Server.Chat.Systems;
using Robust.Shared.Utility;
using Content.Shared.Chat;
using Content.Shared.Humanoid;
using Content.Shared.Inventory;
using Content.Shared.White.Other;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Prototypes;
@@ -26,7 +28,10 @@ namespace Content.Server.White.Halt
private void OnGetEquipped(EntityUid uid, HaltComponent component, GetItemActionsEvent args)
{
if (args.InHands)
if (args.SlotFlags != SlotFlags.MASK)
return;
if (!HasComp<HumanoidAppearanceComponent>(args.User))
return;
args.AddAction(ref component.ActionEntity, "Halt");

View File

@@ -439,7 +439,7 @@ public abstract partial class SharedBuckleSystem
if (ActionBlocker.CanInteract(userUid, buckleUid) == false)
return false;
// If the strap is a vehicle and the rider is not the person unbuckling, return. Unless the rider is crit or dead.
if (TryComp<VehicleComponent>(strapUid, out var vehicle) && vehicle.Rider != userUid && !_mobState.IsIncapacitated(buckleUid))
return false;