Disable interactions for entities in storage

Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs

@@ -1,4 +1,5 @@
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Utility;
 using Robust.Shared.Containers;

Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs

@@ -1,4 +1,5 @@
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory

Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs

@@ -2,6 +2,7 @@ using Content.Server.AI.Utility.Curves;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.Considerations.Clothing

Content.Server/AI/Utility/Considerations/Hands/TargetInOurHandsCon.cs

@@ -2,6 +2,7 @@ using Content.Server.AI.Utility.Curves;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 
 namespace Content.Server.AI.Utility.Considerations.Hands
 {

Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInHandsCon.cs

@@ -4,6 +4,7 @@ using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Hands;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 
 namespace Content.Server.AI.Utility.Considerations.Inventory
 {

Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs

@@ -3,6 +3,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 
 namespace Content.Server.AI.Utility.Considerations.Inventory
 {

Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs

@@ -6,6 +6,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Inventory;
 

Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Gloves

Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs

@@ -6,6 +6,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Inventory;
 

Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Head

Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing

Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing

Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes

Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs

@@ -5,6 +5,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes

Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Content.Server.AI.Utils;
 using Content.Server.GameObjects;
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Movement;
 using JetBrains.Annotations;

Content.Server/Chat/ChatCommands.cs

@@ -11,6 +11,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 
 namespace Content.Server.Chat
 {

Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects.Components.Inventory;

Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;

Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.GameObjects.Components.Power;

Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs

@@ -1,3 +1,4 @@
+using Content.Server.GameObjects.Components.Items.Storage;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;

Content.Server/GameObjects/Components/GUI/InventoryComponent.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks.Dataflow;
+using Content.Server.GameObjects.Components.Items.Clothing;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs

@@ -4,6 +4,7 @@ using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs

@@ -17,6 +17,8 @@ using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using System;
+using Content.Server.GameObjects.Components.Items.Clothing;
+using Content.Server.GameObjects.Components.Items.Storage;
 
 namespace Content.Server.GameObjects.Components.Interactable
 {

Content.Server/GameObjects/Components/Interactable/WelderComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.Remoting;
 using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;

Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs

@@ -3,17 +3,18 @@
 using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
-using Robust.Shared.IoC;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Items.Clothing
 {
     [RegisterComponent]
     [ComponentReference(typeof(ItemComponent))]

Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs

@@ -212,6 +212,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
 
         private bool AddToContents(IEntity entity)
         {
+            if (!entity.HasComponent<InEntityStorageComponent>())
+            {
+                entity.AddComponent<InEntityStorageComponent>();
+            }
+
             var collidableComponent = Owner.GetComponent<ICollidableComponent>();
             ICollidableComponent entityCollidableComponent;
             if (entity.TryGetComponent(out entityCollidableComponent))
@@ -273,6 +278,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
                     {
                         entityCollidableComponent.CanCollide = true;
                     }
+
+                    if (contained.HasComponent<InEntityStorageComponent>())
+                    {
+                        contained.RemoveComponent<InEntityStorageComponent>();
+                    }
                 }
             }
         }
@@ -407,6 +417,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
 
         public void OnDestroy(DestructionEventArgs eventArgs)
         {
+            Open = true;
             EmptyContents();
         }
     }

Content.Server/GameObjects/Components/Items/Storage/InEntityStorageComponent.cs

@@ -0,0 +1,16 @@
+using Content.Shared.GameObjects.EntitySystems;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.GameObjects.Components.Items.Storage
+{
+    [RegisterComponent]
+    public class InEntityStorageComponent : Component, IActionBlocker
+    {
+        public override string Name => "InEntityStorage";
+
+        public bool CanInteract()
+        {
+            return false;
+        }
+    }
+}

Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs

@@ -17,7 +17,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Items.Storage
 {
     [RegisterComponent]
     [ComponentReference(typeof(StoreableComponent))]

Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Storage;
 using Content.Shared.Interfaces;
 using Robust.Server.GameObjects;
@@ -24,7 +21,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Items.Storage
 {
     /// <summary>
     /// Storage component for containing entities within this one, matches a UI on the client which shows stored entities

Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs

@@ -1,7 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Items.Storage
 {
     [RegisterComponent]
     public class StoreableComponent : Component

Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs

@@ -24,6 +24,7 @@ using Robust.Shared.Audio;
 using Content.Server.Interfaces.GameObjects;
 using Content.Server.Interfaces.Chat;
 using Content.Server.BodySystem;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.BodySystem;
 using Robust.Shared.GameObjects.Systems;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;

Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs

@@ -2,6 +2,7 @@
 using Content.Shared.GameObjects.Components.Inventory;
 using Robust.Shared.GameObjects;
 using CannyFastMath;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Math = CannyFastMath.Math;
 using MathF = CannyFastMath.MathF;
 

Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Utility;

Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Nutrition;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/PDA/PDAComponent.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Access;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.PDA;

Content.Server/GameObjects/Components/PottedPlantHideComponent.cs

@@ -1,3 +1,4 @@
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.Audio;

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs

@@ -1,4 +1,5 @@
 using System;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs

@@ -1,4 +1,5 @@
 using System;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Projectiles;
 using Content.Server.GameObjects.Components.Sound;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Construction;
 using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.Interfaces;
 using Content.Server.Utility;

Content.Server/GameObjects/EntitySystems/HandsSystem.cs

@@ -18,6 +18,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Players;
 using System;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.GameObjects.EntitySystems;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/MoverSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Sound;

Content.Server/GameObjects/EntitySystems/StorageSystem.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Robust.Server.GameObjects.EntitySystemMessages;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;

Content.Server/GameTicking/GameTicker.cs

@@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.GameObjects;
 using Content.Server.GameObjects.Components.Access;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Markers;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Observer;

Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.GameObjects.EntitySystemMessages;

Content.Server/PDA/PDAUplinkManager.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Interfaces.PDA;
 using Content.Shared.GameObjects.Components.PDA;