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

Content.Server/Buckle/Systems/StrapSystem.cs

@@ -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

Content.Server/Foldable/FoldableSystem.cs

@@ -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;
 

Content.Server/Storage/EntitySystems/StorageSystem.cs

@@ -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;

Content.Shared/Foldable/FoldableComponent.cs

@@ -9,8 +9,11 @@ using System;
 namespace Content.Shared.Foldable;
 
 /// <summary>
-/// Used to create "foldable structures" that you can pickup like an item when folded. Used for rollerbeds and wheelchairs
+/// Used to create "foldable structures" that you can pickup like an item when folded. Used for rollerbeds and wheelchairs.
 /// </summary>
+/// <remarks>
+/// Wiill prevent any insertions into containers while this item is unfolded.
+/// </remarks>
 [RegisterComponent]
 [NetworkedComponent]
 [Friend(typeof(SharedFoldableSystem))]

Content.Shared/Foldable/SharedFoldableSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Item;
 using JetBrains.Annotations;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 
@@ -18,7 +19,7 @@ public abstract class SharedFoldableSystem : EntitySystem
         SubscribeLocalEvent<FoldableComponent, ComponentHandleState>(OnHandleState);
 
         SubscribeLocalEvent<FoldableComponent, ComponentInit>(OnFoldableInit);
-        SubscribeLocalEvent<FoldableComponent, AttemptItemPickupEvent>(OnPickedUpAttempt);
+        SubscribeLocalEvent<FoldableComponent, ContainerGettingInsertedAttemptEvent>(OnInsertEvent);
     }
 
     private void OnGetState(EntityUid uid, FoldableComponent component, ref ComponentGetState args)
@@ -54,7 +55,7 @@ public abstract class SharedFoldableSystem : EntitySystem
             appearance.SetData(FoldKey, folded);
     }
 
-    private void OnPickedUpAttempt(EntityUid uid, FoldableComponent component, AttemptItemPickupEvent args)
+    private void OnInsertEvent(EntityUid uid, FoldableComponent component, ContainerGettingInsertedAttemptEvent args)
     {
         if (!component.IsFolded)
             args.Cancel();