diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 53236744cc..11e89618db 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -182,31 +182,33 @@
     sprite: Clothing/Belt/assault.rsi
   - type: Clothing
     sprite: Clothing/Belt/assault.rsi
-  - type: Storage
-    whitelist:
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - BallisticAmmoProvider
-        - Ammo
-  - type: ItemMapper
-    mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
-        whitelist:
-          components:
-          - Stunbaton
-      tear_gas_grenade:
-        whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
+  # WD EDIT START (it's already inherited from ClothingBeltSecurity)
+  # - type: Storage
+  #   whitelist:
+  #     components:
+  #       - Stunbaton
+  #       - FlashOnTrigger
+  #       - SmokeOnTrigger
+  #       - Flash
+  #       - Handcuff
+  #       - BallisticAmmoProvider
+  #       - Ammo
+  # - type: ItemMapper
+  #   mapLayers:
+  #     flashbang:
+  #       whitelist:
+  #         components:
+  #         - FlashOnTrigger
+  #     stunbaton:
+  #       whitelist:
+  #         components:
+  #         - Stunbaton
+  #     tear_gas_grenade:
+  #       whitelist:
+  #         components:
+  #         - SmokeOnTrigger
+  #  sprite: Clothing/Belt/belt_overlay.rsi
+  # WD EDIT END
   - type: Appearance
 
 - type: entity
@@ -515,6 +517,8 @@
         - MagazineMagnum
         - CombatKnife
         - Truncheon
+        - HolofanProjector # WD
+        - ClusterBang # WD
       components:
         - Stunbaton
         - FlashOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
index 36d4c947fc..c1660f47aa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -16,6 +16,9 @@
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
+  - type: Tag # WD
+    tags:
+      - ClusterBang
 
 - type: entity
   parent: GrenadeBase
@@ -48,6 +51,9 @@
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
+  - type: Tag # WD
+    tags:
+      - ClusterBang
 
 - type: entity
   parent: GrenadeBase
diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml
index 2cb343cffe..382fc950ab 100644
--- a/Resources/Prototypes/_White/tags.yml
+++ b/Resources/Prototypes/_White/tags.yml
@@ -99,3 +99,6 @@
 
 - type: Tag
   id: BlueMagusArmor
+
+- type: Tag
+  id: ClusterBang