diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index b5dbe02ae8..541d0a098d 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index df66944c9f..b544045682 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml index 462c99ccc1..5958285ee0 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index 8007360ad8..1c2f56922d 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml index 00e613990d..5aa3cec6c9 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d875edfabf..70b2381017 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index bc9bd51fce..904d4f849f 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 13ff3f1a74..f2573b43a5 100644 --- 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/ diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml index 5845c83a13..ae82971cd1 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 0812fe9beb..9105ea9883 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index 5f3d58ba84..18a4ccdbe3 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 36193d19d0..bdc37d7f95 100644 --- 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. diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index fb077a2aeb..f00642695d 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml index 3eafe1ad36..9f3d97cc1f 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml index 8819a4e8de..eeddf26846 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml index 75c4bf7f04..ca09499fb2 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 3a3cd682cb..4fbbf59977 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 293a609057..472922ec69 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index b7b7906d9c..66f0f6d115 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml index 33ee4d433e..006581c564 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml index ef2500cf77..cb4f52101e 100644 --- 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 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index a6b0b16fa6..cd9da7e011 100644 --- 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