Storage Standardization [Take 2] (#21270)

Content.Shared/Storage/StorageComponent.cs

@@ -1,3 +1,5 @@
+using Content.Shared.Item;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -20,6 +22,26 @@ namespace Content.Shared.Storage
         [ViewVariables]
         public Container Container = default!;
 
+        /// <summary>
+        /// A limit for the cumulative ItemSize weights that can be inserted in this storage.
+        /// If MaxSlots is not null, then this is ignored.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+        public int MaxTotalWeight;
+
+        /// <summary>
+        /// The maximum size item that can be inserted into this storage,
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+        [Access(typeof(SharedStorageSystem))]
+        public ItemSize? MaxItemSize;
+
+        /// <summary>
+        /// The max number of entities that can be inserted into this storage.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+        public int? MaxSlots;
+
         // TODO: Make area insert its own component.
         [DataField("quickInsert")]
         public bool QuickInsert; // Can insert storables by "attacking" them with the storage entity
@@ -45,18 +67,6 @@ namespace Content.Shared.Storage
         [DataField("blacklist")]
         public EntityWhitelist? Blacklist;
 
-        /// <summary>
-        /// How much storage is currently being used by contained entities.
-        /// </summary>
-        [ViewVariables, DataField("storageUsed"), AutoNetworkedField]
-        public int StorageUsed;
-
-        /// <summary>
-        /// Maximum capacity for storage.
-        /// </summary>
-        [DataField("capacity"), AutoNetworkedField]
-        public int StorageCapacityMax = 10000;
-
         /// <summary>
         /// Sound played whenever an entity is inserted into storage.
         /// </summary>