From ff75b1be56e0e4e4c24dc9c07bbe9fa067fe21f4 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Wed, 27 Dec 2023 20:59:14 -0600 Subject: [PATCH] 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 --- .../Entities/Objects/Consumable/Food/meat.yml | 11 +++++++ .../Consumable/Food/meat.rsi/meta.json | 3 -- .../Food/salami.rsi/inhand-left.png | Bin 0 -> 1880 bytes .../Food/salami.rsi/inhand-right.png | Bin 0 -> 1909 bytes .../Consumable/Food/salami.rsi/meta.json | 30 ++++++++++++++++++ .../Food/{meat.rsi => salami.rsi}/salami.png | Bin .../Food/salami.rsi/wielded-inhand-left.png | Bin 0 -> 1338 bytes .../Food/salami.rsi/wielded-inhand-right.png | Bin 0 -> 1375 bytes 8 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/salami.rsi/meta.json rename Resources/Textures/Objects/Consumable/Food/{meat.rsi => salami.rsi}/salami.png (100%) create mode 100644 Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index ceafc12302..6b640e6934 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -608,9 +608,20 @@ - Raw - Meat - type: Sprite + sprite: Objects/Consumable/Food/salami.rsi state: salami - type: SliceableFood slice: FoodMeatSalamiSlice + - type: MeleeWeapon + wideAnimationRotation: 100 + damage: + types: + Blunt: 6 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2 - type: entity name: meat clown diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json index 2bb20f1eb5..824d3b9681 100644 --- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json @@ -144,9 +144,6 @@ ] ] }, - { - "name": "salami" - }, { "name": "salami-slice" }, diff --git a/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1b586574b5629c335a22394860dea9904531c98b GIT binary patch literal 1880 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/salami.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/salami.rsi/meta.json new file mode 100644 index 0000000000..e73a6ea1fe --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/salami.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Velcroboy at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "salami" + }, + { + "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/Consumable/Food/meat.rsi/salami.png b/Resources/Textures/Objects/Consumable/Food/salami.rsi/salami.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/meat.rsi/salami.png rename to Resources/Textures/Objects/Consumable/Food/salami.rsi/salami.png diff --git a/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5dc0a1a7ebbc309e31a849b51d58a745ac1998c1 GIT binary patch literal 1338 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 literal 0 HcmV?d00001 -- 2.51.2