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: CartridgeMagnum
+        amount: 1
+      - id: CartridgeAntiMateriel
+        amount: 1
+      - id: ShellShotgun
+        amount: 1
+
 - type: entity
   parent: WeaponCaseShort
   id: WeaponCaseShortRevolverPirate

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

@@ -167,6 +167,19 @@
       - id: WeaponShotgunSawnNonlethal
       - id: BoxBeanbag
 
+# Weapon The Arbitrator
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponTheArbitrator
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverarbitrator
+      - id: CartridgeMagnum
+      - id: CartridgeAntiMateriel
+      - id: ShellShotgun
+
 # WeaponSVT
 - type: entity  #made By VividPups added in with PR 1770
   parent: WeaponCaseLongShuttle

Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml

@@ -235,6 +235,9 @@
     - id: ShuttleWeaponShotgunKammererNonlethal
       orGroup: T3-1
       prob: 0.1
+    - id: ShuttleWeaponTheArbitrator
+      orGroup: T3-1
+      prob: 0.1
     # T3 Melee
     - id: KukriKnife
       orGroup: Melee

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/Revolvers/revolvers.yml

@@ -50,4 +50,56 @@
   parent: WeaponRevolverDeckardExpedition
   id: WeaponRevolverDeckardExpeditionGrifty
   noSpawn: true
-  name: Customer Service Resolver
+  name: Customer Service Resolver
+
+- type: entity
+  parent: BaseItem
+  name: The Arbitrator
+  id: WeaponRevolverarbitrator
+  description: Based off of an older design. S.E.S.W.C decided to revamp and rechamber for a modern era  .45cal, .50cal, and .60cal. 
+  components:
+  - type: Sprite
+    scale: 0.75 , 0.75
+    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
+    minAngle: 1
+    maxAngle: 8
+    selectedMode: SemiAuto
+    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:
+      - ShellShotgun
+      - CartridgeAntiMateriel
+      - CartridgeMagnum
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

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
+        }
+  ]
+}