From f39fbd48002e80a38abec16b25feefc13be11dcd Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 9 Jan 2024 05:17:40 -0500 Subject: [PATCH] Add the N1984 pistol (#23775) --- .../Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../Guns/Ammunition/Magazines/magnum.yml | 58 +++++++++++++++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 68 ++++++++++++++++++ .../Roles/Jobs/Command/centcom_official.yml | 1 + .../Roles/Jobs/Fun/emergencyresponseteam.yml | 4 +- .../Weapons/Guns/Pistols/N1984.rsi/base.png | Bin 0 -> 581 bytes .../Guns/Pistols/N1984.rsi/bolt-open.png | Bin 0 -> 574 bytes .../Guns/Pistols/N1984.rsi/equipped-BELT.png | Bin 0 -> 252 bytes .../Weapons/Guns/Pistols/N1984.rsi/icon.png | Bin 0 -> 587 bytes .../Guns/Pistols/N1984.rsi/inhand-left.png | Bin 0 -> 422 bytes .../Guns/Pistols/N1984.rsi/inhand-right.png | Bin 0 -> 417 bytes .../Weapons/Guns/Pistols/N1984.rsi/mag-0.png | Bin 0 -> 153 bytes .../Weapons/Guns/Pistols/N1984.rsi/meta.json | 35 +++++++++ 13 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json 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 0000000000000000000000000000000000000000..984060bd911d11fe6d94d75fb812f68e117a5f01 GIT binary patch literal 581 zcmV-L0=oT)P) z-)_=S9LK*UctN%hiL92A40VpwOcqTEH%{pbaBK868Xkl9=mT)63AD0A49ynxf^^2D z7t~tRK?jjY;CRv4ct-2Q!Qw?fH>c-!PJe&C`JIykL_|dV&j^A*8jS`K1c6-ESC}6r z><3X4LxYyfWooXf>Qc$*y6(q~|Gps0GU0h1ilU%at3lUwh@$9^08p>jQK?iGoCeu~ zs8*|gRzQ|zqNy!Bd;S!bWx+5EE&}=pX9ZQn*R|zPJLMcEcP!vnP>`%%E z(9{++{tKN>hnkzF3DYze6DW!$(*N=q0FX!|*4EhFZkM^R33Is|*-GD}Y(wD;vp)5hWfX~rEx7I( z?xlvnWQb&9jt^tces^~Vnx-)TaD043mJN8GSXlMHzI%Ny^5#a;mwCT%pRB4Un4sWZ z^#jbNa{$0}Hi!A+2HfEpwzsnYfN!U#FpLxCvI)e4q~|hQz+~VD|9b5<+5PptK TKgu3B00000NkvXXu0mjf_74jk literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..92f2c6e391f8ec1df28d0c8890f77d4d6b0505ff GIT binary patch literal 574 zcmV-E0>S->P) zQE$><6o#K7UMyRPL{NS^|P;n+=Xk63_(ixK` z&^0VN=pYga)C)qhP9Wge;zi$^@B2=_p7WmfoYNG1`0(*RL6&8wSS&iSEIViQHLD+C zv{4jg;^hO=@|>eFX)ZFFrU_FCD2n3bayc|jLs1lW1t=5>ynOM>^U|~DPswC5GX>9P zv!qffk1e0iyM%&67MIX84bwDHRh7-nO;lASolc|cI`@@rj{{xT(KKyl1!}e0^b$N! z9y(7_JCxq;a&r9_R4NtE*)R+Y!NQ50!38mugbFwMH>&d%dU?7n;Nv6%;TVIGBolOEXiF}K4l z=(Y$g4fxg>+HY;FQ!14NfW5s>&b$FnBQPoZ(Y}5-jJ&cOa%H}oytA;L5yk}{X5XaW z8vxMj4={dT#cmz5wiXBA=g|?mzAv1WKyaM&Qgju%O*iqH`9K9oNSi=2|c zIO)UPeK&i6cE<+b^Ovu}qQ^9FI{SOu$>F#)e|e*!5&)to z0`U5cDx3!aPY<-)Hj{TRLC&QEbe{4dHGdm?j^Ps^AX(m-205-lbXn42(=H90Cds4RFSR2?rAQSARDa znP<4A>zm#DzWej%&0C+b^48C{X|Y92(`LT;{&HgEy12D=tY7oq9z)X&HwMi3v)SRA zoztt=A7m2t|82Q=?;&gF#bc5?|H;(vyeBp>Dpmb}UQ=w#i3g{Jpe~5|&5%j6HaBK868Xkl9=mT)63ADpR42_F=K{{`G zL9Im{bP$OIju(xMXSAC*NWAFh=Jfo|>F>`szjF={6BF}4BM1Vi*Xu+O1aetlQGS@H zA4E}%3@S+yHPB+WV2bQs)}m03d1lUiefMVK&@6oxm=!e8fFWl zQmLG;fTAcw*P3|#;u&n)hH0886bdj+6S6F$(P)G^mSy>`5>Qo@Qh-XJD3$`*pGpVN zwI((G3+;BBnp>6y%d+MZD2gT0`}zd{z_RSh8oSf!Fc&sqE|()4nOl_Y&hBjhfa5rk z&Uv0ktJR_^yokt+MX^MNBM%(M!F64%ucctyU24z4lgDTtzNT#U=Pt8|BFU%)&pXAv z^Z*zSkYZ=}H1h3t^SjV>odJNOqjzM{fM-cWRsZ|D+w&u@ucZQ+AMD>J%jyXxEVy5N zAJfSU05F-(VEw!aZ*Yq3?JWSn_mdNt<}q{G1d?IW^P3yMxE}=nc4Y@%uZv73jW?~g z%rZ|!B24=9_&BH@0EQzE0Pz09M`qc_GI6&0hmZFC61TKRd#cWq^@5(_xg;9iHTVz ZzW~X`)z?cl{|^8F002ovPDHLkV1lWO4wC=? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..73e6d63b9c24a5dc22c6b2f747779b54a5b19a6d GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fP&aSW+oe0%F+=OG7yV;{e+ z@{rYZGT6%z-j%?3NOWQwi++C+^C_8{;}VnB6z8cF{okYV=3Gu%UFW`>phpf2j4T4E z1Q+*}(%QT4%del+0V*J-(24Qni$hv{Z#tHM~}ez z-kUksR<2rAVo{^I`<&v9Jx3$=JpHLW{dKbP^`ne63va)DzUuWZ>z0Mrqy6ug=T} mIk|O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..443e6d2587fe034c1afd10620aafbb29b7b5dcf4 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fAzaSW+oe0%F+ZnJ?%YvS@? z19s;SuH7!LG^QFkEa5xoA=rOc;bmu)inHw2@U6F7{_Jt+*;s2gd(Vt176J|oj4UWb zBY)%He_yYB|C`AxacZH>LY=w{UXF(+W!fGpE&H&G@8sQtRR3pNb^L$M2+iDG>(_ob z`qeJIm%r}yr3O3=kV}oc7rc$TVS49b`TqBrvzBeSy*Gy^pz6l=yti}qe+HW8_MvM= z@6Fch)Bf7FhHto35jySp9L5*zd3BmGi3b-yiFtTMkQ2>C$lQOi2X6bWWqS9>)ED#hpKPK)n2tb z#4wMS|B3tW_v>UVs*lOuyRXACDy85}Sb4q9e02LcG3IG5A literal 0 HcmV?d00001 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 + } + ] +} -- 2.51.2