diff --git a/Resources/Prototypes/Actions/item_actions.yml b/Resources/Prototypes/Actions/item_actions.yml
index e54e778be1..2c49352814 100644
--- a/Resources/Prototypes/Actions/item_actions.yml
+++ b/Resources/Prototypes/Actions/item_actions.yml
@@ -107,15 +107,19 @@
   parent: BaseItem
   id: ItemActionExample
   description: for testing item actions
+  suffix: DEBUG
   components:
-    - type: Sprite
-      sprite: Objects/Fun/bikehorn.rsi
-      state: icon
-    - type: ItemActions
-      actions:
-        - actionType: DebugInstant
-        - actionType: DebugToggle
-        - actionType: DebugTargetPoint
-        - actionType: DebugTargetPointRepeat
-        - actionType: DebugTargetEntity
-        - actionType: DebugTargetEntityRepeat
+  - type: Tag
+    tags:
+      - Debug
+  - type: Sprite
+    sprite: Objects/Fun/bikehorn.rsi
+    state: icon
+  - type: ItemActions
+    actions:
+      - actionType: DebugInstant
+      - actionType: DebugToggle
+      - actionType: DebugTargetPoint
+      - actionType: DebugTargetPointRepeat
+      - actionType: DebugTargetEntity
+      - actionType: DebugTargetEntityRepeat
diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml
index fb154ae7a0..eb61b0b812 100644
--- a/Resources/Prototypes/Entities/Debugging/clicktest.yml
+++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml
@@ -7,7 +7,11 @@
 - type: entity
   abstract: true
   id: ClickTestBase
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -80,4 +84,3 @@
   - type: InteractionOutline
   - type: Sprite
     state: invis_base
-
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index 593a7527e2..52f8021a6e 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -5,6 +5,9 @@
   description: ded
   suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/debug.rsi
   - type: Icon
@@ -28,6 +31,9 @@
   parent: MagazinePistolBase
   suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: RangedMagazine
     fillPrototype: CartridgeDebug
     capacity: 1000
@@ -41,6 +47,9 @@
   abstract: true
   suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Projectile
     damages:
       Blunt: 20000
@@ -51,6 +60,9 @@
   parent: CartridgePistolBase
   suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Ammo
     projectile: BulletDebug
 
@@ -61,6 +73,9 @@
   description: hit hard ye
   suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Sprite
     sprite: Objects/Weapons/Melee/debug.rsi
     state: icon
@@ -76,6 +91,9 @@
   parent: MeleeDebugGib
   id: MeleeDebug100
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: MeleeWeapon
     damage: 100
 
@@ -84,5 +102,8 @@
   parent: MeleeDebugGib
   id: MeleeDebug200
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: MeleeWeapon
     damage: 200
diff --git a/Resources/Prototypes/Entities/Debugging/rotation_marker.yml b/Resources/Prototypes/Entities/Debugging/rotation_marker.yml
index aaebd5848f..544a582736 100644
--- a/Resources/Prototypes/Entities/Debugging/rotation_marker.yml
+++ b/Resources/Prototypes/Entities/Debugging/rotation_marker.yml
@@ -1,7 +1,11 @@
 - type: entity
   id: debugRotation1
   name: dbg_rotation1
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -15,7 +19,11 @@
 - type: entity
   id: debugRotation4
   name: dbg_rotation4
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -29,7 +37,11 @@
 - type: entity
   id: debugRotationTex
   name: dbg_rotationTex
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -37,4 +49,4 @@
     visible: true
     texture: debugRotation.rsi/direction1.png
   placement:
-    mode: AlignTileAny
\ No newline at end of file
+    mode: AlignTileAny
diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
index e1d93ccc3b..928a9ad867 100644
--- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
+++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
@@ -3,7 +3,11 @@
   parent: BaseItem
   id: ToolDebug
   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/Debugging/stress_test.yml b/Resources/Prototypes/Entities/Debugging/stress_test.yml
index 979e2c7cd0..ce95072307 100644
--- a/Resources/Prototypes/Entities/Debugging/stress_test.yml
+++ b/Resources/Prototypes/Entities/Debugging/stress_test.yml
@@ -1,7 +1,11 @@
 - type: entity
   id: StressTest
   name: stress test
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Sprite
     texture: Effects/explosion.rsi/explosion.png
   - type: StressTestMovement
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index fe92c46e4d..729ded7258 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -307,6 +307,9 @@
   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 e07aff409c..bdc2f786bb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -2,6 +2,10 @@
   id: DebugGenerator
   parent: BaseGenerator
   suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+      - Debug
 
 - type: entity
   id: DebugConsumer
@@ -10,6 +14,9 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -48,6 +55,9 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -75,6 +85,9 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
@@ -100,16 +113,28 @@
   id: DebugSmes
   parent: BaseSmes
   suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+      - Debug
 
 - type: entity
   id: DebugSubstation
   parent: BaseSubstation
   suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+      - Debug
 
 - type: entity
   id: DebugApc
   parent: BaseApc
   suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+      - Debug
 
 - type: entity
   id: DebugPowerReceiver
@@ -118,6 +143,9 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index bf73758531..3139e52891 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -111,7 +111,11 @@
   parent: WallBase
   id: WallDebug
   name: debug wall
+  suffix: DEBUG
   components:
+  - type: Tag
+    tags:
+      - Debug
   - type: RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/debug.rsi
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c66e905f1c..856715a2fd 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -73,6 +73,9 @@
 - type: Tag
   id: CombatKnife
 
+- type: Tag
+  id: Debug
+
 - type: Tag
   id: DoorElectronics