new-frontiers-14 · VividPups · Aug 17, 2024 · Aug 17, 2024 · Aug 18, 2024 · Aug 18, 2024
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/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

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/ammo.yml
@@ -9,6 +9,8 @@
     WeaponRifleNovaliteC1: 4294967295 # Frontier: Infinite
     WeaponShotgunDoubleBarreled: 4294967295 # Frontier: 10<Infinite
     WeaponRevolverArgenti: 4294967295 # Frontier: 10<Infinite
+    MagazineBox454Casull:  4294967295 # Frontier
+    MagazineBox410cal: 4294967295 # Frontier
     BoxShotgunSlug: 4294967295 # Frontier: 10<Infinite
     BoxLethalshot: 4294967295 # Frontier: 10<Infinite
     BoxBeanbag: 4294967295 # Frontier: 10<Infinite

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/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

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -15,3 +15,20 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+
+- type: entity
+  parent: BaseMagazineBoxMagnum
+  id: MagazineBox454Casull
+  name: ammunition box (.454 Casull )
+  components:
+  - type: BallisticAmmoProvider
+    proto: Cartridge454Casull
+  - type: Icon
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
+    state: 454Casulldisplay
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgunshells.yml b/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
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -12,3 +12,23 @@
       - state: tip
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#43c4f7"
+
+- type: entity
+  id: Cartridge454Casull
+  name: cartridge (.454 Casull)
+  parent: BaseCartridge
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - Cartridge454Casull
+  - type: CartridgeAmmo
+    proto: Bullet454Casull
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi
+    layers:
+    - state: base
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+  - type: StaticPrice
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/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
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -0,0 +1,13 @@
+- type: entity
+  noSpawn: true
+  parent: BaseBullet
+  id: Bullet454Casull
+  name: bullet (.454 Casull)
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 30
+        Slash: 5
+  - type: StaminaDamageOnCollide
+    damage: 15
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -0,0 +1,23 @@
+- type: entity
+  id: Pellet410Shotgun
+  name: pellet (.410)
+  noSpawn: true
+  parent: BaseBullet
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    state: buckshot
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 10
+
+- type: entity
+  id: Pellet410ShotgunSpread
+  noSpawn: true
+  parent: Pellet410Shotgun
+  components:
+  - type: ProjectileSpread
+    proto: Pellet410Shotgun
+    count: 3
+    spread: 5
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -50,4 +50,53 @@
   parent: WeaponRevolverDeckardExpedition
   id: WeaponRevolverDeckardExpeditionGrifty
   noSpawn: true
-  name: Customer Service Resolver
+  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 and .454 cartridges 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:
+      - Shell410Shotgun
+      - CartridgeMagnum
+      - Cartridge454Casull
+      - SpeedLoaderMagnum
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
@@ -34,6 +34,12 @@
   noSpawn: true
   id: WeaponRevolverPirateExpedition
 
+- type: entity
+  parent: [ WeaponRevolverarbitrator, UnregisteredFirearmBase ]
+  noSpawn: true
+  id: WeaponRevolverarbitratorExpedition
+
+
 # Shotguns
 - type: entity
   parent: [ WeaponShotgunDoubleBarreled, UnregisteredFirearmBase ]

diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
@@ -96,3 +96,9 @@
 
 - type: Tag
   id: SmallThrusterMachineCircuitboard
+
+- type: Tag
+  id: Cartridge454Casull
+
+- type: Tag
+  id: Shell410Shotgun
diff --git a/...Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/410caldisplay.png b/...Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/410caldisplay.png
diff --git a/...tures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/454Casulldisplay.png b/...tures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/454Casulldisplay.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/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"
+        }
+    ]
 }
diff --git a/...xtures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base-spent.png b/...xtures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base-spent.png
diff --git a/...ces/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base.png b/...ces/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/meta.json b/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"
+        }
+    ]
+}
diff --git a/...xtures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi/base-spent.png b/...xtures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi/base-spent.png
diff --git a/...ces/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi/base.png b/...ces/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi/base.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/454Casull.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"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/bolt-open.png
diff --git a/...es/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/equipped-BELT.png b/...es/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/icon.png
diff --git a/...rces/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-left.png b/...rces/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-left.png
diff --git a/...ces/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-right.png b/...ces/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-right.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/meta.json b/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
+        }
+  ]
+}