Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-09-29 13:08:38 +03:00
parent b4f67b1963 f051d0087c
commit b09f28657f
128 changed files with 1836 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/White/Mobs/Customization/marg_inal.rsi/m_tail_leopard_primary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 777 B

BIN
Resources/Textures/White/Mobs/Customization/marg_inal.rsi/m_tail_leopard_tertiary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

BIN
Resources/Textures/White/Mobs/Customization/marg_inal.rsi/m_waggingtail_leopard_primary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
Resources/Textures/White/Mobs/Customization/marg_inal.rsi/m_waggingtail_leopard_tertiary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

151
Resources/Textures/White/Mobs/Customization/marg_inal.rsi/meta.json Normal file
View File

@@ -0,0 +1,151 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Valtos",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "m_tail_leopard_primary",
"directions": 4
},
{
"name": "m_tail_leopard_tertiary",
"directions": 4
},
{
"name": "m_waggingtail_leopard_primary",
"directions": 4,
"delays": [
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
]
]
},
{
"name": "m_waggingtail_leopard_tertiary",
"directions": 4,
"delays": [
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
],
[
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177,
0.177
]
]
}
]
}

2
Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept",
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept and 6elblu_0331",
"size": {
"x": 32,
"y": 32

BIN
Resources/Textures/White/Structures/Furniture/Tables/wood.rsi/state_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB