Half a commit

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
index c8f56aa100e051af165ccdf1d35a702b6dc4d84c..9a905db90a362f734f47f494c3e5df4b7fd12e8e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
@@ -2,9 +2,9 @@
 # Base
 
 - type: entity
-  id: FoodBagelBase
-  parent: FoodInjectableBase
   abstract: true
+  parent: FoodInjectableBase
+  id: FoodBagelBase
   description: A delicious bagel.
   components:
   - type: Item
@@ -24,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:
@@ -51,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:
@@ -62,7 +62,7 @@
     - cotton
   - type: Sprite
     state: bagel-cottondough
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index a7d6654e5984d2986e9e71434787519e528bf6e0..f11ece66e5fa94402bdc22e40fe84cf949235115 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -11,7 +11,6 @@
   - type: FlavorProfile
     flavors:
       - bread
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/bread.rsi
   - type: Tag
@@ -133,7 +132,7 @@
     flavors:
     - cotton
     - bread
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Sprite
     layers:
@@ -717,7 +716,7 @@
     state: baguette-cotton
   - type: SliceableFood
     slice: FoodBreadBaguetteCottonSlice
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:
@@ -773,9 +772,9 @@
           Quantity: 0.1
 
 - type: entity
-  name: cotton crostini
   parent: FoodBreadBaguetteSlice
   id: FoodBreadBaguetteCottonSlice
+  name: cotton crostini
   description: Bon az-zetite!
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index f3ff09afc90c14768d8d25419af5b5c590766b1c..7474fd31555e3dd58395c3df09d0cf75d7b2fe4b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -835,7 +835,7 @@
     - cotton
   - type: Sprite
     state: croissant-cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:
@@ -884,15 +884,11 @@
           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.
   components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,0
   - type: FlavorProfile
     flavors:
     - cheesy
@@ -901,7 +897,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/misc.rsi
     state: grilled-cheese-cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 0147fe496a4d64c5d5377e60592307b311b1f787..e2633360bf10180b578f0f5b301cdc5dfac2b0cf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -25,7 +25,7 @@
           Quantity: 14
         - ReagentId: Sugar
           Quantity: 5
-  - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
+  - type: Edible #It's actually possible now to have a pie stored in a tin rather than spawning trash when you finish eating it. But right now I'm just cleaning up.
     trash:
     - FoodPlateTin
   - type: SliceableFood

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 1f628d57b8ae50932f2d91a6f08ba1a7df4d883d..ef2f72deb3f4a9ee7e825ef473f7339f2c2d1642 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -10,7 +10,6 @@
     flavors:
       - oily
       - bread
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
index 25bf2905f73c47a72e0917b989a472877aeccf76..56d38afbb6a2b8acea452f1cf41ac26413e7de58 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -23,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:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
index 8deda57d47c3eaaace689655b2ff501ee34f6305..ff92ad0417a124df490a95c2092a44ae594b24c8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -89,7 +89,7 @@
     flavors:
     - sweet
     - funny
-  - type: Food
+  - type: Edible
     trash:
     - FoodTinPeachesTrash
   - type: Tag
@@ -114,7 +114,7 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi
-  - type: Food
+  - type: Edible
     trash:
     - FoodTinPeachesMaintTrash
 
@@ -156,7 +156,7 @@
     - savory
     - salty
     - cheap
-  - type: Food
+  - type: Edible
     trash:
     - FoodTinBeansTrash
 
@@ -192,7 +192,7 @@
     - meaty
     - salty
     - cheap
-  - type: Food
+  - type: Edible
     trash:
     - FoodTinMRETrash
   - type: Tag

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
index 2842485dbfb80404c40741a936cab9b7450001bf..c50f7d08bed1361c021ea72660d9ddf468d0fd12 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
@@ -10,7 +10,6 @@
   components:
   - type: Item
     size: Normal
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/breakfast.rsi
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 3c55372ba88f95b87f7796982e99639685c9b98c..64c829fb1230f242bc279383057136dda5f31c69 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -7,7 +7,6 @@
   id: FoodBreadBun
   description: A hamburger bun. Round and convenient to hold.
   components:
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/burger.rsi
     layers:
@@ -35,7 +34,6 @@
   components:
   - type: Item
     size: Normal #patch until there is an adequate resizing system in place
-  - type: Food
   - type: Sprite
     drawdepth: Mobs
     noRot: true
@@ -68,7 +66,6 @@
   name: top bun
   description: The perfect finish for your burger tower.
   components:
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/burger_sequence.rsi
     layers:
@@ -726,7 +723,7 @@
   id: FoodBurgerMcrib
   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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index 0f4ed35b6ad7c9301d212def43e26fb733a2f3f9..537043b33fd54bed5527e0e4120300a31529845f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -20,9 +20,9 @@
 # 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
@@ -32,8 +32,8 @@
     state: sandwich
 
 - type: entity
-  name: strawberry ice-cream sandwich
   parent: FoodFrozenBase
+  name: strawberry ice-cream sandwich
   id: FoodFrozenSandwichStrawberry
   description: Portable ice-cream in its own packaging of the strawberry variety.
   components:
@@ -62,9 +62,9 @@
     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
@@ -272,9 +272,9 @@
 # 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