FIX: Uranium, Cak, and BreadDog are not garbage! (#34192)

* FIX: Uranium, Cak, and BreadDog are not garbage!

* Fixed bread typo for spacegarbage change.

* Style: moved ediblebase

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index db77d81ce8479d9b615abb3ac46fd0dbd20ea0f1..d817d53b18a683c51d06af720fd65320751070ed 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -937,9 +937,26 @@
 - type: entity
   name: bread dog
   id: MobBreadDog
-  parent: FoodBreadSausage
+  parent: EdibleBase
   description: It's a bread. It's a dog. It's a... breaddog?
   components:
+  - type: FlavorProfile
+    flavors:
+    - meaty
+    - bread
+  - type: SliceableFood
+    slice: FoodBreadSausageSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 45
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Protein
+          Quantity: 5
   - type: Sprite
     noRot: true
     drawdepth: Mobs
@@ -984,6 +1001,7 @@
     - VimPilot
     - DoorBumpOpener
     - Bread
+    - Meat
   - type: CanEscapeInventory
     baseResistTime: 2
   - type: Puller

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 0b574cdd72088f10b03cf136aff10e8e0c1a29e2..6b2fe3ef4e64e5c339489d1bec78b4007be42679 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -696,9 +696,25 @@
 - type: entity
   name: cak
   id: MobCatCake
-  parent: FoodCakeBase
+  parent: EdibleBase
   description: It's a cake. It's a cat. It's a cak.
   components:
+  - type: FlavorProfile
+    flavors:
+    - sweet
+  - type: InjectableSolution
+    solution: food
+  - type: RefillableSolution
+    solution: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
   - type: Sprite
     noRot: true
     drawdepth: Mobs

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index 0d942ebf96c21a92812eb439d964c93895ece4a3..ddacf71a03ee3d2ac6bcfebc70cc0db236eafbf5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -1,20 +1,30 @@
 #
-# Base component for consumable food
+# Base component for edible food-like items
 #
 - type: entity
   parent: BaseItem
-  id: FoodBase
+  id: EdibleBase
   abstract: true
   components:
   - type: FlavorProfile
     flavors:
       - food
   - type: Food
-  - type: SpaceGarbage
   - type: Sprite
   - type: StaticPrice
     price: 0
 
+#
+# Base component for consumable food
+# that should be cleaned up in space
+#
+- type: entity
+  parent: EdibleBase
+  id: FoodBase
+  abstract: true
+  components:
+  - type: SpaceGarbage
+
 # This base type is used to cover all of the "obvious" things that should be doable to open-package food.
 # Practically this means injection.
 # But it might in future also mean drawing with a syringe, so this is a base prototype just in case.

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 1218f7a9d43624a1e410bf5d5912c445c8ad9e54..4bc98a4d4b077a312eecc51caeb60283cde96ba3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -196,7 +196,7 @@
     count: 1
 
 - type: entity
-  parent: [SheetOtherBase, FoodBase]
+  parent: [SheetOtherBase, EdibleBase]
   id: SheetUranium
   name: uranium
   suffix: Full