Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Added insertion blocking to Strap and Foldable components (#6151)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-14 04:09:42 +13:00
committed by GitHub
parent 291756b67c
commit 723e38f9ab
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Buckle/Systems/StrapSystem.cs
View File

@@ -1,8 +1,12 @@
using Content.Server.Buckle.Components;
using Content.Server.Interaction;
using Content.Shared.Body.Components;
using Content.Shared.MobState.Components;
using Content.Shared.Storage;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
@@ -19,6 +23,14 @@ namespace Content.Server.Buckle.Systems
base.Initialize();
SubscribeLocalEvent<StrapComponent, GetInteractionVerbsEvent>(AddStrapVerbs);
SubscribeLocalEvent<StrapComponent, ContainerGettingInsertedAttemptEvent>(OnInsertAttempt);
}
private void OnInsertAttempt(EntityUid uid, StrapComponent component, ContainerGettingInsertedAttemptEvent args)
{
// If someone is attempting to put this item inside of a backpack, ensure that it has no entities strapped to it.
if (HasComp<SharedStorageComponent>(args.Container.Owner) && component.BuckledEntities.Count != 0)
args.Cancel();
}
// TODO ECS BUCKLE/STRAP These 'Strap' verbs are an incestuous mess of buckle component and strap component

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

@@ -40,7 +40,7 @@ namespace Content.Server.Foldable
if (!Resolve(uid, ref fold))
return false;
// Can't un-fold in hands / inventory
// Can't un-fold in any container (locker, hands, inventory, whatever).
if (_container.IsEntityInContainer(uid))
return false;

1
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Content.Server.Hands.Components;
using Content.Server.Interaction;
using Content.Server.Storage.Components;
using Content.Shared.Interaction;
using Content.Shared.Movement;