Armory update: the Drozd!

Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

@@ -116,6 +116,12 @@ uplink-security-30riflemagazine-rubber-desc = a Box containing 4 filled .30 rifl
 uplink-security-wt550magazine-name = .35 +P Top-mounted Magazines
 uplink-security-wt550magazine-desc = A box containing 3 filled .35 pistol (overpressure) top-mounted magazines.
 
+uplink-security-smgmagazine-name = .35 +P SMG Magazines
+uplink-security-smgmagazine-desc = A box containing 3 filled .35 pistol (overpressure) SMG magazines.
+
+uplink-security-smgmagazine-rubber-name = .35 Rubber SMG Magazines
+uplink-security-smgmagazine-rubber-desc = A box containing 3 filled .35 pistol (rubber) SMG magazines.
+
 uplink-security-hypo-name = Hypospray
 uplink-security-hypo-desc = A sterile medical injector for instant delivery of medications.
 

Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml

@@ -78,6 +78,28 @@
       - id: NFMagazineSubMachineGun35Rubber
         amount: 3
 
+- type: entity
+  name: box of SMG (.35 pistol, overpressure) magazines
+  parent: BoxMagazine
+  id: NFBoxMagazinePistolSubMachineGun35Overpressure
+  description: A box full of SMG (.35 pistol, overpressure) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: NFMagazineSubMachineGun35Overpressure
+        amount: 3
+
+- type: entity
+  name: box of top-mounted SMG (.35 pistol, overpressure) magazines
+  parent: BoxMagazine
+  id: NFBoxMagazineTopMountedSubMachineGun35Overpressure
+  description: A box full of top-mounted SMG (.35 pistol, overpressure) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: NFMagazineSubMachineGunTopMounted35Overpressure
+        amount: 3
+
 - type: entity
   name: box of pistol (.35 pistol, overpressure) magazines
   parent: BoxMagazine

Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml

@@ -82,7 +82,7 @@
       amount: 2
     - id: NFWeaponRifleAssaultVulcan
       amount: 2
-    - id: NFWeaponSubMachineGunWt550
+    - id: NFWeaponSubMachineGunDrozd
       amount: 2
     - id: NFWeaponShotgunEnforcer
       amount: 2
@@ -113,5 +113,5 @@
       amount: 2
     - id: NFWeaponShotgunEnforcerLessLethal
       amount: 2
-    - id: NFWeaponEnergySubMachineGunDeltaV
+    - id: NFWeaponSubMachineGunDrozdLessLethal
       amount: 2

Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml

@@ -332,6 +332,26 @@
         - SeniorOfficer
         - Sheriff
 
+- type: listing
+  id: UplinkSecurityDrozd
+  name:  uplink-security-drozd-name
+  description: uplink-security-drozd-desc
+  productEntity: NFWeaponSubMachineGunDrozd
+  icon: { sprite: Objects/Weapons/Guns/SMGs/drozd.rsi, state: icon }
+  cost:
+    FrontierUplinkCoin: 4
+  categories:
+    - UplinkSecurityWeapons
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - Sheriff
+
 - type: listing
   id: UplinkSecurityWT550
   name:  uplink-security-wt550-name
@@ -349,7 +369,6 @@
           - SecurityUplink
     - !type:BuyerJobCondition
       whitelist:
-        - Bailiff
         - Sheriff
 
 - type: listing
@@ -577,11 +596,31 @@
         - SeniorOfficer
         - Sheriff
 
+- type: listing
+  id: UplinkSecurityMagazineSubMachineGun35Overpressure
+  name:  uplink-security-smgmagazine-name
+  description: uplink-security-smgmagazine-desc
+  productEntity: NFBoxMagazinePistolSubMachineGun35Overpressure
+  icon: { sprite: _NF/Objects/Storage/boxes.rsi, state: icon-magazine }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - Sheriff
+
 - type: listing
   id: UplinkSecurityMagazineSubMachineGunTopMounted35Overpressure
   name:  uplink-security-wt550magazine-name
   description: uplink-security-wt550magazine-desc
-  productEntity: NFMagazineSubMachineGunTopMounted35Overpressure
+  productEntity: NFBoxMagazineTopMountedSubMachineGun35Overpressure
   icon: { sprite: _NF/Objects/Storage/boxes.rsi, state: icon-magazine }
   cost:
     FrontierUplinkCoin: 1
@@ -594,7 +633,6 @@
           - SecurityUplink
     - !type:BuyerJobCondition
       whitelist:
-        - Bailiff
         - Sheriff
 
 - type: listing
@@ -655,6 +693,26 @@
           - SeniorOfficer
           - Sheriff
 
+- type: listing
+  id: UplinkSecurityMagazineSubMachineGunRubber
+  name:  uplink-security-smgmagazine-rubber-name
+  description: uplink-security-smgmagazine-rubber-desc
+  productEntity: NFBoxMagazinePistolSubMachineGun35Rubber
+  icon: { sprite: _NF/Objects/Storage/boxes.rsi, state: icon-magazine }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - Sheriff
+
 - type: listing
   id: UplinkSecurityHypo
   name:  uplink-security-hypo-name

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -37,7 +37,7 @@
 
 - type: entity
   id: NFWeaponSubMachineGunDrozd
-  parent: [ NFBaseWeaponSubMachineGunChamber35, NFBaseWeaponFrameSubMachineGunNanotrasen ]
+  parent: [ BaseC2ContrabandUnredeemable, NFBaseWeaponSubMachineGunChamber35, NFBaseWeaponFrameSubMachineGunNanotrasen ]
   name: Drozd
   description: A fully automatic SMG.
   components: &drozdComponents
@@ -51,7 +51,7 @@
 
 - type: entity
   id: NFWeaponSubMachineGunDrozdLessLethal # Frontier-specific rubber variant
-  parent: [ NFBaseWeaponSubMachineGunChamber35Rubber, NFBaseWeaponFrameSubMachineGunNanotrasen ]
+  parent: [ BaseC2ContrabandUnredeemable, NFBaseWeaponSubMachineGunChamber35Rubber, NFBaseWeaponFrameSubMachineGunNanotrasen ]
   name: Drozd
   description: A fully automatic SMG.
   suffix: Frontier, Less-Lethal