From e5fb3552a7e6d5bbdbcafe3db525b69b9da8fab4 Mon Sep 17 00:00:00 2001 From: KP <13428215+nok-ko@users.noreply.github.com> Date: Sat, 9 Dec 2023 19:12:59 -0800 Subject: [PATCH] Prevent entities who do not have hands from setting off bombs. (#22250) --- Content.Server/Defusable/Systems/DefusableSystem.cs | 2 +- Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs index e9b074268f..c450fd04fb 100644 --- a/Content.Server/Defusable/Systems/DefusableSystem.cs +++ b/Content.Server/Defusable/Systems/DefusableSystem.cs @@ -46,7 +46,7 @@ public sealed class DefusableSystem : SharedDefusableSystem /// private void OnGetAltVerbs(EntityUid uid, DefusableComponent comp, GetVerbsEvent args) { - if (!args.CanInteract || !args.CanAccess) + if (!args.CanInteract || !args.CanAccess || args.Hands == null) return; args.Verbs.Add(new AlternativeVerb diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index c4b0d9c9ba..7edca9b803 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs @@ -45,7 +45,7 @@ public sealed partial class TriggerSystem /// private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component, GetVerbsEvent args) { - if (!args.CanInteract || !args.CanAccess) + if (!args.CanInteract || !args.CanAccess || args.Hands == null) return; if (component.UseVerbInstead)