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

Remove more interaction without hands (#8946)

Browse Source 
* Remove stack splitting without hands

* more no hands crap
This commit is contained in:
Jessica M
2022-06-26 21:07:07 -07:00
committed by GitHub
parent 5f4d50304f
commit 8ba1c1f5e9
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Chemistry.EntitySystems
private void AddSetTransferVerbs(EntityUid uid, SolutionTransferComponent component, GetVerbsEvent<AlternativeVerb> args) private void AddSetTransferVerbs(EntityUid uid, SolutionTransferComponent component, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount) if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount || args.Hands == null)
return; return;
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor)) if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))

2
Content.Server/Foldable/FoldableSystem.cs
View File

@@ -97,7 +97,7 @@ namespace Content.Server.Foldable
private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEvent<AlternativeVerb> args) private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanAccess || !args.CanInteract || !CanToggleFold(uid, component)) if (!args.CanAccess || !args.CanInteract || args.Hands == null || !CanToggleFold(uid, component))
return; return;
AlternativeVerb verb = new() AlternativeVerb verb = new()

2
Content.Server/Morgue/MorgueSystem.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.Morgue
private void AddCremateVerb(EntityUid uid, CrematoriumEntityStorageComponent component, GetVerbsEvent<AlternativeVerb> args) private void AddCremateVerb(EntityUid uid, CrematoriumEntityStorageComponent component, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanAccess || !args.CanInteract || component.Cooking || component.Open) if (!args.CanAccess || !args.CanInteract || args.Hands == null || component.Cooking || component.Open )
return; return;
AlternativeVerb verb = new(); AlternativeVerb verb = new();

2
Content.Server/Stack/StackSystem.cs
View File

@@ -84,7 +84,7 @@ namespace Content.Server.Stack
private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, GetVerbsEvent<AlternativeVerb> args) private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanAccess || !args.CanInteract) if (!args.CanAccess || !args.CanInteract || args.Hands == null)
return; return;
AlternativeVerb halve = new() AlternativeVerb halve = new()