From 017364f2d232032b4983dde4aea76ee1784eda3b Mon Sep 17 00:00:00 2001
From: FireFoxPhoenix <171633349+FireFoxPhoenix@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:01:28 +1000
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Locale/ru-RU/_NF/store/uplink-catalog.ftl | 12 +++--
 .../Entities/Structures/Machines/lathe.yml    |  4 ++
 .../_NF/Catalog/security_uplink_catalog.yml   | 52 +++++++++++++++----
 .../Entities/Structures/Machines/lathe.yml    |  4 ++
 4 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
index 325543050c5..2d683f7e50f 100644
--- a/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
@@ -74,10 +74,14 @@ uplink-security-key-name = Ключи шифрования ДСБФ
 uplink-security-key-desc = Коробка с 4 ключами шифрования, дающими доступ к радиоканалу ДСБФ.
 uplink-security-emprocket-name = ЭМИ-ракета
 uplink-security-emprocket-desc = ЭМИ-ракета для РПГ-7. Гарантированно испортит день любому пирату.
-uplink-security-magazineks23flashbang-name = Светошумовые патроны для KS23
-uplink-security-magazineks23flashbang-desc = Коробка со светошумовыми патронами для дробовика KS23.
-uplink-security-magazineks23smoke-name = Газовые патроны для KS23
-uplink-security-magazineks23smoke-desc = Коробка с газовыми патронами для дробовика KS23.
+uplink-security-boxks23beanbag-name = Раздатчик патронов для KS23 (травматические)
+uplink-security-boxks23beanbag-desc = Полная коробка травматических патронов для дробовика KS23.
+uplink-security-boxks23smoke-name = Раздатчик патронов для KS23 (газовые)
+uplink-security-boxks23smoke-desc = Полная коробка газовых патронов для дробовика KS23.
+uplink-security-boxks23flashbang-name = Раздатчик патронов для KS23 (светошумовые)
+uplink-security-boxks23flashbang-desc = Полная коробка светошумовых патронов для дробовика KS23.
+uplink-security-boxks23lethal-name = Раздатчик патронов для KS23 (летальные)
+uplink-security-boxks23lethal-desc = Полная коробка летальных патронов для дробовика KS23.
 uplink-security-thrusterkit-name = Набор для Апгрейда Двигателей
 uplink-security-thrusterkit-desc = Содержит 12 суперконденсаторов. Идеально подходит для улучшения корабельных двигателей.
 uplink-security-magazinepistol-name = Магазины для пистолета калибра .35 авто
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 6dc7fa1aa60..584302813a6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -931,6 +931,8 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
+      - BoxSmokeKS23 # Corvax-Frontier
+      - BoxFlashbangKS23 # Corvax-Frontier
   - type: MaterialStorage
     whitelist:
       tags:
@@ -983,6 +985,8 @@
         - SpeedLoaderMagnumEmpty
         - SpeedLoaderRifleHeavy # Frontier
         - SpeedLoaderRifleHeavyEmpty # Frontier
+        - BoxBeanbagKS23 # Corvax-Frontier
+        - BoxLethalshotKS23 # Corvax-Frontier
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
index 09bbda67be9..26af42bff89 100644
--- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -585,11 +585,11 @@
           - SecurityUplink
 
 - type: listing # Corvax-Frontier
-  id: UplinkSecurityKS23Flashbang
-  name: uplink-security-magazineks23flashbang-name
-  description: uplink-security-magazineks23flashbang-desc
-  productEntity: BoxMagazineKS23Flashbang
-  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  id: UplinkSecurityBoxBeanbagKS23
+  name: uplink-security-boxks23beanbag-name
+  description: uplink-security-boxks23beanbag-desc
+  productEntity: BoxBeanbagKS23
+  icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23BeanbagDispenser }
   cost:
     FrontierUplinkCoin: 2
   categories:
@@ -601,11 +601,43 @@
           - SecurityUplink
 
 - type: listing # Corvax-Frontier
-  id: UplinkSecurityKS23Smoke
-  name: uplink-security-magazineks23smoke-name
-  description: uplink-security-magazineks23smoke-desc
-  productEntity: BoxMagazineKS23Smoke
-  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  id: UplinkSecurityBoxSmokeKS23
+  name: uplink-security-boxks23smoke-name
+  description: uplink-security-boxks23smoke-desc
+  productEntity: BoxSmokeKS23
+  icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23SmokeDispenser }
+  cost:
+    FrontierUplinkCoin: 3
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+
+- type: listing # Corvax-Frontier
+  id: UplinkSecurityBoxFlashbangKS23
+  name: uplink-security-boxks23flashbang-name
+  description: uplink-security-boxks23flashbang-desc
+  productEntity: BoxFlashbangKS23
+  icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23FlashbangDispenser }
+  cost:
+    FrontierUplinkCoin: 3
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+
+- type: listing # Corvax-Frontier
+  id: UplinkSecurityBoxLethalshotKS23
+  name: uplink-security-boxks23lethal-name
+  description: uplink-security-boxks23lethal-desc
+  productEntity: BoxLethalshotKS23
+  icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23BaseDispenser }
   cost:
     FrontierUplinkCoin: 2
   categories:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ded393be509..204c9659f8e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -795,6 +795,8 @@
       - MagazineBoxRifle
       - CrossbowBolt
       - CrossbowBoltBroadhead
+      - BoxBeanbagKS23 # Corvax-Frontier
+      - BoxLethalshotKS23 # Corvax-Frontier
     ## Mags / Speedloaders / Clips
       - MagazineNovaliteC1Empty
       - MagazineNovaliteC1
@@ -886,6 +888,8 @@
       - MagazineBoxPistolRubber
       - MagazineBoxRifleRubber
       - MagazineShotgunBeanbag
+      - BoxSmokeKS23 # Corvax-Frontier
+      - BoxFlashbangKS23 # Corvax-Frontier
 
 - type: entity
   id: MercenaryTechFabHacked