Reworked sprites, inhands and new melee weapons (#3691)
* reworks * added the rest * reworked the machete handle * reworked the icon for the machete * ok. last one * . * . * replaced machete and knife sprites (again) * the meta.json * license * ffs * final * bs * . * . * got rid of the machete and bat * fuck Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
@@ -0,0 +1,15 @@
|
|||||||
|
- type: entity
|
||||||
|
name: captain's sabre
|
||||||
|
parent: BaseItem
|
||||||
|
id: CaptainSabre
|
||||||
|
description: A ceremonial weapon given to the captain of the station.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Weapons/Melee/captain_sabre.rsi
|
||||||
|
state: icon
|
||||||
|
- type: MeleeWeapon
|
||||||
|
damage: 20
|
||||||
|
- type: Item
|
||||||
|
size: 15
|
||||||
|
sprite: Objects/Weapons/Melee/captain_sabre.rsi
|
||||||
|
prefix: inhand
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
- type: entity
|
||||||
|
name: katana
|
||||||
|
parent: BaseItem
|
||||||
|
id: Katana
|
||||||
|
description: Ancient craftwork made with not so ancient plasteel.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Weapons/Melee/katana.rsi
|
||||||
|
state: icon
|
||||||
|
- type: MeleeWeapon
|
||||||
|
damage: 30
|
||||||
|
- type: Item
|
||||||
|
size: 15
|
||||||
|
sprite: Objects/Weapons/Melee/katana.rsi
|
||||||
|
prefix: inhand
|
||||||
|
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 442 B |
|
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 443 B |
|
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 463 B |
|
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 455 B |
|
After Width: | Height: | Size: 447 B |
|
After Width: | Height: | Size: 365 B |
|
After Width: | Height: | Size: 327 B |
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 498 B After Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 529 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-NC-SA-3.0",
|
"license": "CC-BY-NC-SA-3.0",
|
||||||
"copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806",
|
"copyright": "Taken/modified from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806",
|
||||||
"size": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -9,11 +9,11 @@
|
|||||||
"states": [
|
"states": [
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
"directions": 4,
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-right",
|
"name": "inhand-right",
|
||||||
"directions": 4,
|
"directions": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "icon"
|
"name": "icon"
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 328 B |
|
After Width: | Height: | Size: 316 B |
|
After Width: | Height: | Size: 306 B |
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-left",
|
||||||
|
"directions": 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-right",
|
||||||
|
"directions": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||