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

Merge branch 'master' into 2020-04-28-tool-component

Browse Source 
# Conflicts:
#	SpaceStation14.sln.DotSettings
This commit is contained in:
zumorica
2020-05-22 11:31:18 +02:00
parent 1e91b9f075 958c101e52
commit d2d6c2cecd
56 changed files with 1128 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Buildings/solar_panel.rsi/broken.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

1
Resources/Textures/Buildings/solar_panel.rsi/meta.json Normal file
View File

@@ -0,0 +1 @@
{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"normal","select":[],"flags":{},"directions":8},{"name":"broken","select":[],"flags":{},"directions":1}]}

BIN
Resources/Textures/Buildings/solar_panel.rsi/normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 886 B

143
Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json Normal file
View File

@@ -0,0 +1,143 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC BY-SA 3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656",
"states":
[
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "on-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,
],
[
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,
],
[
0.1,
0.1,
0.1,
0.1,
],
[
0.1,
0.1,
0.1,
0.1,
],
]
},
{
"name": "stunbaton_off",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "stunbaton_nocell",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "stunbaton_on",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
]
]
}
]
}

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/off-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 807 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/on-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 789 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_nocell.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 431 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 362 B

BIN
Resources/Textures/Objects/Melee/stunbaton.rsi/stunbaton_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB