]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Salami does melee dmg (#23041)
authorVelcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Thu, 28 Dec 2023 02:59:14 +0000 (20:59 -0600)
committerGitHub <noreply@github.com>
Thu, 28 Dec 2023 02:59:14 +0000 (19:59 -0700)
commitff75b1be56e0e4e4c24dc9c07bbe9fa067fe21f4
tree6796f3e021ef1afad3169b7a7be6e16ddd51b90b
parentcc5f8990e3295c5895b9953fe9199595651dc438
Salami does melee dmg (#23041)

* Add melee dmg to salami

* Bump up dmg to 6, 1 more than a punch

* Add in-hand and wielded sprites, and adjust swing angle

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/salami.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/salami.rsi/salami.png [moved from Resources/Textures/Objects/Consumable/Food/meat.rsi/salami.png with 100% similarity]
Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png [new file with mode: 0644]