Remove unused tags (#41265)

* the letter R

* the letter S

* extras

* the letter T

* the letter U

* the letter V

* the letter W

* the final letter ( X )

* the easy ones

* Unused b and c

* unused d

* unused G

* unused I

* unused K

* un used m and p

* the letter R

* unused T

* un used W

* re-add heavy rifle, document magazines

* final alphabet

* Merge remote-tracking branch 'upstream/master' into work/tag-nuke

# Conflicts:
#	Resources/Prototypes/tags.yml

* delete haunted

* Revert "delete haunted"

This reverts commit 870d782f7d97a1d7cb34cd14a288cc0cd0299cce.

* mistake

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
index 4024d8c06a2ba882ad1183fc342dd56c96ce27a6..39a331dc0d19ec7aef0d2e4d33acfb9934e721f2 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -247,7 +247,6 @@
   - type: Storage
     whitelist:
       tags:
-      # - PlantAnalyzer
       - PlantSampleTaker
       - BotanyShovel
       - BotanyHoe
@@ -268,10 +267,6 @@
         whitelist:
           tags:
           - BotanyHatchet
-      # hydro:
-      #   whitelist:
-      #     tags:
-      #     - PlantAnalyzer # Dunno what to put here, should be aight.
       hoe:
         whitelist:
           tags:

diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml
index 7eb0a063309c0e4eac3eeb37f39fad0525b6c8dc..f6301dc7148e81cdf88fe32567f9608acf99507a 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/clicktest.yml
+++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml
@@ -9,9 +9,6 @@
   id: ClickTestBase
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index 9ba7c85e1e1908fbb1a514aec6634b99a3d7c33c..a71548ebee49989a4062ae0bdd1b0b8ff6b77626 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -5,9 +5,6 @@
   description: ded
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/debug.rsi
     state: icon
@@ -32,14 +29,14 @@
         priority: 2
         whitelist:
           tags:
-            - Debug
+            - MagazineDebug
       gun_chamber:
         name: Chamber
         startingItem: CartridgeDebug
         priority: 1
         whitelist:
           tags:
-            - CartridgePistol
+            - CartridgeDebug
 
 - type: entity
   id: MagazinePistolDebug
@@ -49,7 +46,7 @@
   components:
   - type: Tag
     tags:
-      - Debug
+      - MagazineDebug
   - type: BallisticAmmoProvider
     proto: CartridgeDebug
     capacity: 1000
@@ -63,9 +60,6 @@
   categories: [ Debug, HideSpawnMenu ]
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Projectile
     damage:
       types:
@@ -79,7 +73,7 @@
   components:
   - type: Tag
     tags:
-      - Debug
+    - CartridgeDebug
   - type: CartridgeAmmo
     proto: BulletDebug
 
@@ -90,9 +84,6 @@
   description: hit hard ye
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Sprite
     sprite: Objects/Weapons/Melee/debug.rsi
     state: icon
@@ -109,9 +100,6 @@
   parent: MeleeDebugGib
   id: MeleeDebug100
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: MeleeWeapon
     damage:
       types:
@@ -122,9 +110,6 @@
   parent: MeleeDebugGib
   id: MeleeDebug200
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: MeleeWeapon
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Debugging/drugs.yml b/Resources/Prototypes/Entities/Debugging/drugs.yml
index 2bb8fdae7144f88ebcb6ebb2ae8837b9a2161570..0ba92443adbd392d8e2273340f93bad051d8bb85 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/drugs.yml
+++ b/Resources/Prototypes/Entities/Debugging/drugs.yml
@@ -5,9 +5,6 @@
   description: Just a whole glass of meth.
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: SolutionContainerManager
     solutions:
       drink:

diff --git a/Resources/Prototypes/Entities/Debugging/item.yml b/Resources/Prototypes/Entities/Debugging/item.yml
index e3c8ffddd285504062ea05957e27893eb9a13b1a..5e74412fe9a73fae6abb2f45b712af2d1eff7b20 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/item.yml
+++ b/Resources/Prototypes/Entities/Debugging/item.yml
@@ -5,9 +5,6 @@
   description: What is it...?
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Sprite
     sprite: Objects/Misc/skub.rsi
     state: icon

diff --git a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
index 229ffa00ccb6b08e6815a3f941caff413a993110..c2b51c8a5addbfbaf83d2a4933d76e22440832bc 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
+++ b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
@@ -2,9 +2,6 @@
   id: OptionsVisualizerTest
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-    - Debug
   - type: Sprite
     sprite: Effects/optionsvisualizertest.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
index 023ba8c08a811c8c6a5b158450c64a9e6d925770..569889375d2e972839f6666bba99614ca15db7f9 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
+++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
@@ -5,9 +5,6 @@
   description: The pain of using this is almost too great to bear.
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Sprite
     sprite: Objects/Tools/debug.rsi
     state: icon

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index ea11162c99ff3982bc04ade9c30ddac45e8bdf64..896142562fdb663774bcf0c70564d6cc34636652 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -13,9 +13,6 @@
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 10
-  - type: Tag
-    tags:
-    - DrinkCup
   - type: StaticPrice
     price: 10
 
@@ -88,7 +85,6 @@
   - type: Tag
     tags:
     - Trash
-    - DrinkCup
     - WhitelistChameleon
   - type: Clothing
     slots:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index f7c984171d6df1f9a57d165a91bad208091f0aae..3ae53b077bd3d8e88c2351d6c45e70a364ebfe5c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -38,9 +38,6 @@
         reagents:
         - ReagentId: SpaceGlue
           Quantity: 30
-  - type: Tag
-    tags:
-      - DrinkSpaceGlue
   - type: Glue
 
 - type: entity
@@ -92,9 +89,6 @@
     sprite: Objects/Consumable/Drinks/jar_what.rsi
   - type: FitsInDispenser
     solution: drink
-  - type: Tag
-    tags:
-    - DrinkGlass
 
 # Mopwata
 - type: weightedRandomFillSolution

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
index aaa58be59c7c18cdf46c1e9e893f2df8888c8a4f..2b2ae6117d4ca0363224bdc7931b87d329a92ca4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -21,10 +21,6 @@
     metamorphicDefaultSprite:
       sprite: Objects/Consumable/Drinks/glass_clear.rsi
       state: icon
-  - type: Tag
-    tags:
-    - DrinkCup # Do these tags
-    - DrinkGlass # even do anything?
   - type: TransformableContainer
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 931620b665d09a6905fca6b087247bd3a77dff82..66ddc0e74d470efce5c6cc7c046e4d0157cff724 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -17,9 +17,6 @@
     inHandsMaxFillLevels: 1
   - type: FitsInDispenser
     solution: drink
-  - type: Tag
-    tags:
-    - DrinkGlass
 
 - type: entity
   parent: [DrinkBaseMaterialMetal, DrinkBase]
@@ -208,9 +205,6 @@
     solution: drink
   - type: FitsInDispenser
     solution: drink
-  - type: Tag
-    tags:
-    - DrinkGlass
 
 - type: entity
   parent: DrinkShakeBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index fda43d65fe2d8f5b1a9ce5daf1f46c3da3c55165..28dfe41ba81e2e92638047735cdb561e59b75fc5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -35,10 +35,6 @@
     solution: food
   - type: TrashOnSolutionEmpty
     solution: food
-  - type: Tag
-    tags:
-      - Ingredient
-
 - type: entity
   abstract: true
   parent: ReagentContainerBase
@@ -278,9 +274,6 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 15
-  - type: Tag
-    tags:
-      - Ingredient
 
 - type: entity
   parent: FoodBakingBase
@@ -468,7 +461,6 @@
     node: start
   - type: Tag
     tags:
-    - Ingredient
     - ClothMade
   - type: SolutionContainerManager
     solutions:
@@ -540,7 +532,6 @@
   - type: Tag
     tags:
      - ClothMade
-     - Ingredient
 
 - type: entity
   name: raw pastry base
@@ -934,9 +925,6 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
-  - type: Tag
-    tags:
-      - Ingredient
 
 - type: entity
   parent: FoodBakingBase

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
index f7d9e0973a3e0e439a00cb1f9718697318a9ced0..f9ef69b1d17984be7dfc62b2c54c26e527f03448 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -23,9 +23,6 @@
   - type: Sprite
     noRot: true
   - type: Appearance
-  - type: Tag
-    tags:
-      - TabletopPiece
 
 - type: entity
   id: BaseBoardTabletop

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 12eaf2cee6c1cea21561577a4829cdeb6e07cc57..d6d989680a4c73e7faa932d0d76495882c4ed917 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1083,9 +1083,6 @@
       collection: packetOpenSounds
   - type: TrashOnSolutionEmpty
     solution: drink
-  - type: Tag
-    tags:
-    - DrinkSpaceGlue
 
 - type: entity
   parent: DrinkBase

diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 71e2704fce9f07a02881e0d61d6eb6471aa741b9..5a3c0992f09d0d74466e5bd2d642aa90772b116d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -81,10 +81,6 @@
   name: metal rod
   suffix: 10
   components:
-  - type: Tag
-    tags:
-    - RodMetal1
-    - ConstructionMaterial
   - type: Sprite
     state: rods
   - type: Stack
@@ -96,10 +92,6 @@
   name: metal rod
   suffix: Single
   components:
-  - type: Tag
-    tags:
-    - RodMetal1
-    - ConstructionMaterial
   - type: Sprite
     state: rods
   - type: Stack

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index c649ef921cb7571799170a8c63c660e9de774982..33da82de7c55fb5dbb1992d1450a6e15c2dfae8e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -242,10 +242,6 @@
     damage:
       types:
         Piercing: 5
-  - type: Tag
-    tags:
-      - ClockworkGlassShard
-      - Trash
   - type: Extractable
     grindableSolutionName: shardcglass
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index 73d72e4fb01be01ba59e465677aec0ba3d3a1898..6a26b3d9005e89571830abd5615e7ed47e1c2c44 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -60,6 +60,3 @@
       Cloth: 25
   - type: StaticPrice
     price: 15
-  - type: Tag
-    tags:
-    - ToteBase

diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index 77ddcf0d983df2d534243f436cb32551bd3157ea..55d4bb33ce8dbeec950a193a79ea767b47718e73 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -9,9 +9,6 @@
   - type: Storage
     grid:
     - 0,0,5,3
-  - type: Tag
-    tags:
-    - Briefcase
   - type: MeleeWeapon
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index 07a332afb1ca6d1749ed2a131c3c2b527fdf8e38..4ff8864bb713dc866d172e7009923c5269870032 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -101,9 +101,6 @@
     stampState: "paper_stamp-clown"
   - type: Sprite
     state: stamp-clown
-  - type: Tag
-    tags:
-      - ClownRubberStamp
 
 - type: entity
   name: chief engineer's rubber stamp

diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 5ff8c79fb41dad6faeae7e4667affcfaf022ff4b..8f6acd91d6c445fd5d9c8b6b157ddcc336d0d50d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -313,7 +313,6 @@
       tags:
       - SubdermalImplant
       - HideContextMenu
-      - MacroBomb
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -339,7 +338,6 @@
     tags:
     - SubdermalImplant
     - HideContextMenu
-    - DeathAcidifier
 
 - type: entity
   parent: BaseSubdermalImplant

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index dd9ac8232dfac343aa58e5fb6790ff2ee7ded886..cb038b3c5a315b26ced4d561ad464418a53be558 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -9,9 +9,6 @@
   - type: Item
     size: Normal
     sprite: Objects/Tanks/generic.rsi
-  - type: Tag
-    tags:
-    - GasTank
   - type: Clothing
     quickEquip: false
     sprite: Objects/Tanks/generic.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
index a953985e9aa10f0da0974b635bb2fafee68b485a..4e2db33abc10e5561da3000ffcc1c0adc24bec3e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
@@ -6,7 +6,7 @@
   components:
   - type: Tag
     tags:
-      - CartridgeHeavyRifle
+    - CartridgeHeavyRifle
   - type: CartridgeAmmo
     proto: BulletHeavyRifle
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
index 0ce441d29126499641100cca8580744408f8ff92..681bf4ff8cbfdd0a051f840997858db979bcc01f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml
@@ -17,7 +17,4 @@
   # All staves recharge. Wands are not.
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 30
-  - type: Tag
-    tags:
-    - WizardStaff
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index a468760035f0bb74caacfacec8bf1e6c29182a38..507dd8504df0e584dcbe50eeed2c8e5bed415788 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -29,9 +29,6 @@
   id: Cutlass
   description: A wickedly curved blade, often seen in the hands of space pirates.
   components:
-  - type: Tag
-    tags:
-    - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: MeleeWeapon
@@ -54,9 +51,6 @@
   id: Machete
   description: A large, vicious looking blade.
   components:
-  - type: Tag
-    tags:
-    - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: MeleeWeapon
@@ -116,9 +110,6 @@
   id: Katana
   description: Ancient craftwork made with not so ancient plasteel.
   components:
-  - type: Tag
-    tags:
-    - Katana
   - type: Sprite
     sprite: Objects/Weapons/Melee/katana.rsi
   - type: MeleeWeapon

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index f90f20db357ce2c03c7a4f9ed38a1f0ccc981d8a..5442816d4fbe894363b311b634bc437339b92a86 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -900,9 +900,6 @@
   description: PUT ON THEM CODERSOCKS!!
   suffix: DEBUG
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Sprite
     sprite: Structures/Furniture/Tables/debug.rsi
   - type: Icon

diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index d2fa8d08a37c80ae6ec177b9d484d78d6773906c..a2e1c585fb42f5f9650139534ef57fbc5c43d940 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -7,9 +7,6 @@
     supplyRate: 300000
     supplyRampRate: 50000
     supplyRampTolerance: 500
-  - type: Tag
-    tags:
-      - Debug
 
 - type: entity
   id: DebugConsumer
@@ -18,9 +15,6 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -63,9 +57,6 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -96,9 +87,6 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Clickable
   - type: PowerNetworkBattery
   - type: InteractionOutline
@@ -128,10 +116,6 @@
   parent: BaseSMES
   id: DebugSMES
   suffix: DEBUG, Empty
-  components:
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseSMES
@@ -141,18 +125,11 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
     autoRecharge: True
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseSubstation
   id: DebugSubstation
   suffix: DEBUG, Empty
-  components:
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseSubstation
@@ -162,18 +139,11 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
     autoRecharge: True
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseSubstationWall
   id: DebugSubstationWall
   suffix: DEBUG, Empty
-  components:
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseSubstationWall
@@ -183,18 +153,11 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
     autoRecharge: True
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseAPC
   id: DebugAPC
   suffix: DEBUG, Empty
-  components:
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   parent: BaseAPC
@@ -204,9 +167,6 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 50000
     autoRecharge: True
-  - type: Tag
-    tags:
-    - Debug
 
 - type: entity
   id: DebugPowerReceiver
@@ -215,9 +175,6 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Tag
-    tags:
-      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index 90893cd432591596baa7aa26dc6ab50f0061aa3e..038ac70d82341bf7818cad43b1fab5051efedbf7 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -30,9 +30,6 @@
     solution: bucket
   - type: ExaminableSolution
     solution: bucket
-  - type: Tag
-    tags:
-      - Wringer
   - type: ItemMapper
     mapLayers:
       mopbucket_shark_blue:
@@ -270,9 +267,6 @@
       solution: bucket
     - type: ExaminableSolution
       solution: bucket
-    - type: Tag
-      tags:
-        - Wringer
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 2964b71162d8194b4daac2edd912553ada652afc..8fbc14393bc9a5dbfe46cdf7ad3bdb3e8e29bb2b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -10,7 +10,7 @@
     - Wall
   components:
   - type: Anchorable
-    flags: 
+    flags:
     - Anchorable
   - type: Rotatable
   - type: RangedDamageSound
@@ -268,7 +268,6 @@
   - type: Tag
     tags:
       - Wall
-      - Debug
   - type: Sprite
     sprite: Structures/Walls/debug.rsi
   - type: Icon

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index cec1aa4baa0c7d0e94b3367c12151768ffaae236..8a466cc8c8a4af3b5745fa284788b0f744242514 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -42,9 +42,6 @@
 - type: Tag
   id: ArtifactFragment # Storage whitelist: OreBag. CargoBounty: BountyArtifactFragment. ConstructionGraph: Artifact
 
-- type: Tag
-  id: ATVKeys # Unused x2
-
 ## B ##
 
 - type: Tag
@@ -101,6 +98,9 @@
 - type: Tag
   id: BorgHead # Used by PartAssemblyComponent on CyborgEndoskeleton. Also in ConstructionGraphs for various bots
 
+- type: Tag
+  id: BorgLeg # Used by PartAssemblyComponent on VimHarness
+
 - type: Tag
   id: BorgLArm # Used by PartAssemblyComponent on CyborgEndoskeleton
 
@@ -116,9 +116,6 @@
 - type: Tag
   id: BorgTorso # Used by PartAssemblyComponent on CyborgEndoskeleton
 
-- type: Tag
-  id: BorgLeg # Used by PartAssemblyComponent on VimHarness
-
 - type: Tag
   id: BorgModuleCargo # Cyborg module category for salvage and cargo
 
@@ -147,7 +144,7 @@
   id: BorgModuleSyndicateAssault # Cyborg module category for extra evil red robots (nukies)
 
 - type: Tag
-  id: Bot # Unused (Exists on MobRobotic, MobSupplyBot)
+  id: Bot # Targeting whitelist: ChameleonProjector
 
 - type: Tag
   id: BotanyHatchet # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
@@ -176,9 +173,6 @@
 - type: Tag
   id: Bread # CargoBounty: BountyBread. Blacklisted in BountyFruit and BountyVegetable
 
-- type: Tag
-  id: Briefcase # Unused (exists on BriefcaseBase)
-
 - type: Tag
   id: BrimFlatcapBrown # ConstructionGraph: BladedFlatcapBrown
 
@@ -192,16 +186,16 @@
   id: Bucket # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley. ConstructionGraph: CleanBot, scraphelmet
 
 - type: Tag
-  id: Burger # Food sequence key
+  id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox
 
 - type: Tag
-  id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox
+  id: Bun # LastElement key on burger associated MetamorphRecipes.
 
 - type: Tag
-  id: Burnt # Storage whitelist: ashtray. Seemingly redundant?
+  id: Burger # Food sequence key
 
 - type: Tag
-  id: Bun # Unused (Exists on FoodSequenceElements BunTopBurger and CottonBunTopBurger)
+  id: Burnt # Storage whitelist: ashtray. Seemingly redundant?
 
 - type: Tag
   id: BypassDropChecks # Tagged entities don't care about drop distance or walls (Aghost).
@@ -215,10 +209,10 @@
   id: CableCoil # Storage whitelist: BaseClothingBeltEngineering, BorgModuleCable
 
 - type: Tag
-  id: Candle # Storage whitelist: BoxCandle
+  id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable
 
 - type: Tag
-  id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable
+  id: Candle # Storage whitelist: BoxCandle
 
 - type: Tag
   id: CaneBlade # Storage whitelist: CaneSheath. ItemMapper: CaneSheath
@@ -236,6 +230,9 @@
 - type: Tag
   id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath
 
+- type: Tag
+  id: Carp # CargoBounty: BountyCarp
+
 - type: Tag
   id: Carpet # CreateEntityTileReaction whitelist on Carpetium
 
@@ -245,44 +242,45 @@
 - type: Tag
   id: CarrotFries # CargoBounty: BountyCarrotFries
 
-- type: Tag
-  id: Carp # CargoBounty: BountyCarp
-
 - type: Tag # NOT bullets. This is for the cart to load PDA programs.
   id: Cartridge # Storage whitelist: BasePDA
 
+#region Cartridge (Ammo)
+
+# Entities tagged with the following are some fashion of bullet. Guns, magazines, and ammo boxes have storage whitelists for these tags.
+# Tagged entities always have CartridgeAmmoComponent.
+
 - type: Tag
-  id: CartridgeAntiMateriel # Ammo: WeaponSniperHristov, Musket, BaseMagazineBoxAntiMateriel
+  id: CartridgeAntiMateriel # .60 high caliber ammo for powerful rifles like WeaponSniperHristov, Musket.
 
 - type: Tag
-  id: CartridgeCap # Ammo: RevolverCapGun, RevolverCapGunFake, BaseSpeedLoaderCap
+  id: CartridgeCap # Specialty ammo for RevolverCapGun, RevolverCapGunFake.
 
 - type: Tag
-  id: CartridgeCaselessRifle # Ammo: WeaponPistolCobra, BaseMagazineCaselessRifle, BaseMagazineBoxCaselessRifle
+  id: CartridgeCaselessRifle # Specialty ammo for WeaponPistolCobra.
 
 - type: Tag
-  id: CartridgeCHIMP # Unused x2
+  id: CartridgeDebug # Specialty ammo for debug guns like the deadly WeaponPistolDebug.
 
 - type: Tag
-  id: CartridgeHeavyRifle # Unused (exists on BaseCartridgeHeavyRifle)
+  id: CartridgeHeavyRifle # .10 caliber ammo type only used by WeaponMinigun (but the tag is unused).
 
 - type: Tag
-  id: CartridgeLightRifle # Ammo: BaseWeaponLightMachineGun, BaseWeaponRifle, BaseWeaponSniper
-                          # SpeedLoaderLightRifle, BaseMagazineLightRifle, BaseMagazineBoxLightRifle
+  id: CartridgeLightRifle # .30 caliber used by lmgs and middle range rifles like WeaponLightMachineGunL6, WeaponRifleAk, WeaponSniperMosin.
 
 - type: Tag
-  id: CartridgeMagnum # Ammo: BaseWeaponRevolver, RevolverCapGunFake, WeaponPistolN1984, WeaponPistolFlintlock, XenoArtifactGun
-                      # BaseMagazineBoxMagnum, BaseMagazineMagnum, BaseSpeedLoaderMagnum
+  id: CartridgeMagnum # .45 caliber used by revolvers and big boy pistols like BaseWeaponRevolver, WeaponPistolN1984.
 
 - type: Tag
-  id: CartridgePistol # Ammo: BaseWeaponPistol, BasePistol, BaseWeaponSubMachineGun, WeaponPistolViper, WeaponSubMachineGunDrozd, WeaponSubMachineGunWt550
-                      # BaseMagazineBoxPistol, BaseMagazinePistol, BaseMagazinePistolHighCapacity, BaseMagazinePistolSubMachineGun, MagazinePistolSubMachineGunTopMounted, BaseSpeedLoaderPistol
+  id: CartridgePistol # .35 caliber used by pistols and smgs like WeaponPistolMk58, WeaponSubMachineGunC20r, WeaponSubMachineGunDrozd.
 
 - type: Tag
-  id: CartridgeRifle # Ammo: BaseMagazineRifle, WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher, BaseMagazineBoxRifle
+  id: CartridgeRifle # .20 caliber used by precise rifles like WeaponRifleLecter, WeaponRifleEstoc.
 
 - type: Tag
-  id: CartridgeRocket # Ammo: WeaponLauncherRocket, WeaponLauncherMultipleRocket
+  id: CartridgeRocket # Specialty ammo for WeaponLauncherRocket.
+
+#endregion
 
 - type: Tag
   id: Catwalk # If a tagged entity is intersecting a hazard tile entity such as lava or chasms, step triggers on those hazards are cancelled.
@@ -290,9 +288,6 @@
 - type: Tag
   id: CentrifugeCompatible # Storage whitelist: MachineCentrifuge
 
-- type: Tag
-  id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken
-
 - type: Tag
   id: Cheese # MetamorphRecipe: FoodBurgerCheese, FoodBurgerDuck
 
@@ -302,6 +297,9 @@
 - type: Tag
   id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical
 
+- type: Tag
+  id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken
+
 - type: Tag
   id: ChiliBowl # CargoBounty: BountyChili
 
@@ -320,9 +318,6 @@
 - type: Tag
   id: Cleaver # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef
 
-- type: Tag
-  id: ClockworkGlassShard # Unused (Exists on ShardGlassClockwork)
-
 - type: Tag
   id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth
 
@@ -332,9 +327,6 @@
 - type: Tag
   id: ClownRecorder # ConstructionGraph: ClownHardsuit
 
-- type: Tag
-  id: ClownRubberStamp # Unused (Exists on RubberStampClown)
-
 - type: Tag
   id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes
 
@@ -422,9 +414,6 @@
 - type: Tag
   id: CrowbarRed # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltChiefEngineer. ItemMapper: BaseClothingBeltEngineering, ClothingBeltChiefEngineer
 
-- type: Tag
-  id: Cryobeaker # Unused x2
-
 - type: Tag
   id: CrystalBlack # ConstructionGraph: BlackLight, BlackLightBulb
 
@@ -454,12 +443,6 @@
 
 ## D ##
 
-- type: Tag
-  id: DeathAcidifier # Unused (Exists on DeathAcidifierImplant)
-
-- type: Tag
-  id: Debug # Exists on various debug / testing entities, but seemingly unused.
-
 - type: Tag # Exists on diagonal walls and windows
   id: Diagonal # Used by TileWallsCommand and FixRotationsCommand
 
@@ -478,9 +461,6 @@
 - type: Tag
   id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination.
 
-- type: Tag
-  id: DockCargo # Unused x2
-
 - type: Tag
   id: DockEmergency # Used bv EmergencyShuttleSystem for finding a priority FTL destination.
 
@@ -509,15 +489,6 @@
 - type: Tag
   id: DrinkCan # ConstructionGraph: FireBomb
 
-- type: Tag
-  id: DrinkCup # Unused (Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass)
-
-- type: Tag
-  id: DrinkGlass # Unused (Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase)
-
-- type: Tag
-  id: DrinkSpaceGlue # Unused (Exists on DrinkSpaceGlue, CrazyGlue)
-
 - type: Tag
   id: Dropper # Storage whitelist: ClothingBeltMedical, ClothingBeltPlant, ChemBag
 
@@ -547,9 +518,6 @@
 - type: Tag
   id: EncryptionCommon # ItemMapper: TelecomServer
 
-- type: Tag
-  id: EncryptionElse # Unused x2
-
 - type: Tag
   id: EncryptionEngineering # ItemMapper: TelecomServer
 
@@ -571,9 +539,6 @@
 - type: Tag
   id: ExCable # Placement blacklist on CableDetStack. Placement whitelist on WiredDetonator
 
-- type: Tag
-  id: ExplosivePassable # Unused x2
-
 ## F ##
 
 - type: Tag
@@ -594,15 +559,15 @@
 - type: Tag
   id: FireAxe # Storage whitelist: FireAxeCabinet
 
-- type: Tag
-  id: FirelockElectronics # ConstructionGraph: Firelock
-
 - type: Tag
   id: FireExtinguisher # ConstructionGraph: FireBot
 
 - type: Tag
   id: FireHelmet # ConstructionGraph: FireBot
 
+- type: Tag
+  id: FirelockElectronics # ConstructionGraph: Firelock
+
 - type: Tag
   id: Flare # Storage whitelist: BaseClothingBeltEngineering
 
@@ -647,9 +612,6 @@
 - type: Tag
   id: GasScrubber # Used by AtmosAlarmableComponent for syncing devices.
 
-- type: Tag
-  id: GasTank # Unused (Exists on GasTankBase)
-
 - type: Tag
   id: GasVent # Used by AtmosAlarmableComponent for syncing devices.
 
@@ -664,7 +626,7 @@
   id: GhostOnlyWarp
 
 - type: Tag
-  id: GenderPin # ChameleonClothing key.
+  id: GenderPin #  Chameleon key for ClothingGenderPinBase.
 
 - type: Tag
   id: GlassAirlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks.
@@ -719,15 +681,15 @@
 - type: Tag
   id: HamtrCentralControlModule # ConstructionGraph: Hamtr
 
-- type: Tag
-  id: HamtrPeripheralsControlModule # ConstructionGraph: Hamtr
-
 - type: Tag
   id: HamtrLArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
 - type: Tag
   id: HamtrLLeg # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
+- type: Tag
+  id: HamtrPeripheralsControlModule # ConstructionGraph: Hamtr
+
 - type: Tag
   id: HamtrRArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
@@ -767,9 +729,6 @@
 - type: Tag
   id: HidesHair # Used by MagicMirrorSystem to prevent haircuts if a tagged entity is worn.
 
-- type: Tag
-  id: HidesNose # Unused x2
-
 - type: Tag
   id: HighRiskItem # Storage blacklist: ClothingHeadHatDetGadget. Blacklisted on MaterialReclaimerComponent by both entities
                    # Used by EventHorizonSystem to send an admin alert.
@@ -795,24 +754,24 @@
 - type: Tag
   id: HonkerCentralControlModule # ConstructionGraph: Honker
 
-- type: Tag
-  id: HonkerPeripheralsControlModule # ConstructionGraph: Honker
-
-- type: Tag
-  id: HonkerTargetingControlModule # ConstructionGraph: Honker
-
 - type: Tag
   id: HonkerLArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
   id: HonkerLLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
+- type: Tag
+  id: HonkerPeripheralsControlModule # ConstructionGraph: Honker
+
 - type: Tag
   id: HonkerRArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
   id: HonkerRLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
+- type: Tag
+  id: HonkerTargetingControlModule # ConstructionGraph: Honker
+
 - type: Tag
   id: Hotsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
@@ -831,16 +790,13 @@
   id: Igniter # ConstructionGraph: makeshiftstunprod, FireBomb. Common ingredient in machines (HyperConvection)
 
 - type: Tag
-  id: Ingredient # Unused. (Exists on items in igredients.yml)
-
-- type: Tag #Drop this innate tool instead of deleting it.
-  id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove
+  id: Inflatable # Storage whitelist: BorgModuleInflatable
 
 - type: Tag
   id: Ingot # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag
 
-- type: Tag
-  id: Inflatable # Storage whitelist: BorgModuleInflatable
+- type: Tag #Drop this innate tool instead of deleting it.
+  id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove
 
 - type: Tag
   id: InstantDoAfters # Used by SharedDoAfterSystem for tagged entities to skip DoAfters (aghost). TODO remove
@@ -865,9 +821,6 @@
 - type: Tag
   id: Kangaroo # Used by inventoryTemplate:kangaroo to whitelist clothes wearable by the man shaped animal.
 
-- type: Tag
-  id: Katana # Unused. (Exists on Katana)
-
 - type: Tag
   id: Ketchup # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
@@ -900,63 +853,54 @@
 
 ## M ##
 
-- type: Tag
-  id: Machete # Unused (Exists on Machete, Cutlass)
-
-- type: Tag
-  id: MacroBomb # Unused (Exists on MacroBombImplant)
-
-# Magazines ordered by slot then caliber
+#region Magazine (Ammo)
 
-- type: Tag
-  id: MagazineCalico # Unused x2
+# Entities tagged with the following are some sort of gun magazine. Guns whitelist their storage using these tags.
+# Tagged entities always have BallisticAmmoProviderComponent.
 
 - type: Tag
   id: MagazineCaselessRifle # Unused (Exists on BaseMagazineCaselessRifle)
 
 - type: Tag
-  id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle)
+  id: MagazineDebug # WeaponPistolDebug
 
 - type: Tag
-  id: MagazineHeavyRifleBox # Unused x2
+  id: MagazineGrenade # ShuttleGunDuster
 
 - type: Tag
-  id: MagazineLightRifle # Storage whitelist: BaseWeaponRifle, WeaponRifleAk
-
-- type: Tag
-  id: MagazineLightRifleBox # Storage whitelist: BaseWeaponLightMachineGun
+  id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle)
 
 - type: Tag
-  id: MagazineLightRiflePan # Unused x2
+  id: MagazineLightRifle # WeaponRifleAk
 
 - type: Tag
-  id: MagazineMagnum # Storage whitelist: ClothingBeltSecurity, WeaponPistolN1984
+  id: MagazineLightRifleBox # WeaponLightMachineGunL6
 
 - type: Tag
-  id: MagazinePistol # Storage whitelist: ClothingBeltSecurity, BaseWeaponPistol, WeaponPistolViper
+  id: MagazineMagnum # WeaponPistolN1984
 
 - type: Tag
-  id: MagazinePistolCaselessRifle # Storage whitelist: WeaponPistolCobra
+  id: MagazinePistol # WeaponPistolMk58, WeaponPistolViper, ClothingBeltSecurity
 
 - type: Tag
-  id: MagazinePistolHighCapacity # Storage whitelist: WeaponPistolViper
+  id: MagazinePistolCaselessRifle # WeaponPistolCobra
 
 - type: Tag
-  id: MagazinePistolSubMachineGunTopMounted # Storage whitelist: WeaponSubMachineGunWt550
+  id: MagazinePistolHighCapacity # WeaponPistolViper
 
 - type: Tag
-  id: MagazineRifle # Storage whitelist: WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher
+  id: MagazinePistolSubMachineGun # WeaponSubMachineGunC20r, WeaponSubMachineGunDrozd, WeaponSubMachineGunAtreides
 
 - type: Tag
-  id: MagazineShotgun # Storage whitelist: WeaponShotgunBulldog
+  id: MagazinePistolSubMachineGunTopMounted # WeaponSubMachineGunWt550
 
 - type: Tag
-  id: MagazinePistolSubMachineGun # Storage whitelist: BaseWeaponSubMachineGun, WeaponSubMachineGunDrozd
+  id: MagazineRifle # WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher
 
 - type: Tag
-  id: MagazineGrenade # Storage whitelist: ShuttleGunDuster
+  id: MagazineShotgun # WeaponShotgunBulldog
 
-# Magazines end
+#endregion
 
 - type: Tag
   id: MailingUnitElectronics # ConstructionGraph: DisposalMachine
@@ -1034,9 +978,6 @@
 - type: Tag
   id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
-- type: Tag
-  id: NoBlockAnchoring # Unused x2
-
 - type: Tag
   id: NoConsoleSound # Blacklist on BaseComputer, StationMap. Tagged entity will not make sound when opening the UI.
 
@@ -1078,13 +1019,13 @@
   id: Packet # Storage whitelist: ClothingBeltChef
 
 - type: Tag
-  id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones
+  id: Pancake # CargoBounty: BountyPancake
 
 - type: Tag
   id: Paper # A writeable piece of paper. Subset of Document tag. SpecialDigestible: OrganMothStomach, OrganReptilianStomach
 
 - type: Tag
-  id: Pancake # CargoBounty: BountyPancake
+  id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones
 
 - type: Tag
   id: ParcelWrapBlacklist # Tagged entities can't be wrapped in ParcelWrap.
@@ -1135,9 +1076,6 @@
 - type: Tag
   id: PKAUpgrade # UpgradeableGun whitelist for WeaponProtoKineticAccelerator.
 
-- type: Tag
-  id: PlantAnalyzer # Commented out on ClothingBeltPlant, so currently unused x2.
-
 - type: Tag
   id: PlantBGone # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
@@ -1244,9 +1182,6 @@
 - type: Tag
   id: RipleyCentralControlModule # ConstructionGraph: Ripley
 
-- type: Tag
-  id: RipleyPeripheralsControlModule # ConstructionGraph: Ripley
-
 - type: Tag
   id: RipleyLArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
 
@@ -1254,13 +1189,13 @@
   id: RipleyLLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
 
 - type: Tag
-  id: RipleyRArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
+  id: RipleyPeripheralsControlModule # ConstructionGraph: Ripley
 
 - type: Tag
-  id: RipleyRLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
+  id: RipleyRArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
 
 - type: Tag
-  id: RodMetal1 # Unused (Exists on PartRodMetal1, PartRodMetal10)
+  id: RipleyRLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness
 
 - type: Tag
   id: RollingPaper # Storage whitelist: PackPaperRolling, PackPaperRollingFilters
@@ -1306,9 +1241,6 @@
 - type: Tag
   id: SecurityHelmet # ConstructionGraph: HelmetJustice
 
-- type: Tag
-  id: SecwayKeys # Unused x2
-
 - type: Tag
   id: Sheet # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag
 
@@ -1333,9 +1265,6 @@
 - type: Tag
   id: SiliconEmotes # Whitelisted and blacklisted in various EmotePrototypes to create a silicon emote group.
 
-- type: Tag
-  id: SkeletonMotorcycleKeys # Unused x2
-
 - type: Tag
   id: Skewer # Food sequence key
 
@@ -1433,9 +1362,6 @@
 - type: Tag
   id: Syndicate # FTLDestination whitelist in nukieplanet.yml. Tag exists on ComputerShuttleSyndie and infiltrator.yml
 
-- type: Tag
-  id: SyndicateSegwayKeys # Unused x2
-
 - type: Tag
   id: Syringe # Storage whitelist: ClothingBeltPlant, ChemBag, SmartFridge. CargoBounty: BountySyringe
 
@@ -1453,9 +1379,6 @@
 - type: Tag
   id: Taco # Food sequence key
 
-- type: Tag
-  id: TabletopPiece # Unused (Exists on BaseTabletopPiece)
-
 - type: Tag
   id: Taser # Storage whitelist: ClothingBeltSecurity
 
@@ -1480,9 +1403,6 @@
 - type: Tag
   id: Torch # CargoBounty: BountyTorch. ConstructionGraph: PumpkinAddLight
 
-- type: Tag
-  id: ToteBase # Unused (Exists on ToteBase)
-
 - type: Tag
   id: ToyRubberDuck # ConstructionGraph: ClothingShoeSlippersDuck
 
@@ -1592,9 +1512,6 @@
 - type: Tag
   id: Wirecutter # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering
 
-- type: Tag
-  id: WizardStaff # Unused (Exists on WeaponStaffBase)
-
 - type: Tag
   id: WizardWand # that evil vvizard vvand
                  # .cs: ChargeSpellEvent. Storage whitelist: ClothingBeltWand
@@ -1611,9 +1528,6 @@
   id: Wrench # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical.
              # ItemMapper: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical
 
-- type: Tag
-  id: Wringer # Unused (Exists on JanitorialTrolley, MopBucket)
-
 - type: Tag
   id: Write # Used by PaperSystem to make tagged entity a writing tool. Many storages whitelist this as well.