diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index c5eadcbd848..c4c8db7f8b2 100644 --- 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 + categories: [ HideSpawnMenu ] + 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 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 index 74e5b6a271d..f62c0abeebd 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -238,6 +238,7 @@ - WeaponCaseLongHristovExpedition - WeaponCaseShortSvalinnExpedition - WeaponCaseShortAdvancedLaserExpedition + - WeaponCaseShortTheArbitrator #- WeaponCaseLongMusketExpedition chance: 1.0 offset: 0.0 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 new file mode 100644 index 00000000000..60f5ec1f073 --- /dev/null +++ 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/shotgun.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml new file mode 100644 index 00000000000..dc3f9444797 --- /dev/null +++ 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/shotgun.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml new file mode 100644 index 00000000000..e2621056149 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -0,0 +1,9 @@ +- type: entity + id: Pellet410ShotgunSpread + categories: [ HideSpawnMenu ] + parent: PelletShotgun + components: + - type: ProjectileSpread + proto: PelletShotgun + count: 3 + spread: 2 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 686acb04317..2888e8c3e61 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -52,6 +52,39 @@ 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: Gun + fireRate: 2 + - 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: entity parent: [ WeaponRevolverPython, BaseC3ContrabandUnredeemable] id: WeaponRevolverPythonGrown diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml index c7b24f9c5af..cafbf208c72 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml +++ b/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: diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 21b551ec9a8..7ff24d16e7e 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -94,6 +94,9 @@ - type: Tag id: SmallThrusterMachineCircuitboard +- type: Tag + id: Shell410Shotgun + - type: Tag id: BrassKnucklesNF @@ -104,4 +107,7 @@ id: Sushi - type: Tag - id: NFVGRoidInterior + id: Judge + +- type: Tag + id: NFVGRoidInterior \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/410caldisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/410caldisplay.png new file mode 100644 index 00000000000..1b302595e19 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/410caldisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/454Casulldisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/454Casulldisplay.png new file mode 100644 index 00000000000..3099c9aaa60 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/454Casulldisplay.png differ 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 index eee4d793d9d..ed229c33cc5 100644 --- 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/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base-spent.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base-spent.png new file mode 100644 index 00000000000..f639ffc87df Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base-spent.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base.png new file mode 100644 index 00000000000..4c9e53ad407 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Casings/410shells.rsi/base.png differ 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 new file mode 100644 index 00000000000..632f148dc68 --- /dev/null +++ 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" + } + ] +} \ No newline at end of file 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 new file mode 100644 index 00000000000..85b4036a193 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/equipped-BELT.png new file mode 100644 index 00000000000..e94e0c9ce1c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/equipped-BELT.png differ 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 new file mode 100644 index 00000000000..8305a119767 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-left.png new file mode 100644 index 00000000000..71650605ad0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-right.png new file mode 100644 index 00000000000..1f506dfde8a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/arbitrator.rsi/inhand-right.png differ 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 new file mode 100644 index 00000000000..49118b5fa9c --- /dev/null +++ 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 + } + ] +}