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 ceafc1230266cb0e4e0a228494f8753eb42a40b6..6b640e6934b9f3c1586fec8a1c60210839d2be73 100644 (file)
--- 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 2bb20f1eb521599b3169bcbf76a3b4356321c34f..824d3b968123cc14ad956990cb1bec988c7df1d5 100644 (file)
--- 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 (file)
index 0000000..1b58657
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 (file)
index 0000000..e998d98
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 (file)
index 0000000..e73a6ea
--- /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 (file)
index 0000000..5dc0a1a
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 (file)
index 0000000..2b84fde
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/salami.rsi/wielded-inhand-right.png differ