Fix donuts tags breaking the bounty (#36903)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index e68c5ac8da8cf57715f7c5f6be874b21439aed62..52ac7b2fe9872a8c67c44cd30591affda23728f5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -22,6 +22,16 @@
   - type: Item
     sprite: Objects/Consumable/Food/Baked/donut.rsi
     size: Tiny
+
+- type: entity
+  abstract: true
+  parent: FoodDonutBase
+  id: FoodDonutFruitBase
+  components:
+  - type: Tag
+    tags:
+    - Donut
+    - Fruit
 # Tastes like donut.
 
 # The sprinkles are now an overlay, so you can put them on any donut! If we really
@@ -109,6 +119,7 @@
   - type: Tag
     tags:
     - Meat
+    - Donut
 # Tastes like meat.
 
 - type: entity
@@ -295,7 +306,7 @@
 
 - type: entity
   name: apple jelly-donut
-  parent: FoodDonutBase
+  parent: FoodDonutFruitBase
   id: FoodDonutJellyApple
   description: Goes great with a shot of cinnamon schnapps.
   components:
@@ -310,9 +321,7 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit
+
 # Tastes like jelly-donut, green apples.
 
 - type: entity
@@ -357,7 +366,7 @@
 
 - type: entity
   name: blue pumpkin jelly-donut
-  parent: FoodDonutBase
+  parent: FoodDonutFruitBase
   id: FoodDonutJellyBluePumpkin
   description: Goes great with a mug of soothing drunken blue pumpkin.
   components:
@@ -376,14 +385,11 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit
 # Tastes like jelly-donut, blue pumpkin.
 
 - type: entity
   name: bungo jelly-donut
-  parent: FoodDonutBase
+  parent: FoodDonutFruitBase
   id: FoodDonutJellyBungo
   description: Goes great with a mason jar of hippie's delight.
   components:
@@ -398,9 +404,6 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
-  - type: Tag
-    tags:
-    - Fruit # Apparently this is a fruit. Huh.
 # Tastes like jelly-donut, tropical sweetness.
 
 - type: entity