From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 9 Jan 2024 10:17:40 +0000 (-0500) Subject: Add the N1984 pistol (#23775) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f39fbd48002e80a38abec16b25feefc13be11dcd;p=space-station-14.git Add the N1984 pistol (#23775) --- diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 429f4c2025..b961659c08 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -252,7 +252,7 @@ - id: RegenerativeMesh - id: BoxZiptie - id: CrowbarRed - - id: MagazinePistol + - id: MagazineMagnum - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index b65dac5d15..bd7cd11e5c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -1,3 +1,19 @@ +- type: entity + id: BaseMagazineMagnum + name: pistol magazine (.45 magnum) + parent: BaseMagazinePistol + abstract: true + components: + - type: Tag + tags: + - MagazineMagnum + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + - type: entity id: BaseMagazineMagnumSubMachineGun name: "Vector magazine (.45 magnum)" @@ -31,6 +47,48 @@ zeroVisible: false - type: Appearance +- type: entity + id: MagazineMagnum + name: pistol magazine (.45 magnum) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnum + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumPractice + name: pistol magazine (.45 magnum practice) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnum + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumRubber + name: pistol magazine (.45 magnum rubber) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnum + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineMagnumSubMachineGun name: "Vector magazine (.45 magnum)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 806b1762b1..3addaad731 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -194,3 +194,71 @@ whitelist: tags: - CartridgePistol + +- type: entity + name: N1984 + parent: BaseWeaponPistol + id: WeaponPistolN1984 # the spaces in description are for formatting. + description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/N1984.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Pistols/N1984.rsi + - type: Gun + minAngle: 1 + maxAngle: 20 + angleIncrease: 8 + angleDecay: 4 + fireRate: 4 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnum + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnum + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum + +- type: entity + name: N1984 + parent: WeaponPistolN1984 + id: WeaponPistolN1984Nonlethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumRubber + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnum + gun_chamber: + name: Chamber + startingItem: CartridgeMagnumRubber + priority: 1 + whitelist: + tags: + - CartridgeMagnum diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index e712b943d5..37c73f38e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -24,5 +24,6 @@ outerClothing: ClothingOuterArmorBasic id: CentcomPDA ears: ClothingHeadsetAltCentCom + belt: WeaponPistolN1984 pocket1: BoxFolderBlack pocket2: PenCentcom diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index c7f08e0af7..01eb7a5f88 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -27,7 +27,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal + pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - type: startingGear @@ -44,7 +44,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal + pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - type: startingGear diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png new file mode 100644 index 0000000000..984060bd91 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png new file mode 100644 index 0000000000..92f2c6e391 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png new file mode 100644 index 0000000000..ab0d0a822f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png new file mode 100644 index 0000000000..bbe6128065 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png new file mode 100644 index 0000000000..73e6d63b9c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png new file mode 100644 index 0000000000..443e6d2587 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png new file mode 100644 index 0000000000..c661c6dfdc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json new file mode 100644 index 0000000000..9ca4968722 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by IProduceWidgets (github) to make the style of desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}