diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
index 11bb54718ba..21107b1c58c 100644
--- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -300,11 +300,15 @@ uplink-pirate-pinpointer-target-scanner-desc = A jury-rigged scanner that can fi
 # region Mercvend
 
 store-category-mercenaryhardsuits = EVA Suits
-store-category-mercenaryweapons = Weapons
+store-category-mercenaryarmor = Armor
 store-category-mercenaryutility = Utility
+store-category-mercenarymedical = Medical
+store-category-mercenarysnipers = Snipers
+store-category-mercenaryrifles = Rifles
+store-category-mercenaryshotguns = Shotguns
+store-category-mercenarysmgs = Sub-Machineguns
+store-category-mercenaryhandguns = Handguns
 store-category-mercenaryammo = Ammunition
-store-category-mercenaryexplosives = Explosives
-store-category-mercenarybundles = Bundles
 
 uplink-mercenary-scafhardsuit-name = SCAF Hardsuit
 uplink-mercenary-scafhardsuit-desc = A suit of vacuum-proof armor highly resistant to projectile weaponry.
@@ -315,14 +319,95 @@ uplink-mercenary-hardsuit-desc = A suit of space-proof armored vac suit that pro
 uplink-mercenary-hardsuit1-name = Private Security Hardsuit
 uplink-mercenary-hardsuit1-desc = A suit of space-proof armored vac suit that protects against general damage.
 
-uplink-mercenary-rifle1-name = Surplus Lecter
-uplink-mercenary-rifle1-desc = A tried and true surplus automatic rifle. The benchmark.
+uplink-mercenary-mininghardsuit-name = mining hardsuit
+uplink-mercenary-mininghardsuit-desc = A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
 
-uplink-mercenary-shotgun1-name = Surplus Kammerer
-uplink-mercenary-shotgun1-desc = Old reliable, rack and shoot. Marked for Surplus.
+uplink-mercenary-luxmininghardsuit-name = luxury mining hardsuit
+uplink-mercenary-luxmininghardsuit-desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move.
 
-uplink-mercenary-smg1-name = Surplus Drozd
-uplink-mercenary-smg1-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range.
+uplink-mercenary-riotshield-name = riot shield
+uplink-mercenary-riotshield-desc = A large tower shield. Good for controlling crowds.
+
+uplink-mercenary-armorcoat-name = bounty hunter's flak trenchcoat
+uplink-mercenary-armorcoat-desc = A greatcoat enhanced with a bulletproof alloy for some extra protection and style for those with a charismatic presence.
+
+uplink-mercenary-armorriot-name = riot suit
+uplink-mercenary-armorriot-desc = A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station.
+
+uplink-mercenary-webmercblack-name = mercenary web vest
+uplink-mercenary-webmercblack-desc = A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
+
+uplink-mercenary-webmercolive-name = mercenary web vest
+uplink-mercenary-webmercolive-desc = A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
+
+uplink-mercenary-armorbasic-name = armor vest
+uplink-mercenary-armorbasic-desc = A standard Type I armored vest that provides decent protection against most types of damage.
+
+uplink-mercenary-armorhelmetmercblack-name = combat helmet
+uplink-mercenary-armorhelmetmercblack-desc = The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the urban sprawl.
+
+uplink-mercenary-armorhelmetswat-name = SWAT helmet
+uplink-mercenary-armorhelmetswat-desc = An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
+
+uplink-mercenary-armorbulletproof-name = bulletproof vest
+uplink-mercenary-armorbulletproof-desc = A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
+
+uplink-mercenary-armorhelmetbulletproof-name = bulletproof helmet
+uplink-mercenary-armorhelmetbulletproof-desc = Protects the face against bullets, can flip up and down.
+
+uplink-mercenary-armorstabproof-name = stabproof vest
+uplink-mercenary-armorstabproof-desc = Contrary to it's name, it's just a Type II armored vest that provides good protection against stabs and punches, but not much else.
+
+uplink-mercenary-armorhelmetstabproof-name = stabproof helmet
+uplink-mercenary-armorhelmetstabproof-desc = The most "comfortable" security helmet, as rated by officers. Will take a blow to the head nicely, but a bullet'll go right through it.
+
+uplink-mercenary-armorhelmetriot-name = light riot helmet
+uplink-mercenary-armorhelmetriot-desc = It's a helmet specifically designed to protect against close range attacks.
+
+uplink-mercenary-tactical-name = tactical pack
+uplink-mercenary-tactical-desc = A tactical pack for your tactical needs.
+
+uplink-mercenary-explorer-name = explorer pack
+uplink-mercenary-explorer-desc = Large pack for all your gear and supplies.
+
+uplink-mercenary-rucksack-name = rucksack
+uplink-mercenary-rucksack-desc = Sacks to haul your burdens.
+
+uplink-mercenary-webbing-name = chest rig
+uplink-mercenary-webbing-desc = A set of tactical webbing worn by boarding parties.
+
+uplink-mercenary-mercwebbing-name = mercenary webbing
+uplink-mercenary-mercwebbing-desc = Ideal for storing everything from ammo to weapons and combat essentials.
+
+uplink-mercenary-stunbaton-name = stun baton
+uplink-mercenary-stunbaton-desc = A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
+
+uplink-mercenary-bola-name = bola
+uplink-mercenary-bola-desc = Linked together with some spare cuffs and metal.
+
+uplink-mercenary-boxhandcuff-name = handcuff box
+uplink-mercenary-boxhandcuff-desc = A box full of handcuffs.
+
+uplink-mercenary-seclite-name = seclite
+uplink-mercenary-seclite-desc = A robust flashlight used by security.
+
+uplink-mercenary-pinpointuni-name = universal pinpointer
+uplink-mercenary-pinpointuni-desc = A handheld tracking device that locks onto any physical entity while off. Keep upright to retain accuracy.
+
+uplink-mercenary-bountyhud-name = bounty hunter hud
+uplink-mercenary-bountyhud-desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status, criminal records and health status.
+
+uplink-mercenary-diagnostichud-name = diagnostic hud
+uplink-mercenary-diagnostichud-desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
+
+uplink-mercenary-medicalhud-name = medical hud
+uplink-mercenary-medicalhud-desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status.
+
+uplink-mercenary-engigoggles-name = engineering goggles
+uplink-mercenary-engigoggles-desc = Green-tinted goggles using a proprietary polymer that provides protection from eye damage of all types.
+
+uplink-mercenary-chemgoggles-name = chemical analysis goggles
+uplink-mercenary-chemgoggles-desc = Goggles that can scan the chemical composition of a solution.
 
 uplink-mercenary-gauze-name = Gauze Roll
 uplink-mercenary-gauze-desc = A full roll of Gauze, for the merc on the go.
@@ -360,6 +445,120 @@ uplink-security-syringe-case-desc = A pocket case filled with medipens for most
 uplink-mercenary-combat-burn-kit-name = Burn Kit
 uplink-mercenary-combat-burn-kit-desc = 4 Ready-made Burn injectors, man burns suck bad.
 
+uplink-mercenary-surpluslecter-name = Surplus Lecter (5.56x45mm)
+uplink-mercenary-surpluslecter-desc = A tried and true surplus automatic rifle. The benchmark.
+
+uplink-mercenary-repeaterrifle-name = N2524 Pattern Repeater (.45 magnum)
+uplink-mercenary-repeaterrifle-desc = A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo.
+
+uplink-mercenary-gestiorifle-name = Gestio (762x39mm)
+uplink-mercenary-gestiorifle-desc = An old burst-fire rifle made by Silver Industries that never left trials. Accepts low capacity 762x39mm magazines.
+
+uplink-mercenary-vulcancfcm-name = FCM-C Vulcan (762x51mm)
+uplink-mercenary-vulcancfcm-desc = The "Vulcan" Civilian Medium combat rifle (Fusil de Combat Moyen Civil) in 762x51mm, this civilian version only has semi-automatic mode and reduced firerate.
+
+uplink-mercenary-lasercannonpmc-name = PMC Laser Cannon
+uplink-mercenary-lasercannonpmc-desc = A laser cannon that has been properly registered for private security and mercenary use.
+
+uplink-mercenary-lasercannon-name = laser cannon
+uplink-mercenary-lasercannon-desc = A heavy duty, high powered laser sniper rifle. On the handle is a label that says 'for authorized use only.'
+
+uplink-mercenary-energyriflebutbetter-name = laser carbine
+uplink-mercenary-energyriflebutbetter-desc = A simple civilian grade laser carbine, the workhorse of many private security organizations.
+
+uplink-mercenary-tempaturegun-name = temperature gun
+uplink-mercenary-tempaturegun-desc = An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime.
+
+uplink-mercenary-mr8crifle-name = MR-8C BR (8x65mm SKR)
+uplink-mercenary-mr8crifle-desc = The BR variant of the MR-8 series, firing with incredible accuracy. Chambered in 8x65mm SKR.
+
+uplink-mercenary-vulcanrifle-name = Vulcan (762x51mm)
+uplink-mercenary-vulcanrifle-desc = One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses 762x51mm ammo.
+
+uplink-mercenary-ceremonialrifle-name = ceremonial rifle (762x51mm)
+uplink-mercenary-ceremonialrifle-desc = A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses 762x51mm ammo.
+
+uplink-mercenary-mosinrifle-name = Kardashev-Mosin (762x54mmR)
+uplink-mercenary-mosinrifle-desc = A weapon for hunting, or endless trench warfare. Uses 762x54mmR ammo. Equipped with bayonet.
+
+uplink-mercenary-akrifle-name = AKM (762x39mm)
+uplink-mercenary-akrifle-desc = An iconic weapon of war. Uses 762x39mm ammo. An illegal firearm often used by Syndicate agents.
+
+uplink-mercenary-assultakrifle-name = Soland-Moss (762x39mm)
+uplink-mercenary-assultakrifle-desc = A heavy assault rifle designed to provide suppressive fire to enemy positions. All serial numbers have been expertly removed, rendering this rifle extremely illegal. Uses 762x39 magazines.
+
+uplink-mercenary-surpluskrammerer-name = Surplus Kammerer
+uplink-mercenary-surpluskrammerer-desc = Old reliable, rack and shoot. Marked for Surplus.
+
+uplink-mercenary-enforcershotty-name = Enforcer (12 gauge)
+uplink-mercenary-enforcershotty-desc = A premium semi-automatic shotgun, and the pride of all security forces. Uses 12 gauge shotgun shells.
+
+uplink-mercenary-vortex12shotty-name = Vortex-12 (12 gauge)
+uplink-mercenary-vortex12shotty-desc = Designed by SESWC. A semi-automatic magazine-fed shotgun for close-quarters combat
+
+uplink-mercenary-bigjohnnyshotty-name = Big Johnny (4 gauge)
+uplink-mercenary-bigjohnnyshotty-desc = An old yet faithful design, and a favorite among irregular forces on many worlds.
+
+uplink-mercenary-surplusdrozd-name = Surplus Drozd
+uplink-mercenary-surplusdrozd-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range.
+
+uplink-mercenary-c20rpmc-name = PMC C-20r (9x19mm)
+uplink-mercenary-c20rpmc-desc = A C-20r that has been properly registered for private security and mercenary use.
+
+uplink-mercenary-disablersmgpmc-name = PMC Disabler SMG
+uplink-mercenary-disablersmgpmc-desc = A disabler SMG that has been properly registered for private security and mercenary use.
+
+uplink-mercenary-novalitec1-name = Novalite C1 (556x45mm)
+uplink-mercenary-novalitec1-desc = A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Uses 556x45mm ammo.
+
+uplink-mercenary-wt550-name = WT550 (46x30mm)
+uplink-mercenary-wt550-desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses 46x30mm ammo. On the receiver is a label that says 'for authorized use only.'
+
+uplink-mercenary-wt440-name = WT-440 (46x30mm)
+uplink-mercenary-wt440-desc = A rarely seen modification of the WT550, this high capacity pistol is a cut-down version of the famous SMG, lacking an arm brace or alternate firemodes. Easier to conceal, and with all serial numbers expertly removed. Takes 4.6x30mm WT magazines.
+
+uplink-mercenary-typewriter-name = Typewriter (.45 ACP)
+uplink-mercenary-typewriter-desc = A modern take on the classic design used by mobsters throughout space and time. Uses .45 ACP ammo.
+
+uplink-mercenary-ritland45-name = Ritland .45 (.45 ACP)
+uplink-mercenary-ritland45-desc = An illegal revolver favoured by Syndicate agents.
+
+uplink-mercenary-ward45-name = Ward .45 (.45 ACP)
+uplink-mercenary-ward45-desc = The iconic sidearm of the dreaded death squads. On the handle is a label that says 'for authorized use only.'
+
+uplink-mercenary-viperpmc-name = PMC Viper (9x19mm)
+uplink-mercenary-viperpmc-desc = A Viper that has been properly registered for private security and mercenary use.
+
+uplink-mercenary-mk58-name = mk 58 (.45 ACP)
+uplink-mercenary-mk58-desc = The Mark 58 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 ACP ammo.
+
+uplink-mercenary-deckard-name = Deckard (.45 magnum)
+uplink-mercenary-deckard-desc = A beautifully machined, custom-built revolver. Used when there is no time for the Voight-Kampff test. Loads 5 rounds of .45 magnum.
+
+uplink-mercenary-laserpistol-name = laser pistol
+uplink-mercenary-laserpistol-desc = An older model of civilian-grade laser pistol with two settings: disable and kill.
+
+uplink-mercenary-svalinn-name = svalinn laser pistol
+uplink-mercenary-svalinn-desc = A cheap and widely used laser pistol.
+
+uplink-mercenary-advancedlaserpistol-name = advanced laser pistol
+uplink-mercenary-advancedlaserpistol-desc = An experimental civilian grade high-energy laser pistol with a self-charging nuclear battery and two settings: disable and kill.
+
+uplink-mercenary-pollock-name = Pollock (9x19mm)
+uplink-mercenary-pollock-desc = A compact and mass-produced combat pistol. Uses 9x19mm ammo.
+
+uplink-mercenary-mk32-name = Mk32 "Universal" (9x19mm)
+uplink-mercenary-mk32-desc = A cheap, civilian grade, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses 9x19mm ammo.
+
+uplink-mercenary-n1984-name = N1984 (.45 magnum)
+uplink-mercenary-n1984-desc = An exceptionally powerful ‘hand cannon’ designed as part of Nanotrasen's BFG initiative. Chambered in .45, the lord’s caliber, it is generally considered too unwieldy for standard use but has become something of a status symbol among Nanotrasen officials. Feeds from .45 pistol magazines.
+
+uplink-mercenary-fitz-name = Fitz Special (.45 magnum)
+uplink-mercenary-fitz-desc = A compact and concealable self defence snub revolver. Uses .45 magnum ammo.
+
+uplink-mercenary-faith-name = Faith (.45 magnum)
+uplink-mercenary-faith-desc = Delivers blessings in bullet form. Uses .45 magnum ammo.
+
 uplink-mercenary-35auto-mags-name = .35 Auto SMG mags
 uplink-mercenary-35auto-mags-desc = A quartet of SMG stick magazines loaded up with lethals, go get 'em tiger
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index d02c77b0749..a110e6ab183 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -76,7 +76,7 @@
 
 - type: entity
   name: seclite
-  parent: [FlashlightLantern, BaseC2ContrabandUnredeemable] # Frontier: BaseSecurityContraband<BaseC2ContrabandUnredeemable
+  parent: [FlashlightLantern, BaseC1Contraband] # Hardlight: Changed to be C1. It's a easily printable item here and not Security Only.
   id: FlashlightSeclite
   description: A robust flashlight used by security.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 80f020c711a..2798459f69d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -53,7 +53,7 @@
 
 - type: entity
   name: AKM (762x39mm)
-  parent: [BaseWeaponRifle, BaseC3SyndicateContraband] # Frontier: BaseSecurityContraband<BaseC3SyndicateContraband
+  parent: [BaseWeaponRifle, BaseC2ContrabandMercenary] # Hardlight: Made C2. Easily balanced PMC item to be used by Freelancers.
   id: WeaponRifleAk
   description: An iconic weapon of war. Uses 762x39mm ammo. An illegal firearm often used by Syndicate agents.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 10d769a8f10..5b839352561 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -40,7 +40,7 @@
 
 - type: entity
   name: Kardashev-Mosin (762x54mmR)
-  parent: [BaseWeaponSniper, BaseGunWieldable, BaseGunMelee, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added BaseGunMelee
+  parent: [BaseWeaponSniper, BaseGunWieldable, BaseGunMelee, BaseC2ContrabandMercenary] # Hardlight: Made C2. Rather minor syndie item for PMC's :3
   id: WeaponSniperMosin
   description: A weapon for hunting, or endless trench warfare. Uses 762x54mmR ammo. Equipped with bayonet. # Frontier: bayonet
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 8a4cbcd0fed..3686085e0be 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: stun baton
-  parent: [BaseItem, BaseC2Contraband] # Frontier: BaseSecurityContraband<BaseC1Contraband
+  parent: [BaseItem, BaseC1Contraband] # Hardlight: Fixed to be a C1 contraband item. As Intended origionally.
   id: Stunbaton
   description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
   components:
diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
index 187517eb6cb..96dc417ca88 100644
--- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
+++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml
@@ -14,3 +14,25 @@
     - Structural
   - type: StaminaDamageOnCollide
     damage: 100
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseBulletTrigger
+  id: shell(25x59mm)
+  name: shell (25x59mm)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 10
+        Blunt: 30
+        Structural: 1000
+  - type: StaminaDamageOnCollide
+    damage: 100
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 10 # Bit less than 1 Tile.
+    intensitySlope: 2
+    maxIntensity: 2
+    maxTileBreak: 0
diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
index 75f79c2e822..54e9f10ddf0 100644
--- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
+++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
@@ -20,3 +20,26 @@
   - type: SpentAmmoVisuals
   - type: StaticPrice
     price: 20
+
+- type: entity
+ # categories: [ HideSpawnMenu ] # Frontier
+  parent: [ BaseCartridge, BaseC2Contraband ] # Frontier: BaseMajorContraband<BaseC2Contraband
+  id: Cartridge25x59HE
+  name: HE Shell (25x59mm)
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - Cartridge25x59HE
+  - type: CartridgeAmmo
+    proto: shell(25x59mm)
+    deleteOnSpawn: true
+  - type: Sprite
+    sprite: _HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+  - type: StaticPrice
+    price: 25
diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index e5721029840..fc0e482f24c 100644
--- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -1,127 +1,141 @@
 
 # Distinction for magazine fed snipers, for round fed refer to BaseWeaponSniper
 
+#- type: entity
+#  name: BaseWeaponSniperMag
+#  parent: BaseItem
+#  id: BaseWeaponSniperMag
+#  description: A rooty tooty maggy point and shooty.
+#  abstract: true
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: base
+#      map: ["enum.GunVisualLayers.Base"]
+#  - type: Item
+#    size: Huge
+#  - type: Clothing
+#    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+#    quickEquip: false
+#    slots:
+#    - Back
+#    - suitStorage
+#  - type: AmmoCounter
+#  - type: Gun
+#    fireRate: 0.2
+#    selectedMode: SemiAuto
+#    availableModes:
+#    - SemiAuto
+#    soundGunshot:
+#      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+#  - type: ContainerContainer
+#    containers:
+#      ballistic-ammo: !type:Container
+#        ents: []
+#  - type: ItemSlots
+#    slots:
+#      gun_magazine:
+#        name: Magazine
+#        # startingItem: MagazineLightRifle # Frontier
+#        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+#        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+#        priority: 2
+#        whitelist:
+#          tags:
+#            - MagazineAMR
+#        whitelistFailPopup: gun-magazine-whitelist-fail
+#      gun_chamber:
+#        name: Chamber
+#        # startingItem: CartridgeLightRifle # Frontier
+#        priority: 1
+#        whitelist:
+#          tags:
+#            - CartridgeAntiMaterielBig
+#  - type: ChamberMagazineAmmoProvider
+#    soundRack:
+#      path: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg
+#  - type: CursorOffsetRequiresWield
+#  - type: EyeCursorOffset
+#    maxOffset: 10
+#    pvsIncrease: 1
+#  - type: StaticPrice
+#    price: 500
+
+#- type: entity
+#  name: Forktail
+#  parent: [BaseWeaponSniper, BaseGunWieldable, BaseC3SyndicateContraband]
+#  id: WeaponSniperBigAMR
+#  description: A not so portable anti-materiel rifle. Fires excessively large 20x82mm shells.
+#  components:
+#  - type: Sprite
+#    sprite: Objects/Weapons/Guns/Snipers/amr.rsi
+#    layers:
+#      - state: base
+#        map: ["enum.GunVisualLayers.Base"]
+#      - state: mag-0
+#        map: ["enum.GunVisualLayers.Mag"]
+#      - state: barrel
+#        visible: true
+#        map: ["enum.ToggleVisuals.Layer"]
+#  - type: Clothing
+#    sprite: Objects/Weapons/Guns/Snipers/amr.rsi
+#  - type: GunRequiresWield
+#  - type: Gun
+#    projectileSpeed: 30
+#  - type: SpeedModifiedOnWield
+#    walkModifier: 0
+#    sprintModifier: 0
+#  - type: ContainerContainer
+#    containers:
+#      gun_magazine: !type:ContainerSlot
+#      gun_chamber: !type:ContainerSlot
+#  - type: ItemSlots
+#    slots:
+#      gun_magazine:
+#        name: Magazine
+#        startingItem: MagazineAMR
+#        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+#        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+#        priority: 2
+#        whitelist:
+#          tags:
+#            - MagazineAMR
+#        whitelistFailPopup: gun-magazine-whitelist-fail
+#  - type: MagazineVisuals
+#    magState: mag
+#    steps: 1
+#    zeroVisible: true
+#  - type: CursorOffsetRequiresWield
+#  - type: EyeCursorOffset
+#    maxOffset: 5
+#    pvsIncrease: 0.5
+  # type: Telescope
+
+# Just going to remake and comment out the old Forktail. This is so fucked.
 - type: entity
-  name: BaseWeaponSniperMag
-  parent: BaseItem
-  id: BaseWeaponSniperMag
-  description: A rooty tooty maggy point and shooty.
-  abstract: true
+  name: Forktail (25x59mm)
+  parent: [BaseWeaponSniper, BaseGunWieldable, BaseC2ContrabandMercenary] # Hardlight
+  id: WeaponSniperBigAMR
+  description: A Hristov bubba'd to fire 25x59mm high-explosive rounds using iron sights... Why?
   components:
   - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-  - type: Item
-    size: Huge
+    sprite: Objects/Weapons/Guns/Snipers/forktail.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
-    quickEquip: false
-    slots:
-    - Back
-    - suitStorage
-  - type: AmmoCounter
+    sprite: Objects/Weapons/Guns/Snipers/forktail.rsi
+  - type: GunRequiresWield
   - type: Gun
-    fireRate: 0.2
+    fireRate: 1
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        # startingItem: MagazineLightRifle # Frontier
-        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineAMR
-        whitelistFailPopup: gun-magazine-whitelist-fail
-      gun_chamber:
-        name: Chamber
-        # startingItem: CartridgeLightRifle # Frontier
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeAntiMaterielBig
-  - type: ChamberMagazineAmmoProvider
-    soundRack:
-      path: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 10
-    pvsIncrease: 1
-  - type: StaticPrice
-    price: 500
-
-- type: entity
-  name: Forktail
-  parent: [BaseWeaponSniper, BaseGunWieldable, BaseC3SyndicateContraband]
-  id: WeaponSniperBigAMR
-  description: A not so portable anti-materiel rifle. Fires excessively large 20x82mm shells.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Snipers/amr.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: mag-0
-        map: ["enum.GunVisualLayers.Mag"]
-      - state: barrel
-        visible: true
-        map: ["enum.ToggleVisuals.Layer"]
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/Snipers/amr.rsi
-  - type: GunRequiresWield
-  - type: Gun
-    projectileSpeed: 30
-  - type: SpeedModifiedOnWield
-    walkModifier: 0
-    sprintModifier: 0
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot
-  - type: ContainerFill
-    containers:
-      gun_magazine:
-      - MagazineAMR
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: true
-
-- type: entity
-  id: MagazineAMR
-  name: magazine (20x82mm)
-  parent: BaseMagazineLightRifle
-  components:
-  - type: Tag # Hardlight change
-    tags:
-      - MagazineAMR
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
   - type: BallisticAmmoProvider
-    proto: CartridgeAntiMaterielBig
-    capacity: 3
-    mayTransfer: true
     whitelist:
       tags:
-        - CartridgeAntiMaterielBig
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 2
-    zeroVisible: false
-  - type: Appearance
+      - Cartridge25x59HE
+    capacity: 1
+    proto: Cartridge25x59HE
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.25
+    sprintModifier: 0.25
diff --git a/Resources/Prototypes/_HL/tags.yml b/Resources/Prototypes/_HL/tags.yml
index 05eebd4b6d8..509beccf6bc 100644
--- a/Resources/Prototypes/_HL/tags.yml
+++ b/Resources/Prototypes/_HL/tags.yml
@@ -357,6 +357,9 @@
 - type: Tag
   id: GaslockFrameMachineCircuitBoard
 
+- type: Tag
+  id: Cartridge25x59HE
+
 # Forged Rifle Mag
 - type: Tag
   id: ForgedRifleMagazine
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml
index 168d0cc5157..4d9caf93bbf 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazine635x40mmCaseless
   name: "magazine (635x40mm Caseless)"
-  parent: [ BaseCartridge, BaseC3SyndicateContrabandNoValue, RecyclableItemSteelTiny ] # Frontier: BaseSecurityContraband<BaseC3SyndicateContraband, added RecyclableItemSteelTiny
+  parent: [ BaseCartridge, BaseC1Contraband, RecyclableItemSteelTiny ] # Hardlight: Made C1. It's Mags. WTF is someone going to do with them by themsevles?
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml
index 9114534a96e..37f7ff8e3ac 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml
@@ -36,8 +36,8 @@
 
 - type: entity #C-20r
   parent:
-
-  - WeaponSubMachineGunC20r
+    - BaseC2ContrabandMercenary
+    - WeaponSubMachineGunC20r
   name: PMC C-20r
   id: WeaponSubMachineGunC20rPMC
   description: A C-20r that has been properly registered for private security and mercenary use.
diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml
index f88d809bebb..4a0a924ab15 100644
--- a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml
@@ -30,6 +30,16 @@
   id: Magazine556x45mmUranium
   result: Magazine556x45mmUranium
 
+- type: latheRecipe
+  parent: BaseAmmoFMJIntermediateMagazineRecipe
+  id: MagazineNovaliteC1
+  result: MagazineNovaliteC1
+
+- type: latheRecipe
+  parent: BaseAmmoEmptyIntermediateMagazineRecipe
+  id: MagazineNovaliteC1Empty
+  result: MagazineNovaliteC1Empty
+
 #Speedloaders
 
 - type: latheRecipe
diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/VariousAmmo.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/VariousAmmo.yml
index 74f0e4dad6f..253edc49a85 100644
--- a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/VariousAmmo.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/VariousAmmo.yml
@@ -8,3 +8,13 @@
     Steel: 250
     Plastic: 250
     Plasma: 1000
+
+- type: latheRecipe
+  parent: BaseAmmoFMJIntermediateMagazineRecipe
+  id: Magazine635x40mmCaseless
+  result: Magazine635x40mmCaseless
+
+- type: latheRecipe
+  parent: BaseAmmoFMJPistolCaliberPistolMagazineRecipe
+  id: Magazine635x40mmCaselessPistol
+  result: Magazine635x40mmCaselessPistol
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml
index 7f354aa04ef..ae9a6a408cd 100644
--- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml
@@ -113,6 +113,8 @@
   - Magazine556x45mmPractice
   - Magazine556x45mmEmpty
   - Magazine556x45mmUranium
+  - MagazineNovaliteC1
+  - MagazineNovaliteC1Empty
   - SpeedLoader556x45mmFMJ
   - SpeedLoader556x45mmRubber
   - SpeedLoader556x45mmIncendiary
@@ -228,7 +230,7 @@
   - Magazine8x65mmEmpty
   - Magazine762x54mmREmpty
   - Magazine762x51mmEmpty
-  - Magazine12_gaugeEmpty
+  - Magazine12_gaugeEmpty 
   - Magazine45_ACPSubMachineGunTopMountedEmpty
   - Magazine9x19mmSubMachineGunTopMountedEmpty
   - Magazine57x28mmSubMachineGunTopMountedEmpty
@@ -382,6 +384,10 @@
   - AmmoBox762x51mmRubberBig
   - AmmoBox762x39mmRubberBig
   - AmmoBox762x54mmRRubberBig
+  - MagazineNovaliteC1
+  - MagazineNovaliteC1Empty
+  - Magazine635x40mmCaseless
+  - Magazine635x40mmCaselessPistol
 
 #civilian = FMJ + practice + empty + rubber
 
@@ -525,6 +531,11 @@
   - AmmoBox762x51mmRubberBig
   - AmmoBox762x39mmRubberBig
   - AmmoBox762x54mmRRubberBig
+  # HL
+  - MagazineNovaliteC1
+  - MagazineNovaliteC1Empty
+  - Magazine635x40mmCaseless
+  - Magazine635x40mmCaselessPistol
 
 #advanced = Uranium + Incendiary
 
@@ -592,3 +603,7 @@
   - AmmoBox23x75mmUranium
 # HL
   - MagRailgun
+  - MagazineNovaliteC1
+  - MagazineNovaliteC1Empty
+  - Magazine635x40mmCaseless
+  - Magazine635x40mmCaselessPistol
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
index f353c38d85c..5a15237bb1c 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
@@ -35,6 +35,7 @@
     #SpeedLoader7.282x39mmFMJ: 28 # 7.282x39mm Gestio/AKM
     #SpeedLoader7.282x54mmRFMJ: 28 # 7.282x54mmR SVS
     SpeedLoader45_magnumFMJ: 28 # .45 magnum revolvers
+    MagazineNovaliteC1: 6
     Magazine762x39mmLowCapacityFMJ: 28
     ClothingBeltQuiverFullBodkin: 6
     ClothingBeltQuiverFullBroadhead: 6
diff --git a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml
index 1405471f87c..aa3c4ab95c0 100644
--- a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml
+++ b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml
@@ -1,3 +1,20 @@
+# EVA Suits
+- type: listing
+  id: UplinkMercenaryHardsuitMining
+  name:  uplink-mercenary-mininghardsuit-name
+  description: uplink-mercenary-mininghardsuit-desc
+  productEntity: ClothingOuterHardsuitSalvage
+  icon: { sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi, state: icon }
+  cost:
+    MercCoin: 5
+  categories:
+    - UplinkMercenaryHardsuits
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
 - type: listing
   id: UplinkMercenaryHardsuit
   name:  uplink-mercenary-hardsuit-name
@@ -5,7 +22,7 @@
   productEntity: ClothingOuterHardsuitMercenary
   icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi, state: icon }
   cost:
-    MercCoin: 8
+    MercCoin: 15
   categories:
     - UplinkMercenaryHardsuits
   conditions:
@@ -21,7 +38,7 @@
   productEntity: ClothingOuterHardsuitPrivateSecurity
   icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi, state: icon }
   cost:
-    MercCoin: 8
+    MercCoin: 15
   categories:
     - UplinkMercenaryHardsuits
   conditions:
@@ -37,7 +54,7 @@
   productEntity: ClothingOuterHardsuitScaf
   icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi, state: icon }
   cost:
-    MercCoin: 32
+    MercCoin: 35
   categories:
     - UplinkMercenaryHardsuits
   conditions:
@@ -47,31 +64,80 @@
           - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryWeaponSurpLecter
-  name:  uplink-mercenary-rifle1-name
-  description: uplink-mercenary-rifle1-desc
-  productEntity: WeaponRifleSurpLecter
-  icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/surplecter.rsi, state: icon }
+  id: UplinkMercenaryHardsuitLuxuryMining
+  name: uplink-mercenary-luxmininghardsuit-name
+  description: uplink-mercenary-luxmininghardsuit-desc
+  productEntity: ClothingOuterHardsuitLuxury
+  icon: { sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi, state: icon }
   cost:
-    MercCoin: 8
+    MercCoin: 50
   categories:
-    - UplinkMercenaryWeapons
+    - UplinkMercenaryHardsuits
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
         tags:
           - MercenaryUplink
 
+# Armor
 - type: listing
-  id: UplinkMercenarySurpKammerer
-  name:  uplink-mercenary-shotgun1-name
-  description: uplink-mercenary-shotgun1-desc
-  productEntity: WeaponShotgunSurpKammerer
-  icon: { sprite: _NF/Objects/Weapons/Guns/Shotguns/surppump.rsi, state: icon }
+  id: UplinkMercenaryArmorRiotShield
+  name: uplink-mercenary-riotshield-name
+  description: uplink-mercenary-riotshield-desc
+  productEntity: RiotShield
+  icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: riot-icon }
+  cost:
+    MercCoin: 12
+  categories:
+    - UplinkMercenaryArmor
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+#- type: listing
+#  id: UplinkMercenaryUpArmorRiotShield
+#  name: uplink-mercenary-uparmorshield-name
+#  description: uplink-mercenary-uparmorshield-desc
+#  productEntity: UpArmoredRiotShield
+#  icon: { sprite: _NF/Clothing/OuterClothing/Coats/bounty_hunter_coat.rsi, state: icon }
+#  cost:
+#    MercCoin: 0
+#  categories:
+#    - UplinkMercenaryArmor
+#  conditions:
+#    - !type:StoreWhitelistCondition
+#      whitelist:
+#        tags:
+#          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryArmorArmorCoat
+  name: uplink-mercenary-armorcoat-name
+  description: uplink-mercenary-armorcoat-desc
+  productEntity: ClothingOuterCoatBHTrench
+  icon: { sprite: _NF/Clothing/OuterClothing/Coats/bounty_hunter_coat.rsi, state: icon }
+  cost:
+    MercCoin: 15
+  categories:
+    - UplinkMercenaryArmor
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryArmorArmorRiot
+  name: uplink-mercenary-armorriot-name
+  description: uplink-mercenary-armorriot-desc
+  productEntity: ClothingOuterArmorRiot
+  icon: { sprite: Clothing/OuterClothing/Armor/riot.rsi, state: icon }
   cost:
     MercCoin: 9
   categories:
-    - UplinkMercenaryWeapons
+    - UplinkMercenaryArmor
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -79,183 +145,1181 @@
           - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenarySurpDrozd
-  name:  uplink-mercenary-smg1-name
-  description: uplink-mercenary-smg1-desc
-  productEntity: WeaponSubMachineGunSurpDrozd
-  icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon }
+  id: UplinkMercenaryArmorWebMercBlack
+  name: uplink-mercenary-webmercblack-name
+  description: uplink-mercenary-webmercblack-desc
+  productEntity: ClothingOuterVestWebMercenaryBlack
+  icon: { sprite: _NF/Clothing/OuterClothing/Vests/mercenary_webvest_black.rsi, state: icon }
   cost:
     MercCoin: 6
   categories:
-    - UplinkMercenaryWeapons
+    - UplinkMercenaryArmor
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
         tags:
           - MercenaryUplink
 
-#Utility - Medical
+- type: listing
+  id: UplinkMercenaryArmorWebMercOlive
+  name: uplink-mercenary-webmercolive-name
+  description: uplink-mercenary-webmercolive-desc
+  productEntity: ClothingOuterVestWebMercenary
+  icon: { sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi, state: icon }
+  cost:
+    MercCoin: 6
+  categories:
+    - UplinkMercenaryArmor
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryGauze
-  name:  uplink-mercenary-gauze-name
-  description: uplink-mercenary-gauze-desc
-  productEntity: Gauze
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorBasic
+  name: uplink-mercenary-armorbasic-name
+  description: uplink-mercenary-armorbasic-desc
+  productEntity: ClothingOuterArmorBasic
+  icon: { sprite: Clothing/OuterClothing/Armor/security.rsi, state: icon }
   cost:
-    MercCoin: 2
+    MercCoin: 8
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryOintment
-  name:  uplink-mercenary-ointment-name
-  description: uplink-mercenary-ointment-desc
-  productEntity: Ointment
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorArmorHelmetMercBlack
+  name: uplink-mercenary-armorhelmetmercblack-name
+  description: uplink-mercenary-armorhelmetmercblack-desc
+  productEntity: ClothingHeadHelmetMercenaryBlack
+  icon: { sprite: _NF/Clothing/Head/Helmets/mercenary_black.rsi, state: icon }
   cost:
-    MercCoin: 2
+    MercCoin: 4
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryBrutepack
-  name:  uplink-mercenary-brute-pack-name
-  description: uplink-mercenary-brute-pack-desc
-  productEntity: Brutepack
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorHelmetSwat
+  name: uplink-mercenary-armorhelmetswat-name
+  description: uplink-mercenary-armorhelmetswat-desc
+  productEntity: ClothingHeadHelmetSwat
+  icon: { sprite: Clothing/Head/Helmets/swat.rsi, state: icon }
   cost:
-    MercCoin: 2
+    MercCoin: 15
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryMedkit
-  name:  uplink-mercenary-medkit-name
-  description: uplink-mercenary-medkit-desc
-  productEntity: MedkitFilled
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorBulletproof
+  name: uplink-mercenary-armorbulletproof-name
+  description: uplink-mercenary-armorbulletproof-desc
+  productEntity: ClothingOuterArmorBulletproof
+  icon: { sprite: Clothing/OuterClothing/Armor/bulletproof.rsi, state: icon }
   cost:
-    MercCoin: 6
+    MercCoin: 10
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryMedkitAdvanced
-  name:  uplink-mercenary-medkit-advanced-name
-  description: uplink-mercenary-medkit-advanced-desc
-  productEntity: MedkitAdvancedFilled
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorHelmetBulletproof
+  name: uplink-mercenary-armorhelmetbulletproof-name
+  description: uplink-mercenary-armorhelmetbulletproof-desc
+  productEntity: ClothingHeadHelmetBulletProof
+  icon: { sprite: _Starlight/Clothing/Head/Helmets/bulletproof.rsi, state: icon }
+  cost:
+    MercCoin: 7
+  categories:
+    - UplinkMercenaryArmor
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryArmorArmorStabproof
+  name: uplink-mercenary-armorstabproof-name
+  description: uplink-mercenary-armorstabproof-desc
+  productEntity: ClothingOuterArmorStab
+  icon: { sprite: _Starlight/Clothing/OuterClothing/Armor/stabvest.rsi, state: icon }
   cost:
     MercCoin: 8
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryCombatMedkit
-  name:  uplink-mercenary-combat-medkit-name
-  description: uplink-mercenary-combat-medkit-desc
-  productEntity: MedkitCombatFilled
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorHelmetStabproof
+  name: uplink-mercenary-armorhelmetstabproof-name
+  description: uplink-mercenary-armorhelmetstabproof-desc
+  productEntity: ClothingHeadHelmetStabproof
+  icon: { sprite: _Starlight/Clothing/Head/Helmets/stabproof.rsi, state: icon }
   cost:
-    MercCoin: 10
+    MercCoin: 5
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryCombatPunctKit
-  name:  uplink-mercenary-combat-punct-kit-name
-  description: uplink-mercenary-combat-punct-kit-desc
-  productEntity: MedkitCombatPunct
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryArmorHelmetRiot
+  name: uplink-mercenary-armorhelmetriot-name
+  description: uplink-mercenary-armorhelmetriot-desc
+  productEntity: ClothingHeadHelmetRiot
+  icon: { sprite: Clothing/Head/Helmets/light_riot.rsi, state: icon }
   cost:
-    MercCoin: 10
+    MercCoin: 8
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryArmor
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
+
+# Utility
 - type: listing
-  id: UplinkMercenaryCombatCrisisKit
-  name:  uplink-mercenary-combat-crisis-kit-name
-  description: uplink-mercenary-combat-crisis-kit-desc
-  productEntity: MedkitCombatCrisis
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryUtilityBackpackTactical
+  name: uplink-mercenary-tactical-name
+  description: uplink-mercenary-tactical-desc
+  productEntity: ClothingBackpackTactical
+  icon: { sprite: _HL/Clothing/Back/tacticalpack.rsi, state: icon }
   cost:
-    MercCoin: 10
+    MercCoin: 5
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryUtility
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryCombatBruizKit
-  name:  uplink-mercenary-combat-bruiz-kit-name
-  description: uplink-mercenary-combat-bruiz-kit-desc
-  productEntity: MedkitCombatBruiz
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryUtilityBackpackExplorer
+  name: uplink-mercenary-explorer-name
+  description: uplink-mercenary-explorer-desc
+  productEntity: ClothingBackpackExplorer
+  icon: { sprite: _HL/Clothing/Back/explorerpack.rsi, state: icon }
   cost:
-    MercCoin: 10
+    MercCoin: 7
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryUtility
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 - type: listing
-  id: UplinkMercenaryCombatBurnKit
-  name:  uplink-mercenary-combat-burn-kit-name
-  description: uplink-mercenary-combat-burn-kit-desc
-  productEntity: MedkitCombatBurn
-  #icon: { sprite: , state: icon }
+  id: UplinkMercenaryUtilityRucksack
+  name: uplink-mercenary-rucksack-name
+  description: uplink-mercenary-rucksack-desc
+  productEntity: ClothingRucksack
+  icon: { sprite: _HL/Clothing/Back/rucksack.rsi, state: icon }
   cost:
-    MercCoin: 10
+    MercCoin: 9
   categories:
-  - UplinkMercenaryUtility
+    - UplinkMercenaryUtility
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - MercenaryUplink
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityChestRig
+  name: uplink-mercenary-webbing-name
+  description: uplink-mercenary-webbing-desc
+  productEntity: ClothingBeltMilitaryWebbing
+  icon: { sprite: Clothing/Belt/militarywebbing.rsi, state: icon }
+  cost:
+    MercCoin: 4
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityMercWebbing
+  name: uplink-mercenary-mercwebbing-name
+  description: uplink-mercenary-mercwebbing-desc
+  productEntity: ClothingBeltMercenaryWebbing
+  icon: { sprite: Clothing/Belt/mercwebbing.rsi, state: icon }
+  cost:
+    MercCoin: 4
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityStunbaton
+  name: uplink-mercenary-stunbaton-name
+  description: uplink-mercenary-stunbaton-desc
+  productEntity: Stunbaton
+  icon: { sprite: Objects/Weapons/Melee/stunbaton.rsi, state: stunbaton_off }
+  cost:
+    MercCoin: 5
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityBola
+  name: uplink-mercenary-bola-name
+  description: uplink-mercenary-bola-desc
+  productEntity: Bola
+  icon: { sprite: Objects/Weapons/Throwable/bola.rsi, state: icon }
+  cost:
+    MercCoin: 1
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
+- type: listing
+  id: UplinkMercenaryUtilityBoxHandcuff
+  name: uplink-mercenary-boxhandcuff-name
+  description: uplink-mercenary-boxhandcuff-desc
+  productEntity: BoxHandcuff
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: handcuff }
+  cost:
+    MercCoin: 1
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilitySeclite
+  name: uplink-mercenary-seclite-name
+  description: uplink-mercenary-seclite-desc
+  productEntity: FlashlightSeclite
+  icon: { sprite: Objects/Tools/seclite.rsi, state: seclite }
+  cost:
+    MercCoin: 3
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityPinpointerUniversal
+  name: uplink-mercenary-pinpointuni-name
+  description: uplink-mercenary-pinpointuni-desc
+  productEntity: PinpointerUniversal
+  icon: { sprite: Objects/Devices/pinpointer.rsi, state: pinpointer-crew }
+  cost:
+    MercCoin: 5
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityHudBountyHud
+  name: uplink-mercenary-bountyhud-name
+  description: uplink-mercenary-bountyhud-desc
+  productEntity: ClothingEyesHudBountyHunter
+  icon: { sprite: Clothing/Eyes/Hud/sec.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityDiagnosticHud
+  name: uplink-mercenary-diagnostichud-name
+  description: uplink-mercenary-diagnostichud-desc
+  productEntity: ClothingEyesHudDiagnostic
+  icon: { sprite: Clothing/Eyes/Hud/diag.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityMedicalHud
+  name: uplink-mercenary-medicalhud-name
+  description: uplink-mercenary-medicalhud-desc
+  productEntity: ClothingEyesHudMedical
+  icon: { sprite: Clothing/Eyes/Hud/med.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityEngiGoggles
+  name: uplink-mercenary-engigoggles-name
+  description: uplink-mercenary-engigoggles-desc
+  productEntity: ClothingEyesGlassesMeson
+  icon: { sprite: Clothing/Eyes/Glasses/meson.rsi, state: icon }
+  cost:
+    MercCoin: 5
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryUtilityChemGoggles
+  name: uplink-mercenary-chemgoggles-name
+  description: uplink-mercenary-chemgoggles-desc
+  productEntity: ClothingEyesGlassesChemical
+  icon: { sprite: Clothing/Eyes/Glasses/science.rsi, state: icon }
+  cost:
+    MercCoin: 5
+  categories:
+    - UplinkMercenaryUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+# Medical
+- type: listing
+  id: UplinkMercenaryGauze
+  name:  uplink-mercenary-gauze-name
+  description: uplink-mercenary-gauze-desc
+  productEntity: Gauze
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 2
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryOintment
+  name:  uplink-mercenary-ointment-name
+  description: uplink-mercenary-ointment-desc
+  productEntity: Ointment
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 2
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryBrutepack
+  name:  uplink-mercenary-brute-pack-name
+  description: uplink-mercenary-brute-pack-desc
+  productEntity: Brutepack
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 2
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryMedkit
+  name:  uplink-mercenary-medkit-name
+  description: uplink-mercenary-medkit-desc
+  productEntity: MedkitFilled
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 6
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryMedkitAdvanced
+  name:  uplink-mercenary-medkit-advanced-name
+  description: uplink-mercenary-medkit-advanced-desc
+  productEntity: MedkitAdvancedFilled
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 8
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryCombatMedkit
+  name:  uplink-mercenary-combat-medkit-name
+  description: uplink-mercenary-combat-medkit-desc
+  productEntity: MedkitCombatFilled
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryCombatPunctKit
+  name:  uplink-mercenary-combat-punct-kit-name
+  description: uplink-mercenary-combat-punct-kit-desc
+  productEntity: MedkitCombatPunct
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryCombatCrisisKit
+  name:  uplink-mercenary-combat-crisis-kit-name
+  description: uplink-mercenary-combat-crisis-kit-desc
+  productEntity: MedkitCombatCrisis
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryCombatBruizKit
+  name:  uplink-mercenary-combat-bruiz-kit-name
+  description: uplink-mercenary-combat-bruiz-kit-desc
+  productEntity: MedkitCombatBruiz
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryCombatBurnKit
+  name:  uplink-mercenary-combat-burn-kit-name
+  description: uplink-mercenary-combat-burn-kit-desc
+  productEntity: MedkitCombatBurn
+  #icon: { sprite: , state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+  - UplinkMercenaryMedical
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - MercenaryUplink
+
+# Snipers
+
+# Rifles
+- type: listing
+  id: UplinkMercenaryWeaponSurpLecter
+  name:  uplink-mercenary-surpluslecter-name
+  description: uplink-mercenary-surpluslecter-desc
+  productEntity: WeaponRifleSurpLecter
+  icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/surplecter.rsi, state: icon }
+  cost:
+    MercCoin: 15
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponRepeaterRifle
+  name:  uplink-mercenary-repeaterrifle-name
+  description: uplink-mercenary-repeaterrifle-desc
+  productEntity: WeaponSniperRepeater
+  icon: { sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi, state: base }
+  cost:
+    MercCoin: 14
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponGestioRifle
+  name:  uplink-mercenary-gestiorifle-name
+  description: uplink-mercenary-gestiorifle-desc
+  productEntity: WeaponRifleGestio
+  icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi, state: icon }
+  cost:
+    MercCoin: 18
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponVylcanCFCM
+  name:  uplink-mercenary-vulcancfcm-name
+  description: uplink-mercenary-vulcancfcm-desc
+  productEntity: WeaponRifleVulcanCFCM
+  icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/WeaponRifleVulcanCFCM.rsi, state: icon }
+  cost:
+    MercCoin: 22
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponLaserCannonPMC
+  name:  uplink-mercenary-lasercannonpmc-name
+  description: uplink-mercenary-lasercannonpmc-desc
+  productEntity: WeaponLaserCannonPMC
+  icon: { sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi, state: icon }
+  cost:
+    MercCoin: 25
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponLaserCannon
+  name:  uplink-mercenary-lasercannon-name
+  description: uplink-mercenary-lasercannon-desc
+  productEntity: NFWeaponEnergyRifleCannon
+  icon: { sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi, state: icon }
+  cost:
+    MercCoin: 25
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponEnergyRifleButBetter
+  name:  uplink-mercenary-energyriflebutbetter-name
+  description: uplink-mercenary-energyriflebutbetter-desc
+  productEntity: NFWeaponEnergyRifleCarbineExpedition
+  icon: { sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi, state: icon }
+  cost:
+    MercCoin: 22
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponTempatureGun
+  name:  uplink-mercenary-tempaturegun-name
+  description: uplink-mercenary-tempaturegun-desc
+  productEntity: WeaponTemperatureGun
+  icon: { sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi, state: icon }
+  cost:
+    MercCoin: 40
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponMR8CRifle
+  name:  uplink-mercenary-mr8crifle-name
+  description: uplink-mercenary-mr8crifle-desc
+  productEntity: WeaponRifleMR8C
+  icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/mr8c.rsi, state: icon }
+  cost:
+    MercCoin: 40
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponVulcanRifle
+  name:  uplink-mercenary-vulcanrifle-name
+  description: uplink-mercenary-vulcanrifle-desc
+  productEntity: WeaponRifleVulcan
+  icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi, state: icon }
+  cost:
+    MercCoin: 36
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponCeremonialRifle
+  name:  uplink-mercenary-ceremonialrifle-name
+  description: uplink-mercenary-ceremonialrifle-desc
+  productEntity: WeaponSniperCeremonial
+  icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi, state: base }
+  cost:
+    MercCoin: 24
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponMosinRifle
+  name:  uplink-mercenary-mosinrifle-name
+  description: uplink-mercenary-mosinrifle-desc
+  productEntity: WeaponSniperMosin
+  icon: { sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi, state: base }
+  cost:
+    MercCoin: 16
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponAKRifle
+  name:  uplink-mercenary-akrifle-name
+  description: uplink-mercenary-akrifle-desc
+  productEntity: WeaponRifleAk
+  icon: { sprite: Objects/Weapons/Guns/Rifles/ak.rsi, state: icon }
+  cost:
+    MercCoin: 28
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWeaponAssultAKRifle
+  name:  uplink-mercenary-assultakrifle-name
+  description: uplink-mercenary-assultakrifle-desc
+  productEntity: NFWeaponRifleAssaultSm
+  icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/solandmoss.rsi, state: icon }
+  cost:
+    MercCoin: 28
+  categories:
+    - UplinkMercenaryRifles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+# Shotguns
+- type: listing
+  id: UplinkMercenarySurpKammerer
+  name:  uplink-mercenary-surpluskrammerer-name
+  description: uplink-mercenary-surpluskrammerer-desc
+  productEntity: WeaponShotgunSurpKammerer
+  icon: { sprite: _NF/Objects/Weapons/Guns/Shotguns/surppump.rsi, state: icon }
+  cost:
+    MercCoin: 12
+  categories:
+    - UplinkMercenaryShotguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryEnforcerShotty
+  name:  uplink-mercenary-enforcershotty-name
+  description: uplink-mercenary-enforcershotty-desc
+  productEntity: WeaponShotgunEnforcer
+  icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon }
+  cost:
+    MercCoin: 16
+  categories:
+    - UplinkMercenaryShotguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryVortex12Shotty
+  name:  uplink-mercenary-vortex12shotty-name
+  description: uplink-mercenary-vortex12shotty-desc
+  productEntity: WeaponShotgunVortex
+  icon: { sprite: _HL/Objects/Weapons/Guns/Shotguns/vortex.rsi, state: icon }
+  cost:
+    MercCoin: 22
+  categories:
+    - UplinkMercenaryShotguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryBigJohnnyShotty
+  name:  uplink-mercenary-bigjohnnyshotty-name
+  description: uplink-mercenary-bigjohnnyshotty-desc
+  productEntity: WeaponShotgunBigJohnny
+  icon: { sprite: _Mono/Objects/Weapons/Guns/Shotguns/BigJohnny.rsi, state: icon }
+  cost:
+    MercCoin: 40
+  categories:
+    - UplinkMercenaryShotguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+# SMGs
+- type: listing
+  id: UplinkMercenarySurpDrozd
+  name:  uplink-mercenary-surplusdrozd-name
+  description: uplink-mercenary-surplusdrozd-desc
+  productEntity: WeaponSubMachineGunSurpDrozd
+  icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryC20rPMC
+  name:  uplink-mercenary-c20rpmc-name
+  description: uplink-mercenary-c20rpmc-desc
+  productEntity: WeaponSubMachineGunC20rPMC
+  icon: { sprite: Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
+  cost:
+    MercCoin: 32
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryDisablerSMGPMC
+  name:  uplink-mercenary-disablersmgpmc-name
+  description: uplink-mercenary-disablersmgpmc-desc
+  productEntity: WeaponDisablerSMGPMC
+  icon: { sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi, state: base }
+  cost:
+    MercCoin: 8
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryNovaliteC1
+  name:  uplink-mercenary-novalitec1-name
+  description: uplink-mercenary-novalitec1-desc
+  productEntity: WeaponRifleNovaliteC1
+  icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi, state: icon }
+  cost:
+    MercCoin: 11
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWt550
+  name:  uplink-mercenary-wt550-name
+  description: uplink-mercenary-wt550-desc
+  productEntity: WeaponSubMachineGunWt550
+  icon: { sprite: Objects/Weapons/Guns/SMGs/wt550.rsi, state: icon }
+  cost:
+    MercCoin: 14
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWT440
+  name:  uplink-mercenary-wt440-name
+  description: uplink-mercenary-wt440-desc
+  productEntity: WeaponPistolWT440446x30mm
+  icon: { sprite: _HL/Objects/Weapons/Guns/Pistols/wt440.rsi, state: icon }
+  cost:
+    MercCoin: 20
+  categories:
+    - UplinkMercenarySMGs
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryTypewriter
+  name:  uplink-mercenary-typewriter-name
+  description: uplink-mercenary-typewriter-desc
+  productEntity: WeaponSubMachineGunTypewriter
+  icon: { sprite: _DV/Objects/Weapons/Guns/SMGs/typewriter.rsi, state: icon }
+  cost:
+    MercCoin: 17
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+# Handguns
+- type: listing
+  id: UplinkMercenaryRitland45
+  name:  uplink-mercenary-ritland45-name
+  description: uplink-mercenary-ritland45-desc
+  productEntity: Ritland45Mercenary
+  icon: { sprite: Objects/Weapons/Guns/Revolvers/python.rsi, state: icon }
+  cost:
+    MercCoin: 28
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryWard45
+  name:  uplink-mercenary-ward45-name
+  description: uplink-mercenary-ward45-desc
+  productEntity: Ward45Mercenary
+  icon: { sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi, state: icon }
+  cost:
+    MercCoin: 28
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryViperPMC
+  name:  uplink-mercenary-viperpmc-name
+  description: uplink-mercenary-viperpmc-desc
+  productEntity: WeaponPistolViperPMC
+  icon: { sprite: Objects/Weapons/Guns/Pistols/viper.rsi, state: icon }
+  cost:
+    MercCoin: 18
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryMk58
+  name:  uplink-mercenary-mk58-name
+  description: uplink-mercenary-mk58-desc
+  productEntity: WeaponPistolMk58
+  icon: { sprite: Objects/Weapons/Guns/Pistols/mk58.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryDeckard
+  name:  uplink-mercenary-deckard-name
+  description: uplink-mercenary-deckard-desc
+  productEntity: WeaponRevolverDeckard
+  icon: { sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi, state: base }
+  cost:
+    MercCoin: 28
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryLaserPistol
+  name:  uplink-mercenary-laserpistol-name
+  description: uplink-mercenary-laserpistol-desc
+  productEntity: NFWeaponEnergyPistolLaser
+  icon: { sprite: _NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi, state: icon }
+  cost:
+    MercCoin: 10
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenarySvalinn
+  name:  uplink-mercenary-svalinn-name
+  description: uplink-mercenary-svalinn-desc
+  productEntity: WeaponLaserSvalinn
+  icon: { sprite: Objects/Weapons/Guns/Battery/svalinn.rsi, state: icon }
+  cost:
+    MercCoin: 8
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryAdvancedLaserPistol
+  name:  uplink-mercenary-advancedlaserpistol-name
+  description: uplink-mercenary-advancedlaserpistol-desc
+  productEntity: NFWeaponEnergyPistolLaserAdvanced
+  icon: { sprite: _NF/Objects/Weapons/Guns/Battery/advancedlasergun.rsi, state: icon }
+  cost:
+    MercCoin: 15
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryPollock
+  name:  uplink-mercenary-pollock-name
+  description: uplink-mercenary-pollock-desc
+  productEntity: WeaponPistolPollock
+  icon: { sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi, state: icon }
+  cost:
+    MercCoin: 18
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryMk32
+  name:  uplink-mercenary-mk32-name
+  description: uplink-mercenary-mk32-desc
+  productEntity: WeaponPistolMk32
+  icon: { sprite: Objects/Weapons/Guns/Pistols/mk32.rsi, state: icon }
+  cost:
+    MercCoin: 12
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryN1984
+  name:  uplink-mercenary-n1984-name
+  description: uplink-mercenary-n1984-desc
+  productEntity: WeaponPistolN1984
+  icon: { sprite: Objects/Weapons/Guns/Pistols/N1984.rsi, state: icon }
+  cost:
+    MercCoin: 35
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryFitz
+  name:  uplink-mercenary-fitz-name
+  description: uplink-mercenary-fitz-desc
+  productEntity: WeaponRevolverFitz
+  icon: { sprite: _DV/Objects/Weapons/Guns/Revolvers/fitz.rsi, state: icon }
+  cost:
+    MercCoin: 18
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
+
+- type: listing
+  id: UplinkMercenaryFaith
+  name:  uplink-mercenary-faith-name
+  description: uplink-mercenary-faith-desc
+  productEntity: WeaponRevolverFaith
+  icon: { sprite: _DV/Objects/Weapons/Guns/Revolvers/faith.rsi, state: icon }
+  cost:
+    MercCoin: 18
+  categories:
+    - UplinkMercenaryHandguns
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - MercenaryUplink
 
 # Ammo
 #- type: listing # HL Depreciated ammo type.
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index a8e609fc19a..4a28ed5601c 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -53,7 +53,7 @@
 
 - type: entity
   id: NFWeaponRevolverRitland45
-  parent: [ NFBaseWeaponRevolverChamber45, NFBaseWeaponFrameRevolverGorlex, BaseC3SyndicateContrabandUnredeemable ]
+  parent: [ NFBaseWeaponRevolverChamber45, NFBaseWeaponFrameRevolverGorlex, BaseC2ContrabandMercenary ] #Updated to be C2. It's on par with the other revolvers they already have access too as C2.
   name: ritland-45
   description: |-
     An illegal revolver favoured by Syndicate agents.
@@ -63,6 +63,16 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
 
+- type: entity #Hardlight: For the Mercvend
+  id: Ritland45Mercenary
+  parent: NFWeaponRevolverRitland45
+  name: Ritland .45 (.45 ACP)
+
+- type: entity #Hardlight: For the Mercvend
+  id: Ward45Mercenary
+  parent: NFWeaponRevolverWard45
+  name: Ward .45 (.45 ACP)
+
 - type: entity #Hardlight Addition Begin
   id: NFWeaponRevolverRitland45Anom 
   parent: [ NFBaseWeaponRevolverChamber45, NFBaseWeaponFrameRevolverGorlex, BaseC3SyndicateContrabandNoValue ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles_assault.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles_assault.yml
index 4f0b75c4df1..d4b2478345c 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles_assault.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles_assault.yml
@@ -1,7 +1,7 @@
 #region WizDen
 - type: entity # TODO: switch to .25 rifle (caseless)
   id: NFWeaponRifleAssaultSm
-  parent: [ BaseWeaponRifle, BaseC3ExpeditionContraband, WeaponRifleAnnie ] # Reparented to use 762x39 instead of .30 rifle, basic C3 instead of syndie. Hardlight
+  parent: [ BaseWeaponRifle, BaseC2ContrabandMercenary, WeaponRifleAnnie ] # Hardlight: Made C2. Same as the AKM so also fits in the boat for a nice freelancer rifle.
   name: Soland-Moss # Renamed: real brand name
   description: |-
     A heavy assault rifle designed to provide suppressive fire to enemy positions. All serial numbers have been expertly removed, rendering this rifle extremely illegal. Uses 762x39 magazines.
diff --git a/Resources/Prototypes/_NF/Store/categories.yml b/Resources/Prototypes/_NF/Store/categories.yml
index ffaab4fe657..e4611747aa5 100644
--- a/Resources/Prototypes/_NF/Store/categories.yml
+++ b/Resources/Prototypes/_NF/Store/categories.yml
@@ -49,26 +49,42 @@
   name: store-category-pirateexplosives
 
 #mercenary
-- type: storeCategory
-  id: UplinkMercenaryBundles
-  name: store-category-mercenarybundles
-
 - type: storeCategory
   id: UplinkMercenaryHardsuits
   name: store-category-mercenaryhardsuits
 
 - type: storeCategory
-  id: UplinkMercenaryWeapons
-  name: store-category-mercenaryweapons
-
-- type: storeCategory
-  id: UplinkMercenaryAmmo
-  name: store-category-mercenaryammo
+  id: UplinkMercenaryArmor
+  name: store-category-mercenaryarmor
 
 - type: storeCategory
   id: UplinkMercenaryUtility
   name: store-category-mercenaryutility
 
 - type: storeCategory
-  id: UplinkMercenaryExplosives
-  name: store-category-mercenaryexplosives
+  id: UplinkMercenaryMedical
+  name: store-category-mercenarymedical
+
+- type: storeCategory
+  id: UplinkMercenarySnipers
+  name: store-category-mercenarysnipers
+
+- type: storeCategory
+  id: UplinkMercenaryRifles
+  name: store-category-mercenaryrifles
+
+- type: storeCategory
+  id: UplinkMercenaryShotguns
+  name: store-category-mercenaryshotguns
+
+- type: storeCategory
+  id: UplinkMercenarySMGs
+  name: store-category-mercenarysmgs
+
+- type: storeCategory
+  id: UplinkMercenaryHandguns
+  name: store-category-mercenaryhandguns
+
+- type: storeCategory
+  id: UplinkMercenaryAmmo
+  name: store-category-mercenaryammo
diff --git a/Resources/Prototypes/_NF/Store/presets.yml b/Resources/Prototypes/_NF/Store/presets.yml
index 84901b17c02..db9f731fb01 100644
--- a/Resources/Prototypes/_NF/Store/presets.yml
+++ b/Resources/Prototypes/_NF/Store/presets.yml
@@ -64,11 +64,15 @@
     name: store-preset-name-merc-uplink
     categories:
     - UplinkMercenaryHardsuits
-    - UplinkMercenaryWeapons
-    - UplinkMercenaryAmmo
+    - UplinkMercenaryArmor
     - UplinkMercenaryUtility
-    - UplinkMercenaryExplosives
-    - UplinkMercenaryBundles
+    - UplinkMercenaryMedical
+    - UplinkMercenarySnipers
+    - UplinkMercenaryRifles
+    - UplinkMercenaryShotguns
+    - UplinkMercenarySMGs
+    - UplinkMercenaryHandguns
+    - UplinkMercenaryAmmo
     currencyWhitelist:
     - MercCoin
     balance:
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/base.png
new file mode 100644
index 00000000000..8f62fe5b08d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png
new file mode 100644
index 00000000000..79ed1ce3d26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..1eb55ed264c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..1eb55ed264c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-left.png
new file mode 100644
index 00000000000..5f03171fcb2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-right.png
new file mode 100644
index 00000000000..d2fee23b54d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json
new file mode 100644
index 00000000000..c979da8c911
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified by nikode16 (Githb) for Hardlight, Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..1962b4afa26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..943c9193d27
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base-spent.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base-spent.png
new file mode 100644
index 00000000000..f4ebffc52cf
Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base-spent.png differ
diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png
new file mode 100644
index 00000000000..b56cbc151d0
Binary files /dev/null and b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png differ
diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/meta.json b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/meta.json
new file mode 100644
index 00000000000..bb10f77af89
--- /dev/null
+++ b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified by nikode16 (GitHub) for Hardlight. Helped by carefullilcassie (Discord). Casing Sprite by https://github.com/discordia-space/CEV-Eris/raw/8a848cde3e8610455f77704e861e5a06315a3b0e/icons/obj/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        }
+    ]
+}
\ No newline at end of file