From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Thu, 28 Dec 2023 02:59:14 +0000 (-0600)
Subject: Salami does melee dmg (#23041)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ff75b1be56e0e4e4c24dc9c07bbe9fa067fe21f4;p=space-station-14.git

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

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 0000000000..1b586574b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-right.png
new file mode 100644
index 0000000000..e998d98675
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/salami.rsi/inhand-right.png differ
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 0000000000..5dc0a1a7eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..2b84fde522
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png differ