]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Hushpup Shotgun (#41512)
authorhalycon <104782767+kleinerstation13@users.noreply.github.com>
Mon, 8 Dec 2025 20:07:32 +0000 (21:07 +0100)
committerGitHub <noreply@github.com>
Mon, 8 Dec 2025 20:07:32 +0000 (20:07 +0000)
commite038b07a40a9d8d9918536090ebb82bea520c160
tree9ac9bd4c2b49ef68e04a18485131b57d2f7a7ab4
parentaf2fd9950cd0cdd4feda7cf83f85e9a0baea81bf
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>
15 files changed:
Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
Resources/Audio/Weapons/Guns/Gunshots/hushpup.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/Shotguns/shotguns.yml
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png [new file with mode: 0644]