From 45be3583ea8fda0f5d1f28a68cea64c213b041ed Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Wed, 9 Feb 2022 15:07:14 +0000
Subject: [PATCH] Adds trash tag to more trash items (#6594)

---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml    |  3 +++
 .../Objects/Consumable/Food/Containers/plate.yml       |  9 +++++----
 .../Prototypes/Entities/Objects/Consumable/drinks.yml  |  8 +++++---
 Resources/Prototypes/Entities/Objects/Fun/crayons.yml  | 10 ++++++++++
 .../Entities/Objects/Specific/Medical/hypospray.yml    |  3 +++
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 9ff26f50f4..d542350ee8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -575,6 +575,9 @@
     pieces: 1
   - type: ReplacementAccent
     accent: mouse
+  - type: Tag
+    tags:
+    - Trash
 
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index d2dcaffa88..64834a99af 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -47,12 +47,15 @@
   name: broken plate
   parent: BaseItem
   id: FoodPlateTrash
-  description: A large plate, broken and useless.
+  description: A broken plate. Useless.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/plates.rsi
     state: plate-trash
     netsync: false
+  - type: Tag
+    tags:
+    - Trash
 
 # Small Plate
 
@@ -84,10 +87,8 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  name: broken plate
-  parent: BaseItem
+  parent: FoodPlateTrash
   id: FoodPlateSmallTrash
-  description: A broken plate. Useless.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/plates.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index f00fca0ccb..7110231609 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -2101,9 +2101,12 @@
           Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ramen.rsi
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkRamen
   id: DrinkHellRamen
   name: hell ramen
   description: Just add 10ml water, self heats! Super spicy flavor.
@@ -2117,5 +2120,4 @@
           Quantity: 30
         - ReagentId: CapsaicinOil
           Quantity: 5
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/ramen.rsi
+          
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index ff9ba053ee..8830024fed 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -9,6 +9,7 @@
     tags:
     - Write
     - Crayon
+    - Trash
   - type: UserInterface
     interfaces:
     - key: enum.CrayonUiKey.Key
@@ -36,6 +37,7 @@
     - Write
     - Crayon
     - CrayonWhite
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -57,6 +59,7 @@
     - Write
     - Crayon
     - CrayonWhite
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -78,6 +81,7 @@
     - Write
     - Crayon
     - CrayonBlack
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -99,6 +103,7 @@
     - Write
     - Crayon
     - CrayonRed
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -120,6 +125,7 @@
     - Write
     - Crayon
     - CrayonOrange
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -141,6 +147,7 @@
     - Write
     - Crayon
     - CrayonYellow
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -162,6 +169,7 @@
     - Write
     - Crayon
     - CrayonGreen
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -183,6 +191,7 @@
     - Write
     - Crayon
     - CrayonBlue
+    - Trash
 
 - type: entity
   parent: Crayon
@@ -204,6 +213,7 @@
     - Write
     - Crayon
     - CrayonPurple
+    - Trash
 
 - type: entity
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 6c2830b198..0ede684b31 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -49,6 +49,9 @@
       maxFillLevels: 1
       changeColor: false
       emptySpriteName: medipen_empty
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
   name: epinephrine medipen