fix (#379)
This commit is contained in:
@@ -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");
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user