From: August Sun <45527070+august-sun@users.noreply.github.com> Date: Tue, 17 Jun 2025 00:20:08 +0000 (-0600) Subject: Adds the Estoc DMR to the syndicate uplink (#38122) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bdcdb6e338c4de732b41f56fef3edf07d032ae2f;p=space-station-14.git 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> --- 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 0000000000..231080beaa Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg differ 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 0000000000..98b6035cd4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png differ 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 0000000000..fbae7fe0a5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png differ 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 0000000000..27623042f0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png differ 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 0000000000..27623042f0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png differ 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 0000000000..be1c0fa741 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png new file mode 100644 index 0000000000..d97f979499 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png differ 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 0000000000..ac6ddf2c2f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png new file mode 100644 index 0000000000..72bff64d38 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json new file mode 100644 index 0000000000..1dbe2d8be5 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited for Space Station 14 by august-sun (GitHub)/augustsun (Discord).", + "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": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..33a453e193 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..cf41396465 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png differ