Whitelist for trashbags (#6143)

2022-01-13 12:53:13 +00:00
parent 92d15bb25e
commit 4ce9c94cd4
22 changed files with 69 additions and 2 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -206,6 +206,9 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    HeldPrefix: packet
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -34,6 +34,9 @@
    - type: DrinkCanVisualizer
      stateClosed: icon
      stateOpen: icon_open
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  parent: DrinkCanBaseFull
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -50,7 +50,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-
+  - type: Tag
+    tags:
+    - Trash

 # Containers
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -23,6 +23,9 @@
    damage:
      types:
        Slash: 2
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  parent: ShardBase
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -18,4 +18,7 @@
    damage:
      types:
        Slash: 2
+  - type: Tag
+    tags:
+    - Trash

--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -25,6 +25,9 @@
          enum.PaperStatus.Written: paper_words
  - type: Item
    size: 1
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  parent: Paper
@@ -37,6 +40,9 @@
    # 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
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -7,6 +7,9 @@
    sprite: Objects/Misc/utensils.rsi
  - type: Item
    sprite: Objects/Misc/utensils.rsi
+  - type: Tag
+    tags:
+    - Trash

 - type: entity
  parent: UtensilBase
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -47,6 +47,9 @@
  - type: Appearance
    visuals:
    - type: LightBulbVisualizer
+  - type: Tag
+    tags:
+    - Trash

 # Lighting color values gathered from
 # https://andi-siess.de/rgb-to-color-temperature/
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -15,6 +15,10 @@
    areaInsert: true
    storageSoundCollection:
      collection: trashBagRustle
+    whitelist:
+      tags:
+        - Cartridge
+        - Trash

 - type: entity
  name: trash bag
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -8,6 +8,7 @@
  - type: Tag
    tags:
    - Bottle
+    - Trash
  - type: Sprite
    sprite: Objects/Specific/Chemistry/bottle.rsi
    netsync: false
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - Flare
+    - Trash
  - type: ExpendableLight
    spentName: spent flare
    spentDesc: It looks like this flare has burnt out. What a bummer.
@@ -77,4 +78,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
@@ -4,6 +4,9 @@
  id: GlowstickBase
  description: Useful for raves and emergencies.
  components:
+    - type: Tag
+      tags:
+      - Trash
    - 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
@@ -17,6 +17,7 @@
  - type: Tag
    tags:
    - Matchstick
+    - Trash
  - type: Sprite
    netsync: false
    sprite: Objects/Tools/matches.rsi
@@ -76,3 +77,6 @@
          - matchbox1
          - matchbox2
          - matchbox3
+  - type: Tag
+    tags:
+    - Trash
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
@@ -17,3 +17,6 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml
@@ -16,6 +16,9 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgeClRifle
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml
@@ -16,6 +16,9 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgeLRifle
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -16,6 +16,9 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgeMagnum
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -16,6 +16,9 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgePistol
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - ShotgunShell
+    - Cartridge
  - type: Ammo
    caliber: Shotgun
    ammoSpread: 40
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml
@@ -16,6 +16,9 @@
  - type: Appearance
    visuals:
    - type: SpentAmmoVisualizer
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgeSRifle
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml
@@ -13,6 +13,9 @@
    layers:
    - state: base
      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Tag
+    tags:
+    - Cartridge

 - type: entity
  id: CartridgeCap
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -44,6 +44,9 @@

 - type: Tag
  id: CaptainSabre
+  
+- type: Tag
+  id: Cartridge

 - type: Tag
  id: CigFilter
@@ -242,6 +245,9 @@

 - type: Tag
  id: Taser
+  
+- type: Tag
+  id: Trash

 - type: Tag
  id: Wall