]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds the Estoc DMR to the syndicate uplink (#38122)
authorAugust Sun <45527070+august-sun@users.noreply.github.com>
Tue, 17 Jun 2025 00:20:08 +0000 (18:20 -0600)
committerGitHub <noreply@github.com>
Tue, 17 Jun 2025 00:20:08 +0000 (17:20 -0700)
* 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>
17 files changed:
Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg [new file with mode: 0644]
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/bolt-open.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/mag-0.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png [new file with mode: 0644]

index 89db045c96da7c943e9fd5a6c1bc9a73ad9ff0d6..4445bc5f294eff994ea74c3950db2e43635d886a 100644 (file)
@@ -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 (file)
index 0000000..231080b
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/estocshot.ogg differ
index 6cdcb30edbe80c5b0cdbd04fb0b45d1ab5e30747..85b1585c1f7b9efcedbd01caeeb5b9e1dcfb9266 100644 (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.
 
index 56bffb73ecdc20473a03460f800d0700a602afcb..62ca952db7822d1935da5f589a4b96df203b0c93 100644 (file)
         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
index c177baa5d7b4d5e262ceb4a05dc2dc53851012d8..2095edabff905029a243416d539b5b674f6abe0b 100644 (file)
   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
   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
index c3262107de162a69c3b504fc1f50c1c18606604a..82955fdc9c3d26c70e1a134b13521d6eaf27d604 100644 (file)
     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 (file)
index 0000000..98b6035
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 (file)
index 0000000..fbae7fe
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 (file)
index 0000000..2762304
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 (file)
index 0000000..2762304
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 (file)
index 0000000..be1c0fa
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 (file)
index 0000000..d97f979
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 (file)
index 0000000..ac6ddf2
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 (file)
index 0000000..72bff64
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 (file)
index 0000000..1dbe2d8
--- /dev/null
@@ -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 (file)
index 0000000..33a453e
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 (file)
index 0000000..cf41396
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/estoc.rsi/wielded-inhand-right.png differ