diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs index b594b7fa3a..2dc54ae99e 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -25,7 +25,7 @@ namespace Content.Server.Chemistry.EntitySystems private void AddSetTransferVerbs(EntityUid uid, SolutionTransferComponent component, GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount) + if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount || args.Hands == null) return; if (!EntityManager.TryGetComponent(args.User, out var actor)) diff --git a/Content.Server/Foldable/FoldableSystem.cs b/Content.Server/Foldable/FoldableSystem.cs index 85e245161a..b9f7b46d78 100644 --- a/Content.Server/Foldable/FoldableSystem.cs +++ b/Content.Server/Foldable/FoldableSystem.cs @@ -97,7 +97,7 @@ namespace Content.Server.Foldable private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract || !CanToggleFold(uid, component)) + if (!args.CanAccess || !args.CanInteract || args.Hands == null || !CanToggleFold(uid, component)) return; AlternativeVerb verb = new() diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs index 6146bd6a23..22ecd7e910 100644 --- a/Content.Server/Morgue/MorgueSystem.cs +++ b/Content.Server/Morgue/MorgueSystem.cs @@ -69,7 +69,7 @@ namespace Content.Server.Morgue private void AddCremateVerb(EntityUid uid, CrematoriumEntityStorageComponent component, GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract || component.Cooking || component.Open) + if (!args.CanAccess || !args.CanInteract || args.Hands == null || component.Cooking || component.Open ) return; AlternativeVerb verb = new(); diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index 1431be8aa4..e3ef06d343 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -84,7 +84,7 @@ namespace Content.Server.Stack private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract) + if (!args.CanAccess || !args.CanInteract || args.Hands == null) return; AlternativeVerb halve = new()