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>
This commit is contained in:
halycon 2025-12-08 21:07:32 +01:00 committed by BarryNorfolk
parent 67ffe6aa9f
commit 0c6ebe6f09
15 changed files with 105 additions and 0 deletions

View File

@ -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/"

Binary file not shown.

View File

@ -35,6 +35,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.

View File

@ -428,3 +428,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

View File

@ -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

View File

@ -296,3 +296,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

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 632 B

View File

@ -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
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B