tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent entities who do not have hands from setting off bombs. (#22250)

Browse Source
This commit is contained in:
KP
2023-12-09 19:12:59 -08:00
committed by GitHub
parent 174a73808f
commit e5fb3552a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Defusable/Systems/DefusableSystem.cs
View File

@@ -46,7 +46,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
/// </summary> /// </summary>
private void OnGetAltVerbs(EntityUid uid, DefusableComponent comp, GetVerbsEvent<AlternativeVerb> args) private void OnGetAltVerbs(EntityUid uid, DefusableComponent comp, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanInteract || !args.CanAccess) if (!args.CanInteract || !args.CanAccess || args.Hands == null)
return; return;
args.Verbs.Add(new AlternativeVerb args.Verbs.Add(new AlternativeVerb

2
Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
View File

@@ -45,7 +45,7 @@ public sealed partial class TriggerSystem
/// </summary> /// </summary>
private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component, GetVerbsEvent<AlternativeVerb> args) private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanInteract || !args.CanAccess) if (!args.CanInteract || !args.CanAccess || args.Hands == null)
return; return;
if (component.UseVerbInstead) if (component.UseVerbInstead)