Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jabak
2024-06-08 22:36:55 +03:00
108 changed files with 383027 additions and 318224 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -1,16 +1,42 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "null",
"copyright": "P O X U I",
"size": {
"x": 64,
"y": 64
"x": 32,
"y": 32
},
"states": [
{
"name": "animated",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1
]
]

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/ at d0dffe7ca643db2624424fdcebf45863f85c0448",
"copyright": "Taken from tgstation at https://github.com/tgstation/ at d0dffe7ca643db2624424fdcebf45863f85c0448, on inhand sprites by Aviu",
"size": {
"x": 32,
"y": 32
@@ -23,12 +23,56 @@
]
},
{
"name": "inhand-left",
"name": "off-inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B