diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
index 0d3f316e39e..685eaf6f7ac 100644
--- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -33,22 +33,18 @@ 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 = MK58
 uplink-security-mk58-desc = Cheap, standard issue sidearm. Uses .35 Auto.
-uplink-security-kammerer-name = Kammerer
-uplink-security-kammerer-desc = Pump action shotgun. Uses .50 shotgun shells. Holds 4.
 uplink-security-disabler-name = Disabler
 uplink-security-disabler-desc = Standard issue non-lethal stun gun. Has an internal battery, but requires using a security charging dock.
 uplink-security-stunbaton-name = Stun Baton
 uplink-security-stunbaton-desc = Standard issue non-lethal stun baton. Has an internal battery, but requires using a security charging dock.
-uplink-security-deckard-name = Deckard
-uplink-security-deckard-desc = A very capable revolver, imported from the Tannhauser Gate. Uses .45 magnum.
 uplink-security-emitter-name = EMP Emitter
 uplink-security-emitter-desc = A high-energy pulse emitter tuned to disrupt electronics and power systems. Harmless to living things. Projectiles pass through glass. Has an internal battery, but requires using a security charging dock.
-uplink-security-n1984-name = N1984
-uplink-security-n1984-desc = Standard issue officer's pistol. Uses .45 magnum magazines.
 uplink-security-enforcer-name = Enforcer
 uplink-security-enforcer-desc = An updated model of the Kammerer, boasts a 7 shell magazine. Uses .50 shotgun shells.
 uplink-security-lecter-name = Lecter
 uplink-security-lecter-desc = Standard issue fully automatic rifle. Uses .20 rifle.
+uplink-security-vulcan-name = Vulcan
+uplink-security-vulcan-desc = Heavy duty, select fire battle rifle. Uses .30 rifle.
 uplink-security-lasercarbine-name = Laser Rifle
 uplink-security-lasercarbine-desc = Standard issue laser carbine. Has an internal battery, but requires using a security charging dock. Fires through glass.
 uplink-security-disablersmg-name = Disabler SMG
@@ -79,8 +75,16 @@ uplink-security-thrusterkit-name = Thruster Upgrade Kit
 uplink-security-thrusterkit-desc = Contains 12 super capaciters. Perfect for upgrading three thrusters.
 uplink-security-magazinepistol-name = .35 Auto Pistol Magazines
 uplink-security-magazinepistol-desc = A box containing 4 filled .35 auto magazines.
+uplink-security-magazinepistol-rubber-name = .35 Auto Pistol Rubber Magazines
+uplink-security-magazinepistol-rubber-desc = A box containing 4 filled .35 auto (rubber) magazines.
 uplink-security-20riflemagazine-name = .20 Rifle Magazines
 uplink-security-20riflemagazine-desc = A box containing 4 filled .20 rifle magazines.
+uplink-security-20riflemagazine-rubber-name = .20 Rifle Rubber Magazines
+uplink-security-20riflemagazine-rubber-desc = A box containing 4 filled .20 rifle (rubber) magazines.
+uplink-security-30riflemagazine-name = .30 Rifle Magazines
+uplink-security-30riflemagazine-desc = A box containing 4 filled .30 rifle magazines.
+uplink-security-30riflemagazine-rubber-name = .30 Rifle Rubber Magazines
+uplink-security-30riflemagazine-rubber-desc = a Box containing 4 filled .30 rifle (rubber) magazines.
 uplink-security-wt550magazine-name = .35 Auto Top-mounted Magazines
 uplink-security-wt550magazine-desc = A box containing 3 filled .35 auto top-mounted magazines.
 uplink-security-hypo-name = Hypospray
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
index b22363c475f..c7dcc64b258 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
@@ -19,7 +19,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunKammerer
+      - id: WeaponShotgunEnforcer
         amount: 2
       - id: BoxLethalshot
         amount: 3
@@ -80,6 +80,8 @@
     contents:
     - id: WeaponRifleLecter
       amount: 5
+    - id: WeaponRifleVulcan
+      amount: 4
     - id: WeaponSubMachineGunWt550
       amount: 4
     - id: WeaponShotgunEnforcer
@@ -90,8 +92,6 @@
       amount: 4
     - id: WeaponPistolMk58
       amount: 4
-    - id: WeaponRevolverInspector
-      amount: 4
 
 - type: entity
   id: CrateArmoryNonLethalNfsd
@@ -109,5 +109,9 @@
       amount: 5
     - id: WeaponRifleLecterRubber
       amount: 4
+    - id: WeaponRifleVulcanRubber
+      amount: 4
     - id: WeaponShotgunEnforcerRubber
       amount: 4
+    - id: WeaponEnergyGun
+      amount: 4
diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
index 8579a4579df..b94881e22d6 100644
--- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -160,22 +160,6 @@
         tags:
           - SecurityUplink
 
-- type: listing
-  id: UplinkSecurityKammerer
-  name:  uplink-security-kammerer-name
-  description: uplink-security-kammerer-desc
-  productEntity: WeaponShotgunKammerer
-  icon: { sprite: Objects/Weapons/Guns/Shotguns/pump.rsi, state: icon }
-  cost:
-    FrontierUplinkCoin: 2
-  categories:
-    - UplinkSecurityWeapons
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - SecurityUplink
-
 - type: listing
   id: UplinkSecurityDisabler
   name:  uplink-security-disabler-name
@@ -208,22 +192,6 @@
         tags:
           - SecurityUplink
 
-- type: listing
-  id: UplinkSecurityDeckard
-  name:  uplink-security-deckard-name
-  description: uplink-security-deckard-desc
-  productEntity: WeaponRevolverDeckard
-  icon: { sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi, state: base }
-  cost:
-    FrontierUplinkCoin: 2
-  categories:
-    - UplinkSecurityWeapons
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - SecurityUplink
-
 - type: listing
   id: UplinkSecurityEmitter
   name:  uplink-security-emitter-name
@@ -241,11 +209,11 @@
           - SecurityUplink
 
 - type: listing
-  id: UplinkSecurityN1984
-  name:  uplink-security-n1984-name
-  description: uplink-security-n1984-desc
-  productEntity: WeaponPistolN1984
-  icon: { sprite: Objects/Weapons/Guns/Pistols/N1984.rsi, state: icon }
+  id: UplinkSecurityEnforcer
+  name:  uplink-security-enforcer-name
+  description: uplink-security-enforcer-desc
+  productEntity: WeaponShotgunEnforcer
+  icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:
@@ -262,11 +230,11 @@
         - Sheriff
 
 - type: listing
-  id: UplinkSecurityEnforcer
-  name:  uplink-security-enforcer-name
-  description: uplink-security-enforcer-desc
-  productEntity: WeaponShotgunEnforcer
-  icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon }
+  id: UplinkSecurityLecter
+  name:  uplink-security-lecter-name
+  description: uplink-security-lecter-desc
+  productEntity: WeaponRifleLecter
+  icon: { sprite: Objects/Weapons/Guns/Rifles/lecter.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:
@@ -283,11 +251,11 @@
         - Sheriff
 
 - type: listing
-  id: UplinkSecurityLecter
-  name:  uplink-security-lecter-name
-  description: uplink-security-lecter-desc
-  productEntity: WeaponRifleLecter
-  icon: { sprite: Objects/Weapons/Guns/Rifles/lecter.rsi, state: icon }
+  id: UplinkSecurityVulcan
+  name:  uplink-security-vulcan-name
+  description: uplink-security-vulcan-desc
+  productEntity: WeaponRifleVulcan
+  icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 3
   categories:
@@ -381,6 +349,7 @@
           - SecurityUplink
     - !type:BuyerJobCondition
       whitelist:
+        - Bailiff
         - Sheriff
 
 - type: listing
@@ -400,6 +369,7 @@
           - SecurityUplink
     - !type:BuyerJobCondition
       whitelist:
+        - Bailiff
         - Sheriff
 
 - type: listing
@@ -585,6 +555,27 @@
         - SeniorOfficer
         - Sheriff
 
+- type: listing
+  id: UplinkSecurity30RifleMagazine
+  name:  uplink-security-30riflemagazine-name
+  description: uplink-security-30riflemagazine-desc
+  productEntity: BoxMagazineLightRifle
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff
+
 - type: listing
   id: UplinkSecurityWT550Magazine
   name:  uplink-security-wt550magazine-name
@@ -602,8 +593,67 @@
           - SecurityUplink
     - !type:BuyerJobCondition
       whitelist:
+        - Bailiff
         - Sheriff
 
+- type: listing
+  id: UplinkSecurityPistolMagazineRubber
+  name:  uplink-security-magazinepistol-rubber-name
+  description: uplink-security-magazinepistol-rubber-desc
+  productEntity: BoxMagazinePistolRubber
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+
+- type: listing
+  id: UplinkSecurity20RifleMagazineRubber
+  name: uplink-security-20riflemagazine-rubber-name
+  description: uplink-security-20riflemagazine-rubber-desc
+  productEntity: BoxMagazineRifleRubber
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - SecurityUplink
+    - !type:BuyerJobCondition
+      whitelist:
+        - Bailiff
+        - SeniorOfficer
+        - Sheriff
+
+- type: listing
+  id: UplinkSecurity30RifleMagazineRubber
+  name: uplink-security-30riflemagazine-rubber-name
+  description: uplink-security-30riflemagazine-rubber-desc
+  productEntity: BoxMagazineLightRifleRubber
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  cost:
+    FrontierUplinkCoin: 1
+  categories:
+    - UplinkSecurityAmmo
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+        - SecurityUplink
+    - !type:BuyerJobCondition
+        whitelist:
+          - Bailiff
+          - SeniorOfficer
+          - Sheriff
+
 - type: listing
   id: UplinkSecurityHypo
   name:  uplink-security-hypo-name
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index edc479a98f9..bb894139c48 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -24,6 +24,32 @@
           tags:
             - CartridgeRifle
 
+#Delta-V
+- type: entity
+  name: Vulcan
+  parent: WeaponRifleVulcan
+  id: WeaponRifleVulcanRubber
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifleRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifleRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+
 # Frontier
 - type: entity
   name: Gestio