Make a bunch of stuff recyclable (#6771)

2022-02-18 01:00:56 -05:00
parent 3010de33fc
commit 2a25203bef
26 changed files with 45 additions and 4 deletions
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -27,6 +27,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  id: RightHandDrone
@@ -48,3 +49,4 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -652,6 +652,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable


 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -56,6 +56,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 # Small Plate

@@ -131,3 +132,7 @@
    sprite: Objects/Consumable/Food/plates.rsi
    state: tin
    netsync: false
+  - type: Tag
+    tags:
+    - Trash
+  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -108,6 +108,8 @@
  - type: Tag
    tags:
    - Egg
+    - Trash
+  - type: Recyclable

 # Egg

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -238,6 +238,9 @@
    sprite: Objects/Consumable/Food/frozen.rsi
    state: cone-trash
    netsync: false
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  name: popsicle stick
@@ -252,3 +255,7 @@
    spriteStates:
    - stick
    - stick2
+  - type: Tag
+    tags:
+    - Trash
+  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -209,6 +209,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -24,6 +24,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  id: CigCartonRed
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -15,6 +15,7 @@
    tags:
      - Cigarette
      - Trash
+  - type: Recyclable
  - type: Clothing
    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
    Slots: [ mask ]
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -12,6 +12,7 @@
    tags:
      - Cigarette
      - Trash
+  - type: Recyclable
  - type: Clothing
    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
    Slots: [ mask ]
@@ -42,6 +43,7 @@
    tags:
      - Cigarette
      - Trash
+  - type: Recyclable
  - type: Clothing
    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
    Slots: [ mask ]
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -8,6 +8,7 @@
    tags:
    - CigPack
    - Trash
+  - type: Recyclable
  - type: Storage
    capacity: 6
  - type: Item
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -59,6 +59,7 @@
    tags:
    - RollingPaper
    - Trash
+  - type: Recyclable

 - type: entity
  id: CigaretteFilter
@@ -80,3 +81,4 @@
    tags:
    - CigFilter
    - Trash
+  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
@@ -13,6 +13,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 # Base for all cigars and cigarettes.
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -2105,6 +2105,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  parent: DrinkRamen
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -38,6 +38,7 @@
    tags:
    - Trash
  - type: ItemCooldown
+  - type: Recyclable

 - type: entity
  parent: DrinkCanBaseFull
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -53,6 +53,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 # Containers
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -10,6 +10,7 @@
    - Write
    - Crayon
    - Trash
+  - type: Recyclable
  - type: UserInterface
    interfaces:
    - key: enum.CrayonUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -26,6 +26,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  parent: ShardBase
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: broken bottle
-  parent: BaseItem 
+  parent: BaseItem
  id: BrokenBottle
  description: In Space Glasgow this is called a conversation starter
  components:
@@ -21,4 +21,5 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -10,6 +10,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  parent: UtensilBase
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -55,6 +55,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 # Lighting color values gathered from
 # https://andi-siess.de/rgb-to-color-temperature/
@@ -126,7 +127,7 @@
  - type: Sprite
    sprite:  Objects/Power/light_tube.rsi
    state: normal
-    
+
 - type: entity
  parent: BaseLightbulb
  name: sodium light tube
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -52,6 +52,7 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable

 - type: entity
  name: epinephrine medipen
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -9,6 +9,7 @@
    tags:
    - Bottle
    - Trash
+  - type: Recyclable
  - type: Sprite
    sprite: Objects/Specific/Chemistry/bottle.rsi
    netsync: false
@@ -123,7 +124,7 @@
        reagents:
        - ReagentId: Epinephrine
          Quantity: 30
-          
+
 - type: entity
  id: RobustHarvestChemistryBottle
  name: robust harvest bottle
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -8,6 +8,7 @@
    tags:
    - Flare
    - Trash
+  - type: Recyclable
  - type: ExpendableLight
    spentName: spent flare
    spentDesc: It looks like this flare has burnt out. What a bummer.
@@ -78,4 +79,4 @@
        maxDuration: 15.0
        startValue: 8.0
        endValue: 1.0
-        property: Radius
+        property: Radius
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -7,6 +7,7 @@
    - type: Tag
      tags:
      - Trash
+    - type: Recyclable
    - type: ExpendableLight
      spentName: spent green glowstick
      spentDesc: It looks like this glowstick has stopped glowing. How tragic.
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -18,6 +18,7 @@
    tags:
    - Matchstick
    - Trash
+  - type: Recyclable
  - type: Sprite
    netsync: false
    sprite: Objects/Tools/matches.rsi
@@ -80,3 +81,4 @@
  - type: Tag
    tags:
    - Trash
+  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
@@ -8,3 +8,4 @@
    - Cartridge
  - type: Item
    size: 1
+  - type: Recyclable