From 3c3e43a7ac79877d2a2a30847c259b878d261ea8 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date: Sat, 26 Oct 2024 18:02:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=89=D0=B5=D0=B9=20=D0=B2=20=D0=BF=D0=BE=D1=8F=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8B=20(#748)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Clothing/Belt/belts.yml          | 54 ++++++++++---------
 .../Objects/Weapons/Throwable/clusterbang.yml |  6 +++
 Resources/Prototypes/_White/tags.yml          |  3 ++
 3 files changed, 38 insertions(+), 25 deletions(-)

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