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

Removal interaction without hands (#8843)

Browse Source
This commit is contained in:
KIBORG04
2022-06-15 08:39:43 +07:00
committed by GitHub
parent 038d534d60
commit a75a921955
9 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Construction/ConstructionSystem.Guided.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Construction
private void AddDeconstructVerb(EntityUid uid, ConstructionComponent component, GetVerbsEvent<Verb> args)
{
if (!args.CanAccess || !args.CanInteract)
if (!args.CanAccess || !args.CanInteract || args.Hands == null)
return;
if (component.TargetNode == component.DeconstructionNode ||

2
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Cuffs
private void AddUncuffVerb(EntityUid uid, CuffableComponent component, GetVerbsEvent<Verb> args)
{
// Can the user access the cuffs, and is there even anything to uncuff?
if (!args.CanAccess || component.CuffedHandCount == 0)
if (!args.CanAccess || component.CuffedHandCount == 0 || args.Hands == null)
return;
// We only check can interact if the user is not uncuffing themselves. As a result, the verb will show up

2
Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Server.Engineering.EntitySystems
}
private void AddDisassembleVerb(EntityUid uid, DisassembleOnAltVerbComponent component, GetVerbsEvent<AlternativeVerb> args)
{
if (!args.CanInteract || !args.CanAccess)
if (!args.CanInteract || !args.CanAccess || args.Hands == null)
return;
AlternativeVerb verb = new()

2
Content.Server/Kitchen/EntitySystems/SharpSystem.cs
View File

@@ -110,7 +110,7 @@ public sealed class SharpSystem : EntitySystem
private void OnGetInteractionVerbs(EntityUid uid, SharedButcherableComponent component, GetVerbsEvent<InteractionVerb> args)
{
if (component.Type != ButcheringType.Knife)
if (component.Type != ButcheringType.Knife || args.Hands == null)
return;
bool disabled = false;

2
Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
View File

@@ -138,7 +138,7 @@ namespace Content.Server.Medical.SuitSensors
return;
// standard interaction checks
if (!args.CanAccess || !args.CanInteract)
if (!args.CanAccess || !args.CanInteract || args.Hands == null)
return;
args.Verbs.UnionWith(new[]

2
Content.Server/Sticky/Systems/StickySystem.cs
View File

@@ -41,7 +41,7 @@ public sealed class StickySystem : EntitySystem
private void AddUnstickVerb(EntityUid uid, StickyComponent component, GetVerbsEvent<Verb> args)
{
if (component.StuckTo == null || !component.CanUnstick || !args.CanInteract)
if (component.StuckTo == null || !component.CanUnstick || !args.CanInteract || args.Hands == null)
return;
// we can't use args.CanAccess, because it stuck in another container

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
View File

@@ -50,7 +50,7 @@ public abstract partial class SharedGunSystem
private void OnBallisticVerb(EntityUid uid, BallisticAmmoProviderComponent component, GetVerbsEvent<Verb> args)
{
if (!args.CanAccess || !args.CanInteract) return;
if (!args.CanAccess || !args.CanInteract || args.Hands == null) return;
args.Verbs.Add(new Verb()
{

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
View File

@@ -98,7 +98,7 @@ public partial class SharedGunSystem
private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent<Verb> args)
{
if (!args.CanAccess || !args.CanInteract) return;
if (!args.CanAccess || !args.CanInteract || args.Hands == null) return;
args.Verbs.Add(new Verb()
{

1
Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
View File

@@ -9,6 +9,7 @@
allowSpectator: false # otherwise they can play client-side music
inHandsOnly: false
singleUser: true
requireHands: true
verbText: verb-instrument-openui
key: enum.InstrumentUiKey.Key
- type: InteractionOutline