Miscellaneous Food/Drink/Edible fixes (#40060)

* bugfixes

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* Revert "bugfixes"

This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19.

* more reverting

* conflicts

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 4e758e4e1c6d245e85ceb702b24119f0236b6561..dbde82b534b4a3a4bf44064754f9ded3d44bc916 100644 (file)
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -206,7 +206,7 @@
     delay: 3
     transferAmount: 1
     solution: puddle
-    utensil: None
+    utensil: Spoon
   - type: ExaminableSolution
     solution: puddle
     locVolume: "examinable-solution-on-examine-volume-puddle"

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index a1b69a09669684d28693913f65a10e1381fcae24..820814a46899aa592a653e8aae2f536475446e83 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -9,7 +9,6 @@
   - type: FlavorProfile
     flavors:
       - sweet
-  - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/cake.rsi
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index c13f52194fad9eb340b38657204c1322d76ac289..2403aefe6d52f97078eb65832859380dbbe6712a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -6,7 +6,6 @@
   abstract: true
   description: Goes great with robust coffee.
   components:
-  - type: Food
   - type: Tag
     tags:
     - Donut

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 7228a213666183befe3867620af5b5db8a8c9e95..20e61869b02cab05c0a4833089e263caf9c0699c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -10,7 +10,7 @@
     tags:
       - Egg
       - Meat
-  - type: Food
+  - type: Edible
     trash:
     - Eggshells
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index b10e071fd9623309f9135fd74a0575096015c2ec..34aff044893f8e613172a2a13f41df7d8fdaa804 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -205,7 +205,7 @@
   suffix: Full
   components:
   - type: Material
-  - type: Food
+  - type: Edible
     transferAmount: 10
   - type: BadFood
   - type: PhysicalComposition

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 9eeed7af80836f5c4f95f30bb18eac5aaa8f0aab..4b7477eed3ae9f138051e0f73355943711674863 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -226,13 +226,6 @@
     state: durathread
   - type: Stack
     count: 1
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents: #Hell if I know what durathread is made out of.
-        - ReagentId: Fiber
-          Quantity: 6
 
 - type: entity
   parent: MaterialBase