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-07-31 01:26:23 +03:00
parent 9acf140673 49d6736a3e
commit a583cfde09
63 changed files with 1267 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Effects/rcd.rsi/construct_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

69
Resources/Textures/Effects/rcd.rsi/meta.json
View File

@@ -25,7 +25,7 @@
0.1
]
]
},
},
{
"name": "construct1",
"delays": [
@@ -64,7 +64,7 @@
0.1
]
]
},
},
{
"name": "construct2",
"delays": [
@@ -201,7 +201,66 @@
0.1
]
]
},
},
{
"name": "construct_red",
"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,
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,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "deconstruct2",
"delays": [
@@ -358,7 +417,7 @@
0.1
]
]
},
},
{
"name": "deconstruct8",
"delays": [
@@ -451,7 +510,7 @@
0.05,
0.05,
0.05,
0.05
0.05
]
]
}

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 554 B

66
Resources/Textures/White/Cult/Entities/rites.rsi/meta.json Normal file
View File

@@ -0,0 +1,66 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"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
]
]
},
{
"name": "inhand-right",
"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
]
]
}
]
}

BIN
Resources/Textures/White/Cult/Entities/stun.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 845 B

After

Width:  |  Height:  |  Size: 508 B

BIN
Resources/Textures/White/Cult/Entities/stun.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 843 B

After

Width:  |  Height:  |  Size: 504 B