From c729e580ce5932cf79a9bb603f4259a1cac44218 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sun, 3 Sep 2023 16:22:28 +0200
Subject: [PATCH] Add fork & spoon to dinnerware (#19784)

* some utensils clean

* add utensils to dinnerware
---
 .../Inventories/dinnerware.yml                |  2 +
 .../Entities/Objects/Misc/utensils.yml        | 48 ++++++++-----------
 2 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index 0ef9f7a794..ccf702b210 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -3,6 +3,8 @@
   startingInventory:
     ButchCleaver: 1
     KitchenKnife: 5
+    Spoon: 4
+    Fork: 4
     FoodBowlBig: 10
     FoodPlate: 10
     FoodPlateSmall: 10
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index e2891c48bf..b180e7d631 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -1,16 +1,30 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: UtensilBase
   abstract: true
   components:
   - type: Sprite
     sprite: Objects/Misc/utensils.rsi
-  - type: Item
+  - type: Item # TODO add inhand sprites for all utensils
     sprite: Objects/Misc/utensils.rsi
   - type: Tag
     tags:
-    - Trash
+    - Metal
   - type: SpaceGarbage
+  
+- type: entity
+  parent: UtensilBase
+  id: UtensilBasePlastic
+  abstract: true
+  components:
+  - type: Utensil
+    breakChance: 0.20
+  - type: StaticPrice
+    price: 0
+  - type: Tag
+    tags:
+     - Plastic
+     - Trash
 
 - type: entity
   parent: UtensilBase
@@ -34,24 +48,16 @@
         Piercing: 5
 
 - type: entity
-  parent: UtensilBase
+  parent: UtensilBasePlastic
   id: ForkPlastic
   name: plastic fork
   description: An eating utensil, perfect for stabbing.
   components:
   - type: Sprite
     state: plastic_fork
-  - type: Item
   - type: Utensil
     types:
     - Fork
-    breakChance: 0.20
-  - type: Tag
-    tags:
-      - Plastic
-      - Trash
-  - type: StaticPrice
-    price: 0
 
 - type: entity
   parent: UtensilBase
@@ -59,9 +65,6 @@
   name: spoon
   description: There is no spoon.
   components:
-  - type: Tag
-    tags:
-    - Metal
   - type: Sprite
     state: spoon
   - type: Item
@@ -76,15 +79,11 @@
         Blunt: 1
 
 - type: entity
-  parent: UtensilBase
+  parent: UtensilBasePlastic
   id: SpoonPlastic
   name: plastic spoon
   description: There is no spoon.
   components:
-  - type: Tag
-    tags:
-    - Plastic
-    - Trash
   - type: Sprite
     state: plastic_spoon
   - type: Item
@@ -92,7 +91,6 @@
   - type: Utensil
     types:
     - Spoon
-    breakChance: 0.20
 
 - type: entity
   parent: UtensilBase
@@ -100,16 +98,8 @@
   name: plastic knife
   description: That's not a knife. This is a knife.
   components:
-  - type: Tag
-    tags:
-    - Plastic
-    - Trash
   - type: Sprite
     state: plastic_knife
-  - type: Item
   - type: Utensil
     types:
     - Knife
-    breakChance: 0.20
-  - type: StaticPrice
-    price: 0