From e76f7d7750db0a7c166398821cd1246a136404c3 Mon Sep 17 00:00:00 2001
From: lzk228 <124214523+lzk228@users.noreply.github.com>
Date: Mon, 10 Apr 2023 01:06:30 +0300
Subject: [PATCH] [Cargo] Added MK58 crate (#15204)

* Added crate with MK58 to request console

* fix price

* fix
---
 .../prototypes/catalog/fills/crates/armory-crates.ftl |  3 +++
 Resources/Prototypes/Catalog/Cargo/cargo_armory.yml   | 10 ++++++++++
 Resources/Prototypes/Catalog/Fills/Crates/armory.yml  | 11 +++++++++++
 3 files changed, 24 insertions(+)

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl
index ea92aa9f0f..b958ed61f3 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl
@@ -9,3 +9,6 @@ ent-CrateTrackingImplants = Tracking implants
 
 ent-CrateArmoryLaser = lasers crate
     .desc = Contains three lethal, high-energy laser guns. Requires Armory access to open.
+
+ent-CrateArmoryPistols = pistols crate
+    .desc = Contains two standard NT pistols with four mags. Requires Armory access to open.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index d989e10fe8..ce380bd839 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -37,3 +37,13 @@
   cost: 1600
   category: Armory
   group: market
+
+- type: cargoProduct
+  id: ArmoryPistol
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
+    state: icon
+  product: CrateArmoryPistols
+  cost: 1700
+  category: Armory
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index fe37c3fb84..1ca078bd42 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -37,3 +37,14 @@
     contents:
       - id: WeaponLaserGun
         amount: 3
+
+- type: entity
+  id: CrateArmoryPistols
+  parent: CrateWeaponSecure
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolMk58
+      amount: 2
+    - id: MagazinePistol
+      amount: 4
-- 
2.51.2