Wyvern, Salamander and Shotgun Shell names

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.

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

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -452,6 +452,7 @@
     - id: SpaceCash1000
     - id: BeachBall
     - id: BikeHorn
+    - id: WeaponPistolWyvern #funkieststation
 
 - type: entity
   id: LockerFreezerVaultFilled

Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml

@@ -78,6 +78,7 @@
           tags:
           - Knife
           - Sidearm
+          - RevolverSalamander # Funky
 
 - type: entity
   abstract: true

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

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

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