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>
This commit is contained in:
Velcroboy
2023-12-27 20:59:14 -06:00
committed by GitHub
parent cc5f8990e3
commit ff75b1be56
8 changed files with 41 additions and 3 deletions

View File

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

View File

@@ -144,9 +144,6 @@
]
]
},
{
"name": "salami"
},
{
"name": "salami-slice"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -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
}
]
}

View File

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB