From eaef1d432b2a7da7ed90de670dd6a3c67564d061 Mon Sep 17 00:00:00 2001
From: Salvantrix <149609610+Salvantrix@users.noreply.github.com>
Date: Mon, 29 Apr 2024 19:21:51 -0400
Subject: [PATCH] 04/29/2024 (#1311)

Added two new crate spawns to the Uplink valued at 15 and 10 FUCs respectively.

Added a "Lethal Armory Stock" crate spawn including:
- id: WeaponRifleLecter
      amount: 5
    - id: WeaponSubMachineGunWt550
      amount: 4
    - id: WeaponShotgunEnforcer
      amount: 5
    - id: WeaponLaserCarbine
      amount: 4
    - id: WeaponEnergyGun
      amount: 4
    - id: WeaponPistolMk58
      amount: 4
    - id: WeaponRevolverInspector
      amount: 4

and a "Non-lethal Armory Stock" crate spawn including:
    - id: WeaponDisabler
      amount: 5
    - id: WeaponPistolMk58Nonlethal
      amount: 4
    - id: WeaponDisablerSMG
      amount: 5
    - id: WeaponRifleLecterRubber
      amount: 4
    - id: WeaponShotgunEnforcerRubber
      amount: 4
---
 .../Locale/en-US/_NF/store/uplink-catalog.ftl |  4 ++
 .../_NF/Catalog/Fills/Crates/nfsdarmory.yml   | 42 +++++++++++++++++++
 .../_NF/Catalog/security_uplink_catalog.yml   | 42 +++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
index 6d65758abd7..9ff0cb4f2cd 100644
--- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -24,6 +24,10 @@ uplink-security-hardsuit-combat-name = Patrol Combat Hardsuit
 uplink-security-hardsuit-combat-desc = An armored patrol suit for combat meant to be utilized for multi-environmental hostile engagements.
 uplink-security-hardsuit-commmand-name = Command Combat Hardsuit
 uplink-security-hardsuit-commmand-desc = An advanced combat suit designed for seasoned nfsd supervisors meant to be utilized for multi-environmental hostile engagements.
+uplink-security-lethalarmory-name = Lethal armory stock crate
+uplink-security-lethalarmory-desc = A crate containing weapons necessary to fill an armory.
+uplink-security-nonlethalarmory-name = Non-lethal armory stock crate
+uplink-security-nonlethalarmory-desc = A crate containing non-lethal weapons necessary to fill an armory.
 uplink-security-mk58-name = MK 58
 uplink-security-mk58-desc = Cheap, standard issue side-arm. Uses .35 Auto.
 uplink-security-kammerer-name = Kammerer
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
index 03916e5b3a5..521335d5361 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
@@ -69,3 +69,45 @@
       amount: 2
     - id: MagazinePistol
       amount: 4
+
+- type: entity
+  id: CrateArmoryLethalNfsd
+  parent: CrateNfsdSecure2
+  name: nfsd lethal armory crate
+  description: Contains a standard armory stock kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleLecter
+      amount: 5
+    - id: WeaponSubMachineGunWt550
+      amount: 4
+    - id: WeaponShotgunEnforcer
+      amount: 5
+    - id: WeaponLaserCarbine
+      amount: 4
+    - id: WeaponEnergyGun
+      amount: 4
+    - id: WeaponPistolMk58
+      amount: 4
+    - id: WeaponRevolverInspector
+      amount: 4
+
+- type: entity
+  id: CrateArmoryNonLethalNfsd
+  parent: CrateNfsdSecure1
+  name: nfsd non-lethal armory crate
+  description: Contains a standard armory stock kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDisabler
+      amount: 5
+    - id: WeaponPistolMk58Nonlethal
+      amount: 4
+    - id: WeaponDisablerSMG
+      amount: 5
+    - id: WeaponRifleLecterRubber
+      amount: 4
+    - id: WeaponShotgunEnforcerRubber
+      amount: 4
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
index 4e07d0d8eda..4e86da470f5 100644
--- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -1185,3 +1185,45 @@
         - Bailiff
         - SeniorOfficer
         - Sheriff
+
+- type: listing
+  id: UplinkSecurityLethalArmory
+  name:  uplink-security-lethalarmory-name
+  description: uplink-security-lethalarmory-desc
+  productEntity: CrateArmoryLethalNfsd
+  icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 15
+  categories:
+    - UplinkSecurityUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff
+
+- type: listing
+  id: UplinkSecurityNonLethalArmory
+  name:  uplink-security-nonlethalarmory-name
+  description: uplink-security-nonlethalarmory-desc
+  productEntity: CrateArmoryNonLethalNfsd
+  icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 10
+  categories:
+    - UplinkSecurityUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff
\ No newline at end of file