From bdcdb6e338c4de732b41f56fef3edf07d032ae2f Mon Sep 17 00:00:00 2001 From: August Sun <45527070+august-sun@users.noreply.github.com> Date: Mon, 16 Jun 2025 18:20:08 -0600 Subject: [PATCH] Adds the Estoc DMR to the syndicate uplink (#38122) * Initial commit, adds the prototype, sprites and attributions, entries into syndicate uplink for weapon bundle and magazines * Reduced weapon spread when wielded * minor visual updates to sprites * slightly adjusted burst rate down * Update duffelbag.yml --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> --- .../Weapons/Guns/Gunshots/attributions.yml | 7 +- .../Audio/Weapons/Guns/Gunshots/estocshot.ogg | Bin 0 -> 15268 bytes .../Locale/en-US/store/uplink-catalog.ftl | 6 ++ .../Catalog/Fills/Backpacks/duffelbag.yml | 12 ++++ .../Prototypes/Catalog/uplink_catalog.yml | 25 +++++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 65 ++++++++++++++++++ .../Weapons/Guns/Rifles/estoc.rsi/base.png | Bin 0 -> 537 bytes .../Guns/Rifles/estoc.rsi/bolt-open.png | Bin 0 -> 542 bytes .../Rifles/estoc.rsi/equipped-BACKPACK.png | Bin 0 -> 569 bytes .../Rifles/estoc.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 569 bytes .../Weapons/Guns/Rifles/estoc.rsi/icon.png | Bin 0 -> 563 bytes .../Guns/Rifles/estoc.rsi/inhand-left.png | Bin 0 -> 893 bytes .../Guns/Rifles/estoc.rsi/inhand-right.png | Bin 0 -> 856 bytes .../Weapons/Guns/Rifles/estoc.rsi/mag-0.png | Bin 0 -> 154 bytes .../Weapons/Guns/Rifles/estoc.rsi/meta.json | 47 +++++++++++++ .../Rifles/estoc.rsi/wielded-inhand-left.png | Bin 0 -> 892 bytes .../Rifles/estoc.rsi/wielded-inhand-right.png | Bin 0 -> 850 bytes 17 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml index 89db045c96..4445bc5f29 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml @@ -31,4 +31,9 @@ - files: ["syringe_gun.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from vgstation" - source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730" \ No newline at end of file + source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730" + +- files: ["estocshot.ogg"] + license: "CC-BY-SA-3.0" + copyright: "machinegun-one-shot.wav by DeltaCode. Converted to .OGG and MONO by august-sun" + source: "https://freesound.org/people/DeltaCode/sounds/668347/" diff --git a/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg b/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..231080beaae0f29b3319ce47b303fa3ef8cb379f GIT binary patch literal 15268 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 T;TpSYkK1I66Xt(I9Q3~cA|a49 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 6cdcb30edb..85b1585c1f 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -2,6 +2,9 @@ uplink-pistol-viper-name = Viper uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). +uplink-estoc-bundle-name = Estoc DMR +uplink-estoc-bundle-desc = A designated marksman rifle, fitted with a mid-range optic for longer-range combat. Bundled with two rifle magazines (.20 rifle). + uplink-revolver-python-name = Python uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. @@ -96,6 +99,9 @@ uplink-magazine-bulldog-pellet-desc = Shotgun magazine with 8 shells filled with uplink-magazine-bulldog-slug-name = Drum magazine (.50 slug) uplink-magazine-bulldog-slug-desc = Shotgun magazine with 8 shells filled with slugs. Compatible with the Bulldog. +uplink-estoc-ammo-name = Rifle magazine (.20 rifle) +uplink-estoc-ammo-desc = A rifle magazine with 25 cartridges. Compatible with the Estoc DMR. + uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 cartridges. Compatible with the Cobra. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 56bffb73ec..62ca952db7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -57,6 +57,18 @@ amount: 2 # - id: SMGSuppressor +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateFilledRifle + name: Estoc DMR bundle + description: "For medium-range sharpshooting, the Estoc DMR. Bundled with three magazines." + components: + - type: StorageFill + contents: + - id: WeaponRifleEstoc + - id: MagazineRifle + amount: 2 + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledRevolver diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c177baa5d7..2095edabff 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -186,6 +186,20 @@ categories: - UplinkWeaponry +- type: listing + id: UplinkEstocBundle + name: uplink-estoc-bundle-name + description: uplink-estoc-bundle-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/estoc.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledRifle + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 11 + cost: + Telecrystal: 18 + categories: + - UplinkWeaponry + - type: listing id: UplinkBulldogBundle name: uplink-buldog-bundle-name @@ -557,6 +571,17 @@ categories: - UplinkAmmo +# For the Estoc +- type: listing + id: UplinkEstocAmmo + name: uplink-estoc-ammo-name + description: uplink-estoc-ammo-desc + productEntity: MagazineRifle + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + # for the hristov - type: listing id: UplinkHristovAmmo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index c3262107de..82955fdc9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -191,6 +191,71 @@ zeroVisible: true - type: Appearance +- type: entity + name: Estoc DMR + parent: [BaseWeaponRifle, BaseSyndicateContraband] + id: WeaponRifleEstoc + description: A designated marksman rifle, favored for medium-to-long range engagements. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/estoc.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/estoc.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/estocshot.ogg + minAngle: 30 + maxAngle: 43 + shotsPerBurst: 3 + selectedMode: Burst + availableModes: + - Burst + - SemiAuto + burstFireRate: 14 + - type: GunWieldBonus + minAngle: -28 + maxAngle: -25 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: SpeedModifiedOnWield + walkModifier: 0.75 + sprintModifier: 0.75 + - type: CursorOffsetRequiresWield + - type: EyeCursorOffset + maxOffset: 2 + pvsIncrease: 0.2 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: entity name: Foam Force Astro Ace parent: [BaseWeaponShotgun, BaseGunWieldable] diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..98b6035cd43100a3bc33d6a9eb3b3bcbe1c78931 GIT binary patch literal 537 zcmV+!0_OdRP)Px$(@8`@R9J=Wl(CBHKoo}mEUPKRfGMJ+NVJI$kY}*4$OHKV*1m_ngJ3CGScqaQ zlptY{h|%B-Ddtu)WMti4ckksk`5>H}$(i$?Ihh%tq@<+eKcl@mVKSNU-EM~@Nf5^| z7K;Uz%jL^?1n=Jo>h*e@Qi>o5FrUv6h9LkTiX!BB{!{Jm7eFb+<#NGlwZiRoLli}z zlmfu73wQ$n&+~Zkc?_D(W*PvT&u1h_f@ZS`#uyl52*dED_6I?rcDuY#+*3}clVSz7ZSzW{qKv%(Kpe*! zAq4e$U5Y!7^CR)kI3ADMbkCSN&G9(l9G~= bk|KWq9OX43)}DAd00000NkvXXu0mjf({J|W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..fbae7fe0a5ba9552c5aaf05693447f8ff3b2321d GIT binary patch literal 542 zcmV+(0^$9MP)Px$*hxe|R9J=Wl(CBHKoo}mEUPKRfGMJ+NVJI$;4@fQq*HtrpTOD&@f`$9!NNim zW1$2IgG3w+W=Ju&njs^1_pZD5a+`b*PEO{ZbIzR13{X%|Q1GA8UY#(VPWgVnM;yn9 zq6o|7606nfF`GzVBnPSRe=j06-Xq$g=FaxxZdOnx?p3uUN0wxZm#x z!w_kj0>F<8cmn{>^LYMw7R~2#4FE2e3*tCNy})oZMZb%c06?$T`)$>&R!iD`zmLISAjgKoAvT*02q6G~PN(y! zZ<;11lL;S>#~6)9&>D>f&nFi`0I)0zgb-MkCCBpbLh~nI%p-&#NfI=hO_@V(LP7{A zr7#Rb?()2E7zQY%N@wyur4+~G5xTA`n%!;(#uyyOk$IF~@Ej}%0&KTiA>d+?SW&)1 z&wiF=NRkAVN=32dav6jWd2;e7$MAN$Ns;TiT(nIT)NZ$VuDB05pU;XF*tX3}rIPaP z4FIAj(g-1_R;x0(<2c_+{u!s!NqfFGWI)$-d97BH1CPf;Y1!d$_)+qYP=dOyt6UQQ gDrrGMK|w*DUoCw#A%+lx5dZ)H07*qoM6N<$f-DX0cK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..27623042f0468a28d7dcf8b2774daf5bd6d1f3df GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTORCt{2+OewQKokbx-(|rnGhiWN5gUnCB3cX6ruPASCEvie$OBkwVHX>* z2{K3^BN45##U;yK*kWeZ$tHTfRtC=eOwLJg073{M&9+{z3){7=R~GU=2qB6zO#uMc z>lI0o813nYld38jW^y(ChV#`%_~Bn9XMJ zeIIF>V!2#GDTO@GjYDW`003~m-vI!p)9H^fXcB^U05-?VrOjs38jr^SfZc8fr4;)8 z{_o#)>(vf`b8cFrbNl@solXY;z!*au$1Tn|@;t}oa?u*s+5yCIT)X*yI2`_3)9rTC zuC>uU;5(%h7K_E_Oo398Bme*@CAQmb>+yJCFc`eP3EHGvh4Kxs+wEdHoff7qMA`vJ zDa|UYQ290Jc^;&cIG@kjJwW?&ILk7->Ktpg+W@{sAt8hiLI@#*5JCuX;a~3KxaPdJ zAP9;&UXUmWAqpXcyZY+9`I6HBNJFevtJnWA@~%EU0749So>%)3V>$-4dq5L5Z{y>e zpiuxOS5My3Xf&$*W8n0jV3uXIyDs-#CAHN#073{Mgc$h+kDQ(Yx>}vi00000NkvXX Hu0mjfZMFQ( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..27623042f0468a28d7dcf8b2774daf5bd6d1f3df GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTORCt{2+OewQKokbx-(|rnGhiWN5gUnCB3cX6ruPASCEvie$OBkwVHX>* z2{K3^BN45##U;yK*kWeZ$tHTfRtC=eOwLJg073{M&9+{z3){7=R~GU=2qB6zO#uMc z>lI0o813nYld38jW^y(ChV#`%_~Bn9XMJ zeIIF>V!2#GDTO@GjYDW`003~m-vI!p)9H^fXcB^U05-?VrOjs38jr^SfZc8fr4;)8 z{_o#)>(vf`b8cFrbNl@solXY;z!*au$1Tn|@;t}oa?u*s+5yCIT)X*yI2`_3)9rTC zuC>uU;5(%h7K_E_Oo398Bme*@CAQmb>+yJCFc`eP3EHGvh4Kxs+wEdHoff7qMA`vJ zDa|UYQ290Jc^;&cIG@kjJwW?&ILk7->Ktpg+W@{sAt8hiLI@#*5JCuX;a~3KxaPdJ zAP9;&UXUmWAqpXcyZY+9`I6HBNJFevtJnWA@~%EU0749So>%)3V>$-4dq5L5Z{y>e zpiuxOS5My3Xf&$*W8n0jV3uXIyDs-#CAHN#073{Mgc$h+kDQ(Yx>}vi00000NkvXX Hu0mjfZMFQ( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..be1c0fa741164e755b450269f49b96025693d89d GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR9J=WR6(lZKoEWTe9b}v0kr12mt{2zWsCJpsK3G*>1O>l)`Zwp(Fi*$7Ep`Vzb$B0^>n^N97JZ`bAM7 z%Q7??4awH)br3?te(0c&T`W3Kjla`~V4ZUmPX$SQ`KU002ovPDHLkV1g~K B`=Px&H%UZ6RCt{2nn6qRN)(3QUT^6_T^gph@^5CVaryO2Lo|C4+FfLn1_ z1aa9eBp^a0*hQ702%>^noxAW(skQcN>@>p1d3J5mlR3|1(lF-$48t%C!!QiPFbu=2 zitqa*r6d4|+FfL#oDT5Iw^%>n@Er#b<^ z)H0yqaEQ@pRBQ6ThHcvf0NrkP^1`FPV;F{E7=~dOhG7_nVVLSv*blR=qokkIJ3x{xwUr_%wjoCM>$!bMT&5;nQ63jp+!^7wbeaZIl3;`#ZR zgb*l-;>$ToDFBll=!F;;@c&jf2_ew$_i=D=fM&BvyAGcmn6gWLSMUo`OT3Rg2 zq9jRB6a_XnH$U|bXtuYvE5$T=o6L4^yuZIA2!hJ}0rSugJf#%!JpXiTmA(Pv>tuGe zTdmg05~hHdIu$GK;KVQS+)V=J$m TVJ$f#00000NkvXXu0mjfy~U$f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac6ddf2c2f61adec3ffdd84a56bb8095f2039bb1 GIT binary patch literal 856 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 literal 0 HcmV?d00001 -- 2.51.2