tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More belts and welders (#2453)

Browse Source 
* Adds sprites

* Added prototypes

* Adds experimental and mini welder

* Adds welder to CE's belt

* Lazily filled out the belts

* Added to spawn jobs

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/2453

* Update Resources/Prototypes/Entities/Objects/Tools/welders.yml

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Swept
2020-11-08 01:40:49 +00:00
committed by GitHub
parent c580423f41
commit 4a6d0ae5a4
122 changed files with 1786 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Resources/Textures/Objects/Tools/welder.rsi/welder.png → Resources/Textures/Objects/Tools/welder.rsi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 527 B

216
Resources/Textures/Objects/Tools/welder.rsi/meta.json
View File

@@ -1,112 +1,110 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
"states": [
{
"name": "icon",
"directions": 1,
"delays": [
[
1
]
]
},
"states": [
{
"name": "welder",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "welder_flame",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.2,
0.1
]
]
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
]
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
]
]
},
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
{
"name": "welder_flame",
"directions": 1,
"delays": [
[
0.2,
0.1
]
]
},
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
]
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
],
[
0.2,
0.1
]
]
}
]
}

BIN
Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 583 B

121
Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json Normal file
View File

@@ -0,0 +1,121 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
"states": [
{
"name": "icon",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "welder_flame",
"directions": 1,
"delays": [
[
0.2,
0.1
]
]
},
{
"name": "off-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
}
]
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 358 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 868 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 809 B

BIN
Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 B

BIN
Resources/Textures/Objects/Tools/welder_mini.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B

30
Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json Normal file
View File

@@ -0,0 +1,30 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
"states": [
{
"name": "icon",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "welder_flame",
"directions": 1,
"delays": [
[
0.2,
0.1
]
]
}
]
}

BIN
Resources/Textures/Objects/Tools/welder_mini.rsi/welder_flame.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 B