From: 5tickman <5tick@comcast.net>
Date: Sun, 10 Aug 2025 15:31:19 +0000 (-0500)
Subject: Combat box now huge. Reorganize order of abstract, parent, id, and name. Replaced... 
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=03326477a8690c8bb500a2fc7f1472c199248dae;p=space-station-14.git

Combat box now huge. Reorganize order of abstract, parent, id, and name. Replaced "type: Food" with "type: Edible".
---

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 2f08b1eb75..98748799ff 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -79,6 +79,7 @@
     - 0,0,3,3
     maxItemSize: Normal
   - type: Item
+    size: Huge
     shape:
     - 0,0,3,3
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index f11ece66e5..67c442f191 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -2,9 +2,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodBreadBase
-  abstract: true
   components:
   - type: Item
     size: Normal
@@ -54,7 +54,7 @@
   id: FoodBreadVolcanic
   description: A dark loaf. Resembles pumice.
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: alpha
@@ -70,7 +70,7 @@
   id: FoodBreadVolcanicSlice
   description: A slice of dark loaf. Resembles pumice.
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: alpha-slice
@@ -90,7 +90,7 @@
     flavors:
       - banana
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: banana
@@ -112,7 +112,7 @@
     flavors:
       - banana
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: banana-slice
@@ -123,9 +123,9 @@
     - Slice
 
 - type: entity
-  name: cotton bread
   parent: FoodBreadBase
   id: FoodBreadCotton
+  name: cotton bread
   description: Bread, but for moff.
   components:
   - type: FlavorProfile
@@ -163,7 +163,7 @@
     flavors:
     - cotton
     - bread
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Sprite
     layers:
@@ -193,7 +193,7 @@
     flavors:
       - bread
       - corn
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: cornbread
@@ -218,7 +218,7 @@
     flavors:
       - bread
       - corn
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: cornbread-slice
@@ -241,7 +241,7 @@
       - cheesy
       - creamy
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: creamcheese
@@ -269,7 +269,7 @@
       - cheesy
       - creamy
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: creamcheese-slice
@@ -293,7 +293,7 @@
     flavors:
       - meaty
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: meat
@@ -324,7 +324,7 @@
     flavors:
       - meaty
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: meat-slice
@@ -353,7 +353,7 @@
     flavors:
       - nothing
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: mimana
@@ -384,7 +384,7 @@
     flavors:
       - nothing
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: mimana-slice
@@ -408,7 +408,7 @@
   id: FoodBreadPlain
   description: Some plain old earthen bread.
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: plain
@@ -421,7 +421,7 @@
   id: FoodBreadPlainSlice
   description: A slice of home.
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: plain-slice
@@ -436,7 +436,7 @@
     flavors:
       - meaty
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: sausage
@@ -468,7 +468,7 @@
     flavors:
       - meaty
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: sausage-slice
@@ -499,7 +499,7 @@
     flavors:
       - cobwebs
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: spidermeat
@@ -530,7 +530,7 @@
     flavors:
       - cobwebs
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: spidermeat-slice
@@ -559,7 +559,7 @@
     flavors:
       - tofu
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: tofu
@@ -586,7 +586,7 @@
     flavors:
       - tofu
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: tofu-slice
@@ -610,7 +610,7 @@
     flavors:
       - acid
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: xenomeat
@@ -641,7 +641,7 @@
     flavors:
       - acid
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     layers:
     - state: xenomeat-slice
@@ -663,9 +663,9 @@
 # Other than bread/slices
 
 - type: entity
-  name: baguette
   parent: FoodBreadBase
   id: FoodBreadBaguette
+  name: baguette
   description: Bon appétit!
   components:
   - type: Sprite
@@ -707,9 +707,9 @@
 # Tastes like France.
 
 - type: entity
-  name: cotton baguette
   parent: FoodBreadBaguette
   id: FoodBreadBaguetteCotton
+  name: cotton baguette
   description: Bon azzétit!
   components:
   - type: Sprite
@@ -779,7 +779,7 @@
   components:
   - type: Sprite
     state: crostini-cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 7474fd3155..faa9f45fde 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -6,7 +6,7 @@
   id: FoodBakedBase
   abstract: true
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/misc.rsi
   - type: SolutionContainerManager
@@ -27,7 +27,7 @@
   id: FoodBakedMuffin
   description: A delicious and spongy little cake.
   components:
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlateMuffinTin
   - type: Sprite
@@ -625,7 +625,7 @@
     - cotton
   - type: Sprite
     state: chevrechaud-cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:
@@ -643,9 +643,9 @@
           Quantity: 0.5
 
 - type: entity
-  name: brownies
   parent: FoodBakedBase
   id: FoodBakedBrownieBatch
+  name: brownies
   description: A pan of brownies.
   components:
   - type: Item
@@ -699,9 +699,9 @@
     - Slice
 
 - type: entity
-  name: special brownies
   parent: FoodBakedBase
   id: FoodBakedCannabisBrownieBatch
+  name: special brownies
   description: A pan of "special" brownies.
   components:
   - type: Item
@@ -731,9 +731,9 @@
     slice: FoodBakedCannabisBrownie
 
 - type: entity
-  name: special brownie
   parent: FoodBakedBase
   id: FoodBakedCannabisBrownie
+  name: special brownie
   description: A "special" brownie.
   components:
   - type: FlavorProfile
@@ -784,9 +784,9 @@
             Quantity: 1
 
 - type: entity
-  name: croissant
   parent: FoodBakedBase
   id: FoodBakedCroissant
+  name: croissant
   description: Buttery, flaky goodness.
   components:
   - type: Item
@@ -818,9 +818,9 @@
         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
@@ -855,9 +855,9 @@
           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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index e2633360bf..b2dd9257b5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -2,9 +2,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodPieBase
-  abstract: true
   components:
   - type: Item
     shape:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index ef2f72deb3..99fb7c87b7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -2,9 +2,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodPizzaBase
-  abstract: true
   components:
   - type: FlavorProfile
     flavors:
@@ -42,7 +42,7 @@
     flavors:
       - oily
       - bread
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
   - type: SolutionContainerManager
@@ -654,7 +654,7 @@
   - type: Sprite
     layers:
     - state: cotton-pizza
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SliceableFood
     slice: FoodPizzaCottonSlice
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
index 56d38afbb6..1ac5dce0e8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -1,9 +1,9 @@
 # Bowls
 
 - type: entity
-  name: bowl
   parent: ReagentContainerBase
   id: FoodBowlBig
+  name: bowl
   description: A simple bowl, used for soups and salads.
   components:
   - type: Item
@@ -67,9 +67,9 @@
     - Trash
 
 - type: entity
-  name: broken bowl
   parent: BaseItem
   id: FoodBowlBigTrash
+  name: broken bowl
   description: A simple bowl, broken and useless.
   components:
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index a4e0239ab0..55d22e3980 100644
--- 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: large 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: small 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,9 +202,9 @@
 # Muffin Tin
 
 - type: entity
-  name: muffin tin
   parent: BaseItem
   id: FoodPlateMuffinTin
+  name: muffin tin
   description: A cheap foil tin for muffins.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
index c50f7d08be..c9b9cdcce1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
@@ -3,9 +3,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodBreakfastBase
-  abstract: true
   description: A full breakfast, rise and shine!
   components:
   - type: Item
@@ -25,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
@@ -37,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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 64c829fb12..a20ce930f6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -2,9 +2,9 @@
 # Bun
 
 - type: entity
-  name: bun
   parent: FoodBreadSliceBase
   id: FoodBreadBun
+  name: bun
   description: A hamburger bun. Round and convenient to hold.
   components:
   - type: Sprite
@@ -27,8 +27,8 @@
         amount: 1
 
 - type: entity
-  id: FoodBreadBunBottom
   parent: FoodBreadSliceBase
+  id: FoodBreadBunBottom
   name: bottom bun
   description: It's time to start building the burger tower.
   components:
@@ -61,8 +61,8 @@
           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:
@@ -84,9 +84,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodBurgerBase
-  abstract: true
   components:
   - type: FlavorProfile
     flavors:
@@ -211,9 +211,9 @@
     - Meat
 
 - type: entity
-  name: bearger
   parent: FoodBurgerBase
   id: FoodBurgerBear
+  name: bearger
   description: Best served rawr.
   components:
   - type: Item
@@ -240,9 +240,9 @@
     - Meat
 
 - 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
@@ -274,9 +274,9 @@
 # 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
@@ -304,9 +304,9 @@
 # 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
@@ -401,9 +401,9 @@
 # Tastes like bun, chicken.
 
 - type: entity
-  name: clown burger
   parent: FoodBurgerBase
   id: FoodBurgerClown
+  name: clown burger
   description: This tastes funny...
   components:
   - type: Item
@@ -482,9 +482,9 @@
     - Meat
 
 - 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
@@ -520,9 +520,9 @@
     - Meat
 
 - 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
@@ -548,9 +548,9 @@
 # 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
@@ -573,9 +573,9 @@
 # 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
@@ -592,9 +592,9 @@
 # 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
@@ -630,9 +630,9 @@
 # Tastes like bun, HEAT.
 
 - type: entity
-  name: ghost burger
   parent: FoodBurgerBase
   id: FoodBurgerGhost
+  name: ghost burger
   description: Too spooky!
   components:
   - type: Item
@@ -689,9 +689,9 @@
     - Meat
 
 - type: entity
-  name: McGuffin
   parent: FoodBurgerBase
   id: FoodBurgerMcguffin
+  name: McGuffin
   description: A cheap and greasy imitation of an eggs Benedict.
   components:
   - type: Item
@@ -718,9 +718,9 @@
     - Meat
 
 - 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: Edible
@@ -860,9 +860,9 @@
 # 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
@@ -885,9 +885,9 @@
 # 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
@@ -915,9 +915,9 @@
 # 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
@@ -1006,9 +1006,9 @@
 # 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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index 537043b33f..b3aff8075f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -6,7 +6,7 @@
   id: FoodFrozenBase
   abstract: true
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/frozen.rsi
   - type: SolutionContainerManager
@@ -33,8 +33,8 @@
 
 - type: entity
   parent: FoodFrozenBase
-  name: strawberry ice-cream sandwich
   id: FoodFrozenSandwichStrawberry
+  name: strawberry ice-cream sandwich
   description: Portable ice-cream in its own packaging of the strawberry variety.
   components:
   - type: Item
@@ -95,7 +95,7 @@
     - state: popsicle-base
     - state: popsicle
       color: orange
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenPopsicleTrash
   - type: Tag
@@ -115,7 +115,7 @@
     - state: popsicle-base
     - state: popsicle
       color: red
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenPopsicleTrash
   - type: Tag
@@ -133,7 +133,7 @@
     layers:
     - state: stick
     - state: jumbo
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenPopsicleTrash
   - type: SolutionContainerManager
@@ -164,7 +164,7 @@
         - state: cone
         - state: alpha-filling
     #      color: foo
-    - type: Food
+    - type: Edible
       trash:
       - FoodFrozenSnowconeTrash
     - type: SolutionContainerManager
@@ -203,7 +203,7 @@
     layers:
     - state: cone
     - state: berry
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenSnowconeTrash
   - type: Tag
@@ -220,7 +220,7 @@
     layers:
     - state: cone
     - state: fruitsalad
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenSnowconeTrash
   - type: Tag
@@ -237,7 +237,7 @@
     layers:
     - state: cone
     - state: clown
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenSnowconeTrash
 
@@ -251,7 +251,7 @@
     layers:
     - state: cone
     - state: mime
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenSnowconeTrash
 
@@ -265,7 +265,7 @@
     layers:
     - state: cone
     - state: rainbow
-  - type: Food
+  - type: Edible
     trash:
     - FoodFrozenSnowconeTrash
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index cb1194d72b..76ea3073e5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -281,9 +281,9 @@
       - Ingredient
 
 - type: entity
-  name: dough
   parent: FoodBakingBase
   id: FoodDough
+  name: dough
   description: A piece of dough.
   components:
   - type: Item
@@ -301,9 +301,9 @@
     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
@@ -328,9 +328,9 @@
           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
@@ -352,9 +352,9 @@
           Quantity: 5
 
 - type: entity
-  name: cornmeal dough
   parent: FoodBakingBase
   id: FoodDoughCornmeal
+  name: cornmeal dough
   description: A piece of cornmeal dough.
   components:
   - type: Item
@@ -370,9 +370,9 @@
     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
@@ -388,9 +388,9 @@
     - Slice
 
 - type: entity
-  name: tortilla dough
   parent: FoodBakingBase
   id: FoodDoughTortilla
+  name: tortilla dough
   description: A piece of tortilla dough.
   components:
   - type: Item
@@ -406,9 +406,9 @@
     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
@@ -427,9 +427,9 @@
     - 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
@@ -445,9 +445,9 @@
     node: flat
 
 - type: entity
-  name: cotton dough
   parent: FoodBakingBase
   id: FoodDoughCotton
+  name: cotton dough
   description: A piece of fabric dough.
   components:
   - type: Item
@@ -479,9 +479,9 @@
           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
@@ -510,9 +510,9 @@
           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
@@ -559,9 +559,9 @@
     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
@@ -570,9 +570,9 @@
     state: dough-pie
 
 - type: entity
-  name: flat dough
   parent: FoodBakingBase
   id: FoodDoughFlat
+  name: flat dough
   description: A flattened dough.
   components:
   - type: Item
@@ -589,9 +589,9 @@
     slice: FoodCroissantRaw
 
 - type: entity
-  name: flat cotton dough
   parent: FoodBakingBase
   id: FoodDoughCottonFlat
+  name: flat cotton dough
   description: A flattened cotton dough.
   components:
   - type: Item
@@ -608,9 +608,9 @@
     slice: FoodCroissantRawCotton
 
 - type: entity
-  name: pizza bread
   parent: FoodBakingBase
   id: FoodDoughPizzaBaked
+  name: pizza bread
   description: Add ingredients to make a pizza.
   components:
   - type: Item
@@ -621,9 +621,9 @@
     state: pizzabread
 
 - type: entity
-  name: cake batter
   parent: FoodBakingBase
   id: FoodCakeBatter
+  name: cake batter
   description: Cook it to get a cake.
   components:
   - type: Item
@@ -635,9 +635,9 @@
     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
@@ -680,9 +680,9 @@
     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
@@ -739,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
@@ -773,9 +773,9 @@
       - 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
@@ -802,9 +802,9 @@
           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
@@ -829,9 +829,9 @@
     - Slice
 
 - type: entity
-  name: tofu
   parent: FoodBakingBase
   id: FoodTofu
+  name: tofu
   description: Solid white block with a subtle flavor.
   components:
   - type: Item
@@ -855,9 +855,9 @@
     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
@@ -937,9 +937,9 @@
       - Ingredient
 
 - type: entity
-  name: raw croissant
   parent: FoodBakingBase
   id: FoodCroissantRaw
+  name: raw croissant
   description: Buttery, flaky goodness waiting to happen.
   components:
   - type: Item
@@ -961,9 +961,9 @@
           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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 1d8b270405..c0d1f0fd75 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -5,15 +5,15 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodMealBase
-  abstract: true
   description: A delicious meal, cooked with love.
   components:
   - type: Item
     shape:
     - 0,0,1,0
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/meals.rsi
   - type: SolutionContainerManager
@@ -27,9 +27,9 @@
 # Meals
 
 - type: entity
-  name: loaded baked potato
   parent: FoodMealBase
   id: FoodMealPotatoLoaded
+  name: loaded baked potato
   description: Totally baked.
   components:
   - type: Item
@@ -43,9 +43,9 @@
 # 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
@@ -59,9 +59,9 @@
 # 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
@@ -76,9 +76,9 @@
 # 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
@@ -102,14 +102,14 @@
 # Tastes like carrots, salt.
 
 - type: entity
-  name: nachos
   parent: FoodMealBase
   id: FoodMealNachos
+  name: nachos
   description: Chips from Space Mexico.
   components:
   - type: Item
     storedOffset: 0,-2
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlateSmall
   - type: FlavorProfile
@@ -129,14 +129,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: Item
     storedOffset: 0,-2
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlateSmall
   - type: FlavorProfile
@@ -157,14 +157,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: Item
     storedOffset: 0,-2
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlateSmall
   - type: FlavorProfile
@@ -188,9 +188,9 @@
 # Tastes like nachos, hot pepper.
 
 - type: entity
-  name: mint
   parent: FoodMealBase
   id: FoodMealMint
+  name: mint
   description: It's wafer thin.
   components:
   - type: Item
@@ -211,9 +211,9 @@
 # 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
@@ -239,9 +239,9 @@
 # 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
@@ -255,9 +255,9 @@
 # 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
@@ -289,9 +289,9 @@
 # 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
@@ -317,9 +317,9 @@
 # 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
@@ -348,9 +348,9 @@
 # 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
@@ -378,14 +378,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: Item
     storedOffset: 0,-4
-  - type: Food
+  - type: Edible
     trash:
     - FoodKebabSkewer
   - type: FlavorProfile
@@ -411,9 +411,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
@@ -438,9 +438,9 @@
 # Tastes like eggs, bacon, bun.
 
 - type: entity
-  name: cheese omelette
   parent: FoodMealBase
   id: FoodMealOmelette
+  name: cheese omelette
   description: Cheesy.
   components:
   - type: Item
@@ -464,9 +464,9 @@
 # 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
@@ -495,9 +495,9 @@
 # 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
@@ -513,9 +513,9 @@
 # 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
@@ -538,9 +538,9 @@
 # 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
@@ -564,9 +564,9 @@
 # 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
@@ -604,9 +604,9 @@
 # tastes exotic
 
 - type: entity
-  name: enchiladas
   parent: FoodMealBase
   id: FoodMealEnchiladas
+  name: enchiladas
   description: Viva La Mexico!
   components:
     - type: Item
@@ -635,9 +635,9 @@
 # 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
@@ -668,14 +668,14 @@
     - Fruit
 
 - type: entity
-  name: corn in butter
   parent: FoodMealBase
   id: FoodMealCornInButter
+  name: corn in butter
   description: Buttery.
   components:
   - type: Item
     storedOffset: 0,-5
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlate
   - type: FlavorProfile
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 9d506407a3..642a068069 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -1,9 +1,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodMeatBase
-  abstract: true
   components:
   - type: FlavorProfile
     flavors:
@@ -83,9 +83,9 @@
 # Raw
 
 - type: entity
-  name: raw meat
   parent: FoodMeatRawBase
   id: FoodMeat
+  name: raw meat
   description: A slab of raw meat.
   components:
   - type: Sprite
@@ -119,9 +119,9 @@
       - state: plain-inhand-right
 
 - type: entity
-  name: raw human meat
   parent: FoodMeatRawBase
   id: FoodMeatHuman
+  name: raw human meat
   description: Gross.
   components:
   - type: Sprite
@@ -144,10 +144,10 @@
       - state: plain-inhand-right
 
 - type: entity
-  name: raw carp fillet
   parent: FoodMeatBase
   # MeatFish?...
   id: FoodMeatFish
+  name: raw carp fillet
   description: Your last words being "Wow, exotic!" are not worth it. The taste itself though? Maybe.
   components:
   - type: FlavorProfile
@@ -179,10 +179,10 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw bacon
   # bacon is cured so not raw = cant rot
   parent: FoodMeatBase
   id: FoodMeatBacon
+  name: raw bacon
   description: A raw piece of bacon.
   components:
   - type: Tag
@@ -216,9 +216,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw bear meat
   parent: FoodMeatRawBase
   id: FoodMeatBear
+  name: raw bear meat
   description: A very manly slab of raw bear meat.
   components:
   - type: Sprite
@@ -249,9 +249,9 @@
         color: "#934C64"
 
 - type: entity
-  name: raw penguin meat
   parent: FoodMeatRawBase
   id: FoodMeatPenguin
+  name: raw penguin meat
   description: A slab of raw penguin meat. Can be used as a substitute for fish in recipes.
   components:
   - type: Sprite
@@ -280,9 +280,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw chicken meat
   parent: FoodMeatRawBase
   id: FoodMeatChicken
+  name: raw chicken meat
   description: A slab of raw chicken. Remember to wash your hands!
   components:
   - type: Sprite
@@ -313,9 +313,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw duck meat
   parent: FoodMeatRawBase
   id: FoodMeatDuck
+  name: raw duck meat
   description: A slab of raw duck. Remember to wash your hands!
   components:
   - type: Sprite
@@ -375,9 +375,9 @@
       - state: corgi-inhand-right
 
 - type: entity
-  name: raw crab meat
   parent: FoodMeatRawBase
   id: FoodMeatCrab
+  name: raw crab meat
   description: A pile of raw crab meat.
   components:
   - type: Item
@@ -401,9 +401,9 @@
     defaultTarget: cooked crab
 
 - type: entity
-  name: raw goliath meat
   parent: FoodMeatRawBase
   id: FoodMeatGoliath
+  name: raw goliath meat
   description: A slab of goliath meat. It's not very edible now, but it cooks great in lava.
   components:
   - type: Sprite
@@ -431,9 +431,9 @@
       - state: plain-inhand-right
 
 - type: entity
-  name: dragon flesh
   parent: FoodMeatBase
   id: FoodMeatDragon
+  name: dragon flesh
   description: The dense meat of the space-era apex predator is oozing with its mythical ichor. Ironically, best eaten raw.
   components:
   - type: Tag
@@ -472,9 +472,9 @@
       - state: dragon-inhand-right
 
 - type: entity
-  name: raw rat meat
   parent: FoodMeatRawBase
   id: FoodMeatRat
+  name: raw rat meat
   description: Prime meat from maintenance!
   components:
   - type: Sprite
@@ -499,9 +499,9 @@
       - state: plain-inhand-right
 
 - type: entity
-  name: raw lizard meat
   parent: FoodMeatRawBase
   id: FoodMeatLizard
+  name: raw lizard meat
   description: Delicious dino damage.
   components:
   - type: Sprite
@@ -541,9 +541,9 @@
     state: plant
 
 - type: entity
-  name: rotten meat
   parent: FoodMeatBase
   id: FoodMeatRotten
+  name: rotten meat
   description: Halfway to becoming fertilizer for your garden.
   components:
   - type: Tag
@@ -573,9 +573,9 @@
       - state: rotten-inhand-right
 
 - type: entity
-  name: raw spider meat
   parent: FoodMeatRawBase
   id: FoodMeatSpider
+  name: raw spider meat
   description: A slab of spider meat. That's so Kafkaesque.
   components:
   - type: Sprite
@@ -596,9 +596,9 @@
     heldPrefix: spider
 
 - type: entity
-  name: raw spider leg
   parent: FoodMeatBase
   id: FoodMeatSpiderLeg
+  name: raw spider leg
   description: A still twitching leg of a giant spider... you don't really want to eat this, do you?
   components:
   - type: Sprite
@@ -624,9 +624,9 @@
         color: "#333333"
 
 - type: entity
-  name: meatwheat clump
   parent: FoodMeatBase
   id: FoodMeatWheat
+  name: meatwheat clump
   description: This doesn't look like meat, but your standards aren't that high to begin with.
   components:
   - type: FlavorProfile
@@ -653,9 +653,9 @@
         color: "#934C64"
 
 - type: entity
-  name: raw snake meat
   parent: FoodMeatBase
   id: FoodMeatSnake
+  name: raw snake meat
   description: A long piece of snake meat, hopefully not poisonous.
   components:
   - type: Tag
@@ -681,10 +681,10 @@
       - state: snake-inhand-right
 
 - type: entity
-  name: raw xeno meat
   # not raw since acid kills bacteria or something, same as xeno
   parent: FoodMeatBase
   id: FoodMeatXeno
+  name: raw xeno meat
   description: A slab of xeno meat, dripping with acid.
   components:
   - type: FlavorProfile
@@ -752,9 +752,9 @@
       - state: plain-inhand-right
 
 - type: entity
-  name: killer tomato meat
   parent: FoodMeatBase
   id: FoodMeatTomato
+  name: killer tomato meat
   description: A slice from a huge tomato.
   components:
   - type: Sprite
@@ -773,9 +773,9 @@
       - state: tomato-inhand-right
 
 - type: entity
-  name: salami
   parent: FoodMeatBase
   id: FoodMeatSalami
+  name: salami
   description: A large tube of salami. Best not to ask what went into it.
   components:
   - type: Item
@@ -801,9 +801,9 @@
         Blunt: 2
 
 - type: entity
-  name: meat clown
   parent: FoodMeatBase
   id: FoodMeatClown
+  name: meat clown
   description: A delicious, round piece of meat clown. How horrifying.
   components:
   - type: Item
@@ -822,9 +822,9 @@
     slice: FoodMeatSalamiSlice
 
 - type: entity
-  name: meatball
   parent: FoodMeatBase
   id: FoodMeatMeatball
+  name: meatball
   description: A raw ball of meat. Meat ball.
   components:
   - type: Item
@@ -845,9 +845,9 @@
 # meat patty - grillin' time
 
 - type: entity
-  name: meat patty
   parent: FoodMeatBase
   id: FoodMeatPatty
+  name: meat patty
   description: A flat slab of ground meat. Ready for grillin'.
   components:
   - type: Tag
@@ -869,9 +869,9 @@
     heldPrefix: generic-pink
 
 - type: entity
-  name: slimeball
   parent: FoodMeatBase
   id: FoodMeatSlime
+  name: slimeball
   description: A gelatinous shaping of slime jelly.
   components:
   - type: FlavorProfile
@@ -897,9 +897,9 @@
       - state: slime-inhand-right
 
 - type: entity
-  name: raw snail meat
   parent: FoodMeatRawBase
   id: FoodMeatSnail
+  name: raw snail meat
   description: Improved with salt.
   components:
   - type: Sprite
@@ -926,9 +926,9 @@
         color: "#E2AE7C"
 
 - type: entity
-  name: anomalous meat mass
   parent: FoodMeatRawBase
   id: FoodMeatAnomaly
+  name: anomalous meat mass
   description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable.
   components:
   - type: Sprite
@@ -1001,9 +1001,9 @@
     - Meat
 
 - type: entity
-  name: steak
   parent: FoodMeatBase
   id: FoodMeatCooked
+  name: steak
   description: A cooked slab of meat. Smells primal.
   components:
   - type: Tag
@@ -1041,9 +1041,9 @@
       - state: plain-cooked-inhand-right
 
 - type: entity
-  name: bacon
   parent: FoodMeatBase
   id: FoodMeatBaconCooked
+  name: bacon
   description: A delicious piece of cooked bacon.
   components:
   - type: Tag
@@ -1085,9 +1085,9 @@
         color: "#5B3E2A"
 
 - type: entity
-  name: cooked bear
   parent: FoodMeatBase
   id: FoodMeatBearCooked
+  name: cooked bear
   description: A well-cooked slab of bear meat. Tough, but tasty with the right sides.
   components:
   - type: Tag
@@ -1121,9 +1121,9 @@
     heldPrefix: meatball
 
 - type: entity
-  name: penguin filet
   parent: FoodMeatBase
   id: FoodMeatPenguinCooked
+  name: penguin filet
   description: A cooked filet of penguin. Can be used as a substitute for fish in recipes.
   components:
   - type: Tag
@@ -1162,9 +1162,9 @@
         color: "#F7E3A3"
 
 - type: entity
-  name: cooked chicken
   parent: FoodMeatBase
   id: FoodMeatChickenCooked
+  name: cooked chicken
   description: A cooked piece of chicken. Best used in other recipes.
   components:
   - type: Tag
@@ -1243,9 +1243,9 @@
         color: "#F7E3A3"
 
 - type: entity
-  name: cooked duck
   parent: FoodMeatBase
   id: FoodMeatDuckCooked
+  name: cooked duck
   description: A cooked piece of duck. Best used in other recipes.
   components:
   - type: Tag
@@ -1284,9 +1284,9 @@
         color: "#F7E3A3"
 
 - type: entity
-  name: cooked crab
   parent: FoodMeatBase
   id: FoodMeatCrabCooked
+  name: cooked crab
   description: Some deliciously cooked crab meat.
   components:
   - type: FlavorProfile
@@ -1323,9 +1323,9 @@
       - state: plain-cooked-inhand-right
 
 - type: entity
-  name: goliath steak
   parent: FoodMeatBase
   id: FoodMeatGoliathCooked
+  name: goliath steak
   description: A delicious, lava cooked steak.
   components:
   - type: Tag
@@ -1400,9 +1400,9 @@
       - state: plain-cooked-inhand-right
 
 - type: entity
-  name: lizard steak
   parent: FoodMeatBase
   id: FoodMeatLizardCooked
+  name: lizard steak
   description: Cooked, tough lizard meat.
   components:
   - type: Tag
@@ -1440,9 +1440,9 @@
       - state: plain-cooked-inhand-right
 
 - type: entity
-  name: boiled spider leg
   parent: FoodMeatBase
   id: FoodMeatSpiderlegCooked
+  name: boiled spider leg
   description: A giant spider's leg that's still twitching after being cooked. Gross!
   components:
   - type: Tag
@@ -1475,9 +1475,9 @@
         color: "#44201A"
 
 - type: entity
-  name: meatball
   parent: FoodMeatBase
   id: FoodMeatMeatballCooked
+  name: meatball
   description: A cooked meatball. Perfect to add to other dishes... except fruity ones.
   components:
   - type: Tag
@@ -1509,9 +1509,9 @@
     heldPrefix: meatball
 
 - type: entity
-  name: cooked meat patty
   parent: FoodMeatBase
   id: FoodMeatPattyCooked
+  name: cooked meat patty
   description: A cooked meat patty.
   components:
   - type: Tag
@@ -1543,9 +1543,9 @@
     heldPrefix: meatball
 
 - type: entity
-  name: boiled snail
   parent: FoodMeatBase
   id: FoodMeatSnailCooked
+  name: boiled snail
   description: Improved with salt.
   components:
   - type: Tag
@@ -1581,9 +1581,9 @@
         color: "#5B3E2A"
 
 - type: entity
-  name: anomalous steak
   parent: FoodMeatBase
   id: FoodMeatAnomalyCooked
+  name: anomalous steak
   description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry.
   components:
   - type: Tag
@@ -1619,9 +1619,9 @@
       - state: plain-cooked-inhand-right
 
 - type: entity
-  name: dragon steak
   parent: FoodMeatBase
   id: FoodMeatDragonCooked
+  name: dragon steak
   description: Pouring ketchup on this is considered a capital crime on most stations.
   components:
   - type: Tag
@@ -1665,9 +1665,9 @@
 # Raw
 
 - type: entity
-  name: raw cutlet
   parent: FoodMeatBase
   id: FoodMeatCutlet
+  name: raw cutlet
   description: A raw meat cutlet.
   components:
   - type: Tag
@@ -1700,9 +1700,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw bear cutlet
   parent: FoodMeatBase
   id: FoodMeatBearCutlet
+  name: raw bear cutlet
   description: A very manly cutlet of raw bear meat.
   components:
   - type: Tag
@@ -1740,9 +1740,9 @@
         color: brown
 
 - type: entity
-  name: raw penguin cutlet
   parent: FoodMeatBase
   id: FoodMeatPenguinCutlet
+  name: raw penguin cutlet
   description: A cutlet of raw penguin meat. Can be used as a substitute for fish in recipes.
   components:
   - type: Tag
@@ -1778,9 +1778,9 @@
         color: white
 
 - type: entity
-  name: raw chicken cutlet
   parent: FoodMeatBase
   id: FoodMeatChickenCutlet
+  name: raw chicken cutlet
   description: A cutlet of raw chicken. Remember to wash your hands!
   components:
   - type: Tag
@@ -1814,9 +1814,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw duck cutlet
   parent: FoodMeatBase
   id: FoodMeatDuckCutlet
+  name: raw duck cutlet
   description: A cutlet of raw duck. Remember to wash your hands!
   components:
   - type: Tag
@@ -1850,9 +1850,9 @@
       - state: generic-pink-inhand-right
 
 - type: entity
-  name: raw lizard cutlet
   parent: FoodMeatBase
   id: FoodMeatLizardCutlet
+  name: raw lizard cutlet
   description: Delicious dino cutlet.
   components:
   - type: Tag
@@ -1891,9 +1891,9 @@
         color: green
 
 - type: entity
-  name: raw spider cutlet
   parent: FoodMeatBase
   id: FoodMeatSpiderCutlet
+  name: raw spider cutlet
   description: A cutlet of raw spider meat. So Kafkaesque.
   components:
   - type: Tag
@@ -1928,9 +1928,9 @@
         color: green
 
 - type: entity
-  name: raw xeno cutlet
   parent: FoodMeatBase
   id: FoodMeatXenoCutlet
+  name: raw xeno cutlet
   description: A slab of raw xeno meat, dripping with acid.
   components:
   - type: FlavorProfile
@@ -1967,9 +1967,9 @@
         color: green
 
 - type: entity
-  name: raw killer tomato cutlet
   parent: FoodMeatBase
   id: FoodMeatTomatoCutlet
+  name: raw killer tomato cutlet
   description: A cutlet from a slab of tomato.
   components:
   - type: Item
@@ -1988,9 +1988,9 @@
     price: 30
 
 - type: entity
-  name: salami slice
   parent: FoodMeatBase
   id: FoodMeatSalamiSlice
+  name: salami slice
   description: A slice of cured salami.
   components:
   - type: Item
@@ -2015,9 +2015,9 @@
           Quantity: 1
 
 - type: entity
-  name: raw dragon cutlet
   parent: FoodMeatBase
   id: FoodMeatDragonCutlet
+  name: raw dragon cutlet
   description: A raw dragon meat cutlet.
   components:
   - type: Tag
@@ -2055,9 +2055,9 @@
 # Cooked
 
 - type: entity
-  name: cutlet
   parent: FoodMeatBase
   id: FoodMeatCutletCooked
+  name: cutlet
   description: A cooked meat cutlet. Needs some seasoning.
   components:
   - type: Tag
@@ -2096,9 +2096,9 @@
         color: "#5B3614"
 
 - type: entity
-  name: bear cutlet
   parent: FoodMeatBase
   id: FoodMeatBearCutletCooked
+  name: bear cutlet
   description: A very manly cutlet of cooked bear meat.
   components:
   - type: Tag
@@ -2140,9 +2140,9 @@
         color: "#5B3614"
 
 - type: entity
-  name: penguin cutlet
   parent: FoodMeatBase
   id: FoodMeatPenguinCutletCooked
+  name: penguin cutlet
   description: A cutlet of cooked penguin meat.
   components:
   - type: Tag
@@ -2182,9 +2182,9 @@
         color: "#5B3614"
 
 - type: entity
-  name: chicken cutlet
   parent: FoodMeatBase
   id: FoodMeatChickenCutletCooked
+  name: chicken cutlet
   description: A cutlet of cooked chicken. Remember to wash your hands!
   components:
   - type: Tag
@@ -2224,9 +2224,9 @@
         color: "#5B3614"
 
 - type: entity
-  name: duck cutlet
   parent: FoodMeatBase
   id: FoodMeatDuckCutletCooked
+  name: duck cutlet
   description: A cutlet of cooked duck. Remember to wash your hands!
   components:
   - type: Tag
@@ -2266,9 +2266,9 @@
         color: "#5B3614"
 
 - type: entity
-  name: lizard cutlet
   parent: FoodMeatBase
   id: FoodMeatLizardCutletCooked
+  name: lizard cutlet
   description: Delicious cooked dino cutlet.
   components:
   - type: Tag
@@ -2309,9 +2309,9 @@
         color: "#153F06"
 
 - type: entity
-  name: spider cutlet
   parent: FoodMeatBase
   id: FoodMeatSpiderCutletCooked
+  name: spider cutlet
   description: A cutlet of cooked spider meat. Finally edible.
   components:
   - type: Tag
@@ -2350,9 +2350,9 @@
         color: "#153F06"
 
 - type: entity
-  name: xeno cutlet
   parent: FoodMeatBase
   id: FoodMeatXenoCutletCooked
+  name: xeno cutlet
   description: A cutlet of cooked xeno, dripping with... tastiness?
   components:
   - type: Tag
@@ -2391,9 +2391,9 @@
         color: "#153F06"
 
 - type: entity
-  name: dragon cutlet
   parent: FoodMeatBase
   id: FoodMeatDragonCutletCooked
+  name: dragon cutlet
   description: It's a meal for kings!
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index b33a35e8fc..ce20fbb46c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -2,9 +2,9 @@
 # Base
 
 - type: entity
+  abstract: true
   parent: FoodInjectableBase
   id: FoodNoodlesBase
-  abstract: true
   description: Now that's a nice pasta!
   components:
   - type: Item
@@ -23,9 +23,9 @@
 # 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
@@ -38,9 +38,9 @@
 # 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
@@ -64,16 +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: Item
     size: Normal
     shape:
     - 0,0,1,1
-  - type: Food
+  - type: Edible
     trash:
     - FoodPlateSmall
     - FoodPlateSmall
@@ -92,9 +92,9 @@
 # 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
@@ -120,9 +120,9 @@
 # Tastes like pasta, meat.
 
 - type: entity
-  name: spesslaw
   parent: FoodNoodlesBase
   id: FoodNoodlesSpesslaw
+  name: spesslaw
   description: A lawyer's favourite.
   components:
   - type: Item
@@ -172,9 +172,9 @@
 # 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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 2722881564..f49e3a1256 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -2,9 +2,9 @@
 # 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
@@ -53,7 +53,7 @@
     tags:
     - Trash
     - Skewer
-  - type: Food
+  - type: Edible
     trash:
     - FoodKebabSkewer
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 83a1c61dc9..f537da712b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -6,7 +6,7 @@
   id: FoodSnackBase
   abstract: true
   components:
-  - type: Food
+  - type: Edible
   - type: Tag
     tags:
       - FoodSnack
@@ -41,7 +41,7 @@
     state: boritos
   - type: Item
     heldPrefix: boritos
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketBoritosTrash
 
@@ -58,7 +58,7 @@
     state: cnds
   - type: Item
     heldPrefix: cnds
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketCnDsTrash
 
@@ -76,7 +76,7 @@
     state: cheesiehonkers
   - type: Item
     heldPrefix: cheesiehonkers
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketCheesieTrash
 
@@ -95,14 +95,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
@@ -123,9 +123,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
@@ -153,9 +153,9 @@
           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
@@ -171,9 +171,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
@@ -189,9 +189,9 @@
     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
@@ -203,7 +203,7 @@
   - type: Item
     heldPrefix: pistachio
     storedOffset: 1,0
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketPistachioTrash
   - type: Tag
@@ -226,7 +226,7 @@
     state: popcorn
   - type: Item
     heldPrefix: popcorn
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketPopcornTrash
 
@@ -243,7 +243,7 @@
     state: raisins
   - type: Item
     heldPrefix: raisins
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketRaisinsTrash
   - type: Tag
@@ -251,9 +251,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
@@ -264,7 +264,7 @@
   - type: Item
     heldPrefix: semki
     storedOffset: 1,0
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketSemkiTrash
 
@@ -281,7 +281,7 @@
     state: susjerky
   - type: Item
     heldPrefix: susjerky
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketSusTrash
   - type: Tag
@@ -301,7 +301,7 @@
     state: syndicakes
   - type: Item
     heldPrefix: syndicakes
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketSyndiTrash
 
@@ -326,7 +326,7 @@
           Quantity: 5
   - type: Sprite
     state: ramen
-  - type: Food
+  - type: Edible
     trash:
     - FoodPacketCupRamenTrash
   - type: Item
@@ -350,9 +350,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
@@ -374,14 +374,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
@@ -405,14 +405,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
@@ -432,13 +432,13 @@
     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:
@@ -460,8 +460,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:
@@ -477,7 +477,7 @@
       - ReptilianFood
   - type: Sprite
     state: nutribrick-open
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
@@ -487,8 +487,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:
@@ -510,8 +510,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.
@@ -524,7 +524,7 @@
   - type: Item
     heldPrefix: mre-brownie-open
     storedOffset: -1,-1
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
@@ -536,9 +536,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
@@ -602,7 +602,7 @@
         reagents:
         - ReagentId: ToxinTrash
           Quantity: 5
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
 
 - type: entity
@@ -862,7 +862,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:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index c919aab528..47db7366f7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -1,15 +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
     shape:
     - 0,0,1,0
     storedOffset: 0,-3
-  - type: Food
+  - type: Edible
     trash:
     - FoodBowlBig
     utensil: Spoon
@@ -559,9 +559,9 @@
     - 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
@@ -983,7 +983,7 @@
   - type: FlavorProfile
     flavors:
       - miso
-  - type: Food
+  - type: Edible
     trash:
     - FoodBowlFancy
   - type: Sprite
@@ -1188,9 +1188,9 @@
 # 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
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
index 651594c8ee..7597197590 100644
--- 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
     storedOffset: 0,-3
-  - type: Food
+  - 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
@@ -74,7 +74,7 @@
   id: FoodTacoBeef
   description: A very basic and run of the mill beef taco, now with cheese!
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: beeftaco
 
@@ -84,7 +84,7 @@
   id: FoodTacoChicken
   description: A very basic and run of the mill chicken taco, now with cheese!
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: chickentaco
 
@@ -98,7 +98,7 @@
     flavors:
       - onion
       - fishy
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: fishtaco
   - type: SolutionContainerManager
@@ -117,7 +117,7 @@
   id: FoodTacoRat
   description: Yeah, that looks about right...
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: rattaco
   - type: SolutionContainerManager
@@ -136,7 +136,7 @@
   id: FoodTacoBeefSupreme
   description: It's like a regular beef taco, but surpeme!
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: beeftacosupreme
   - type: SolutionContainerManager
@@ -155,7 +155,7 @@
   id: FoodTacoChickenSupreme
   description: It's like a regular chicken taco, but surpeme!
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: chickentacosupreme
   - type: SolutionContainerManager
@@ -169,9 +169,9 @@
           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
@@ -180,7 +180,7 @@
     flavors:
     - meaty
     - spicy
-  - type: Food
+  - type: Edible
   - type: Sprite
     state: dragontaco
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 880ec58302..aadf15153e 100644
--- 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