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>
@@ -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"
|
||||
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/"
|
||||
|
||||
BIN
Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg
Normal file
@@ -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.
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]
|
||||
|
||||
|
After Width: | Height: | Size: 537 B |
|
After Width: | Height: | Size: 542 B |
|
After Width: | Height: | Size: 569 B |
|
After Width: | Height: | Size: 569 B |
|
After Width: | Height: | Size: 563 B |
|
After Width: | Height: | Size: 893 B |
|
After Width: | Height: | Size: 856 B |
|
After Width: | Height: | Size: 154 B |
@@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 892 B |
|
After Width: | Height: | Size: 850 B |