The Arbitrator

Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml

@@ -107,6 +107,22 @@
     - id: SpeedLoaderMagnum
       amount: 2
 
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortTheArbitrator
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverarbitrator
+        amount: 1
+      - id: MagazineBoxMagnum
+        amount: 1
+      - id: MagazineBoxPistol
+        amount: 1
+      - id: MagazineBox410cal
+        amount: 1
+
 - type: entity
   parent: WeaponCaseShort
   id: WeaponCaseShortRevolverPirate

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml

@@ -272,6 +272,7 @@
     - WeaponCaseLongHristovExpedition
     - WeaponCaseShortSvalinnExpedition
     - WeaponCaseShortAdvancedLaserExpedition
+    - WeaponCaseShortTheArbitrator
     #- WeaponCaseLongMusketExpedition
     chance: 1.0
     offset: 0.0

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgunshells.yml

@@ -0,0 +1,11 @@
+- type: entity
+  parent: BaseMagazineBoxMagnum
+  id: MagazineBox410cal
+  name: ammunition box (.410 Cal )
+  components:
+  - type: BallisticAmmoProvider
+    proto: Shell410Shotgun
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
+    layers:
+    - state: 410caldisplay

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: Shell410Shotgun
+  name: shell (.410)
+  parent: ShellShotgun
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - Shell410Shotgun
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: SpentAmmoVisuals
+  - type: CartridgeAmmo
+    proto: Pellet410ShotgunSpread

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -0,0 +1,9 @@
+- type: entity
+  id: Pellet410ShotgunSpread
+  noSpawn: true
+  parent: PelletShotgun
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgun
+    count: 3
+    spread: 2

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -52,6 +52,56 @@
   categories: [ HideSpawnMenu ]
   name: Customer Service Resolver
 
+- type: entity
+  parent: BaseWeaponRevolver
+  name: The Arbitrator
+  id: WeaponRevolverarbitrator
+  description: S.E.S.W.C has revamped this classic for the modern age! Civilian-grade, supports .45 mag, .35 auto, and .410 shells 
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi
+    quickEquip: false
+    slots:
+    - Belt
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
+  - type: Tag
+    tags:
+    - Sidearm
+  - type: Gun
+    fireRate: 2
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+  - type: AmmoCounter
+  - type: RevolverAmmoProvider
+    proto: null
+    capacity: 4
+    chambers: [ null, null, null, null ]
+    ammoSlots: [ null, null, null, null ]
+    soundEject:
+      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+    whitelist:
+      tags:
+      - CartridgePistol
+      - Shell410Shotgun
+      - CartridgeMagnum
+      - SpeedLoaderMagnum
+      - SpeedLoaderPistol
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
 - type: entity
   parent: [ WeaponRevolverPython, BaseC3ContrabandUnredeemable]
   id: WeaponRevolverPythonGrown

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml

@@ -38,6 +38,12 @@
   categories: [ HideSpawnMenu ]
   id: WeaponRevolverPirateExpedition
 
+- type: entity
+  parent: [ WeaponRevolverarbitrator, BaseC2ExpeditionContraband ]
+  categories: [ HideSpawnMenu ]
+  id: WeaponRevolverarbitratorExpedition
+
+
 # Shotguns
 - type: entity
   parent:

Resources/Prototypes/_NF/tags.yml

@@ -95,4 +95,7 @@
   id: SmallThrusterMachineCircuitboard
 
 - type: Tag
-  id: BrassKnucklesNF
+  id: Shell410Shotgun
+
+- type: Tag
+  id: BrassKnucklesNF

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json

@@ -1,32 +1,38 @@
 {
   "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. capbase and cap in magnum.rsi modified from base and rubber by potato1234x (github) for ss14, tweaked by Aleshhh",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi. capbase and cap in magnum.rsi modified from base and rubber by potato1234x (github) for ss14, tweaked by Aleshhh,   410 and 454casull was added by VividPups",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "capdisplay"
-    },
-    {
-      "name": "display"
-    },
-    {
-      "name": "incendiarydisplay"
-    },
-    {
-      "name": "piercingdisplay"
-    },
-    {
-      "name": "practicedisplay"
-    },
-    {
-      "name": "rubberdisplay"
-    },
-    {
-      "name": "uraniumdisplay"
-    }
-  ]
+    "states": [
+        {
+            "name": "capdisplay"
+        },
+        {
+            "name": "display"
+        },
+        {
+            "name": "incendiarydisplay"
+        },
+        {
+            "name": "piercingdisplay"
+        },
+        {
+            "name": "practicedisplay"
+        },
+        {
+            "name": "rubberdisplay"
+        },
+        {
+            "name": "uraniumdisplay"
+        },
+        {
+            "name": "454Casulldisplay"
+        },
+        {
+            "name": "410caldisplay"
+        }
+    ]
 }

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/8a848cde3e8610455f77704e861e5a06315a3b0e/icons/obj/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        }
+    ]
+}

Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by ra.Y (discord)",
+  "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
+        }
+  ]
+}