From cebf64fcb15d093c1f21fe7016e4b100a961a899 Mon Sep 17 00:00:00 2001
From: EstKemran <kievkemran@gmail.com>
Date: Tue, 31 Dec 2024 18:06:22 +0300
Subject: [PATCH] fix-blueshield-belts

---
 .../ru-RU/ss220/clothing/Back/backpacks.ftl   | 11 +++++--
 .../ru-RU/ss220/clothing/Belt/belts.ftl       |  4 +--
 .../Entities/Clothing/Belt/belts.yml          |  1 +
 .../Catalog/Fills/Backpacks/backpack.yml      |  2 +-
 .../SS220/Entities/Clothing/Belt/belts.yml    | 31 ++++++++++++-------
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl
index 634107d3347d67..2d4626109e1712 100644
--- a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl
+++ b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl
@@ -1,6 +1,13 @@
 ent-ClothingBackpackArmy = армейский ранец
         .desc = Твердый ранец с спальным мешком. Помогает пережить длительные марши.
+
 ent-ClothingBackpackBlueShield = рюкзак "Синий Щит"
     .desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра.
-ent-ClothingBackpackBlueShieldHight = рюкзак "Синий Щит"
-    .desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра.
+    .suffix = Лёгкий скафандр
+
+ent-ClothingBackpackBlueShieldHight = { ent-ClothingBackpackBlueShield }
+    .desc = { ent-ClothingBackpackBlueShield.desc }
+    .suffix = Тяжелый скафандр
+ent-ClothingBackpackBlueShieldHightFilled = { ent-ClothingBackpackBlueShield }
+    .suffix = Тяжелый скафандр, заполненный
+    .desc = { ent-ClothingBackpackBlueShield.desc }
diff --git a/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl b/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl
index 07d46bf32d99ab..eadc72eda2028c 100644
--- a/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl
+++ b/Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl
@@ -16,8 +16,8 @@ ent-ClothingBeltBlueShieldFilled = { ent-ClothingBeltBlueShield }
 
 ent-ClothingBeltWebbingBlueShield = РПС "Синий Щит"
     .desc = Универсальный разгрузочный жилет с ремнями и поясом. Может вмещать всё что угодно... всё что угодно небольшого размера.
-ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltBlueShield }
-    .desc = { ent-ClothingBeltBlueShield.desc }
+ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltWebbingBlueShield }
+    .desc = { ent-ClothingBeltWebbingBlueShield.desc }
     .suffix = Заполненный
 
 ent-ClothingBeltMedicalInterdyne = РПС образца НМП-023
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 7d0f3857c8648e..65b53ab9df55b7 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -487,6 +487,7 @@
         - CombatKnife
         - Truncheon
         - HolofanProjectorSecurity # SS220 Fix #2009
+        - BlasterPowerCell # SS220 fix-blueshield-belts
       components:
         - Stunbaton
         - FlashOnTrigger
diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml
index d94866cafc8ead..6eb7041550aed0 100644
--- a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml
+++ b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml
@@ -148,7 +148,7 @@
   - type: StorageFill
     contents:
       - id: BoxSurvivalSecurity
-      - id: WeaponBlasterKRS
+      - id: WeaponBlasterKRV
       - id: BlasterPowerCellPulse
         amount: 3
       - id: BlasterPowerCellDisabler
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
index 170c5240b8801e..79b6241f09fe55 100644
--- a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
@@ -14,7 +14,7 @@
     maxItemSize: Normal
     defaultStorageOrientation: Vertical
     grid:
-    - 0,0,4,2
+    - 0,0,6,2
 
 - type: entity
   parent: ClothingBeltBlueShield
@@ -23,6 +23,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: Stunbaton
       - id: Handcuffs
       - id: Handcuffs
       - id: GrenadeFlashBang
@@ -40,18 +41,20 @@
   - type: Clothing
     sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi
   - type: Storage
+    maxItemSize: Small
+    defaultStorageOrientation: Vertical
     grid:
-    - 0,1,0,2
-    - 1,1,1,1
-    - 2,2,2,3
-    - 3,0,3,1
-    - 4,2,4,3
-    - 5,0,5,1
-    - 6,2,6,3
-    - 7,0,7,1
-    - 8,2,8,3
-    - 9,1,9,1
-    - 10,1,10,2
+    - 0,0,6,1
+  - type: ItemSlots
+    slots:
+      item:
+        name: clothing-boots-sidearm
+        whitelist:
+          tags:
+            - Sidearm
+            - Medkit
+          components:
+            - Stunbaton
 
 - type: entity
   parent: ClothingBeltWebbingBlueShield
@@ -65,6 +68,10 @@
       - id: Handcuffs
       - id: GrenadeFlashBang
       - id: GrenadeFlashBang
+  - type: ContainerFill
+    containers:
+     item:
+      - Stunbaton
 
 - type: entity
   parent: ClothingBeltSheath