[TEST MERGE] Slot-based Storage (#21212)

2023-10-25 18:53:38 -04:00
parent 6b04aaf964
commit 41795720da
234 changed files with 1052 additions and 1008 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -28,7 +28,7 @@
      - id: BoxSurvivalSecurity
      - id: Flash
      - id: MagazinePistol
-      
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSecurity
@@ -291,8 +291,7 @@
        - id: RegenerativeMesh
        - id: RCD
        - id: RCDAmmo
-        - id: RCDAmmo
-        - id: RCDAmmo
+          amount: 2
        - id: CableMVStack
        - id: CableHVStack

--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -198,6 +198,9 @@
  name: syndicate pyjama duffel bag
  description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
  components:
+  - type: Storage
+    maxSlots: 16
+    maxTotalWeight: 44
  - type: StorageFill
    contents:
      - id: ClothingUniformJumpsuitPyjamaSyndicateRed
@@ -231,6 +234,8 @@
  id: ClothingBackpackChameleonFill
  suffix: Fill, Chameleon
  components:
+    - type: Storage
+      maxSlots: 9
    - type: StorageFill
      contents:
        - id: ClothingUniformJumpsuitChameleon
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -278,7 +278,7 @@
    containers:
      ballistic-ammo: !type:Container
  - type: Item
-    size: 30
+    size: Normal
  - type: Sprite
    sprite: Objects/Storage/boxes.rsi

--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -37,7 +37,8 @@
      - state: box
      - state: light
  - type: Storage
-    capacity: 60
+    maxSlots: 12
+    maxTotalWeight: 24
    whitelist:
      components:
      - LightBulb
@@ -60,7 +61,8 @@
      - state: box
      - state: lighttube
  - type: Storage
-    capacity: 60
+    maxSlots: 12
+    maxTotalWeight: 24
    whitelist:
      components:
      - LightBulb
@@ -85,7 +87,8 @@
      - state: box
      - state: lightmixed
  - type: Storage
-    capacity: 60
+    maxSlots: 12
+    maxTotalWeight: 24
    whitelist:
      components:
      - LightBulb
@@ -108,7 +111,6 @@
      - state: box
      - state: pda
  - type: Storage
-    capacity: 60
    whitelist:
      components:
      - Pda
@@ -128,7 +130,6 @@
      - state: box
      - state: pda
  - type: Storage
-    capacity: 60
    whitelist:
      components:
      - IdCard
@@ -148,7 +149,6 @@
      - state: box
      - state: headset
  - type: Storage
-    capacity: 60
    whitelist:
      components:
      - Headset
@@ -192,7 +192,6 @@
  description: A special box for sensitive people.
  components:
  - type: Storage
-    capacity: 30
  - type: Sprite
    layers:
      - state: box_hug
@@ -234,6 +233,12 @@
  id: BoxPerformer
  description: Happy Hatsune Miku Day!
  components:
+  - type: Storage
+    maxItemSize: Normal
+    whitelist:
+      components:
+      - Clothing
+      - Food
  - type: StorageFill
    contents:
      - id: ClothingShoesBootsPerformer
@@ -267,7 +272,7 @@
      - id: TrashBag
        amount: 6
  - type: Storage
-    capacity: 800
+    maxItemSize: Normal
    whitelist:
      tags:
        - TrashBag
@@ -294,7 +299,6 @@
      - state: box
      - state: encryptokey
  - type: Storage
-    capacity: 30
    whitelist:
      components:
      - EncryptionKey
@@ -386,13 +390,12 @@
  description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use.
  components:
  - type: Item
-    size: 15
+    size: Normal
  - type: StorageFill
    contents:
      - id: EncryptionKeySyndie
        amount: 2
  - type: Storage
-    capacity: 15

 - type: entity
  name: deathrattle implant box
@@ -401,7 +404,7 @@
  description: Six deathrattle implants and handheld GPS devices for the whole squad.
  components:
  - type: Item
-    size: 60
+    size: Normal
  - type: StorageFill
    contents:
      - id: DeathRattleImplanter
@@ -409,7 +412,8 @@
      - id: HandheldGPSBasic
        amount: 6
  - type: Storage
-    capacity: 60
+    maxSlots: 12
+    maxTotalWeight: 24
  - type: Sprite
    layers:
      - state: box
@@ -434,20 +438,21 @@
  description: This box filled with colorful darts.
  components:
  - type: Item
-    size: 40
+    size: Normal
  - type: StorageFill
    contents:
      - id: Dart
-        amount: 5
+        amount: 3
      - id: DartBlue
-        amount: 5
+        amount: 3
      - id: DartPurple
-        amount: 5
+        amount: 3
      - id: DartYellow
-        amount: 5
+        amount: 3
  - type: Storage
-    capacity: 40
+    maxSlots: 12
+    maxTotalWeight: 24
  - type: Sprite
    layers:
      - state: box
-      - state: darts
+      - state: darts
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -93,10 +93,13 @@
  parent: BoxCardboard
  id: BoxMouthSwab
  components:
+  - type: Storage
+    maxSlots: 10
+    maxTotalWeight: 20
  - type: StorageFill
    contents:
      - id: DiseaseSwab
-        amount: 30
+        amount: 10
  - type: Sprite
    layers:
      - state: box
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -49,6 +49,12 @@
  id: BoxZiptie
  description: A box full of zipties.
  components:
+  - type: Storage
+    maxSlots: 10
+    maxTotalWeight: 20
+    whitelist:
+      components:
+      - Handcuff
  - type: StorageFill
    contents:
      - id: Zipties
@@ -64,6 +70,9 @@
  id: BoxForensicPad
  description: A box of forensic pads.
  components:
+  - type: Storage
+    maxSlots: 10
+    maxTotalWeight: 20
  - type: StorageFill
    contents:
      - id: ForensicPad
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -302,8 +302,8 @@
      - id: TargetDarts
        amount: 1
      - id: BoxDarts
-        amount: 1
+        amount: 2
      - id: BoxDarts
        amount: 1
        prob: 0.05
-  
+
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -89,14 +89,11 @@
  - type: StorageFill
    contents:
      - id: Brutepack
-        amount: 1
      - id: Ointment
-        amount: 1
      - id: Bloodpack
-        amount: 1
      - id: Gauze
      - id: EmergencyMedipen #You never know what people are going to latejoin into
-        amount: 6
+        amount: 3

 - type: entity
  id: ClothingBeltPlantFilled
@@ -124,6 +121,10 @@
  name: grenadier chest rig
  suffix: Filled
  components:
+  - type: Item
+    size: Large
+  - type: Storage
+    maxSlots: 8
  - type: StorageFill
    contents:
      - id: ExGrenade
@@ -169,4 +170,4 @@
    contents:
        - id: WeaponRevolverInspector
        - id: SpeedLoaderMagnum
-        - id: SpeedLoaderMagnumRubber
+        - id: SpeedLoaderMagnumRubber
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -15,6 +15,10 @@
  parent: BriefcaseSyndie
  suffix: SniperBundle
  components:
+  - type: Item
+    size: Huge
+  - type: Storage
+    maxItemSize: Large
  - type: StorageFill
    contents:
      - id: WeaponSniperHristov
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -12,8 +12,7 @@
      - id: Ointment
        amount: 2
      - id: Gauze
-      - id: PillTricordrazine
-        amount: 5
+      - id: PillCanisterTricordrazine
      # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents

 - type: entity
@@ -28,10 +27,8 @@
      - id: Ointment
        amount: 2
      - id: SyringeSigynate
-      - id: PillKelotane
-        amount: 5
-      - id: PillDermaline
-        amount: 5
+      - id: PillCanisterKelotane
+      - id: PillCanisterDermaline

 - type: entity
  id: MedkitBruteFilled
@@ -45,10 +42,8 @@
      - id: Gauze
      - id: Bloodpack
      - id: SyringeTranexamicAcid
-      - id: PillIron
-        amount: 5
-      - id: PillBicaridine
-        amount: 5
+      - id: PillCanisterIron
+      - id: PillCanisterBicaridine

 - type: entity
  id: MedkitToxinFilled
@@ -60,10 +55,8 @@
      - id: SyringeIpecac
      - id: SyringeEthylredoxrazine
      - id: AntiPoisonMedipen
-      - id: PillDylovene
-        amount: 5
-      - id: PillCharcoal
-        amount: 3
+      - id: PillCanisterDylovene
+      - id: PillCanisterCharcoal

 - type: entity
  id: MedkitOxygenFilled
@@ -76,8 +69,7 @@
      - id: EmergencyOxygenTankFilled
      - id: EmergencyMedipen
      - id: SyringeInaprovaline
-      - id: PillDexalin
-        amount: 7
+      - id: PillCanisterDexalin

 - type: entity
  id: MedkitRadiationFilled
@@ -92,8 +84,7 @@
        amount: 1
      - id: EmergencyMedipen
        amount: 1
-      - id: PillHyronalin
-        amount: 5
+      - id: PillCanisterHyronalin

 - type: entity
  id: MedkitAdvancedFilled
@@ -120,11 +111,9 @@
      - id: MedicatedSuture
      - id: RegenerativeMesh
      - id: SyringeEphedrine
-      - id: SyringeSaline
      - id: BruteAutoInjector
      - id: BurnAutoInjector
      - id: EmergencyMedipen
-      - id: Bloodpack

 - type: entity
  id: StimkitFilled
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -8,13 +8,14 @@
    sprite: Clothing/Back/Backpacks/backpack.rsi
    state: icon
  - type: Item
-    size: 9999
+    size: Huge
  - type: Clothing
    quickEquip: false
    slots:
    - back
  - type: Storage
-    capacity: 100
+    maxSlots: 7
+    maxTotalWeight: 28
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
@@ -196,7 +197,8 @@
  - type: Sprite
    sprite: Clothing/Back/Backpacks/ertleader.rsi
  - type: Storage
-    capacity: 250
+    maxSlots: 10
+    maxTotalWeight: 40

 - type: entity
  parent: ClothingBackpackERTLeader
@@ -259,8 +261,12 @@
      shader: unshaded
  - type: Clothing
    equippedPrefix: holding
+  - type: Item
+    size: Ginormous
  - type: Storage
-    capacity: 9999
+    maxSlots: 14
+    maxItemSize: Large
+    maxTotalWeight: 56 #14 normal-sized items.

 - type: entity
  parent: ClothingBackpackClown
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -7,7 +7,8 @@
  - type: Sprite
    sprite: Clothing/Back/Duffels/duffel.rsi
  - type: Storage
-    capacity: 120
+    maxSlots: 10
+    maxTotalWeight: 40
  - type: ClothingSpeedModifier
    walkModifier: 1
    sprintModifier: 0.9
@@ -162,8 +163,6 @@
  components:
  - type: Sprite
    sprite: Clothing/Back/Duffels/syndicate.rsi
-  - type: Storage
-    capacity: 131

 - type: entity
  parent: ClothingBackpackDuffelSyndicate
@@ -228,7 +227,11 @@
    - state: icon
    - state: icon-unlit
      shader: unshaded
+  - type: Item
+    size: Ginormous
  - type: Storage
-    capacity: 9999
+    maxSlots: 14
+    maxItemSize: Large
+    maxTotalWeight: 56 #14 normal-sized items.
  - type: ClothingSpeedModifier
    sprintModifier: 1 # makes its stats identical to other variants of bag of holding
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -167,5 +167,9 @@
    - state: icon
    - state: icon-unlit
      shader: unshaded
+  - type: Item
+    size: Ginormous
  - type: Storage
-    capacity: 9999
+    maxSlots: 14
+    maxItemSize: Large
+    maxTotalWeight: 56 #14 normal-sized items.
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -33,7 +33,7 @@
    sprite: Clothing/Back/Backpacks/waterbackpack.rsi
    state: icon
  - type: Item
-    size: 200
+    size: Huge
  - type: Clothing
    slots: BACK
    sprite: Clothing/Back/Backpacks/waterbackpack.rsi
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -6,7 +6,7 @@
  - type: Sprite
    state: icon
  - type: Item
-    size: 50
+    size: Normal
  - type: Clothing
    slots: [belt]
    quickEquip: false
@@ -22,7 +22,10 @@
  id: ClothingBeltStorageBase
  components:
  - type: Storage
-    capacity: 40
+    maxSlots: 7
+    maxItemSize: Normal
+  - type: Item
+    size: Large
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -11,7 +11,7 @@
  - type: Clothing
    sprite: Clothing/Belt/utility.rsi
  - type: Storage
-    capacity: 45
+    maxItemSize: Normal
    # TODO: Fill this out more.
    whitelist:
      tags:
@@ -83,7 +83,6 @@
  - type: Clothing
    sprite: Clothing/Belt/ce.rsi
  - type: Storage
-    capacity: 105
    # TODO: Fill this out more.
    whitelist:
      tags:
@@ -238,7 +237,6 @@
  - type: Clothing
    sprite: Clothing/Belt/medical.rsi
  - type: Storage
-    capacity: 60
    whitelist:
      tags:
        - Wrench
@@ -393,7 +391,7 @@
  - type: Clothing
    sprite: Clothing/Belt/sheath.rsi
  - type: Storage
-    capacity: 15
+    maxSlots: 1
    whitelist:
      tags:
        - CaptainSabre
@@ -418,9 +416,8 @@
  - type: Clothing
    sprite: Clothing/Belt/bandolier.rsi
  - type: Item
-    size: 60
+    size: Large
  - type: Storage
-    capacity: 60
    whitelist:
      tags:
        - ShellShotgun
@@ -451,7 +448,7 @@
  - type: Clothing
    sprite: Clothing/Belt/holster.rsi
  - type: Storage
-    capacity: 20
+    maxSlots: 3

 - type: entity
  parent: ClothingBeltStorageBase
@@ -464,9 +461,8 @@
  - type: Clothing
    sprite: Clothing/Belt/syndieholster.rsi
  - type: Item
-    size: 60
+    size: Large
  - type: Storage
-    capacity: 60
    whitelist:
      components:
        - Gun
@@ -528,9 +524,7 @@
  - type: Clothing
    sprite: Clothing/Belt/militarywebbingmed.rsi
  - type: Item
-    size: 70
-  - type: Storage
-    capacity: 70
+    size: Large

 - type: entity
  parent: ClothingBeltBase
@@ -559,7 +553,7 @@
  - type: Clothing
    sprite: Clothing/Belt/wand.rsi
  - type: Storage
-    capacity: 120
+    maxSlots: 8
    whitelist:
      tags:
      - WizardWand
--- a/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
@@ -12,7 +12,8 @@
      visible: false
  - type: Clothing
  - type: Storage
-    capacity: 150
+    maxSlots: 15
+    maxItemSize: Small
    whitelist:
      tags:
      - Arrow
--- a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
@@ -9,8 +9,9 @@
  - type: Clothing
    sprite: Clothing/Belt/waistbag_leather.rsi
  - type: Storage
-    capacity: 20
-        
+    maxSlots: 5
+    maxItemSize: Small
+
 #Colorization on worn items doesn't work. If this ever gets fixed, you can duplicate this entry and change the color on the sprite to add color variants.
 #- type: entity
 #  parent: ClothingBeltStorageWaistbag
@@ -29,4 +30,4 @@
 #    layers:
 #    - state: "equipped-BELT"
 #      color: "#bf1313"
-#    - state: "equipped-trinkets"
+#    - state: "equipped-trinkets"
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -17,6 +17,8 @@
    keySlots: 4
  - type: Sprite
    state: icon
+  - type: Item
+    size: Small
  - type: Clothing
    slots:
    - ears
--- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
@@ -7,3 +7,5 @@
    state: icon
  - type: Clothing
    slots: [eyes]
+  - type: Item
+    size: Small
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -9,6 +9,8 @@
    slots: [gloves]
  - type: Food
    requiresSpecialDigestion: true
+  - type: Item
+    size: Small
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -8,6 +8,8 @@
    - HEAD
  - type: Sprite
    state: icon
+  - type: Item
+    size: Small
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -117,7 +119,7 @@
  name: base space helmet
  components:
  - type: Item
-    size: 10
+    size: Small
  - type: PressureProtection
    highPressureMultiplier: 0.6
    lowPressureMultiplier: 1000
@@ -241,4 +243,4 @@
  - type: GroupExamine
  - type: Tag
    tags:
-    - HidesHair
+    - HidesHair
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -197,7 +197,7 @@
  - type: Clothing
    sprite: Clothing/Head/Hats/chefhat.rsi
  - type: Storage
-    capacity: 5
+    maxSlots: 1
  - type: UserInterface
    interfaces:
      - key: enum.StorageUiKey.Key
@@ -751,10 +751,10 @@
        offset: "0, 0.12"
    sprite: Clothing/Head/Hats/magician.rsi
  - type: Item
-    size: 10
+    size: Small
    sprite: Clothing/Head/Hats/magician.rsi
  - type: Storage
-    capacity: 10
+    maxSlots: 1
  - type: UserInterface
    interfaces:
      - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -5,6 +5,8 @@
  components:
  - type: Sprite
    state: icon
+  - type: Item
+    size: Small
  - type: Clothing
    slots: [mask]

--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -4,7 +4,7 @@
  id: ClothingNeckBase
  components:
  - type: Item
-    size: 10
+    size: Small
  - type: Clothing
    quickEquip: true
    slots:
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -6,7 +6,7 @@
  description: be nothing do crime
  components:
  - type: Item
-    size: 1
+    size: Tiny

 - type: entity
  parent: ClothingNeckPinBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -15,7 +15,7 @@
  id: ClothingOuterBaseLarge
  components:
  - type: Item
-    size: 80
+    size: Normal
  - type: Clothing
    slots:
    - outerClothing
@@ -29,9 +29,9 @@
  id: ClothingOuterStorageBase
  components:
  - type: Item
-    size: 10
+    size: Normal
  - type: Storage
-    capacity: 10
+    maxSlots: 3
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
@@ -72,7 +72,7 @@
    walkModifier: 0.4
    sprintModifier: 0.6
  - type: Item
-    size: 121
+    size: Large
  - type: Armor
    modifiers:
      coefficients:
@@ -107,7 +107,7 @@
    walkModifier: 0.8
    sprintModifier: 0.8
  - type: Item
-    size: 80
+    size: Normal

 - type: entity
  parent: ClothingOuterBase
@@ -130,7 +130,7 @@
  id: ClothingOuterBaseMedium
  components:
  - type: Item
-    size: 30
+    size: Normal
  - type: Clothing
    slots:
    - outerClothing
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -350,7 +350,7 @@
    walkModifier: 0.75
    sprintModifier: 0.75
  - type: Item
-    size: 50
+    size: Normal
  - type: Tag
    tags:
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -176,7 +176,7 @@
  - type: Sprite
    sprite: Clothing/OuterClothing/Suits/iansuit.rsi
  - type: Item
-    size: 30
+    size: Normal
  - type: Clothing
    sprite: Clothing/OuterClothing/Suits/iansuit.rsi
  - type: ToggleableClothing
@@ -197,7 +197,7 @@
  - type: Sprite
    sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
  - type: Item
-    size: 30
+    size: Normal
  - type: Clothing
    sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
  - type: ToggleableClothing
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -11,7 +11,7 @@
  - type: TemperatureProtection
    coefficient: 0.1
  - type: Item
-    size: 10
+    size: Small
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -8,6 +8,8 @@
    - FEET
  - type: Sprite
    state: icon
+  - type: Item
+    size: Normal
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -39,7 +41,7 @@
  id: ClothingShoesStorageBase
  components:
  - type: Storage
-    capacity: 10
+    maxSlots: 1
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -181,7 +181,7 @@
      - state: equipped-FEET
        offset: "0, -0.02"
  - type: Item
-    size: 10
+    size: Small
    sprite: Clothing/Shoes/Specific/large_clown.rsi
  - type: ClothingSpeedModifier
    walkModifier: 0.85
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -3,6 +3,8 @@
  parent: BaseItem
  id: Clothing
  components:
+  - type: Item
+    size: Normal
  - type: Sprite
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -101,7 +101,7 @@
      types:
        Blunt: 20000
  - type: Item
-    size: 1
+    size: Tiny
    sprite: Objects/Weapons/Melee/debug.rsi

 - type: entity
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -959,7 +959,7 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: mouse-0
  - type: Item
-    size: 5
+    size: Tiny
  - type: Clothing
    quickEquip: false
    sprite: Mobs/Animals/mouse.rsi
@@ -1424,7 +1424,7 @@
      groups:
        Brute: 5
  - type: Item
-    size: 80
+    size: Normal
  - type: OnUseTimerTrigger
    delay: 10
    beepSound:
@@ -2329,7 +2329,7 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: hamster-0
  - type: Item
-    size: 5
+    size: Tiny
  - type: Physics
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -172,7 +172,9 @@
    graph: SupplyBot
    node: bot
  - type: Storage
-    capacity: 250
+    maxSlots: 15
+    maxItemSize: Large
+    maxTotalWeight: 60
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -370,9 +370,9 @@
        map: ["6pack6"]
        visible: false
  - type: Item
-    size: 6
+    size: Normal
  - type: Storage
-    capacity: 30
+    maxSlots: 6
    whitelist:
      tags:
        - Cola
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -28,7 +28,7 @@
  abstract: true
  components:
  - type: Item
-    size: 1
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - bread
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -21,7 +21,7 @@
        - ReagentId: Vitamin
          Quantity: 5
  - type: Item
-    size: 25
+    size: Normal

 - type: entity
  parent: FoodCakeBase
@@ -43,7 +43,7 @@
        - ReagentId: Vitamin
          Quantity: 1
  - type: Item
-    size: 5
+    size: Tiny

 # Custom Cake Example

@@ -574,7 +574,7 @@
  - type: Food
    transferAmount: 12
  - type: Item
-    size: 40
+    size: Normal
  - type: PointLight
    color: "#FFFF00"
    radius: 2
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -16,7 +16,7 @@
        - ReagentId: Nutriment
          Quantity: 3
  - type: Item
-    size: 1
+    size: Tiny
  - type: Tag
    tags:
    - DonkPocket
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -21,7 +21,7 @@
          Quantity: 3
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donut.rsi
-    size: 1
+    size: Tiny
 # Tastes like donut.

 # The sprinkles are now an overlay, so you can put them on any donut! If we really
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -16,7 +16,7 @@
        - ReagentId: Nutriment
          Quantity: 5
  - type: Item
-    size: 1
+    size: Tiny

 # Muffins/Buns

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -24,7 +24,7 @@
  - type: SliceableFood
    count: 8
  - type: Item
-    size: 8
+    size: Normal
  - type: Tag
    tags:
    - Pizza
@@ -53,7 +53,7 @@
        - ReagentId: Vitamin
          Quantity: 0.8
  - type: Item
-    size: 1
+    size: Tiny
  - type: Tag
    tags:
    - Pizza
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -38,13 +38,14 @@
      map: ["pink-box6"]
      visible: false
  - type: Storage
-    capacity: 6
+    maxSlots: 6
+    maxTotalWeight: 12
    whitelist:
      tags:
      - Donut
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donut.rsi
-    size: 6
+    size: Small
    heldPrefix: box
  - type: StorageFill
    contents:
@@ -118,13 +119,13 @@
      map: ["box12"]
      visible: false
  - type: Storage
-    capacity: 12
+    maxSlots: 12
    whitelist:
      tags:
      - Egg
  - type: Item
    sprite: Objects/Consumable/Food/egg.rsi
-    size: 12
+    size: Small
  - type: StorageFill
    contents:
    - id: FoodEgg
@@ -175,6 +176,9 @@
  id: EggBoxBroken
  suffix: Broken
  components:
+  - type: Storage
+    maxSlots: 12
+    maxItemSize: Small
  - type: StorageFill
    contents:
    - id: Eggshells
@@ -206,7 +210,8 @@
      map: ["enum.StorageVisualLayers.Door"]
  # TODO make these entitystorage again + placeablesurface after entity storage ECS gets merged.
  - type: Storage
-    capacity: 8
+    maxSlots: 1
+    maxItemSize: Normal
    whitelist:
      tags:
      - Pizza
@@ -296,10 +301,10 @@
      map: ["box6"]
      visible: false
  - type: Storage
-    capacity: 6
+    maxSlots: 6
  - type: Item
    sprite: Objects/Consumable/Food/Baked/nuggets.rsi
-    size: 6
+    size: Small
    heldPrefix: box
  - type: StorageFill
    contents:
@@ -333,10 +338,10 @@
    whitelist:
      tags:
      - DonkPocket
-    capacity: 6
+    maxSlots: 6
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
-    size: 6
+    size: Small
  - type: StorageFill
    contents:
    - id: FoodDonkpocket
@@ -458,8 +463,6 @@
  - type: Item
    sprite: Objects/Storage/Happyhonk/clown.rsi
    heldPrefix: box
-  - type: Storage
-    capacity: 30
  - type: Tag
    tags:
    - Trash
@@ -583,10 +586,8 @@
  suffix: Toy Unsafe, Snacks
  name: syndicate snack box
  components:
-  - type: Item
-    size: 64
  - type: Storage
-    capacity: 64 # need more room for goodies
+    maxSlots: 9
  - type: StorageFill
    contents:
    # toy
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -37,7 +37,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: packet
-    size: 3
+    size: Tiny
  - type: DamageOnLand
    damage:
      types:
@@ -63,7 +63,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: packet
-    size: 3
+    size: Tiny
  - type: PhysicalComposition
    materialComposition:
      Steel: 100
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -16,7 +16,7 @@
    sprite: Objects/Consumable/Food/egg.rsi
  - type: Item
    sprite: Objects/Consumable/Food/egg.rsi
-    size: 1
+    size: Tiny
  - type: SolutionContainerManager
    solutions:
      food:
@@ -69,7 +69,7 @@
    sprite: Objects/Consumable/Food/egg.rsi
    state: eggshells
  - type: Item
-    size: 1
+    size: Tiny
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -24,7 +24,7 @@
        - ReagentId: Fat
          Quantity: 5
  - type: Item
-    size: 5
+    size: Tiny
  - type: Fixtures
    fixtures:
      fix1:
@@ -209,7 +209,7 @@
    graph: BearSteak
    node: start
    defaultTarget: filet migrawr
-    
+

 - type: entity
  name: raw penguin meat
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -136,7 +136,7 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/nettle.rsi
  - type: Item
-    size: 10
+    size: Small
    sprite: Objects/Specific/Hydroponics/nettle.rsi
  - type: MeleeWeapon
    damage:
@@ -166,7 +166,7 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/death_nettle.rsi
  - type: Item
-    size: 10
+    size: Small
    sprite: Objects/Specific/Hydroponics/death_nettle.rsi
  - type: MeleeWeapon
    damage:
@@ -184,7 +184,7 @@
  - type: Produce
    seedId: deathNettle
  - type: MeleeChemicalInjector
-    transferAmount: 6 
+    transferAmount: 6
    solution: food
    pierceArmor: true # We do a little trolling
  - type: Extractable
@@ -222,7 +222,7 @@
  - type: Tag
    tags:
    - Fruit
-    
+
 - type: entity
  name: mimana
  parent: FoodProduceBase
@@ -314,7 +314,7 @@
    state: peel
  - type: Item
    sprite: Objects/Specific/Hydroponics/mimana.rsi
-    heldPrefix: peel  
+    heldPrefix: peel
  - type: Slippery
    slipSound:
      path: /Audio/Effects/slip.ogg
@@ -836,7 +836,7 @@
    sprite: Objects/Specific/Hydroponics/corn.rsi
    state: cob
  - type: Item
-    size: 1
+    size: Tiny
  - type: Tag
    tags:
      - Trash
@@ -1237,7 +1237,7 @@
  - type: Tag
    tags:
    - Galaxythistle
-    - Fruit # Probably? 
+    - Fruit # Probably?

 - type: entity
  name: fly amanita
@@ -1365,7 +1365,7 @@
  description: Round green object that you can slice and eat.
  components:
  - type: Item
-    size: 10
+    size: Small
  - type: FlavorProfile
    flavors:
      - watermelon
@@ -1427,7 +1427,7 @@
  description: Juicy green and red slice.
  components:
  - type: Item
-    size: 2
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - watermelon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -17,7 +17,7 @@
        - ReagentId: Nutriment
          Quantity: 8
  - type: Item
-    size: 5
+    size: Small

 # Kebabs

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -21,7 +21,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: packet
-    size: 3
+    size: Tiny
 # Snacks

 # "Snacks" means food in a packet. Down the line this stuff can have multiple
@@ -101,7 +101,7 @@
    state: chocolatebar
  - type: Item
    heldPrefix: chocolatebar
-    size: 3
+    size: Tiny
  - type: Tag
    tags:
      - FoodSnack
@@ -346,7 +346,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: packet
-    size: 1
+    size: Tiny
  - type: Food
    trash: FoodCookieFortune

@@ -357,7 +357,7 @@
  description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
  components:
  - type: Item
-    size: 10
+    size: Small
  - type: Tag
    tags:
      - FoodSnack
@@ -381,7 +381,7 @@
    flavors:
      - nutribrick
  - type: Item
-    size: 10
+    size: Small
  - type: Sprite
    state: nutribrick-open
  - type: Food
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -10,11 +10,9 @@
      - state: closed
      - state: open
        map: ["openLayer"]
-  - type: Storage
-    capacity: 36
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    size: 36
+    size: Normal
  - type: StorageFill
    contents:
      - id: CigPackGreen
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -17,7 +17,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny
  - type: Construction
    graph: smokeableCigarette
    node: cigarette
@@ -41,7 +41,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny
  - type: Construction
    graph: smokeableCigarette
    node: cigarette
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -17,7 +17,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny
  - type: Construction
    graph: smokeableJoint
    node: joint
@@ -48,7 +48,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny
  - type: Construction
    graph: smokeableBlunt
    node: blunt
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -43,9 +43,9 @@
      Steel: 50
  - type: SpaceGarbage
  - type: Storage
-    capacity: 5
+    maxSlots: 5
  - type: Item
-    size: 5
+    size: Small
  - type: StorageFill
    contents:
    - id: Cigarette
@@ -108,9 +108,10 @@
      Steel: 50
  - type: SpaceGarbage
  - type: Storage
-    capacity: 10
+    maxSlots: 10
+    maxTotalWeight: 20
  - type: Item
-    size: 10
+    size: Small
  - type: StorageFill
    contents:
    - id: CigaretteRandom
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -9,7 +9,7 @@
      tags:
      - RollingPaper
      - CigFilter
-    capacity: 20
+    maxSlots: 20
  - type: StorageFill
    contents:
      - id: PaperRolling
@@ -31,7 +31,6 @@
      tags:
      - RollingPaper
      - CigFilter
-    capacity: 32
  - type: StorageFill
    contents:
      - id: PaperRolling
@@ -54,7 +53,7 @@
    state: cigpaper
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-    size: 5
+    size: Tiny
  - type: Tag
    tags:
    - RollingPaper
@@ -68,8 +67,6 @@
  components:
    - type: Stack
      count: 1
-    - type: Item
-      size: 1

 - type: entity
  id: CigaretteFilter
@@ -86,7 +83,7 @@
    state: cigfilter
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
-    size: 10
+    size: Tiny
  - type: Tag
    tags:
    - CigFilter
@@ -99,5 +96,3 @@
  components:
    - type: Stack
      count: 1
-    - type: Item
-      size: 2
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
@@ -35,10 +35,10 @@
      map: ["cigar8"]
      visible: false
  - type: Storage
-    capacity: 8
+    maxSlots: 8
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
-    size: 8
+    size: Small
  - type: StorageFill
    contents:
    - id: Cigar
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -19,7 +19,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny

 - type: entity
  id: CigarSpent
@@ -49,7 +49,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 1
+    size: Tiny

 - type: entity
  id: CigarGoldSpent
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
@@ -12,7 +12,7 @@
    slots: [ mask ]
    equippedPrefix: unlit
  - type: Item
-    size: 3
+    size: Tiny
    sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi
  - type: Appearance
  - type: BurnStateVisuals
--- a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
@@ -9,6 +9,6 @@
    layers:
      - state: icon
  - type: Item
-    size: 1001
+    size: Huge
  - type: StaticPrice
    price: 0
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -15,9 +15,7 @@
  suffix: Empty
  components:
  - type: Item
-    size: 30
-  - type: Storage
-    capacity: 30
+    size: Normal

 - type: entity
  id: PresentRandomUnsafe
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -17,7 +17,7 @@
    sprite: Objects/Devices/timer.rsi
    state: timer
  - type: Item
-    size: 5
+    size: Small
  - type: PayloadTrigger
    components:
    - type: OnUseTimerTrigger
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml
@@ -6,9 +6,9 @@
  components:
  - type: Sprite
    sprite: Objects/Misc/module.rsi
-    state: abductor_mod  
+    state: abductor_mod
  - type: Item
-    size: 10
+    size: Small
  - type: Tag
    tags:
-    - WeaponPistolCHIMPUpgradeKit
+    - WeaponPistolCHIMPUpgradeKit
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Devices/forensic_scanner.rsi
    state: forensicnew
  - type: Item
-    size: 5
+    size: Small
  - type: Clothing
    sprite: Objects/Devices/forensic_scanner.rsi
    quickEquip: false
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -37,7 +37,7 @@
        components:
        - IdCard
  - type: Item
-    size: 10
+    size: Tiny
  - type: ContainerContainer
    containers:
      PDA-id: !type:ContainerSlot {}
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -16,7 +16,7 @@
    - key: enum.InstrumentUiKey.Key
      type: InstrumentBoundUserInterface
  - type: Item
-    size: 24
+    size: Normal
  - type: StaticPrice
    price: 200

--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -14,7 +14,7 @@
    sprite: Objects/Fun/Instruments/trumpet.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/trumpet.rsi
  - type: Tag
    tags:
@@ -32,7 +32,7 @@
    sprite: Objects/Fun/Instruments/trombone.rsi
    state: icon
  - type: Item
-    size: 48
+    size: Normal
    sprite: Objects/Fun/Instruments/trombone.rsi
  - type: Tag
    tags:
@@ -50,7 +50,7 @@
    sprite: Objects/Fun/Instruments/frenchhorn.rsi
    state: icon
  - type: Item
-    size: 48
+    size: Normal
    sprite: Objects/Fun/Instruments/frenchhorn.rsi
  - type: Tag
    tags:
@@ -69,7 +69,7 @@
    sprite: Objects/Fun/Instruments/euphonium.rsi
    state: icon
  - type: Item
-    size: 48
+    size: Normal
    sprite: Objects/Fun/Instruments/euphonium.rsi
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -10,7 +10,7 @@
  - type: Instrument
    program: 121
  - type: Item
-    size: 10
+    size: Small

 - type: entity
  parent: BaseHandheldInstrument
@@ -24,7 +24,7 @@
  - type: Instrument
    program: 122
  - type: Item
-    size: 10
+    size: Small

 - type: entity
  parent: BaseHandheldInstrument
@@ -38,7 +38,7 @@
  - type: Instrument
    program: 123
  - type: Item
-    size: 5
+    size: Tiny

 - type: entity
  parent: BaseHandheldInstrument
@@ -55,7 +55,7 @@
  - type: Instrument
    program: 124
  - type: Item
-    size: 10
+    size: Small
  - type: Prayable
    sentMessage: prayer-popup-notify-centcom-sent
    notifiactionPrefix: prayer-chat-notify-centcom
@@ -74,7 +74,7 @@
  - type: Instrument
    program: 125
  - type: Item
-    size: 10
+    size: Small

 - type: entity
  parent: BaseHandheldInstrument
@@ -88,7 +88,7 @@
  - type: Instrument
    program: 126
  - type: Item
-    size: 5
+    size: Tiny

 - type: entity
  parent: BaseHandheldInstrument
@@ -102,7 +102,7 @@
    sprite: Objects/Fun/Instruments/gunpet.rsi
    state: icon
  - type: Item
-    size: 15
+    size: Normal
    sprite: Objects/Fun/Instruments/gunpet.rsi
  - type: Tag
    tags:
@@ -125,7 +125,7 @@
    - BrassInstrument #Go figure.
  - type: Item
    sprite: Objects/Fun/Instruments/bike_horn.rsi
-    size: 10
+    size: Small
  - type: Clothing
    sprite: Objects/Fun/Instruments/bike_horn.rsi
    slots: [Belt]
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -9,7 +9,7 @@
    sprite: Objects/Fun/Instruments/glockenspiel.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/glockenspiel.rsi
  - type: Tag
    tags:
@@ -58,7 +58,7 @@
    sprite: Objects/Fun/Instruments/microphone.rsi
    state: icon
  - type: Item
-    size: 10
+    size: Small
    sprite: Objects/Fun/Instruments/microphone.rsi

 - type: entity
@@ -76,7 +76,7 @@
    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
  - type: Tag
    tags:
@@ -135,5 +135,5 @@
    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
    state: icon
  - type: Item
-    size: 24
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    size: Normal
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -15,7 +15,7 @@
    sprite: Objects/Fun/Instruments/eguitar.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/eguitar.rsi
  - type: Clothing
    quickEquip: false
@@ -44,7 +44,7 @@
    sprite: Objects/Fun/Instruments/bassguitar.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/bassguitar.rsi
  - type: Clothing
    quickEquip: false
@@ -72,7 +72,7 @@
    sprite: Objects/Fun/Instruments/rockguitar.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/rockguitar.rsi
  - type: Clothing
    quickEquip: false
@@ -115,7 +115,7 @@
    - StringInstrument
  - type: Item
    sprite: Objects/Fun/Instruments/guitar.rsi
-    size: 24
+    size: Normal
  - type: Clothing
    quickEquip: false
    slots:
@@ -178,7 +178,7 @@
    sprite: Objects/Fun/Instruments/banjo.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/banjo.rsi
  - type: Tag
    tags:
@@ -200,7 +200,7 @@
    sprite: Objects/Fun/Instruments/violin.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/violin.rsi
  - type: Tag
    tags:
@@ -218,7 +218,7 @@
    sprite: Objects/Fun/Instruments/viola.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/viola.rsi
  - type: Tag
    tags:
@@ -236,7 +236,7 @@
    sprite: Objects/Fun/Instruments/cello.rsi
    state: icon
  - type: Item
-    size: 48
+    size: Normal
    sprite: Objects/Fun/Instruments/cello.rsi
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -16,7 +16,7 @@
    sprite: Objects/Fun/Instruments/saxophone.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/saxophone.rsi
  - type: Tag
    tags:
@@ -45,7 +45,7 @@
    sprite: Objects/Fun/Instruments/accordion.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/accordion.rsi
  - type: Tag
    tags:
@@ -62,7 +62,7 @@
    sprite: Objects/Fun/Instruments/harmonica.rsi
    state: icon
  - type: Item
-    size: 10
+    size: Small
    sprite: Objects/Fun/Instruments/harmonica.rsi
  - type: Tag
    tags:
@@ -80,7 +80,7 @@
    sprite: Objects/Fun/Instruments/clarinet.rsi
    state: icon
  - type: Item
-    size: 20
+    size: Normal
    sprite: Objects/Fun/Instruments/clarinet.rsi
  - type: Tag
    tags:
@@ -98,7 +98,7 @@
    sprite: Objects/Fun/Instruments/flute.rsi
    state: icon
  - type: Item
-    size: 20
+    size: Normal
    sprite: Objects/Fun/Instruments/flute.rsi
  - type: Tag
    tags:
@@ -116,7 +116,7 @@
    sprite: Objects/Fun/Instruments/recorder.rsi
    state: icon
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/Instruments/recorder.rsi
  - type: Tag
    tags:
@@ -134,7 +134,7 @@
    sprite: Objects/Fun/Instruments/panflute.rsi
    state: icon
  - type: Item
-    size: 15
+    size: Normal
    sprite: Objects/Fun/Instruments/panflute.rsi
  - type: Tag
    tags:
@@ -153,7 +153,7 @@
    sprite: Objects/Fun/Instruments/ocarina.rsi
    state: icon
  - type: Item
-    size: 15
+    size: Normal
    sprite: Objects/Fun/Instruments/ocarina.rsi
  - type: Tag
    tags:
@@ -171,8 +171,8 @@
    sprite: Objects/Fun/Instruments/bagpipes.rsi
    state: icon
  - type: Item
-    size: 48
+    size: Normal
    sprite: Objects/Fun/Instruments/bagpipes.rsi
  - type: Tag
    tags:
-    - WoodwindInstrument
+    - WoodwindInstrument
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -9,7 +9,7 @@
    state: icon
  - type: Item
    sprite: Objects/Fun/bikehorn.rsi
-    size: 5
+    size: Tiny
  - type: Clothing
    sprite: Objects/Fun/bikehorn.rsi
    slots: [Belt]
@@ -58,7 +58,7 @@
    state: icon
  - type: Item
    sprite: Objects/Fun/cluwnehorn.rsi
-    size: 5
+    size: Tiny
  - type: Clothing
    sprite: Objects/Fun/cluwnehorn.rsi
    slots: [Belt]
@@ -100,7 +100,7 @@
    state: icon
  - type: Item
    sprite: Objects/Fun/goldbikehorn.rsi
-    size: 5
+    size: Tiny
  - type: Clothing
    sprite: Objects/Fun/goldbikehorn.rsi
    slots: [Belt]
@@ -119,7 +119,7 @@
    state: icon
  - type: Item
    sprite: Objects/Fun/bananiumhorn.rsi
-    size: 5
+    size: Tiny
  - type: Clothing
    sprite: Objects/Fun/bananiumhorn.rsi
    slots: [Belt]
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -9,7 +9,7 @@
    sprite: Objects/Fun/crayons.rsi
  - type: Item
    sprite: Objects/Fun/crayons.rsi
-    size: 1
+    size: Tiny
  - type: Tag
    tags:
    - Write
@@ -235,10 +235,11 @@
    sprite: Objects/Fun/crayons.rsi
    state: box
  - type: Storage
-    capacity: 7
+    maxSlots: 7
+    maxTotalWeight: 7
  - type: Item
    sprite: Objects/Fun/crayons.rsi
-    size: 7
+    size: Small
    heldPrefix: box
  - type: StorageFill
    contents:
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -40,7 +40,7 @@
      types:
        Piercing: 4
  - type: Item
-    size: 2
+    size: Tiny
    sprite: Objects/Fun/Darts/dart_red.rsi
  - type: ItemCooldown
  - type: SolutionContainerManager
@@ -86,7 +86,7 @@
  - type: SolutionContainerVisuals
    maxFillLevels: 1
    fillBaseName: dart
-    
+
 - type: entity
  parent: Dart
  id: DartBlue
@@ -95,7 +95,7 @@
    sprite: Objects/Fun/Darts/dart_blue.rsi
  - type: Item
    sprite: Objects/Fun/Darts/dart_blue.rsi
-     
+
 - type: entity
  parent: Dart
  id: DartPurple
@@ -104,7 +104,7 @@
    sprite: Objects/Fun/Darts/dart_purple.rsi
  - type: Item
    sprite: Objects/Fun/Darts/dart_purple.rsi
-     
+
 - type: entity
  parent: Dart
  id: DartYellow
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -13,7 +13,7 @@
    tags:
    - Dice
  - type: Item
-    size: 2
+    size: Tiny

 - type: entity
  parent: BaseDice
--- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
@@ -17,11 +17,11 @@
    sprite: Objects/Fun/dice.rsi
    state: dicebag
  - type: Item
+    size: Small
  - type: Storage
-    capacity: 18
    whitelist:
      tags:
-        - Dice
+      - Dice

 - type: entity
  parent: DiceBag
@@ -32,4 +32,5 @@
    sprite: Objects/Fun/dice.rsi
    state: magicdicebag
  - type: Storage
-    capacity: 30
+    maxSlots: 14
+    maxTotalWeight: 28
--- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
@@ -14,7 +14,7 @@
  - type: DoAfter
  - type: VentriloquistPuppet
  - type: Item
-    size: 30
+    size: Normal
  - type: Muted
  - type: TypingIndicator
    proto: robot
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -554,7 +554,7 @@
  components:
  - type: Sprite
  - type: Item
-    size: 24
+    size: Normal

 - type: entity
  parent: FoamWeaponBase
@@ -566,7 +566,7 @@
    sprite: Objects/Fun/toys.rsi
    state: foamcrossbow
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/toys.rsi
    heldPrefix: foamcrossbow
  - type: Gun
@@ -672,7 +672,7 @@
      types:
        Blunt: 0
  - type: Item
-    size: 20
+    size: Small
    sprite: Objects/Fun/toys.rsi
    heldPrefix: foamblade
  - type: ItemCooldown
@@ -692,7 +692,7 @@
    sound:
      path: /Audio/Effects/Footsteps/bounce.ogg
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/toys.rsi
    heldPrefix: bask
  - type: TileFrictionModifier
@@ -708,7 +708,7 @@
    sprite: Objects/Fun/toys.rsi
    state: football
  - type: Item
-    size: 12
+    size: Small
    sprite: Objects/Fun/toys.rsi
    heldPrefix: footb

@@ -725,7 +725,7 @@
    sound:
      path: /Audio/Effects/Footsteps/bounce.ogg
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/toys.rsi
    heldPrefix: beachb
  - type: TileFrictionModifier
@@ -741,7 +741,7 @@
    sprite: Objects/Fun/toys.rsi
    state: synb
  - type: Item
-    size: 24
+    size: Small
    sprite: Objects/Fun/toys.rsi
    heldPrefix: synb
  - type: Damageable
@@ -760,7 +760,7 @@
    sprite: Objects/Fun/toys.rsi
    state: corgib
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/toys.rsi
    heldPrefix: corgib
  - type: Damageable
@@ -785,7 +785,7 @@
    intensity: 2000
    falloffPower: 2.6
  - type: Item
-    size: 12
+    size: Small
    sprite: Objects/Fun/toys.rsi
    heldPrefix: singularitytoy

@@ -803,7 +803,7 @@
    radius: 2
    color: "#00CCFF"
  - type: Item
-    size: 24
+    size: Normal
    sprite: Objects/Fun/toys.rsi
    heldPrefix: orb
  - type: TileFrictionModifier
@@ -828,7 +828,7 @@
          shader: unshaded
          map: [ "blade" ]
    - type: Item
-      size: 5
+      size: Small
      sprite: Objects/Weapons/Melee/e_sword.rsi
    - type: UseDelay
      delay: 1.0
@@ -892,7 +892,7 @@
      types:
        Blunt: 0
  - type: Item
-    size: 15
+    size: Normal
    sprite: Objects/Weapons/Melee/cutlass.rsi

 - type: entity
@@ -934,7 +934,7 @@
    - type: StaminaDamageOnHit
      damage: 8
    - type: Item
-      size: 5
+      size: Small
      sprite: Objects/Fun/rubber_hammer.rsi
    - type: Appearance
    - type: DisarmMalus
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -9,7 +9,7 @@
    sprite: Objects/Materials/Sheets/glass.rsi
  - type: Item
    sprite: Objects/Materials/Sheets/glass.rsi
-    size: 30
+    size: Normal
  - type: StaticPrice
    price: 0
  - type: Tag
@@ -83,8 +83,6 @@
  - type: Stack
    stackType: Glass
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: SheetGlass
@@ -96,16 +94,12 @@
  - type: Stack
    stackType: Glass
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetGlass
  id: SheetGlassLingering0
  suffix: Lingering, 0
  components:
-  - type: Item
-    size: 0
  - type: Stack
    lingering: true
    count: 0
@@ -174,8 +168,6 @@
  - type: Stack
    stackType: ReinforcedGlass
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetGlassBase
@@ -201,7 +193,6 @@
      map: ["base"]
  - type: Item
    heldPrefix: pglass
-    size: 30
  - type: Construction
    graph: Glass
    node: SheetPGlass
@@ -239,8 +230,6 @@
  - type: Stack
    stackType: PlasmaGlass
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetPGlass
@@ -281,8 +270,6 @@
  - type: Stack
    stackType: ReinforcedPlasmaGlass
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetGlassBase
@@ -345,8 +332,6 @@
  - type: Stack
    stackType: UraniumGlass
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetUGlass
@@ -386,5 +371,3 @@
  - type: Stack
    stackType: ReinforcedUraniumGlass
    count: 1
-  - type: Item
-    size: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Materials/Sheets/metal.rsi
  - type: Item
    sprite: Objects/Materials/Sheets/metal.rsi
-    size: 30
+    size: Normal
  - type: StaticPrice
    price: 0
  - type: Tag
@@ -75,8 +75,6 @@
  name: steel
  suffix: 10
  components:
-  - type: Item
-    size: 10
  - type: Sprite
    state: steel
  - type: Stack
@@ -89,8 +87,6 @@
  name: steel
  suffix: Single
  components:
-  - type: Item
-    size: 1
  - type: Sprite
    state: steel
  - type: Stack
@@ -102,8 +98,6 @@
  id: SheetSteelLingering0
  suffix: Lingering, 0
  components:
-  - type: Item
-    size: 0
  - type: Stack
    lingering: true
    count: 0
@@ -145,8 +139,6 @@
  - type: Stack
    stackType: Plasteel
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: SheetPlasteel
@@ -159,5 +151,3 @@
  - type: Stack
    stackType: Plasteel
    count: 1
-  - type: Item
-    size: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Materials/Sheets/other.rsi
  - type: Item
    sprite: Objects/Materials/Sheets/other.rsi
-    size: 30
+    size: Normal
  - type: Tag
    tags:
    - Sheet
@@ -56,8 +56,6 @@
    state: paper
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetOtherBase
@@ -106,8 +104,6 @@
    state: plasma
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetOtherBase
@@ -138,7 +134,6 @@
      map: ["base"]
  - type: Item
    heldPrefix: plastic
-    size: 30
  - type: Appearance

 - type: entity
@@ -149,8 +144,6 @@
  components:
  - type: Sprite
    state: plastic
-  - type: Item
-    size: 10
  - type: Stack
    count: 10

@@ -162,8 +155,6 @@
  components:
  - type: Sprite
    state: plastic
-  - type: Item
-    size: 1
  - type: Stack
    count: 1

@@ -212,8 +203,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: SheetOtherBase
@@ -255,5 +244,3 @@
      state: meat
    - type: Stack
      count: 1
-    - type: Item
-      size: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Materials/ingots.rsi
  - type: Item
    sprite: Objects/Materials/ingots.rsi
-    size: 30
+    size: Normal
  - type: StaticPrice
    price: 0
  - type: Tag
@@ -62,8 +62,6 @@
    state: gold
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: IngotBase
@@ -99,7 +97,3 @@
  components:
  - type: Sprite
    state: silver
-  - type: Stack
-    count: 1
-  - type: Item
-    size: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Materials/materials.rsi
  - type: Item
    sprite: Objects/Materials/materials.rsi
-    size: 30
+    size: Normal
  - type: Tag
    tags:
      - DroneUsable
@@ -47,8 +47,6 @@
    - state: cardboard_3
      map: ["base"]
  - type: Appearance
-  - type: Item
-    size: 30

 - type: entity
  parent: MaterialCardboard
@@ -59,8 +57,6 @@
    state: cardboard
  - type: Stack
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: MaterialCardboard
@@ -71,8 +67,6 @@
    state: cardboard
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -114,8 +108,6 @@
    - state: cloth_3
      map: ["base"]
  - type: Appearance
-  - type: Item
-    size: 30
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -144,8 +136,6 @@
    state: cloth
  - type: Stack
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: MaterialCloth
@@ -156,8 +146,6 @@
    state: cloth
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -209,8 +197,6 @@
    state: durathread
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -245,8 +231,6 @@
  components:
  - type: Stack
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: MaterialWoodPlank
@@ -255,8 +239,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -278,8 +260,6 @@
  - type: GuideHelp
    guides:
    - Cloning
-  - type: Item
-    size: 100

 - type: entity
  parent: MaterialBiomass
@@ -288,8 +268,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 # Following not used currently
 - type: entity
@@ -352,7 +330,6 @@
    state: diamond
  - type: Item
    heldPrefix: diamond
-    size: 60

 - type: entity
  parent: MaterialDiamond
@@ -361,8 +338,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2

 - type: entity
  parent: MaterialBase
@@ -383,8 +358,6 @@
    - state: cotton_3
      map: ["base"]
  - type: Appearance
-  - type: Item
-    size: 30
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -410,8 +383,6 @@
    state: cotton
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -462,8 +433,6 @@
      - ReagentId: Honk
        Quantity: 5
  - type: Appearance
-  - type: Item
-    size: 20

 - type: entity
  parent: MaterialBananium
@@ -474,8 +443,6 @@
    state: bananium
  - type: Stack
    count: 1
-  - type: Item
-    size: 2

 - type: entity
  parent: MaterialBase
@@ -493,8 +460,6 @@
  - type: Stack
    count: 50
    stackType: WebSilk
-  - type: Item
-    size: 50
  - type: Food
    requiresSpecialDigestion: true
  - type: FlavorProfile
@@ -522,8 +487,6 @@
  components:
  - type: Stack
    count: 25
-  - type: Item
-    size: 25

 - type: entity
  parent: MaterialWebSilk
@@ -532,8 +495,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: MaterialBase
@@ -554,8 +515,6 @@
    - state: cotton_3
      map: ["base"]
  - type: Appearance
-  - type: Item
-    size: 30
  - type: Food
  - type: BadFood
  - type: SolutionContainerManager
@@ -573,5 +532,3 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 1
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -8,7 +8,7 @@
    sprite: Objects/Materials/ore.rsi
  - type: Item
    sprite: Objects/Materials/ore.rsi
-    size: 60
+    size: Normal
  - type: Tag
    tags:
    - Ore
@@ -57,8 +57,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2

 - type: entity
  parent: OreBase
@@ -82,8 +80,6 @@
  components:
    - type: Stack
      count: 1
-    - type: Item
-      size: 2

 - type: entity
  parent: OreBase
@@ -107,8 +103,6 @@
  components:
    - type: Stack
      count: 1
-    - type: Item
-      size: 2

 - type: entity
  parent: OreBase
@@ -132,8 +126,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2

 - type: entity
  parent: OreBase
@@ -157,8 +149,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2

 - type: entity
  parent: OreBase
@@ -182,9 +172,6 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2
-

 - type: entity
  parent: OreBase
@@ -208,5 +195,3 @@
  components:
  - type: Stack
    count: 1
-  - type: Item
-    size: 2
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -44,7 +44,7 @@
    - state: rods_5
      map: ["base"]
  - type: Item
-    size: 30
+    size: Normal
 #    heldPrefix: rods
  - type: Construction
    graph: MetalRod
@@ -73,8 +73,6 @@
    state: rods
  - type: Stack
    count: 10
-  - type: Item
-    size: 10

 - type: entity
  parent: PartRodMetal
@@ -90,16 +88,12 @@
    state: rods
  - type: Stack
    count: 1
-  - type: Item
-    size: 1

 - type: entity
  parent: PartRodMetal
  id: PartRodMetalLingering0
  suffix: Lingering, 0
  components:
-  - type: Item
-    size: 0
  - type: Stack
    lingering: true
    count: 0
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -26,7 +26,7 @@
        Slash: 3.5
  - type: Item
    sprite: Objects/Materials/Shards/shard.rsi
-    size: 4
+    size: Tiny
  - type: CollisionWake
    enabled: false
  - type: Fixtures
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -13,7 +13,7 @@
    sprite: Objects/Misc/bedsheets.rsi
    noRot: true
  - type: Item
-    size: 10
+    size: Small
  - type: Clothing
    quickEquip: true
    slots:
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -7,9 +7,9 @@
    sprite: Objects/Storage/boxes.rsi
  - type: Item
    sprite: Objects/Storage/boxes.rsi
-    size: 30
+    size: Normal
  - type: Storage
-    capacity: 30
+    maxSlots: 7
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -5,9 +5,10 @@
  description: Useful for carrying items in your hands.
  components:
  - type: Item
-    size: 60
+    size: Large
  - type: Storage
-    capacity: 60
+    maxSlots: 4
+    maxTotalWeight: 16
  - type: Tag
    tags:
    - Briefcase
@@ -25,16 +26,17 @@
    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi

 - type: entity
-  parent: BaseStorageItem
+  parent: BriefcaseBase
  abstract: true
  id: BriefcaseSyndieBase
  suffix: Syndicate, Empty
  description: Useful for carrying items in your hands.
  components:
  - type: Item
-    size: 80
+    size: Large
  - type: Storage
-    capacity: 80
+    maxSlots: 6
+    maxTotalWeight: 24
  - type: Tag
    tags:
    - Briefcase
--- a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
@@ -14,7 +14,7 @@
        Structural: 2
    animation: WeaponArcPunch
  - type: Item
-    size: 5
+    size: Small
  - type: PointLight
    radius: 1.5
    energy: 3
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -11,7 +11,7 @@
          map: [ "enabled" ]
  - type: Item
    sprite: Objects/Misc/fire_extinguisher.rsi
-    size: 10
+    size: Small
  - type: SolutionContainerManager
    solutions:
      spray:
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -38,7 +38,7 @@
    sprite: Objects/Misc/Lights/lights.rsi
  - type: Item
    sprite: Objects/Misc/Lights/lights.rsi
-    size: 20
+    size: Normal
    heldPrefix: off
  - type: PointLight
    enabled: false
@@ -158,7 +158,7 @@
  description: A pole with powerful mounted lights on it.
  components:
  - type: Item
-    size: 50
+    size: Normal
  - type: Sprite
    layers:
      - state: floodlight
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -5,7 +5,7 @@
  parent: BaseItem
  components:
  - type: Item
-    size: 3
+    size: Small
  - type: Handcuff
    cuffedRSI: Objects/Misc/handcuffs.rsi
    bodyIconState: body-overlay
@@ -31,8 +31,6 @@
  id: Cablecuffs
  parent: Handcuffs
  components:
-  - type: Item
-    size: 5
  - type: Handcuff
    breakoutTime: 15
    cuffedRSI: Objects/Misc/cablecuffs.rsi
@@ -65,7 +63,7 @@
  parent: Handcuffs
  components:
  - type: Item
-    size: 2
+    size: Tiny
  - type: Handcuff
    breakoutTime: 20  # halfway between improvised cablecuffs and metal ones
    cuffedRSI: Objects/Misc/cablecuffs.rsi  # cablecuffs will look fine
@@ -92,7 +90,7 @@
  abstract: true
  components:
  - type: Item
-    size: 2
+    size: Tiny
  - type: Tag
    tags:
    - Trash
@@ -128,7 +126,7 @@
  description: Used to restrain those who may cause harm to themselves or others.
  components:
  - type: Item
-    size: 20
+    size: Normal
  - type: Handcuff
    cuffedRSI: Clothing/OuterClothing/Misc/straight_jacket.rsi
    breakoutTime: 100
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -12,6 +12,7 @@
    - idcard
    sprite: Objects/Misc/id_cards.rsi
  - type: Item
+    size: Small
    heldPrefix: default
  - type: Access
  - type: IdCard
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -81,7 +81,7 @@
  components:
    - type: Item
      sprite: Objects/Specific/Medical/syndi_implanter.rsi
-      size: 3
+      size: Tiny
    - type: Sprite
      sprite: Objects/Specific/Medical/syndi_implanter.rsi
      state: implanter1
--- a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
@@ -2,12 +2,12 @@
 #TODO: Assimilate these into the same RSI.
 - type: entity
  parent: BaseItem
-  id: ModularReceiver 
-  name: modular receiver 
+  id: ModularReceiver
+  name: modular receiver
  description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that.
  components:
 #    - type: Item
-#      size: 15
+#      size: Normal
    - type: Sprite
      sprite: Objects/Misc/modular_receiver.rsi
      state: icon
@@ -23,7 +23,7 @@
  description: A robust wooden stock, used in the creation of firearms. #Same as above
  components:
 #    - type: Item
-#      size: 25
+#      size: Normal
    - type: Sprite
      sprite: Objects/Misc/rifle_stock.rsi
      state: icon
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -8,7 +8,7 @@
    - type: Sprite
      sprite: Objects/Misc/stock_parts.rsi
    - type: Item
-      size: 1
+      size: Tiny
    - type: GuideHelp
      guides:
      - MachineUpgrading
--- a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
@@ -9,9 +9,10 @@
    state: icon
  - type: Item
    sprite: Objects/Storage/medalcase.rsi
-    size: 80
+    size: Normal
  - type: Storage
-    capacity: 80
+    maxSlots: 8
+    maxTotalWeight: 16
  - type: StorageFill
    contents:
    - id: ClothingNeckGoldmedal
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -8,7 +8,6 @@
    whitelist:
      tags:
      - MonkeyCube
-    capacity: 30
  - type: StorageFill
    contents:
      - id: MonkeyCubeWrapped
@@ -47,7 +46,6 @@
    whitelist:
      tags:
      - MonkeyCube
-    capacity: 30
  - type: StorageFill
    contents:
      - id: SyndicateSpongeWrapped
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -23,7 +23,7 @@
    - key: enum.PaperUiKey.Key
      type: PaperBoundUserInterface
  - type: Item
-    size: 1
+    size: Tiny
  - type: Tag
    tags:
    - Document
@@ -245,7 +245,7 @@
  - type: Item
    sprite: Objects/Misc/bureaucracy.rsi
    heldPrefix: pen
-    size: 2
+    size: Tiny
  - type: PhysicalComposition
    materialComposition:
      Steel: 25
@@ -277,7 +277,7 @@
  - type: Item
    sprite: Objects/Misc/bureaucracy.rsi
    heldPrefix: overpriced_pen
-    size: 2
+    size: Tiny

 - type: entity
  name: captain's fountain pen
@@ -336,9 +336,11 @@
 #      black: "#3f3f3f"
  - type: Item
    sprite: Objects/Misc/bureaucracy.rsi
-    size: 5
+    size: Small
  - type: Storage
-    capacity: 10
+    maxSlots: 10
+    maxItemSize: Small
+    maxTotalWeight: 20
    whitelist:
      tags:
        - Document
@@ -468,13 +470,14 @@
        insertOnInteract: false
  - type: Item
    sprite: Objects/Misc/clipboard.rsi
-    size: 10
+    size: Small
  - type: Clothing
    slots: [belt]
    quickEquip: false
    sprite: Objects/Misc/clipboard.rsi
  - type: Storage
-    capacity: 20
+    maxSlots: 15
+    maxTotalWeight: 30
    whitelist:
      tags:
        - Document
@@ -526,13 +529,13 @@
        insertOnInteract: true
  - type: Item
    sprite: Objects/Misc/qm_clipboard.rsi
-    size: 30
+    size: Normal
  - type: Clothing
    slots: [belt]
    quickEquip: false
    sprite: Objects/Misc/qm_clipboard.rsi
  - type: Storage
-    capacity: 90
+    maxSlots: 20
    quickInsert: true
    whitelist:
      tags:
@@ -585,7 +588,7 @@
    sprite: Objects/Misc/bureaucracy.rsi
    state: stamp-mime
  - type: Item
-    size: 3
+    size: Tiny

 - type: entity
  name: alternate rubber stamp
--- a/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/potatoai_chip.yml
@@ -8,10 +8,10 @@
      sprite: Objects/Misc/potatoai_chip.rsi
      state: icon
    - type: Item
-      size: 3
+      size: Tiny
    - type: Tag
      tags:
        - SmallAIChip
    - type: Construction
      graph: PotatoAIChip
-      node: potatoaichip
+      node: potatoaichip
--- a/Show More
+++ b/Show More