From 990a929aee12151cc82d89ccd2d640503660657e Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Sun, 16 Jan 2022 19:37:48 +0000
Subject: [PATCH] Adds trash tag to more items (#6183)

---
 .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 3 +++
 .../Objects/Consumable/Smokeables/Cigarettes/cartons.yml    | 3 +++
 .../Objects/Consumable/Smokeables/Cigarettes/cigarette.yml  | 1 +
 .../Objects/Consumable/Smokeables/Cigarettes/joints.yml     | 2 ++
 .../Objects/Consumable/Smokeables/Cigarettes/packs.yml      | 1 +
 .../Consumable/Smokeables/Cigarettes/rolling_paper.yml      | 2 ++
 .../Objects/Consumable/Smokeables/base_smokeables.yml       | 3 +++
 .../Prototypes/Entities/Objects/Consumable/drinks_cans.yml  | 1 +
 Resources/Prototypes/Entities/Objects/Misc/paper.yml        | 6 ------
 9 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index ccedcbdbb1..52d57439c4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -191,6 +191,9 @@
       mass: 5
       mask:
         - SmallImpassable
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
   name: carrot
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index 915362684c..d7d0eedef6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -21,6 +21,9 @@
     visuals:
       - type: BagOpenCloseVisualizer
         openIcon: open
+  - type: Tag
+    tags:
+    - Trash
 
 - type: entity
   id: CigCartonRed
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 3b14f98b8a..e88506613b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -14,6 +14,7 @@
   - type: Tag
     tags:
       - Cigarette
+      - Trash
   - type: Clothing
     sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
     Slots: [ mask ]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
index 28808de511..9bec50e4a0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -11,6 +11,7 @@
   - type: Tag
     tags:
       - Cigarette
+      - Trash
   - type: Clothing
     sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
     Slots: [ mask ]
@@ -40,6 +41,7 @@
   - type: Tag
     tags:
       - Cigarette
+      - Trash
   - type: Clothing
     sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
     Slots: [ mask ]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 44984e2c1e..e62379f5d8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -7,6 +7,7 @@
   - type: Tag
     tags:
     - CigPack
+    - Trash
   - type: Storage
     capacity: 6
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
index a0dbfdcb5c..c27062bc9e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -58,6 +58,7 @@
   - type: Tag
     tags:
     - RollingPaper
+    - Trash
 
 - type: entity
   id: CigaretteFilter
@@ -78,3 +79,4 @@
   - type: Tag
     tags:
     - CigFilter
+    - Trash
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
index e56f4ab7a6..afdd6a7b7a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
@@ -10,6 +10,9 @@
   - type: Appearance
     visuals:
       - type: BurnStateVisualizer
+  - type: Tag
+    tags:
+    - Trash
 
 # Base for all cigars and cigarettes.
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
index b544045682..ff2463c52c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -54,6 +54,7 @@
   - type: Tag
     tags:
     - Cola
+    - Trash
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cola.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 70b2381017..d875edfabf 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -25,9 +25,6 @@
           enum.PaperStatus.Written: paper_words
   - type: Item
     size: 1
-  - type: Tag
-    tags:
-    - Trash
 
 - type: entity
   parent: Paper
@@ -40,9 +37,6 @@
     # Changing it here is fine - if the PaperStatus key is actually added,
     #  something happened, so that ought to override this either way.
     - state: paper_words
-  - type: Tag
-    tags:
-    - Trash
 
 - type: entity
   parent: PaperWritten