Cleanup Base food and drink a little (#39485)

Edible base prototype convention compliance

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 4df720d541744c4d9bdc04ea0dcaa77d98e74218..ca633cdb39072b4cff8c6048758df7a146d73506 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2,9 +2,9 @@
 # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml
 # When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_glass.yml
 - type: entity
+  abstract: true
   parent: BaseItem
   id: DrinkBase
-  abstract: true
   components:
   - type: SolutionContainerManager
     solutions:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index fedce70e799adf1dccc5ad815881244992f4215b..6ba1895548ab3cdc54c2f8c4648765528e8ced77 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -2,9 +2,9 @@
 # Base component for edible food-like items
 #
 - type: entity
+  abstract: true
   parent: BaseItem
   id: EdibleBase
-  abstract: true
   components:
   - type: FlavorProfile
     flavors:
@@ -19,9 +19,9 @@
 # that should be cleaned up in space
 #
 - type: entity
+  abstract: true
   parent: EdibleBase
   id: FoodBase
-  abstract: true
   components:
   - type: SpaceGarbage
 
@@ -30,9 +30,9 @@
 # But it might in future also mean drawing with a syringe, so this is a base prototype just in case.
 
 - type: entity
+  abstract: true
   parent: FoodBase
   id: FoodInjectableBase
-  abstract: true
   components:
   - type: InjectableSolution
     solution: food
@@ -42,8 +42,8 @@
 # usable by any food that can be opened
 # handles appearance with states "icon" and "icon-open"
 - type: entity
-  id: FoodOpenableBase
   abstract: true
+  id: FoodOpenableBase
   components:
   - type: Appearance
   - type: Sprite