Food Item Size Adjustment (#39203)

2025-09-11 13:37:25 +02:00
parent 09f17802c2 f4325c4235
commit 8a4a6ec7ab
24 changed files with 745 additions and 332 deletions
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -212,7 +212,7 @@
    - id: EmergencyOxygenTankFilled
    - id: EmergencyMedipen
    - id: Flare
-    - id: FoodBreadBaguette
+    - id: FoodSnackNutribrick
    - id: DrinkWaterBottleFull

 - type: entity
@@ -226,7 +226,7 @@
    - id: EmergencyNitrogenTankFilled
    - id: EmergencyMedipen
    - id: Flare
-    - id: FoodBreadBaguette
+    - id: FoodSnackNutribrick
    - id: DrinkWaterBottleFull
  - type: Sprite
    layers:
@@ -246,7 +246,7 @@
    - id: EmergencyOxygenTankFilled
    - id: EmergencyMedipen
    - id: Flare
-    - id: FoodBreadBaguetteCotton
+    - id: FoodSnackNutribrick
    - id: DrinkWaterBottleFull

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -74,6 +74,14 @@
  name: combat bakery kit
  description: A kit of clandestine baked weapons.
  components:
+  - type: Storage
+    grid:
+    - 0,0,3,3
+    maxItemSize: Normal
+  - type: Item
+    size: Huge
+    shape:
+    - 0,0,3,3
  - type: Sprite
    layers:
      - state: box_of_doom
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
@@ -2,11 +2,13 @@
 # Base

 - type: entity
-  id: FoodBagelBase
-  parent: FoodInjectableBase
  abstract: true
+  parent: FoodInjectableBase
+  id: FoodBagelBase
  description: A delicious bagel.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - bread
@@ -22,13 +24,13 @@
          Quantity: 5

 - type: entity
+  parent: FoodBagelBase
  id: FoodBagel
  name: bagel
-  parent: FoodBagelBase

 - type: entity
-  id: FoodBagelPoppy
  parent: FoodBagelBase
+  id: FoodBagelPoppy
  name: poppy seed bagel
  description: A delicious bagel topped with bicaridine-infused poppy seeds.
  components:
@@ -49,8 +51,8 @@
          Quantity: 5

 - type: entity
-  id: FoodBagelCotton
  parent: FoodBagelBase
+  id: FoodBagelCotton
  name: cotton bagel
  description: A delicious bagel made with cotton dough.
  components:
@@ -60,7 +62,7 @@
    - cotton
  - type: Sprite
    state: bagel-cottondough
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -2,14 +2,15 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodBreadBase
-  abstract: true
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - bread
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/bread.rsi
  - type: Tag
@@ -53,7 +54,6 @@
  id: FoodBreadVolcanic
  description: A dark loaf. Resembles pumice.
  components:
-  - type: Food
  - type: Sprite
    layers:
    - state: alpha
@@ -69,7 +69,6 @@
  id: FoodBreadVolcanicSlice
  description: A slice of dark loaf. Resembles pumice.
  components:
-  - type: Food
  - type: Sprite
    layers:
    - state: alpha-slice
@@ -89,7 +88,6 @@
    flavors:
      - banana
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: banana
@@ -111,7 +109,6 @@
    flavors:
      - banana
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: banana-slice
@@ -122,16 +119,16 @@
    - Slice

 - type: entity
-  name: cotton bread
  parent: FoodBreadBase
  id: FoodBreadCotton
+  name: cotton bread
  description: Bread, but for moff.
  components:
  - type: FlavorProfile
    flavors:
    - cotton
    - bread
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Sprite
    layers:
@@ -162,7 +159,7 @@
    flavors:
    - cotton
    - bread
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Sprite
    layers:
@@ -192,7 +189,6 @@
    flavors:
      - bread
      - corn
-  - type: Food
  - type: Sprite
    layers:
    - state: cornbread
@@ -217,7 +213,6 @@
    flavors:
      - bread
      - corn
-  - type: Food
  - type: Sprite
    layers:
    - state: cornbread-slice
@@ -240,7 +235,6 @@
      - cheesy
      - creamy
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: creamcheese
@@ -268,7 +262,6 @@
      - cheesy
      - creamy
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: creamcheese-slice
@@ -292,7 +285,6 @@
    flavors:
      - meaty
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: meat
@@ -323,7 +315,6 @@
    flavors:
      - meaty
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: meat-slice
@@ -352,7 +343,6 @@
    flavors:
      - nothing
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: mimana
@@ -383,7 +373,6 @@
    flavors:
      - nothing
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: mimana-slice
@@ -407,7 +396,6 @@
  id: FoodBreadPlain
  description: Some plain old earthen bread.
  components:
-  - type: Food
  - type: Sprite
    layers:
    - state: plain
@@ -420,7 +408,6 @@
  id: FoodBreadPlainSlice
  description: A slice of home.
  components:
-  - type: Food
  - type: Sprite
    layers:
    - state: plain-slice
@@ -435,7 +422,6 @@
    flavors:
      - meaty
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: sausage
@@ -467,7 +453,6 @@
    flavors:
      - meaty
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: sausage-slice
@@ -498,7 +483,6 @@
    flavors:
      - cobwebs
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: spidermeat
@@ -529,7 +513,6 @@
    flavors:
      - cobwebs
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: spidermeat-slice
@@ -558,7 +541,6 @@
    flavors:
      - tofu
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: tofu
@@ -585,7 +567,6 @@
    flavors:
      - tofu
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: tofu-slice
@@ -609,7 +590,6 @@
    flavors:
      - acid
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: xenomeat
@@ -640,7 +620,6 @@
    flavors:
      - acid
      - bread
-  - type: Food
  - type: Sprite
    layers:
    - state: xenomeat-slice
@@ -662,9 +641,9 @@
 # Other than bread/slices

 - type: entity
-  name: baguette
  parent: FoodBreadBase
  id: FoodBreadBaguette
+  name: baguette
  description: Bon appétit!
  components:
  - type: Sprite
@@ -690,6 +669,9 @@
    equippedPrefix: baguette
    quickEquip: false
  - type: Item
+    shape:
+    - 0,0,0,3
+    storedRotation: -45
    inhandVisuals:
      left:
      - state: baguette-inhand-left
@@ -703,16 +685,16 @@
 # Tastes like France.

 - type: entity
-  name: cotton baguette
  parent: FoodBreadBaguette
  id: FoodBreadBaguetteCotton
+  name: cotton baguette
  description: Bon azzétit!
  components:
  - type: Sprite
    state: baguette-cotton
  - type: SliceableFood
    slice: FoodBreadBaguetteCottonSlice
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
@@ -721,6 +703,9 @@
  - type: Clothing
    equippedPrefix: baguette-cotton
  - type: Item
+    shape:
+    - 0,0,0,3
+    storedRotation: -45
    inhandVisuals:
      left:
      - state: baguette-cotton-inhand-left
@@ -765,14 +750,14 @@
          Quantity: 0.1

 - type: entity
-  name: cotton crostini
  parent: FoodBreadBaguetteSlice
  id: FoodBreadBaguetteCottonSlice
+  name: cotton crostini
  description: Bon az-zetite!
  components:
  - type: Sprite
    state: crostini-cotton
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -6,7 +6,6 @@
  id: FoodBakedBase
  abstract: true
  components:
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/misc.rsi
  - type: SolutionContainerManager
@@ -27,7 +26,7 @@
  id: FoodBakedMuffin
  description: A delicious and spongy little cake.
  components:
-  - type: Food
+  - type: Edible
    trash:
    - FoodPlateMuffinTin
  - type: Sprite
@@ -625,7 +624,7 @@
    - cotton
  - type: Sprite
    state: chevrechaud-cotton
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
@@ -643,11 +642,14 @@
          Quantity: 0.5

 - type: entity
-  name: brownies
  parent: FoodBakedBase
  id: FoodBakedBrownieBatch
+  name: brownies
  description: A pan of brownies.
  components:
+  - type: Item
+    size: Normal
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - sweet
@@ -696,11 +698,14 @@
    - Slice

 - type: entity
-  name: special brownies
  parent: FoodBakedBase
  id: FoodBakedCannabisBrownieBatch
+  name: special brownies
  description: A pan of "special" brownies.
  components:
+  - type: Item
+    size: Normal
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - sweet
@@ -725,9 +730,9 @@
    slice: FoodBakedCannabisBrownie

 - type: entity
-  name: special brownie
  parent: FoodBakedBase
  id: FoodBakedCannabisBrownie
+  name: special brownie
  description: A "special" brownie.
  components:
  - type: FlavorProfile
@@ -778,11 +783,17 @@
            Quantity: 1

 - type: entity
-  name: croissant
  parent: FoodBakedBase
  id: FoodBakedCroissant
+  name: croissant
  description: Buttery, flaky goodness.
  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+    storedOffset: -2,-4
  - type: FlavorProfile
    flavors:
      - bread
@@ -806,11 +817,16 @@
        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones

 - type: entity
-  name: cotton croissant
  parent: FoodBakedCroissant
  id: FoodBakedCroissantCotton
+  name: cotton croissant
  description: Buttery, flaky, fibery goodness.
  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
  - type: FlavorProfile
    flavors:
    - bread
@@ -818,7 +834,7 @@
    - cotton
  - type: Sprite
    state: croissant-cotton
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
@@ -838,11 +854,15 @@
          Quantity: 1

 - type: entity
-  name: grilled cheese sandwich
  parent: FoodBakedBase
  id: FoodBakedGrilledCheeseSandwich
+  name: grilled cheese sandwich
  description: Bread and cheese toasted with butter, perfect for a chilly day in space.
  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
  - type: FlavorProfile
    flavors:
      - cheesy
@@ -863,7 +883,7 @@
          Quantity: 3

 - type: entity
-  parent: FoodBakedBase
+  parent: FoodBakedGrilledCheeseSandwich
  id: FoodBakedGrilledCheeseSandwichCotton
  name: cotton grilled cheese sandwich
  description: Cotton bread slightly burnt in butter, with melted cheese. Moths find it difficult to resist this combination.
@@ -876,7 +896,7 @@
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/misc.rsi
    state: grilled-cheese-cotton
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -2,12 +2,13 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodPieBase
-  abstract: true
  components:
  - type: Item
-    storedRotation: -90
+    shape:
+    - 0,0,1,0
  - type: FlavorProfile
    flavors:
      - sweet
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -2,15 +2,14 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodPizzaBase
-  abstract: true
  components:
  - type: FlavorProfile
    flavors:
      - oily
      - bread
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/pizza.rsi
  - type: SolutionContainerManager
@@ -28,6 +27,7 @@
    size: Normal
    shape:
    - 0,0,2,1
+    storedOffset: 0,-5
  - type: Tag
    tags:
    - Pizza
@@ -42,7 +42,6 @@
    flavors:
      - oily
      - bread
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/pizza.rsi
  - type: SolutionContainerManager
@@ -654,7 +653,7 @@
  - type: Sprite
    layers:
    - state: cotton-pizza
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: SliceableFood
    slice: FoodPizzaCottonSlice
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -1,13 +1,15 @@
 # Bowls

 - type: entity
-  name: bowl
  parent: ReagentContainerBase
  id: FoodBowlBig
+  name: bowl
  description: A simple bowl, used for soups and salads.
  components:
  - type: Item
-    storedRotation: -90
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
  - type: SolutionContainerManager
    solutions:
      food:
@@ -21,10 +23,10 @@
      visible: false
  - type: MixableSolution
    solution: food
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: food
-    useSound:
-      path: /Audio/Items/drink.ogg
+    destroyOnEmpty: false
  - type: DamageOnLand
    damage:
      types:
@@ -65,11 +67,15 @@
    - Trash

 - type: entity
-  name: broken bowl
  parent: BaseItem
  id: FoodBowlBigTrash
+  name: broken bowl
  description: A simple bowl, broken and useless.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/bowl.rsi
    state: bowl-trash
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -46,7 +46,9 @@
      - Donut
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donut.rsi
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,2,1
    heldPrefix: box
  - type: StorageFill
    contents:
@@ -128,7 +130,10 @@
      - Egg
  - type: Item
    sprite: Objects/Consumable/Food/egg.rsi
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,2,1
+    storedOffset: 0,-6
  - type: StorageFill
    contents:
    - id: FoodEgg
@@ -223,6 +228,7 @@
    heldPrefix: box
    shape:
    - 0,0,2,1
+    storedOffset: 0,-6
  - type: Appearance
  - type: EntityStorageVisuals
    stateDoorOpen: box-open
@@ -367,7 +373,10 @@
      - DonkPocket
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,2,1
+    storedOffset: -1,1
  - type: StorageFill
    contents:
    - id: FoodDonkpocket
@@ -714,8 +723,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: FoodBurgerCrazy
-        orGroup: Burgers
      - id: FoodBurgerCheese
        orGroup: Burgers
      - id: DrinkColaCan
@@ -880,6 +887,8 @@
      - ClothMade
  - type: Item
    size: Normal
+    shape:
+    - 0,0,1,1
  - type: StorageFill
    contents:
    - id: MaterialCloth10
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -132,9 +132,9 @@
 # Plastic Plate

 - type: entity
-  name: plastic plate
  parent: BaseItem
  id: FoodPlatePlastic
+  name: large plastic plate
  description: A large blue plastic plate, excellent for a birthday cake.
  components:
  - type: Sprite
@@ -154,9 +154,9 @@
    - Trash

 - type: entity
-  name: plastic plate
  parent: BaseItem
  id: FoodPlateSmallPlastic
+  name: small plastic plate
  description: A blue plastic plate, excellent for slices of birthday cake.
  components:
  - type: Sprite
@@ -202,19 +202,19 @@
 # Muffin Tin

 - type: entity
-  name: muffin tin
  parent: BaseItem
  id: FoodPlateMuffinTin
+  name: muffin tin
  description: A cheap foil tin for muffins.
  components:
  - type: Sprite
    sprite: Objects/Consumable/Food/plates.rsi
    state: muffin-tin
  - type: Item
-    size: Small
+    size: Tiny
    shape:
-    - 0,0,1,0
-    storedOffset: 0,-3
+    - 0,0,0,0
+    storedOffset: 0,-2
  - type: Tag
    tags:
    - Trash
--- 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: Tiny
+    size: Small
  - type: DamageOnLand
    damage:
      types:
@@ -63,7 +63,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: packet
-    size: Tiny
+    size: Small
  - type: PhysicalComposition
    materialComposition:
      Steel: 100
@@ -81,14 +81,16 @@
  name: tinned peaches
  description: Just a nice can of ripe peaches swimming in their own juices.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/peaches.rsi
  - type: FlavorProfile
    flavors:
    - sweet
    - funny
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodTinPeachesTrash
  - type: Tag
    tags:
@@ -99,6 +101,8 @@
  id: FoodTinPeachesTrash
  name: tinned peaches
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/peaches.rsi

@@ -110,8 +114,8 @@
  components:
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodTinPeachesMaintTrash

 # only exists for backwards compatibility with a few maps, nothing else uses it
@@ -132,6 +136,8 @@
  id: FoodTinPeachesMaintTrash
  name: maintenance peaches
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi

@@ -141,6 +147,8 @@
  name: tin of beans
  description: Musical fruit in a slightly less musical container.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/beans.rsi
  - type: FlavorProfile
@@ -148,8 +156,8 @@
    - savory
    - salty
    - cheap
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodTinBeansTrash

 - type: entity
@@ -157,6 +165,8 @@
  id: FoodTinBeansTrash
  name: tin of beans
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/beans.rsi

@@ -168,6 +178,10 @@
  name: tinned meat
  description: A standard issue tin of meat with a convenient pull tab.
  components:
+  - type: Item
+    size: Tiny
+    shape:
+    - 0,0,0,0
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/meat.rsi
  # the convenient pull tab
@@ -178,8 +192,8 @@
    - meaty
    - salty
    - cheap
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodTinMRETrash
  - type: Tag
    tags:
@@ -190,5 +204,9 @@
  id: FoodTinMRETrash
  name: tinned meat
  components:
+  - type: Item
+    size: Tiny
+    shape:
+    - 0,0,0,0
  - type: Sprite
    sprite: Objects/Consumable/Food/Tins/meat.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
@@ -3,14 +3,13 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodBreakfastBase
-  abstract: true
  description: A full breakfast, rise and shine!
  components:
  - type: Item
-    storedRotation: -90
-  - type: Food
+    size: Normal
  - type: Sprite
    sprite: Objects/Consumable/Food/breakfast.rsi
  - type: SolutionContainerManager
@@ -26,9 +25,9 @@
 # Breakfasts

 - type: entity
-  name: full american breakfast
  parent: FoodBreakfastBase
  id: FoodBreakfastAmerican
+  name: full american breakfast
  description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Oh, what fresh hell is this?
  components:
  - type: FlavorProfile
@@ -38,9 +37,9 @@
    state: fullamerican

 - type: entity
-  name: full english breakfast
  parent: FoodBreakfastBase
  id: FoodBreakfastEnglish
+  name: full english breakfast
  description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Don't mention the war!
  components:
  - type: FlavorProfile
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -2,12 +2,11 @@
 # Bun

 - type: entity
-  name: bun
  parent: FoodBreadSliceBase
  id: FoodBreadBun
+  name: bun
  description: A hamburger bun. Round and convenient to hold.
  components:
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/burger.rsi
    layers:
@@ -28,14 +27,13 @@
        amount: 1

 - type: entity
-  id: FoodBreadBunBottom
  parent: FoodBreadSliceBase
+  id: FoodBreadBunBottom
  name: bottom bun
  description: It's time to start building the burger tower.
  components:
  - type: Item
    size: Normal #patch until there is an adequate resizing system in place
-  - type: Food
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@@ -63,12 +61,11 @@
          Quantity: 3.3 # 1/2 of a bun

 - type: entity
-  id: FoodBreadBunTop
  parent: FoodBreadSliceBase
+  id: FoodBreadBunTop
  name: top bun
  description: The perfect finish for your burger tower.
  components:
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/burger_sequence.rsi
    layers:
@@ -87,9 +84,9 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodBurgerBase
-  abstract: true
  components:
  - type: FlavorProfile
    flavors:
@@ -108,6 +105,8 @@
          Quantity: 3
  - type: Item
    sprite: Objects/Consumable/Food/burger.rsi
+    shape:
+    - 0,0,1,0

 # Custom Burger Example

@@ -264,11 +263,13 @@
      - state: burger-inhand-right

 - type: entity
-  name: bearger
  parent: FoodBurgerBase
  id: FoodBurgerBear
+  name: bearger
  description: Best served rawr.
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -297,11 +298,16 @@
      - state: bear-inhand-right

 - type: entity
-  name: big bite burger
  parent: FoodBurgerBase
  id: FoodBurgerBig
+  name: big bite burger
  description: Forget the Big Mac. THIS is the future!
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,3
  - type: FlavorProfile
    flavors: # What bun?
      - meaty
@@ -332,11 +338,13 @@
 # Tastes like bun, silver, magic.

 - type: entity
-  name: brain burger
  parent: FoodBurgerBase
  id: FoodBurgerBrain
+  name: brain burger
  description: A strange looking burger. It looks almost sentient.
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -366,11 +374,13 @@
 # Tastes like bun, brains.

 - type: entity
-  name: cat burger
  parent: FoodBurgerBase
  id: FoodBurgerCat
+  name: cat burger
  description: Finally those cats and catpeople are worth something!
  components:
+  - type: Item
+    storedOffset: -1,1
  - type: Sprite
    state: cat
  - type: FlavorProfile
@@ -489,11 +499,13 @@
 # Tastes like bun, chicken.

 - type: entity
-  name: clown burger
  parent: FoodBurgerBase
  id: FoodBurgerClown
+  name: clown burger
  description: This tastes funny...
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -594,11 +606,16 @@
        color: "#7e1a07"

 - type: entity
-  name: crazy hamburger # Burger for you euro-cucks
  parent: FoodBurgerBase
  id: FoodBurgerCrazy
+  name: crazy hamburger # Burger for you euro-cucks
  description: This looks like the sort of food that a demented clown in a trenchcoat would make.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: -2,0
  - type: FlavorProfile
    flavors:
      - bun
@@ -633,11 +650,13 @@
      - state: crazy-inhand-right

 - type: entity
-  name: duck sandwich # Burger for you sick bastards
  parent: FoodBurgerBase
  id: FoodBurgerDuck
+  name: duck sandwich # Burger for you sick bastards
  description: A duck sandwich, only the criminally insane would dare to eat the meat of such an adorable creature.
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -673,11 +692,13 @@
 # Tastes like bun, duck.

 - type: entity
-  name: empowered burger
  parent: FoodBurgerBase
  id: FoodBurgerEmpowered
+  name: empowered burger
  description: It's shockingly good, if you live off of electricity that is.
  components:
+  - type: Item
+    storedOffset: -2,1
  - type: Sprite
    state: empowered
  - type: FlavorProfile
@@ -702,11 +723,13 @@
 # Tastes like bun, pure electricity.

 - type: entity
-  name: fillet-o-carp burger
  parent: FoodBurgerBase
  id: FoodBurgerCarp
+  name: fillet-o-carp burger
  description: Almost like a carp is yelling somewhere...
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -733,11 +756,16 @@
 # Tastes like bun, fish.

 - type: entity
-  name: five alarm burger
  parent: FoodBurgerBase
  id: FoodBurgerFive
+  name: five alarm burger
  description: HOT! HOT! HOT!
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - meaty
@@ -772,11 +800,16 @@
 # Tastes like bun, HEAT.

 - type: entity
-  name: ghost burger
  parent: FoodBurgerBase
  id: FoodBurgerGhost
+  name: ghost burger
  description: Too spooky!
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,3
  - type: FlavorProfile
    flavors:
      - bun
@@ -848,11 +881,13 @@
      - state: plain-inhand-right

 - type: entity
-  name: McGuffin
  parent: FoodBurgerBase
  id: FoodBurgerMcguffin
+  name: McGuffin
  description: A cheap and greasy imitation of an eggs Benedict.
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - muffin
@@ -889,12 +924,12 @@
        color: "#e3756d"

 - type: entity
-  name: BBQ Rib Sandwich
  parent: FoodBurgerBase
  id: FoodBurgerMcrib
+  name: BBQ Rib Sandwich
  description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it.
  components:
-  - type: Food
+  - type: Edible
    trash:
    - FoodKebabSkewer
  - type: FlavorProfile
@@ -1082,11 +1117,13 @@
 # Tastes like bun, lettuce, sludge.

 - type: entity
-  name: soylent burger
  parent: FoodBurgerBase
  id: FoodBurgerSoy
+  name: soylent burger
  description: After eating this you have the overwhelming urge to purchase overpriced figurines of superheroes.
  components:
+  - type: Item
+    storedOffset: 0,1
  - type: FlavorProfile
    flavors:
      - bun
@@ -1119,11 +1156,16 @@
 # Tastes like bun, redditors.

 - type: entity
-  name: spell burger
  parent: FoodBurgerBase
  id: FoodBurgerSpell
+  name: spell burger
  description: This is absolutely Ei Nath.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: -1,2
  - type: FlavorProfile
    flavors:
      - bun
@@ -1150,11 +1192,16 @@
 # Tastes like bun, silver.

 - type: entity
-  name: super bite burger
  parent: FoodBurgerBase
  id: FoodBurgerSuper
+  name: super bite burger
  description: This is a mountain of a burger. FOOD!
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,4
  - type: FlavorProfile
    flavors: # What bun?
      - meaty
@@ -1270,11 +1317,14 @@
 # I'd rather wait for a custom burger component.

 - type: entity
-  name: mothroachburger
  parent: FoodBurgerBase
  id: FoodBurgerMothRoach
+  name: mothroachburger
  description: The last lamp it saw was the one inside the microwave.
  components:
+  - type: Item
+    shape:
+    - 0,0,0,1
  - type: FlavorProfile
    flavors:
      - bun
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -6,7 +6,6 @@
  id: FoodFrozenBase
  abstract: true
  components:
-  - type: Food
  - type: Sprite
    sprite: Objects/Consumable/Food/frozen.rsi
  - type: SolutionContainerManager
@@ -20,20 +19,26 @@
 # Ice-cream

 - type: entity
-  name: ice-cream sandwich
  parent: FoodFrozenBase
  id: FoodFrozenSandwich
+  name: ice-cream sandwich
  description: Portable ice-cream in its own packaging.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
  - type: Sprite
    state: sandwich

 - type: entity
-  name: strawberry ice-cream sandwich
  parent: FoodFrozenBase
  id: FoodFrozenSandwichStrawberry
+  name: strawberry ice-cream sandwich
  description: Portable ice-cream in its own packaging of the strawberry variety.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
  - type: Sprite
    state: sandwich-strawberry

@@ -56,11 +61,13 @@
    state: spacefreezy

 - type: entity
-  name: cornuto
  parent: FoodFrozenBase
  id: FoodFrozenCornuto
+  name: strawberry ice-cream sandwich
  description: A Neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts.
  components:
+  - type: Item
+    storedRotation: -45
  - type: Sprite
    state: cornuto
  - type: SolutionContainerManager
@@ -87,8 +94,8 @@
    - state: popsicle-base
    - state: popsicle
      color: orange
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenPopsicleTrash
  - type: Tag
    tags:
@@ -107,8 +114,8 @@
    - state: popsicle-base
    - state: popsicle
      color: red
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenPopsicleTrash
  - type: Tag
    tags:
@@ -125,8 +132,8 @@
    layers:
    - state: stick
    - state: jumbo
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenPopsicleTrash
  - type: SolutionContainerManager
    solutions:
@@ -156,8 +163,8 @@
        - state: cone
        - state: alpha-filling
    #      color: foo
-    - type: Food
-      trash: 
+    - type: Edible
+      trash:
      - FoodFrozenSnowconeTrash
    - type: SolutionContainerManager
      solutions:
@@ -195,8 +202,8 @@
    layers:
    - state: cone
    - state: berry
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenSnowconeTrash
  - type: Tag
    tags:
@@ -212,8 +219,8 @@
    layers:
    - state: cone
    - state: fruitsalad
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenSnowconeTrash
  - type: Tag
    tags:
@@ -229,8 +236,8 @@
    layers:
    - state: cone
    - state: clown
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenSnowconeTrash

 - type: entity
@@ -243,8 +250,8 @@
    layers:
    - state: cone
    - state: mime
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenSnowconeTrash

 - type: entity
@@ -257,18 +264,20 @@
    layers:
    - state: cone
    - state: rainbow
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodFrozenSnowconeTrash

 # Trash

 - type: entity
-  name: paper cone
  parent: BaseItem
  id: FoodFrozenSnowconeTrash
+  name: paper cone
  description: A crumpled paper cone used for an icy treat. Worthless.
  components:
+  - type: Item
+    size: Tiny
  - type: Sprite
    sprite: Objects/Consumable/Food/frozen.rsi
    state: cone-trash
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -281,11 +281,13 @@
      - Ingredient

 - type: entity
-  name: dough
  parent: FoodBakingBase
  id: FoodDough
+  name: dough
  description: A piece of dough.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - dough
@@ -299,11 +301,13 @@
    node: start

 - type: entity
-  name: dough slice
  parent: FoodBakingBase
  id: FoodDoughSlice
+  name: dough slice
  description: A slice of dough. Can be cooked into a bun.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - dough
@@ -324,11 +328,13 @@
          Quantity: 5

 - type: entity
-  name: dough rope
  parent: FoodBakingBase
  id: FoodDoughRope
+  name: dough rope
  description: A thin noodle of dough. Can be cooked into a bagel.
  components:
+  - type: Item
+    storedRotation: -45
  - type: FlavorProfile
    flavors:
      - dough
@@ -346,11 +352,13 @@
          Quantity: 5

 - type: entity
-  name: cornmeal dough
  parent: FoodBakingBase
  id: FoodDoughCornmeal
+  name: cornmeal dough
  description: A piece of cornmeal dough.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - chalky
@@ -362,11 +370,13 @@
    slice: FoodDoughCornmealSlice

 - type: entity
-  name: cornmeal dough slice
  parent: FoodBakingBase
  id: FoodDoughCornmealSlice
+  name: cornmeal dough slice
  description: A slice of cornmeal dough.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - chalky
@@ -378,11 +388,13 @@
    - Slice

 - type: entity
-  name: tortilla dough
  parent: FoodBakingBase
  id: FoodDoughTortilla
+  name: tortilla dough
  description: A piece of tortilla dough.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - chalky
@@ -394,11 +406,13 @@
    slice: FoodDoughTortillaSlice

 - type: entity
-  name: tortilla dough slice
  parent: FoodBakingBase
  id: FoodDoughTortillaSlice
+  name: tortilla dough slice
  description: A slice of tortilla dough.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - chalky
@@ -413,11 +427,13 @@
    - Slice

 - type: entity
-  name: flattened tortilla dough
  parent: FoodBakingBase
  id: FoodDoughTortillaFlat
+  name: flattened tortilla dough
  description: A flattened slice of tortilla dough, cook this to get a taco shell.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - chalky
@@ -429,11 +445,13 @@
    node: flat

 - type: entity
-  name: cotton dough
  parent: FoodBakingBase
  id: FoodDoughCotton
+  name: cotton dough
  description: A piece of fabric dough.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
    - dough
@@ -461,11 +479,13 @@
          Quantity: 10

 - type: entity
-  name: cotton dough slice
  parent: FoodBakingBase
  id: FoodDoughCottonSlice
+  name: cotton dough slice
  description: A slice of cotton dough.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
    - dough
@@ -490,11 +510,13 @@
          Quantity: 3.5

 - type: entity
-  name: cotton dough rope
  parent: FoodBakingBase
  id: FoodDoughCottonRope
+  name: cotton dough rope
  description: A thin noodle of cotton dough. Can be cooked into a cotton bagel.
  components:
+  - type: Item
+    storedRotation: -45
  - type: FlavorProfile
    flavors:
    - dough
@@ -537,20 +559,26 @@
    state: dough-pastry-baked

 - type: entity
-  name: pie dough
  parent: FoodBakingBase
  id: FoodDoughPie
+  name: pie dough
  description: Cook it to get a pie.
  components:
+  - type: Item
+    size: Normal
  - type: Sprite
    state: dough-pie

 - type: entity
-  name: flat dough
  parent: FoodBakingBase
  id: FoodDoughFlat
+  name: flat dough
  description: A flattened dough.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
  - type: Sprite
    state: dough-flat
  - type: Construction
@@ -561,11 +589,15 @@
    slice: FoodCroissantRaw

 - type: entity
-  name: flat cotton dough
  parent: FoodBakingBase
  id: FoodDoughCottonFlat
+  name: flat cotton dough
  description: A flattened cotton dough.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
  - type: Sprite
    state: cotton-dough-flat
  - type: Construction
@@ -576,20 +608,26 @@
    slice: FoodCroissantRawCotton

 - type: entity
-  name: pizza bread
  parent: FoodBakingBase
  id: FoodDoughPizzaBaked
+  name: pizza bread
  description: Add ingredients to make a pizza.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
  - type: Sprite
    state: pizzabread

 - type: entity
-  name: cake batter
  parent: FoodBakingBase
  id: FoodCakeBatter
+  name: cake batter
  description: Cook it to get a cake.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - sweetdough
@@ -597,11 +635,14 @@
    state: cakebatter

 - type: entity
-  name: stick of butter
  parent: FoodBakingBase
  id: FoodButter
+  name: stick of butter
  description: A stick of delicious, golden, fatty goodness.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
  - type: Sprite
    state: butter
  - type: Slippery
@@ -639,11 +680,13 @@
    slice: FoodButterSlice

 - type: entity
-  name: butter slice
  parent: FoodBakingBase
  id: FoodButterSlice
+  name: butter slice
  description: A pat of delicious, golden, fatty goodness.
  components:
+  - type: Item
+    size: Tiny
  - type: Sprite
    state: butter-slice
  - type: SolutionContainerManager
@@ -696,9 +739,9 @@
    slice: FoodCheeseSlice

 - type: entity
-  name: cheese wedge
  parent: FoodBakingBase
  id: FoodCheeseSlice
+  name: cheese wedge
  description: A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far.
  components:
  - type: FlavorProfile
@@ -721,6 +764,8 @@
      Taco: CheeseTaco
      Burger: CheeseBurger
  - type: Item
+    size: Tiny
+    storedOffset: 0,-3
    inhandVisuals:
      left:
      - state: cheesewedge-inhand-left
@@ -728,11 +773,15 @@
      - state: cheesewedge-inhand-right

 - type: entity
-  name: chèvre log
  parent: FoodBakingBase
  id: FoodChevre
+  name: chèvre log
  description: A soft log of creamy Chèvre.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-2
  - type: FlavorProfile
    flavors:
      - nutty
@@ -753,11 +802,13 @@
          Quantity: 0.6

 - type: entity
-  name: chèvre disk
  parent: FoodBakingBase
  id: FoodChevreSlice
+  name: chèvre disk
  description: A small disk of creamy Chèvre. An ideal adornment for French side dishes.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - nutty
@@ -778,11 +829,13 @@
    - Slice

 - type: entity
-  name: tofu
  parent: FoodBakingBase
  id: FoodTofu
+  name: tofu
  description: Solid white block with a subtle flavor.
  components:
+  - type: Item
+    size: Normal
  - type: FlavorProfile
    flavors:
      - tofu
@@ -802,11 +855,13 @@
    slice: FoodTofuSlice

 - type: entity
-  name: tofu slice
  parent: FoodBakingBase
  id: FoodTofuSlice
+  name: tofu slice
  description: A slice of tofu. Ingredient of various vegetarian dishes.
  components:
+  - type: Item
+    size: Tiny
  - type: FlavorProfile
    flavors:
      - tofu
@@ -882,11 +937,16 @@
      - Ingredient

 - type: entity
-  name: raw croissant
  parent: FoodBakingBase
  id: FoodCroissantRaw
+  name: raw croissant
  description: Buttery, flaky goodness waiting to happen.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+    storedOffset: -2,-4
  - type: FlavorProfile
    flavors:
      - dough
@@ -901,11 +961,16 @@
          Quantity: 3

 - type: entity
-  name: raw cotton croissant
  parent: FoodCroissantRaw
  id: FoodCroissantRawCotton
+  name: raw cotton croissant
  description: Buttery, flaky, fibery goodness waiting to happen.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+    storedOffset: -2,-4
  - type: FlavorProfile
    flavors:
    - dough
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -5,14 +5,14 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodMealBase
-  abstract: true
  description: A delicious meal, cooked with love.
  components:
  - type: Item
-    storedRotation: -90
-  - type: Food
+    shape:
+    - 0,0,1,0
  - type: Sprite
    sprite: Objects/Consumable/Food/meals.rsi
  - type: SolutionContainerManager
@@ -26,11 +26,13 @@
 # Meals

 - type: entity
-  name: loaded baked potato
  parent: FoodMealBase
  id: FoodMealPotatoLoaded
+  name: loaded baked potato
  description: Totally baked.
  components:
+  - type: Item
+    storedOffset: 0,-2
  - type: FlavorProfile
    flavors:
      - cheesy
@@ -40,11 +42,13 @@
 # Tastes like potato.

 - type: entity
-  name: space fries
  parent: FoodMealBase
  id: FoodMealFries
+  name: space fries
  description: AKA, French Fries, Freedom Fries, etc.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - potatoes
@@ -54,11 +58,13 @@
 # Tastes like fries, salt.

 - type: entity
-  name: cheesy fries
  parent: FoodMealBase
  id: FoodMealFriesCheesy
+  name: cheesy fries
  description: Fries. Covered in cheese. Duh.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - potatoes
@@ -69,11 +75,13 @@
 # Tastes like fries, cheese.

 - type: entity
-  name: carrot fries
  parent: FoodMealBase
  id: FoodMealFriesCarrot
+  name: carrot fries
  description: Tasty fries from fresh carrots.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - carrots
@@ -93,12 +101,14 @@
 # Tastes like carrots, salt.

 - type: entity
-  name: nachos
  parent: FoodMealBase
  id: FoodMealNachos
+  name: nachos
  description: Chips from Space Mexico.
  components:
-  - type: Food
+  - type: Item
+    storedOffset: 0,-2
+  - type: Edible
    trash:
    - FoodPlateSmall
  - type: FlavorProfile
@@ -118,12 +128,14 @@
 # Tastes like nachos.

 - type: entity
-  name: cheesy nachos
  parent: FoodMealBase
  id: FoodMealNachosCheesy
+  name: cheesy nachos
  description: The delicious combination of nachos and melting cheese.
  components:
-  - type: Food
+  - type: Item
+    storedOffset: 0,-2
+  - type: Edible
    trash:
    - FoodPlateSmall
  - type: FlavorProfile
@@ -144,12 +156,14 @@
 # Tastes like nachos, cheese.

 - type: entity
-  name: Cuban nachos
  parent: FoodMealBase
  id: FoodMealNachosCuban
+  name: Cuban nachos
  description: That's some dangerously spicy nachos.
  components:
-  - type: Food
+  - type: Item
+    storedOffset: 0,-2
+  - type: Edible
    trash:
    - FoodPlateSmall
  - type: FlavorProfile
@@ -173,11 +187,13 @@
 # Tastes like nachos, hot pepper.

 - type: entity
-  name: mint
  parent: FoodMealBase
  id: FoodMealMint
+  name: mint
  description: It's wafer thin.
  components:
+  - type: Item
+    storedOffset: 0,-1
  - type: FlavorProfile
    flavors:
      - minty
@@ -194,11 +210,13 @@
 # Tastes like parsnips, salt.

 - type: entity
-  name: eggplant parmigiana
  parent: FoodMealBase
  id: FoodMealEggplantParm
+  name: eggplant parmigiana
  description: The only good recipe for eggplant.
  components:
+  - type: Item
+    storedOffset: 0,-2
  - type: FlavorProfile
    flavors:
      - eggplant
@@ -220,11 +238,13 @@
 # Tastes like eggplant, cheese.

 - type: entity
-  name: yaki imo
  parent: FoodMealBase
  id: FoodMealPotatoYaki
+  name: yaki imo
  description: Made with roasted sweet potatoes!
  components:
+  - type: Item
+    storedOffset: 0,-2
  - type: FlavorProfile
    flavors:
      - sweet
@@ -234,11 +254,13 @@
 # Tastes like sweet potato.

 - type: entity
-  name: Cuban carp
  parent: FoodMealBase
  id: FoodMealCubancarp
+  name: Cuban carp
  description: A grifftastic sandwich that burns your tongue and then leaves it numb!
  components:
+  - type: Item
+    storedOffset: 3,-7
  - type: FlavorProfile
    flavors:
      - fishy
@@ -266,11 +288,13 @@
 # Tastes like fish, batter, hot peppers.

 - type: entity
-  name: corned beef and cabbage
  parent: FoodMealBase
  id: FoodMealCornedbeef
+  name: corned beef and cabbage
  description: Now you can feel like a real tourist vacationing in Ireland.
  components:
+  - type: Item
+    storedOffset: 0,-1
  - type: FlavorProfile
    flavors:
      - meaty
@@ -292,11 +316,16 @@
 # Tastes like meat, cabbage.

 - type: entity
-  name: filet migrawr
  parent: FoodMealBase
  id: FoodMealBearsteak
+  name: filet migrawr
  description: Because eating bear wasn't manly enough.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: -1,4
  - type: FlavorProfile
    flavors:
      - meaty
@@ -318,11 +347,15 @@
 # Tastes like meat, salmon.

 - type: entity
-  name: pig in a blanket
  parent: FoodMealBase
  id: FoodMealPigblanket
+  name: pig in a blanket
  description: A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it.
  components:
+  - type: Item
+    size: Tiny
+    shape:
+    - 0,0,0,0
  - type: FlavorProfile
    flavors:
      - meaty
@@ -344,12 +377,14 @@
 # Tastes like meat, butter.

 - type: entity
-  name: bbq ribs
  parent: FoodMealBase
  id: FoodMealRibs
+  name: bbq ribs
  description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist.
  components:
-  - type: Food
+  - type: Item
+    storedOffset: 0,-4
+  - type: Edible
    trash:
    - FoodKebabSkewer
  - type: FlavorProfile
@@ -375,9 +410,9 @@
 # Tastes like meat, smokey sauce.

 - type: entity
-  name: eggs benedict
  parent: FoodMealBase
  id: FoodMealEggsbenedict
+  name: eggs benedict
  description: There is only one egg on this, how rude.
  components:
  - type: FlavorProfile
@@ -402,11 +437,13 @@
 # Tastes like eggs, bacon, bun.

 - type: entity
-  name: cheese omelette
  parent: FoodMealBase
  id: FoodMealOmelette
+  name: cheese omelette
  description: Cheesy.
  components:
+  - type: Item
+    storedOffset: 0,-1
  - type: FlavorProfile
    flavors:
      - egg
@@ -426,11 +463,13 @@
 # Tastes like egg, cheese.

 - type: entity
-  name: fried egg
  parent: FoodMealBase
  id: FoodMealFriedegg
+  name: fried egg
  description: A fried egg, with a touch of salt and pepper.
  components:
+  - type: Item
+    storedOffset: 0,-1
  - type: FlavorProfile
    flavors:
      - egg
@@ -455,11 +494,15 @@
 # Tastes like egg, salt, pepper.

 - type: entity
-  name: milk ape
  parent: FoodMealBase
  id: FoodMealMilkape
+  name: milk ape
  description: The king of Jungle Thick.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
  - type: FlavorProfile
    flavors:
      - milk
@@ -469,11 +512,14 @@
 # Tastes like milk, chocolate, the jungle.

 - type: entity
-  name: memory leek
  parent: FoodMealBase
  id: FoodMealMemoryleek
+  name: memory leek
  description: This should refresh your memory.
  components:
+  - type: Item
+    shape:
+    - 0,0,0,1
  - type: FlavorProfile
    flavors:
      - memoryleek
@@ -491,11 +537,16 @@
 # Tastes like pain.

 - type: entity
-  name: salty sweet miso cola soup
  parent: FoodMealBase
  id: DisgustingSweptSoup
+  name: salty sweet miso cola soup
  description: Jesus christ.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,-2
  - type: Sprite
    state: saltysweet
  - type: SolutionContainerManager
@@ -512,11 +563,13 @@
 # Tastes awesome.

 - type: entity
-  name: queso
  parent: FoodMealBase
  id: FoodMealQueso
+  name: queso
  description: A classic dipping sauce that you can't go wrong with.
  components:
+    - type: Item
+      storedOffset: 0,-6
    - type: FlavorProfile
      flavors:
        - cheesy
@@ -550,11 +603,13 @@
 # tastes exotic

 - type: entity
-  name: enchiladas
  parent: FoodMealBase
  id: FoodMealEnchiladas
+  name: enchiladas
  description: Viva La Mexico!
  components:
+    - type: Item
+      storedOffset: -1,0
    - type: FlavorProfile
      flavors:
        - meaty
@@ -579,11 +634,13 @@
 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas.

 - type: entity
-  name: melon fruit bowl
  parent: FoodMealBase
  id: FoodSaladWatermelonFruitBowl
+  name: melon fruit bowl
  description: The only salad where you can eat the bowl.
  components:
+  - type: Item
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - fruity
@@ -610,12 +667,14 @@
    - Fruit

 - type: entity
-  name: corn in butter
  parent: FoodMealBase
  id: FoodMealCornInButter
+  name: corn in butter
  description: Buttery.
  components:
-  - type: Food
+  - type: Item
+    storedOffset: 0,-5
+  - type: Edible
    trash:
    - FoodPlate
  - type: FlavorProfile
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -2,13 +2,14 @@
 # Base

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodNoodlesBase
-  abstract: true
  description: Now that's a nice pasta!
  components:
  - type: Item
-    storedRotation: -90
+    shape:
+    - 0,0,1,0
  - type: Sprite
    sprite: Objects/Consumable/Food/noodles.rsi
  - type: SolutionContainerManager
@@ -22,11 +23,13 @@
 # Noodles

 - type: entity
-  name: boiled spaghetti
  parent: FoodNoodlesBase
  id: FoodNoodlesBoiled
+  name: boiled spaghetti
  description: A plain dish of noodles, this needs more ingredients.
  components:
+  - type: Item
+    storedOffset: 0,-4
  - type: FlavorProfile
    flavors:
      - pasta
@@ -35,11 +38,13 @@
 # Tastes like pasta.

 - type: entity
-  name: spaghetti
  parent: FoodNoodlesBase
  id: FoodNoodles
+  name: spaghetti
  description: Spaghetti and crushed tomatoes. Just like your abusive father used to make!
  components:
+  - type: Item
+    storedOffset: 0,-4
  - type: FlavorProfile
    flavors:
      - pasta
@@ -59,12 +64,16 @@
 # Tastes like pasta, tomato.

 - type: entity
-  name: copypasta
  parent: FoodNoodlesBase
  id: FoodNoodlesCopy
+  name: copypasta
  description: You probably shouldn't try this, you always hear people talking about how bad it is...
  components:
-  - type: Food
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+  - type: Edible
    trash:
    - FoodPlateSmall
    - FoodPlateSmall
@@ -83,11 +92,13 @@
 # Tastes like pasta, bad humor.

 - type: entity
-  name: spaghetti and meatballs
  parent: FoodNoodlesBase
  id: FoodNoodlesMeatball
+  name: spaghetti and meatballs
  description: Now that's a nice-a meatball!
  components:
+  - type: Item
+    storedOffset: 0,-4
  - type: FlavorProfile
    flavors:
      - pasta
@@ -109,11 +120,13 @@
 # Tastes like pasta, meat.

 - type: entity
-  name: spesslaw
  parent: FoodNoodlesBase
  id: FoodNoodlesSpesslaw
+  name: spesslaw
  description: A lawyer's favourite.
  components:
+  - type: Item
+    storedOffset: 0,-4
  - type: FlavorProfile
    flavors:
      - pasta
@@ -159,11 +172,13 @@
 # Tastes like pasta, tomato.

 - type: entity
-  name: butter noodles
  parent: FoodNoodlesBase
  id: FoodNoodlesButter
+  name: butter noodles
  description: Noodles covered in savory butter. Simple and slippery, but delicious.
  components:
+  - type: Item
+    storedOffset: 0,-4
  - type: FlavorProfile
    flavors:
      - pasta
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -2,21 +2,25 @@
 # Kebabs

 - type: entity
-  name: skewer
  parent: BaseItem
  id: FoodKebabSkewer
+  name: skewer
  description: A thin rod of metal used to skewer just about anything and cook it.
  components:
+  - type: Item
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-2
  - type: Sprite
    sprite: Objects/Consumable/Food/skewer.rsi
-    state: 
+    state:
    layers:
    - state: skewer
    - map: ["foodSequenceLayers"]
  - type: LandAtCursor
  - type: Fixtures
    fixtures:
-      fix1: 
+      fix1:
        shape: !type:PolygonShape
          vertices:
            - -0.40,-0.20
@@ -49,8 +53,8 @@
    tags:
    - Trash
    - Skewer
-  - type: Food
-    trash: 
+  - type: Edible
+    trash:
    - FoodKebabSkewer
  - type: SolutionContainerManager
    solutions:
@@ -61,8 +65,8 @@
    key: Skewer
    maxLayers: 4
    startPosition: -0.27, -0.19
-    inverseLayers: true 
+    inverseLayers: true
    offset: 0.2, 0.1
    nameGeneration: food-sequence-skewer-gen
    contentSeparator: ", "
-    allowHorizontalFlip: false
+    allowHorizontalFlip: false
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -6,7 +6,6 @@
  id: FoodSnackBase
  abstract: true
  components:
-  - type: Food
  - type: Tag
    tags:
      - FoodSnack
@@ -41,7 +40,7 @@
    state: boritos
  - type: Item
    heldPrefix: boritos
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketBoritosTrash

@@ -58,7 +57,7 @@
    state: cnds
  - type: Item
    heldPrefix: cnds
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketCnDsTrash

@@ -76,7 +75,7 @@
    state: cheesiehonkers
  - type: Item
    heldPrefix: cheesiehonkers
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketCheesieTrash

@@ -95,14 +94,14 @@
    state: chips
  - type: Item
    heldPrefix: chips
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketChipsTrash

 - type: entity
-  name: chocolate bar
  parent: BaseItem
  id: FoodSnackChocolate
+  name: chocolate bar
  description: Tastes like cardboard.
  components:
  - type: Sprite
@@ -111,6 +110,7 @@
  - type: Item
    heldPrefix: chocolatebar
    size: Tiny
+    storedOffset: 1,-1
  - type: Tag
    tags:
      - FoodSnack
@@ -122,9 +122,9 @@
      path: /Audio/Effects/unwrap.ogg

 - type: entity
-  name: chocolate bar
  parent: FoodSnackBase
  id: FoodSnackChocolateBar
+  name: chocolate bar
  description: Tastes like cardboard.
  components:
  - type: FlavorProfile
@@ -134,6 +134,7 @@
    state: chocolatebar-open
  - type: Item
    heldPrefix: chocolatebar-open
+    storedOffset: 1,-2
  - type: Tag
    tags:
      - FoodSnack
@@ -151,15 +152,16 @@
          Quantity: 1

 - type: entity
-  name: energy bar
  parent: FoodSnackBase
  id: FoodSnackEnergy
+  name: energy bar
  description: An energy bar with a lot of punch.
  components:
  - type: Sprite
    state: energybar
  - type: Item
    heldPrefix: energybar
+    storedOffset: 0,-1
  - type: SpawnItemsOnUse
    items:
      - id: FoodPacketEnergyTrash
@@ -168,9 +170,9 @@
      path: /Audio/Effects/unwrap.ogg

 - type: entity
-  name: energy bar
  parent: FoodSnackBase
  id: FoodSnackEnergyBar
+  name: energy bar
  description: An energy bar with a lot of punch.
  components:
  - type: FlavorProfile
@@ -183,11 +185,12 @@
    state: energybar-open
  - type: Item
    heldPrefix: energybar-open
+    storedOffset: 0,-2

 - type: entity
-  name: Sweetie's pistachios
  parent: FoodSnackBase
  id: FoodSnackPistachios
+  name: Sweetie's pistachios
  description: Sweeties's name-brand pistachios. Probably won't give you diseases. Probably.
  components:
  - type: FlavorProfile
@@ -198,7 +201,8 @@
    state: pistachio
  - type: Item
    heldPrefix: pistachio
-  - type: Food
+    storedOffset: 1,0
+  - type: Edible
    trash:
    - FoodPacketPistachioTrash
  - type: Tag
@@ -221,7 +225,7 @@
    state: popcorn
  - type: Item
    heldPrefix: popcorn
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketPopcornTrash

@@ -238,7 +242,7 @@
    state: raisins
  - type: Item
    heldPrefix: raisins
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketRaisinsTrash
  - type: Tag
@@ -246,9 +250,9 @@
    - Fruit

 - type: entity
-  name: bob's semki sunflower seeds
  parent: FoodSnackBase
  id: FoodSnackSemki
+  name: bob's semki sunflower seeds
  description: Proudly produced by the Bob Bobson nutritional corporation. Perfect for spitting at people.
  components:
  - type: FlavorProfile
@@ -258,7 +262,8 @@
    state: semki
  - type: Item
    heldPrefix: semki
-  - type: Food
+    storedOffset: 1,0
+  - type: Edible
    trash:
    - FoodPacketSemkiTrash

@@ -275,7 +280,7 @@
    state: susjerky
  - type: Item
    heldPrefix: susjerky
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketSusTrash
  - type: Tag
@@ -295,7 +300,7 @@
    state: syndicakes
  - type: Item
    heldPrefix: syndicakes
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketSyndiTrash

@@ -320,11 +325,12 @@
          Quantity: 5
  - type: Sprite
    state: ramen
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketCupRamenTrash
  - type: Item
    heldPrefix: ramen
+    storedOffset: 0,-1

 - type: entity
  parent: DrinkRamen
@@ -343,9 +349,9 @@
          Quantity: 5

 - type: entity
-  name: chow mein
  parent: FoodSnackBase
  id: FoodSnackChowMein
+  name: chow mein
  description: A salty fried noodle snack. Looks like they forgot the vegetables.
  components:
  - type: FlavorProfile
@@ -357,6 +363,7 @@
    state: chinese1
  - type: Item
    heldPrefix: chinese1
+    storedOffset: 1,-2
  - type: SolutionContainerManager
    solutions:
      food:
@@ -366,14 +373,14 @@
          Quantity: 10
        - ReagentId: Soysauce
          Quantity: 2
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketChowMeinTrash

 - type: entity
-  name: dan dan noodles
  parent: FoodSnackBase
  id: FoodSnackDanDanNoodles
+  name: dan dan noodles
  description: A spicy Sichuan noodle snack. The chili oil slick pools on top.
  components:
  - type: FlavorProfile
@@ -385,6 +392,7 @@
    state: chinese2
  - type: Item
    heldPrefix: chinese2
+    storedOffset: 0,-2
  - type: SolutionContainerManager
    solutions:
      food:
@@ -396,14 +404,14 @@
          Quantity: 2
        - ReagentId: Soysauce
          Quantity: 2
-  - type: Food
+  - type: Edible
    trash:
    - FoodPacketDanDanTrash

 - type: entity
-  name: fortune cookie
  parent: FoodSnackBase
  id: FoodSnackCookieFortune
+  name: fortune cookie
  description: A boring cardboard tasting snack with a fortune inside. Surprise! You're boring too.
  components:
  - type: FlavorProfile
@@ -421,19 +429,21 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    heldPrefix: cookie_fortune
+    storedOffset: 1,-1
    size: Tiny
-  - type: Food
+  - type: Edible
    trash:
    - FoodCookieFortune

 - type: entity
-  id: FoodSnackNutribrick
  parent: BaseItem
+  id: FoodSnackNutribrick
  name: nutribrick
  description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
  components:
  - type: Item
    size: Small
+    storedOffset: -1,0
    heldPrefix: nutribrick
  - type: Tag
    tags:
@@ -449,8 +459,8 @@
      path: /Audio/Effects/unwrap.ogg

 - type: entity
-  id: FoodSnackNutribrickOpen
  parent: FoodSnackBase
+  id: FoodSnackNutribrickOpen
  name: nutribrick
  description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
  components:
@@ -459,13 +469,13 @@
      - nutribrick
  - type: Item
    size: Small
+    storedOffset: -1,0
    heldPrefix: nutribrick-open
  - type: Tag
    tags:
      - ReptilianFood
  - type: Sprite
    state: nutribrick-open
-  - type: Food
  - type: SolutionContainerManager
    solutions:
      food:
@@ -475,8 +485,8 @@
          Quantity: 20

 - type: entity
-  id: FoodSnackMREBrownie
  parent: BaseItem
+  id: FoodSnackMREBrownie
  name: brownie
  description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit.
  components:
@@ -485,6 +495,8 @@
    state: mre-brownie
  - type: Item
    heldPrefix: mre-brownie
+    size: Tiny
+    storedOffset: -1,-1
  - type: Tag
    tags:
      - FoodSnack
@@ -496,8 +508,8 @@
      path: /Audio/Effects/unwrap.ogg

 - type: entity
-  id: FoodSnackMREBrownieOpen
  parent: FoodSnackBase
+  id: FoodSnackMREBrownieOpen
  name: brownie
  suffix: MRE
  description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit.
@@ -509,7 +521,7 @@
    state: mre-brownie-open
  - type: Item
    heldPrefix: mre-brownie-open
-  - type: Food
+    storedOffset: -1,-1
  - type: SolutionContainerManager
    solutions:
      food:
@@ -521,9 +533,9 @@
          Quantity: 3

 - type: entity
-  name: swirl lollipop
  parent: FoodSnackBase
  id: FoodSnackSwirlLollipop
+  name: swirl lollipop
  description: A swirly circle of pure concentrated sugar. Who's the biggest kid on the playground now?
  components:
  - type: Sprite
@@ -533,6 +545,8 @@
    sprite: Objects/Consumable/Food/candy.rsi
    heldPrefix: swirl_lollipop
    size: Small
+    storedRotation: -45
+    storedOffset: 0,-1
  - type: Tag
    tags:
    - FoodSnack
@@ -585,7 +599,7 @@
        reagents:
        - ReagentId: ToxinTrash
          Quantity: 5
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true

 - type: entity
@@ -845,7 +859,7 @@
  name: MRE wrapper
  description: A general purpose wrapper for a variety of military food goods.
  components:
-  - type: Food
+  - type: Edible
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -1,13 +1,15 @@
 # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodBowlBase
-  abstract: true
  components:
  - type: Item
-    storedRotation: -90
-  - type: Food
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
+  - type: Edible
    trash:
    - FoodBowlBig
    utensil: Spoon
@@ -315,7 +317,7 @@
        - ReagentId: Sugar
          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 17 
+          Quantity: 17
  - type: Tag
    tags:
    - Fruit
@@ -557,11 +559,14 @@
    - state: spacelibertyduff

 - type: entity
-  name: amanita jelly
  parent: FoodInjectableBase
  id: FoodJellyAmanita
+  name: amanita jelly
  description: It's evil, don't touch it!
  components:
+  - type: Item
+    size: Normal
+    storedOffset: 0,-3
  - type: FlavorProfile
    flavors:
      - mushroom
@@ -978,7 +983,7 @@
  - type: FlavorProfile
    flavors:
      - miso
-  - type: Food
+  - type: Edible
    trash:
    - FoodBowlFancy
  - type: Sprite
@@ -1183,11 +1188,16 @@
 # Tastes like crab.

 - type: entity
-  name: electron soup
  parent: FoodBowlBase
  id: FoodSoupElectron
+  name: electron soup
  description: A gastronomic curiosity of ethereal origin.
  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+    storedOffset: 0,2
  - type: FlavorProfile
    flavors:
      - mushrooms
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -1,14 +1,14 @@
 # When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml

 - type: entity
-  name: taco shell
  parent: FoodMealBase
  id: FoodTacoShell
+  name: taco shell
  description: A taco shell, easy to hold, but falls on its side when put down.
  components:
  - type: Item
-    storedRotation: -90
-  - type: Food
+    storedOffset: 0,-3
+  - type: Edible
    transferAmount: 3
  - type: Sprite
    sprite: Objects/Consumable/Food/taco_sequence.rsi
@@ -38,15 +38,15 @@
 # Old tacos

 - type: entity
+  abstract: true
  parent: FoodInjectableBase
  id: FoodTacoBase
-  abstract: true
  components:
  - type: FlavorProfile
    flavors:
      - meaty
      - cheesy
-  - type: Food
+  - type: Edible
    transferAmount: 3
  - type: Sprite
    sprite: Objects/Consumable/Food/taco.rsi
@@ -61,7 +61,9 @@
          Quantity: 4
  - type: Item
    sprite: Objects/Consumable/Food/taco.rsi
-    storedRotation: -90
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,1
  - type: Tag
    tags:
      - Meat
@@ -72,7 +74,6 @@
  id: FoodTacoBeef
  description: A very basic and run of the mill beef taco, now with cheese!
  components:
-  - type: Food
  - type: Sprite
    state: beeftaco

@@ -82,7 +83,6 @@
  id: FoodTacoChicken
  description: A very basic and run of the mill chicken taco, now with cheese!
  components:
-  - type: Food
  - type: Sprite
    state: chickentaco

@@ -96,7 +96,6 @@
    flavors:
      - onion
      - fishy
-  - type: Food
  - type: Sprite
    state: fishtaco
  - type: SolutionContainerManager
@@ -115,7 +114,6 @@
  id: FoodTacoRat
  description: Yeah, that looks about right...
  components:
-  - type: Food
  - type: Sprite
    state: rattaco
  - type: SolutionContainerManager
@@ -134,7 +132,6 @@
  id: FoodTacoBeefSupreme
  description: It's like a regular beef taco, but supreme!
  components:
-  - type: Food
  - type: Sprite
    state: beeftacosupreme
  - type: SolutionContainerManager
@@ -153,7 +150,6 @@
  id: FoodTacoChickenSupreme
  description: It's like a regular chicken taco, but supreme!
  components:
-  - type: Food
  - type: Sprite
    state: chickentacosupreme
  - type: SolutionContainerManager
@@ -167,16 +163,17 @@
          Quantity: 6

 - type: entity
-  name: draco
  parent: FoodTacoBase
  id: FoodTacoDragon
+  name: draco
  description: A dragon taco, which is technically also a fish taco.
  components:
+  - type: Item
+    storedOffset: 0,3
  - type: FlavorProfile
    flavors:
    - meaty
    - spicy
-  - type: Food
  - type: Sprite
    state: dragontaco
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -499,6 +499,7 @@
  - type: Item
    sprite: Objects/Tools/rolling_pin.rsi
    size: Small
+    storedRotation: -45
  - type: Clothing
    sprite: Objects/Tools/rolling_pin.rsi
    quickEquip: false
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -29,9 +29,9 @@
      path: /Audio/Items/Culinary/chop.ogg

 - type: entity
-  name: kitchen knife
  parent: BaseKnife
  id: KitchenKnife
+  name: kitchen knife
  description: A general purpose Chef's Knife made by Asters Merchant Guild. Guaranteed to stay sharp for years to come..
  components:
  - type: Tag
@@ -43,6 +43,8 @@
    state: icon
  - type: Item
    sprite: Objects/Weapons/Melee/kitchen_knife.rsi
+    storedOffset: -1,1
+    storedRotation: -45
  - type: GuideHelp
    guides:
    - Chef