Hushpup Shotgun (#41512)

* upstream hushpup

* fixes incorrect filename in attribution

* sprite cleanup

* Make the YAML not ass

* Remove redundant line of code

* Resprite, attributes original sources

* More sourcing fixes

* Last minute sprite touchups

* So... don't accidentally copy paste stuff

* Fixes bolt being on the wrong side while wielded

* adjust rolloffFactor

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
* Resprite

* No more pegs

* Spanky mind controlled me to commit these changes

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
index 4445bc5f294eff994ea74c3950db2e43635d886a..1a0136111c7015a2a6015357c9dc9562623190db 100644 (file)
--- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
@@ -37,3 +37,8 @@
   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/"
+
+- files: ["hushpup.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by UnderlinedDesigns and DrinkingWindGames (https://freesound.org/people/DrinkingWindGames/sounds/789647), modified by Halycon"
+  source: "https://freesound.org/people/UnderlinedDesigns/sounds/188499/"

diff --git a/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg b/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg
new file mode 100644 (file)
index 0000000..c86e605
Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg differ

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 7f0f14aed8b427b1e905d528d1e9dc3ffe07750e..9034c82fb8655c16c7a5ff6ac418300de0d17cd4 100644 (file)
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -34,6 +34,10 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold
 
 uplink-gloves-knuckleduster-name = Syndicate Knuckle Dusters
 uplink-gloves-knuckleduster-desc = A pair of plastitanium knuckle dusters that let you punch hard enough to break the captains jaw into pieces.
+
+uplink-hushpup-name = Hushpup
+uplink-hushpup-desc = A powerful silenced shotgun with a low magazine capacity. Comes with a spare box of buckshot. Uses .50 shotgun ammo.
+
 # Explosives
 uplink-explosive-grenade-name = Explosive Grenade
 uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage.

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 6ae9e32a5986f2dfa4c4353274d4946017df6604..7d7c4385a19915a9920a5586a1e42c6b1f413cdc 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -418,3 +418,17 @@
         - id: EmpImplanter
         - id: ClothingShoesBootsMagSyndie
         - id: AgentIDCard
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledHushpup
+  name: Hushpup bundle
+  description: Contains the Hushpup, bundled with a box of buckshot. Quarter included.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: WeaponShotgunHushpup
+        - id: BoxLethalshot
+        - id: TreasureCoinIron

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 9925596c4854d6aaf901fdbd2cbb7fac95b2c9b7..37e4b7a37188275c123bf3c46a0cd5f703936039 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -188,6 +188,20 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkHushpup
+  name: uplink-hushpup-name
+  description: uplink-hushpup-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledHushpup
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 8
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWeaponry
+
 - type: listing
   id: UplinkC20RBundle
   name: uplink-c20r-bundle-name

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 27dc095c7373797080a1a7ac9eb0983bfe1abc7a..75e25e2c66c88d104eaef1827a5fce0f1486b293 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -294,3 +294,30 @@
   components:
   - type: BallisticAmmoProvider
     proto: ShellShotgunImprovised
+
+- type: entity
+  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband]
+  id: WeaponShotgunHushpup
+  name: Hushpup
+  description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses .50 shotgun shells.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+  - type: Item
+    sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi
+    shape:
+    - 0,0,3,0 # smaller than BaseShotgun by 1 tile
+  - type: BallisticAmmoProvider
+    capacity: 4
+  - type: GunRequiresWield
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/hushpup.ogg
+      params:
+        volume: -3
+        rolloffFactor: 1.3
+    fireRate: 2
+  - type: GunSpreadModifier
+    spread: 1.2

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png
new file mode 100644 (file)
index 0000000..8e31be6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png
new file mode 100644 (file)
index 0000000..20c4eb7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..20c4eb7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png
new file mode 100644 (file)
index 0000000..e397edc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..343ea77
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..d175ebb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json
new file mode 100644 (file)
index 0000000..1b360a9
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/b5f048539b43797b371061e69534554595704525. Created by pireamaineach (github). Bolt-open modified from icon.png by Flareguy.  Resprite by kleinerstation13 (Github). Suppressor sprite made by Kleinerstation13 (Github), inspired from sprites created by BoskiYourk (Github) at commit https://github.com/Sector-Crescent/Hullrot/commit/1f7e549e20528ca7f4154616ef615cc456fd1c6d.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..674b221
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..7edd6ad
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png differ