diff --git a/Resources/Locale/en-US/_Funkystation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Funkystation/store/uplink-catalog.ftl
new file mode 100644
index 00000000000..22690093fd1
--- /dev/null
+++ b/Resources/Locale/en-US/_Funkystation/store/uplink-catalog.ftl
@@ -0,0 +1,13 @@
+# Weapons
+uplink-pistol-wyvern-name = Wyvern
+uplink-pistol-wyvern-desc = A heavy pistol sold in few numbers to both NT and the Syndicate, chambered in .50 AE. Comes loaded with uranium rounds.
+
+uplink-revolver-salamander-name = Salamander
+uplink-revolver-salamander-desc = An assasin's revolver, the Salamander is able to fit in small places such as inside bibles and in jackboots and in survival boxes but its small size and large caliber make it less than accurate, so try not to miss. It comes loaded with three standard .50 AE rounds.
+
+# Ammo
+uplink-pistol-magazine-large-uranium-name = pistol magazine (.50 AE Uranium)
+uplink-pistol-magazine-large-uranium-desc = .50 AE magazine compatible with the wyvern.
+
+uplink-pistol-magazine-large-incendiary-name = pistol magazine (.50 AE Incendiary)
+uplink-pistol-magazine-large-incendiary-desc = .50 AE magazine compatible with the wyvern. For when you want to spice it up.
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 05c82cb71a0..67a81721e8a 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -166,10 +166,10 @@
 
 # Shotgun
 - type: entity
-  name: box of (.50 pellet) ammo drums
+  name: box of (12 gauge pellet) ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgun
-  description: A box full of (.50 pellet) ammo drums.
+  description: A box full of (12 gauge pellet) ammo drums.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -178,10 +178,10 @@
         amount: 4
 
 - type: entity
-  name: box of (.50 beanbag) ammo drums
+  name: box of (12 gauge beanbag) ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunBeanbag
-  description: A box full of (.50 beanbag) ammo drums.
+  description: A box full of (12 gauge beanbag) ammo drums.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -190,10 +190,10 @@
         amount: 4
 
 - type: entity
-  name: box of (.50 slug) ammo drums
+  name: box of (12 gauge slug) ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunSlug
-  description: A box full of (.50 slug) ammo drums.
+  description: A box full of (12 gauge slug) ammo drums.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -202,10 +202,10 @@
         amount: 4
 
 - type: entity
-  name: box of (.50 incendiary) ammo drums
+  name: box of (12 gauge incendiary) ammo drums
   parent: BoxMagazine
   id: BoxMagazineShotgunIncendiary
-  description: A box full of (.50 incendiary) ammo drums.
+  description: A box full of (12 gauge incendiary) ammo drums.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -237,3 +237,48 @@
       storagebase:
         id: MagazineRiflePractice
         amount: 4
+
+# Funky - .50 AE
+- type: entity
+  name: box of (.50 AE) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolLarge
+  description: A box full of (.50 AE) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolLarge
+        amount: 4
+
+- type: entity
+  name: box of (.50 AE Practice) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolLargePractice
+  description: A box full of (.50 AE Practice) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolLargePractice
+        amount: 4
+
+- type: entity
+  name: box of (.50 AE Incendiary) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolLargeIncendiary
+  description: A box full of (.50 AE Incendiary) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolLargeIncendiary
+        amount: 4
+
+- type: entity
+  name: box of (.50 AE Uranium) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolLargeUranium
+  description: A box full of (.50 AE Uranium) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolLargeUranium
+        amount: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index c0623b764a7..af7f63a0b60 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -452,6 +452,7 @@
     - id: SpaceCash1000
     - id: BeachBall
     - id: BikeHorn
+    - id: WeaponPistolWyvern #funkieststation
 
 - type: entity
   id: LockerFreezerVaultFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index 0188568e1cb..7a55f11b8c8 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -78,6 +78,7 @@
           tags:
           - Knife
           - Sidearm
+          - RevolverSalamander # Funky
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index ba9e35fab99..3cc0ce29db6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -43,8 +43,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxBeanbag
-  name: ammunition box (.50 beanbag)
-  description: A cardboard box of .50 shotgun shells. Intended to hold less-than-lethal beanbag ammunition.
+  name: ammunition box (12 gauge beanbag)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold less-than-lethal beanbag ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunBeanbag
@@ -63,8 +63,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxLethalshot
-  name: ammunition box (.50 pellet)
-  description: A cardboard box of .50 shotgun shells. Intended to hold general-purpose kinetic ammunition.
+  name: ammunition box (12 gauge pellet)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold general-purpose kinetic ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgun
@@ -79,8 +79,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShotgunSlug
-  name: ammunition box (.50 slug)
-  description: A cardboard box of .50 shotgun shells. Intended to hold long-ranged slug ammunition.
+  name: ammunition box (12 gauge slug)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold long-ranged slug ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunSlug
@@ -99,8 +99,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShotgunFlare
-  name: ammunition box (.50 flare)
-  description: A cardboard box of .50 shotgun shells. Intended to hold illuminating flare ammunition.
+  name: ammunition box (12 gauge flare)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold illuminating flare ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunFlare
@@ -119,8 +119,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShotgunIncendiary
-  name: ammunition box (.50 incendiary)
-  description: A cardboard box of .50 shotgun shells. Intended to hold self-igniting incendiary ammunition.
+  name: ammunition box (12 gauge incendiary)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold self-igniting incendiary ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunIncendiary
@@ -139,8 +139,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShotgunUranium
-  name: ammunition box (.50 uranium)
-  description: A cardboard box of .50 shotgun shells. Intended to hold exotic uranium-core ammunition.
+  name: ammunition box (12 gauge uranium)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold exotic uranium-core ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunUranium
@@ -159,8 +159,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShotgunPractice
-  name: ammunition box (.50 practice)
-  description: A cardboard box of .50 shotgun shells. Intended to hold harmless practice ammunition.
+  name: ammunition box (12 gauge practice)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold harmless practice ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellShotgunPractice
@@ -179,8 +179,8 @@
 - type: entity
   parent: AmmoProviderShotgunShell
   id: BoxShellTranquilizer
-  name: ammunition box (.50 tranquilizer)
-  description: A cardboard box of .50 shotgun shells. Intended to hold nonlethal tranquilizer ammunition.
+  name: ammunition box (12 gauge tranquilizer)
+  description: A cardboard box of 12 gauge shotgun shells. Intended to hold nonlethal tranquilizer ammunition.
   components:
     - type: BallisticAmmoProvider
       proto: ShellTranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index 631963278b7..a8ebf33af06 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -33,7 +33,7 @@
   abstract: true
   parent: BaseCartridge
   id: BaseShellShotgun
-  name: shell (.50)
+  name: shell (12 gauge)
   components:
   - type: Tag
     tags:
@@ -52,7 +52,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
   id: ShellShotgunBeanbag
-  name: shell (.50 beanbag)
+  name: shell (12 gauge beanbag)
   description: The standard cartridge used by most modern shotguns. Beanbag ammunition contains a single less-than-lethal projectile that can stun targets.
   components:
   - type: Tag
@@ -71,7 +71,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityContraband]
   id: ShellShotgunSlug
-  name: shell (.50 slug)
+  name: shell (12 gauge slug)
   description: The standard cartridge used by most modern shotguns. Slug ammunition contains a single high-density projectile effective at longer ranges than pellet ammunition.
   components:
   - type: Sprite
@@ -86,7 +86,7 @@
 - type: entity
   parent: BaseShellShotgun
   id: ShellShotgunFlare
-  name: shell (.50 flare)
+  name: shell (12 gauge flare)
   description: The standard cartridge used by most modern shotguns. Flare ammunition contains a single brightly-burning projectile intended for illumination and signalling, rather than combat.
   components:
   - type: Tag
@@ -105,7 +105,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgun
-  name: shell (.50 pellet)
+  name: shell (12 gauge pellet)
   description: The standard cartridge used by most modern shotguns. Standard kinetic ammunition is common and useful in most situations.
   components:
   - type: Sprite
@@ -118,7 +118,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunIncendiary
-  name: shell (.50 incendiary)
+  name: shell (12 gauge incendiary)
   description: The standard cartridge used by most modern shotguns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze.
   components:
   - type: Sprite
@@ -133,7 +133,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellShotgunPractice
-  name: shell (.50 practice)
+  name: shell (12 gauge practice)
   description: The standard cartridge used by most modern shotguns. Practice ammunition fires chalk pellets that sting a little, but otherwise cause no lasting damage.
   components:
   - type: Sprite
@@ -148,7 +148,7 @@
 - type: entity
   parent: [ BaseShellShotgun, BaseSecurityContraband ]
   id: ShellTranquilizer
-  name: shell (.50 tranquilizer)
+  name: shell (12 gauge tranquilizer)
   description: The standard cartridge used by most modern shotguns. Tranquilizer ammunition contains a single ballistic syringe loaded with a strong sedative that harmlessly puts targets to sleep.
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index c0306bdac7e..60e23565400 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -19,7 +19,7 @@
   abstract: true
   parent: [ BaseItem, BaseSecurityContraband ]
   id: BaseMagazineShotgun
-  name: ammo drum (.50 shells)
+  name: ammo drum (12 gauge shells)
   components:
   - type: Tag
     tags:
@@ -61,7 +61,7 @@
 
 - type: entity
   id: MagazineShotgunEmpty
-  name: ammo drum (.50 shells any)
+  name: ammo drum (12 gauge shells any)
   suffix: empty
   description: A large drum magazine used by some military-grade automatic shotguns.
   parent: BaseMagazineShotgun
@@ -72,7 +72,7 @@
 - type: entity
   parent: BaseMagazineShotgun
   id: MagazineShotgun
-  name: ammo drum (.50 pellet)
+  name: ammo drum (12 gauge pellet)
   description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -97,7 +97,7 @@
 - type: entity
   parent: BaseMagazineShotgun
   id: MagazineShotgunBeanbag
-  name: ammo drum (.50 beanbag)
+  name: ammo drum (12 gauge beanbag)
   description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold less-than-lethal beanbag ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -122,7 +122,7 @@
 - type: entity
   parent: BaseMagazineShotgun
   id: MagazineShotgunSlug
-  name: ammo drum (.50 slug)
+  name: ammo drum (12 gauge slug)
   description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition.
   components:
   - type: BallisticAmmoProvider
@@ -147,7 +147,7 @@
 - type: entity
   parent: BaseMagazineShotgun
   id: MagazineShotgunIncendiary
-  name: ammo drum (.50 incendiary)
+  name: ammo drum (12 gauge incendiary)
   description: A large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition.
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 6d7893dd188..150856354cc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -38,7 +38,7 @@
   parent: BaseBullet
   id: PelletShotgunSlug
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 slug)
+  name: pellet (12 gauge slug)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -54,7 +54,7 @@
   parent: BaseBullet
   id: PelletShotgunBeanbag
   categories: [ HideSpawnMenu ]
-  name: beanbag (.50)
+  name: beanbag (12 gauge)
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -71,7 +71,7 @@
   parent: BaseBullet
   id: PelletShotgun
   categories: [ HideSpawnMenu ]
-  name: pellet (.50)
+  name: pellet (12 gauge)
   components:
   - type: Projectile
     damage:
@@ -93,7 +93,7 @@
   parent: BaseBulletIncendiary
   id: PelletShotgunIncendiary
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 incendiary)
+  name: pellet (12 gauge incendiary)
   components:
   - type: Projectile
     damage:
@@ -117,7 +117,7 @@
   parent: BaseBulletPractice
   id: PelletShotgunPractice
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 practice)
+  name: pellet (12 gauge practice)
   components:
   - type: Projectile
     damage:
@@ -165,7 +165,7 @@
   parent: BaseBulletPractice
   id: PelletShotgunTranquilizer
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 tranquilizer)
+  name: pellet (12 gauge tranquilizer)
   components:
   - type: Projectile
     damage:
@@ -182,7 +182,7 @@
 - type: entity
   id: PelletShotgunFlare
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 flare)
+  name: pellet (12 gauge flare)
   components:
   - type: Physics
     bodyType: Dynamic
@@ -230,7 +230,7 @@
   parent: BaseBulletUranium
   id: PelletShotgunUranium
   categories: [ HideSpawnMenu ]
-  name: pellet (.50 uranium)
+  name: pellet (12 gauge uranium)
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index db31b1373d3..3c234de833b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -94,7 +94,7 @@
   # Don't parent to BaseWeaponShotgun because it differs significantly
   parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponShotgunBulldog
-  description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells.
+  description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses 12 gauge shotgun shells.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
@@ -151,7 +151,7 @@
   name: double-barreled shotgun
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderContraband]
   id: WeaponShotgunDoubleBarreled
-  description: An immortal classic. Uses .50 shotgun shells.
+  description: An immortal classic. Uses 12 gauge shotgun shells.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
@@ -173,7 +173,7 @@
   name: double-barreled shotgun
   parent: WeaponShotgunDoubleBarreled
   id: WeaponShotgunDoubleBarreledRubber
-  description: An immortal classic. Uses .50 shotgun shells.
+  description: An immortal classic. Uses 12 gauge shotgun shells.
   suffix: Non-Lethal
   components:
   - type: BallisticAmmoProvider
@@ -183,7 +183,7 @@
   name: Enforcer
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponShotgunEnforcer
-  description: A premium semi-automatic shotgun, and the pride of all security forces. Uses .50 shotgun shells.
+  description: A premium semi-automatic shotgun, and the pride of all security forces. Uses 12 gauge shotgun shells.
   components: # intend for Enforcer to have wider choke for semi-auto function
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
@@ -206,7 +206,7 @@
   name: Kammerer
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponShotgunKammerer
-  description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses .50 shotgun shells.
+  description: An old yet faithful design, and a favorite among irregular forces of many worlds. Uses 12 gauge shotgun shells.
   components: # intend for Kammerer to have tighter choke for slower fire rate and/or manual cycling
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
@@ -227,7 +227,7 @@
   name: sawn-off shotgun
   parent: [ BaseWeaponShotgun, BaseSecurityBartenderContraband ]
   id: WeaponShotgunSawn
-  description: Groovy! Uses .50 shotgun shells.
+  description: Groovy! Uses 12 gauge shotgun shells.
   components: # needs to be super inaccurate because you don't need to wield it
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
@@ -253,7 +253,7 @@
   name: sawn-off shotgun
   parent: WeaponShotgunSawn
   id: WeaponShotgunSawnEmpty
-  description: Groovy! Uses .50 shotgun shells.
+  description: Groovy! Uses 12 gauge shotgun shells.
   suffix: Empty
   components:
   - type: BallisticAmmoProvider
@@ -267,7 +267,7 @@
   name: handmade pistol
   parent: [BaseWeaponShotgun, BaseMinorContraband]
   id: WeaponShotgunHandmade
-  description: Looks unreliable. Uses .50 shotgun shells.
+  description: Looks unreliable. Uses 12 gauge shotgun shells.
   components:
   - type: Item
     size: Small
@@ -311,7 +311,7 @@
   name: improvised shotgun
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband]
   id: WeaponShotgunImprovised
-  description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
+  description: A shitty, hand-made shotgun that uses 12 gauge shotgun shells. It can only hold one round in the chamber.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
@@ -344,7 +344,7 @@
   parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband]
   id: WeaponShotgunHushpup
   name: Hushpup
-  description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses .50 shotgun shells.
+  description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses 12 gauge shotgun shells.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index 90e9d0431fa..139403fb318 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -26,11 +26,13 @@
   - MagazineBoxMagnumPractice
   - MagazineBoxPistolPractice
   - MagazineBoxRiflePractice
+  - MagazineBoxPistolLargePractice # Funky
   - WeaponDisablerPractice
   - WeaponLaserCarbinePractice
   - MagazineLightRiflePractice
   - MagazineRiflePractice
   - MagazinePistolPractice
+  - MagazinePistolLargePractice # Funky
   - SpeedLoaderMagnumPractice
   - MagazinePistolSubMachineGunPractice
   - WeaponFlareGunSecurity
@@ -45,6 +47,7 @@
   - MagazineBoxMagnum
   - MagazineBoxPistol
   - MagazineBoxRifle
+  - MagazineBoxPistolLarge # Funky
   - MagazineLightRifle
   - MagazineLightRifleEmpty
   - MagazinePistol
@@ -53,6 +56,8 @@
   - MagazinePistolSubMachineGunEmpty
   - MagazinePistolSubMachineGunTopMounted
   - MagazinePistolSubMachineGunTopMountedEmpty
+  - MagazinePistolLarge # Funky
+  - MagazinePistolLargeEmpty # Funky
   - MagazineRifle
   - MagazineRifleEmpty
   - SpeedLoaderMagnum
@@ -117,6 +122,8 @@
   - MagazineBoxPistolUranium
   - MagazineBoxRifleIncendiary
   - MagazineBoxRifleUranium
+  - MagazineBoxPistolLargeIncendiary # Funky
+  - MagazineBoxPistolLargeUranium # Funky
   - MagazineLightRifleIncendiary
   - MagazineLightRifleUranium
   - MagazinePistolIncendiary
@@ -125,6 +132,8 @@
   - MagazinePistolSubMachineGunUranium
   - MagazineRifleIncendiary
   - MagazineRifleUranium
+  - MagazinePistolLargeIncendiary # Funky
+  - MagazinePistolLargeUranium # Funky
   - MagazineShotgunBeanbag
   - MagazineShotgunIncendiary
   - SpeedLoaderMagnumIncendiary
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 441be291d05..d6eb45e2e2f 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -52,12 +52,14 @@
   - MagazinePistolIncendiary
   - MagazinePistolSubMachineGunIncendiary
   - MagazineLightRifleIncendiary
+  - MagazinePistolLargeIncendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
+  - MagazineBoxPistolLargeIncendiary
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -100,11 +102,13 @@
   - MagazinePistolUranium
   - MagazinePistolSubMachineGunUranium
   - MagazineLightRifleUranium
+  - MagazinePistolLargeUranium
   - SpeedLoaderMagnumUranium
   - MagazineBoxPistolUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
+  - MagazineBoxPistolLargeUranium
   - BoxShotgunUranium
 
 - type: technology
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Boxes/pistol.yml
new file mode 100644
index 00000000000..9876d4d39f8
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -0,0 +1,85 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseMagazineBoxPistolLarge
+  name: ammunition box (.50 AE)
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgePistolLarge
+    proto: CartridgePistolLarge
+    capacity: 28
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 3
+    zeroVisible: false
+  - type: Appearance
+
+# Boxes
+- type: entity
+  parent: BaseMagazineBoxPistolLarge
+  id: MagazineBoxPistolLarge
+  name: ammunition box (.50 AE)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLarge
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  parent: BaseMagazineBoxPistolLarge
+  id: MagazineBoxPistolLargePractice
+  name: ammunition box (.50 AE practice)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargePractice
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: practice
+
+- type: entity
+  id: MagazineBoxPistolLargeIncendiary
+  parent: BaseMagazineBoxPistolLarge
+  name: ammunition box (.50 AE incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargeIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
+
+- type: entity
+  id: MagazineBoxPistolLargeUranium
+  parent: BaseMagazineBoxPistolLarge
+  name: ammunition box (.50 AE uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargeUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Cartridges/pistol.yml
new file mode 100644
index 00000000000..6048bbe8800
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -0,0 +1,96 @@
+# SPDX-FileCopyrightText: 2020 AJCM-git <60196617+AJCM-git@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2020 Clement-O <topy72.mine@gmail.com>
+# SPDX-FileCopyrightText: 2020 Paul Ritter <ritter.paul1@googlemail.com>
+# SPDX-FileCopyrightText: 2021 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2021 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
+# SPDX-FileCopyrightText: 2021 Swept <sweptwastaken@protonmail.com>
+# SPDX-FileCopyrightText: 2022 Kara <lunarautomaton6@gmail.com>
+# SPDX-FileCopyrightText: 2022 Peptide90 <78795277+Peptide90@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2022 Visne <39844191+Visne@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2022 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 Vordenburg <114301317+Vordenburg@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 lzk <124214523+lzk228@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Nairod <110078045+Nairodian@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Tadeo <td12233a@gmail.com>
+# SPDX-FileCopyrightText: 2024 Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 SigmaTheDragon <162711378+SigmaTheDragon@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
+# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
+
+- type: entity
+  id: BaseCartridgePistolLarge
+  name: cartridge (.50 AE)
+  parent: [ BaseCartridge, BaseSecurityContraband ]
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - Cartridge
+      - CartridgePistolLarge
+  - type: CartridgeAmmo
+    proto: BulletPistolLarge
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+
+- type: entity
+  id: CartridgePistolLarge
+  name: cartridge (.50 AE)
+  parent: BaseCartridgePistolLarge
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolLarge
+
+- type: entity
+  id: CartridgePistolLargePractice
+  name: cartridge (.50 AE practice)
+  parent: BaseCartridgePistolLarge
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolLargePractice
+  -  type: Sprite
+     layers:
+       - state: base
+         map: [ "enum.AmmoVisualLayers.Base" ]
+       - state: tip
+         map: [ "enum.AmmoVisualLayers.Tip" ]
+         color: "#dbdbdb"
+
+- type: entity
+  id: CartridgePistolLargeIncendiary
+  name: cartridge (.50 AE incendiary)
+  parent: BaseCartridgePistolLarge
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolLargeIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
+
+- type: entity
+  id: CartridgePistolLargeUranium
+  name: cartridge (.50 AE uranium)
+  parent: BaseCartridgePistolLarge
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolLargeUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Magazines/pistol.yml
new file mode 100644
index 00000000000..46a95dee587
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -0,0 +1,97 @@
+- type: entity
+  id: BaseMagazinePistolLarge
+  name: pistol magazine (.50 AE)
+  parent: [ BaseItem, BaseSecurityContraband ]
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - MagazinePistolLarge
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgePistolLarge
+    capacity: 7
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: MagazinePistolLarge
+  name: pistol magazine (.50 AE)
+  parent: BaseMagazinePistolLarge
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLarge
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolLargeEmpty
+  name: pistol magazine (.50 AE any)
+  suffix: empty
+  parent: MagazinePistolLarge
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolLargeIncendiary
+  name: pistol magazine (.50 AE incendiary)
+  parent: MagazinePistolLarge
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargeIncendiary
+
+- type: entity
+  id: MagazinePistolLargePractice
+  name: pistol magazine (.50 AE practice)
+  parent: BaseMagazinePistolLarge
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargePractice
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolLargeUranium
+  name: pistol magazine (.50 AE uranium)
+  parent: BaseMagazinePistolLarge
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolLargeUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Projectiles/pistol.yml
new file mode 100644
index 00000000000..774e68b5686
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -0,0 +1,74 @@
+# SPDX-FileCopyrightText: 2020 AJCM-git <60196617+AJCM-git@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2020 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2020 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
+# SPDX-FileCopyrightText: 2021 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2021 Swept <sweptwastaken@protonmail.com>
+# SPDX-FileCopyrightText: 2022 Charlese2 <knightside@hotmail.com>
+# SPDX-FileCopyrightText: 2022 Kara <lunarautomaton6@gmail.com>
+# SPDX-FileCopyrightText: 2022 Vera Aguilera Puerto <gradientvera@outlook.com>
+# SPDX-FileCopyrightText: 2022 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 Vordenburg <114301317+Vordenburg@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2023 kerisargit <108146620+kerisargit@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2024 Plykiya <58439124+Plykiya@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Mish <bluscout78@yahoo.com>
+# SPDX-FileCopyrightText: 2025 SigmaTheDragon <162711378+SigmaTheDragon@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
+
+- type: entity
+  id: BulletPistolLarge
+  name: bullet (.50 AE)
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 38
+  - type: StaminaDamageOnCollide
+    damage: 20
+
+- type: entity
+  id: BulletPistolLargePractice
+  name: bullet (.50 AE practice)
+  parent: BaseBulletPractice
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnCollide
+    damage: 30
+
+- type: entity
+  id: BulletPistolLargeIncendiary
+  parent: BaseBulletIncendiary
+  name: bullet (.50 AE incendiary)
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 10
+        Heat: 28
+  - type: StaminaDamageOnCollide
+    damage: 20
+
+- type: entity
+  id: BulletPistolLargeUranium
+  parent: BaseBulletUranium
+  name: bullet (.20 rifle uranium)
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 19
+        Piercing: 19
+  - type: StaminaDamageOnCollide
+    damage: 20
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Pistols/pistols.yml
new file mode 100644
index 00000000000..b2931cfad7c
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Pistols/pistols.yml
@@ -0,0 +1,105 @@
+- type: entity
+  name: Wyvern
+  parent: [BaseWeaponPistol, BaseSecurityCommandContraband]
+  id: WeaponPistolWyvern
+  description: A large, bulky and incredibly powerful pistol with large damage potential and stopping power. Chambered in .50 AE, it is able to hurt even armored targets. Historically it has been produced and sold in small amounts to both Nanotransen and Cybersun, making it a rare and sought after pistol.
+  components:
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi
+  - type: Gun
+    minAngle: 1
+    maxAngle: 15
+    angleIncrease: 5
+    angleDecay: 5
+    fireRate: 1.5
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolLarge
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistolLarge
+        whitelistFailPopup: gun-magazine-whitelist-fail
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolLarge
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistolLarge
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: AltFireMelee
+    attackType: Light
+
+- type: entity
+  name: Wyvern
+  parent: [BaseWeaponPistol, BaseSecurityCommandContraband]
+  id: WeaponPistolWyvernSyndicate
+  description: A large, bulky and incredibly powerful pistol with large damage potential and stopping power. Chambered in .50 AE, it is able to hurt even armored targets. Historically it has been produced and sold in small amounts to both Nanotransen and Cybersun, making it a rare and sought after pistol.
+  components:
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi
+  - type: Gun
+    minAngle: 1
+    maxAngle: 15
+    angleIncrease: 5
+    angleDecay: 5
+    fireRate: 1.5
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolLargeUranium
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistolLarge
+        whitelistFailPopup: gun-magazine-whitelist-fail
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolLargeUranium
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistolLarge
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: AltFireMelee
+    attackType: Light
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Revolvers/revolvers.yml
new file mode 100644
index 00000000000..b1d93bebf14
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Weapons/Guns/Revolvers/revolvers.yml
@@ -0,0 +1,48 @@
+- type: entity
+  name: Salamander
+  parent: [BaseWeaponRevolver, BaseSyndicateContraband]
+  id: WeaponRevolverSalamander
+  description: A miniscule revolver chambered in .50 AE, the salamander is a cheap covert assasination tool. Try to not miss.
+  components:
+  - type: Sprite
+    sprite: _Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi
+  - type: Clothing
+    sprite: _Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi
+  - type: Gun
+    minAngle: 10
+    maxAngle: 30
+    angleIncrease: 10
+    angleDecay: 5
+    fireRate: 3
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+  - type: RevolverAmmoProvider
+    capacity: 3
+    chambers: [ True, True, True ]
+    ammoSlots: [ null, null, null ]
+    proto: CartridgePistolLarge
+    whitelist:
+      tags:
+        - CartridgePistolLarge
+  - type: MagazineVisuals
+    magState: mag
+    steps: 3
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: Item
+    size: Tiny
+    shape:
+    - 0,0,1,0
+  - type: Tag
+    tags:
+      - RevolverSalamander
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: AltFireMelee
+    attackType: Light
diff --git a/Resources/Prototypes/_Funkystation/Store/uplink_catalog.yml b/Resources/Prototypes/_Funkystation/Store/uplink_catalog.yml
new file mode 100644
index 00000000000..2e8ecca69af
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Store/uplink_catalog.yml
@@ -0,0 +1,51 @@
+#  Big gun with uranium rounds, don't forget chem can make Siever!
+- type: listing
+  id: UplinkPistolWyvern
+  name: uplink-pistol-wyvern-name
+  description: uplink-pistol-wyvern-desc
+  productEntity: WeaponPistolWyvernSyndicate
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeaponry
+  saleLimit: 1
+
+- type: listing
+  id: UplinkRevolverSalamander
+  name: uplink-revolver-salamander-name
+  description: uplink-revolver-salamander-desc
+  productEntity: WeaponRevolverSalamander
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkWeaponry
+
+# For the wyvern
+- type: listing
+  id: UplinkPistolLargeMagazineUranium
+  name: uplink-pistol-magazine-large-uranium-name
+  description: uplink-pistol-magazine-large-uranium-desc
+  icon: { sprite: /Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi, state: green-icon }
+  productEntity: MagazinePistolLargeUranium
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo
+  saleBlacklist: true
+
+- type: listing
+  id: UplinkPistolLargeMagazineIncendiary
+  name: uplink-pistol-magazine-large-incendiary-name
+  description: uplink-pistol-magazine-large-incendiary-desc
+  icon: { sprite: /Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi, state: red-icon }
+  productEntity: MagazinePistolLargeIncendiary
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo
+  saleBlacklist: true
+  conditions:
+    - !type:BuyerWhitelistCondition # as to not spam the surplus crates with a bunch of ammo types
+      blacklist:
+        components:
+          - SurplusBundle
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/tags.yml b/Resources/Prototypes/_Funkystation/tags.yml
index 149d001cefa..b79f04d2ac9 100644
--- a/Resources/Prototypes/_Funkystation/tags.yml
+++ b/Resources/Prototypes/_Funkystation/tags.yml
@@ -12,3 +12,12 @@
 
 - type: Tag # Funky atmos - /tg/ gases
   id: PlasmaSheet
+  
+- type: Tag # Funky weapon - ammo
+  id: CartridgePistolLarge
+
+- type: Tag # Funky weapon - magazine
+  id: MagazinePistolLarge
+  
+- type: Tag # Funky weapon - Salamander Revolver
+  id: RevolverSalamander
\ No newline at end of file
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/base.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/base.png
new file mode 100644
index 00000000000..37264215298
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/base.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiary.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiary.png
new file mode 100644
index 00000000000..031d4ba53eb
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiary.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiarydisplay.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiarydisplay.png
new file mode 100644
index 00000000000..ddfcf628ab8
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/incendiarydisplay.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-1.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-1.png
new file mode 100644
index 00000000000..ace62504713
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-1.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-2.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-2.png
new file mode 100644
index 00000000000..fd034b08cd1
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/mag-2.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/meta.json
new file mode 100644
index 00000000000..245cf9645ad
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh then further tweaked by Sigma Draconis",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "mag-1"
+    },
+    {
+      "name": "mag-2"
+    },
+    {
+      "name": "incendiarydisplay"
+    },
+    {
+      "name": "incendiary"
+    },
+    {
+      "name": "practice"
+    },
+    {
+      "name": "rubber"
+    },
+    {
+      "name": "uranium"
+    }
+  ]
+}
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/practice.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/practice.png
new file mode 100644
index 00000000000..8a5d9ca95a1
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/practice.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/rubber.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/rubber.png
new file mode 100644
index 00000000000..bd4da264990
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/rubber.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/uranium.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/uranium.png
new file mode 100644
index 00000000000..29c912b9746
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Boxes/pistol_large.rsi/uranium.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base-spent.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base-spent.png
new file mode 100644
index 00000000000..0d573243def
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base-spent.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base.png
new file mode 100644
index 00000000000..dea44fc48e4
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/base.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/meta.json
new file mode 100644
index 00000000000..8cda8ca465e
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by Sigma Draconis",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        },
+        {
+            "name": "tip"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/tip.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/tip.png
new file mode 100644
index 00000000000..9c3f651c492
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Casings/pistol_large.rsi/tip.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/base.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/base.png
new file mode 100644
index 00000000000..071ca95f513
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/base.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/green-icon.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/green-icon.png
new file mode 100644
index 00000000000..26130ecc714
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/green-icon.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-1.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-1.png
new file mode 100644
index 00000000000..97cd389df8c
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-1.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-2.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-2.png
new file mode 100644
index 00000000000..7a1b0d0734c
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-2.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-3.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-3.png
new file mode 100644
index 00000000000..89c47160abd
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-3.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-4.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-4.png
new file mode 100644
index 00000000000..44fb3409aa4
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-4.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-5.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-5.png
new file mode 100644
index 00000000000..2a690a38256
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/mag-5.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/meta.json
new file mode 100644
index 00000000000..610d683f564
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by Sigma Draconis",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "red-icon"
+        },
+        {
+            "name": "green-icon"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+
+        }
+    ]
+}
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/piercing.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/piercing.png
new file mode 100644
index 00000000000..f4dd38152b2
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/piercing.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/practice.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/practice.png
new file mode 100644
index 00000000000..831753587c8
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/practice.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red-icon.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red-icon.png
new file mode 100644
index 00000000000..13ef561b28e
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red-icon.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red.png
new file mode 100644
index 00000000000..7ded541c0c2
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/red.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/rubber.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/rubber.png
new file mode 100644
index 00000000000..acf8f07310d
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/rubber.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/uranium.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/uranium.png
new file mode 100644
index 00000000000..ebab59c1846
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_50.rsi/uranium.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/base.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/base.png
new file mode 100644
index 00000000000..68a15b77a34
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/base.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/bolt-open.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/bolt-open.png
new file mode 100644
index 00000000000..d14ecd062f9
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BACKSTORAGE.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BACKSTORAGE.png
new file mode 100644
index 00000000000..bb49b156967
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BACKSTORAGE.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BELT.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..bb49b156967
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/icon.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/icon.png
new file mode 100644
index 00000000000..c4f3e5c7017
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/icon.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-left.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-left.png
new file mode 100644
index 00000000000..17e94210844
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-right.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-right.png
new file mode 100644
index 00000000000..818b684a783
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/mag-0.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/mag-0.png
new file mode 100644
index 00000000000..b1b8d6339eb
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/mag-0.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/meta.json
new file mode 100644
index 00000000000..fc4e1278759
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Pistols/wyvern.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Based on sprites from cmss13 at https://github.com/cmss13-devs/cmss13/blob/3163b001e2cd4e0560d2d19902eabfee238c23a5/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi, https://github.com/cmss13-devs/cmss13/blob/106c92cdf232ebc12c9d7a2feb23956c6755496f/icons/mob/humans/onmob/items_lefthand_1.dmi, https://github.com/cmss13-devs/cmss13/blob/4047c473d4d2f3e58e68efdec5aa95d0676bf4d1/icons/mob/humans/onmob/items_righthand_1.dmi, in hand sprites made by Aleksh on discord and modified by Sigma Draconis" ,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+		{
+            "name": "equipped-BACKSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/bolt-open.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/bolt-open.png
new file mode 100644
index 00000000000..f71b6c60d4f
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/equipped-BELT.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..f3a0f6e57dc
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/icon.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/icon.png
new file mode 100644
index 00000000000..705bb0b0005
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/icon.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-left.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-left.png
new file mode 100644
index 00000000000..4577f329f98
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-right.png b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-right.png
new file mode 100644
index 00000000000..0042ee061fd
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/meta.json
new file mode 100644
index 00000000000..5665063abdf
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Weapons/Guns/Revolvers/salamander.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Sprites by Sigma Draconis",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}