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

Piping sprites cleanup (#3022)

Browse Source 
* Moves piping visualizers to own folder

* Pump visualizer update

* Siphon and vent visualiser only set enabled visibility

* PipeVisualizer cleanup

* Replaces off vent/scrubber sprites

* Gas filter sprite update

* Revert "Gas filter sprite update"

This reverts commit 676e5d55e1157a229b1445eeea53a5c8032dbbb5.

* Rotates gas filter sprites to match T-junction pipe directions

* Removes pipes from scruber and vent state

* Makes sprite components use layers

* disabled sprite netsync on piping entities

* piping meta.json cleanup

Co-authored-by: py01 <pyronetics01@gmail.com>
This commit is contained in:
py01
2021-01-19 07:26:16 -06:00
committed by GitHub
parent 6a41194bc9
commit f9f724b4af
27 changed files with 251 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json
View File

@@ -1 +1,15 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "gasCanisterPort", "directions": 1, "delays": [[1.0]]}]}
{
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
"states":[
{
"name":"gasCanisterPort",
"directions":1
}
]
}

BIN
Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

21
Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json
View File

@@ -1 +1,20 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "gasFilter", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "gasFilterOn", "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], [0.2, 0.2, 0.2, 0.2]]}]}
{
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
"states":[
{
"name":"gasFilter",
"directions":4
},
{
"name":"gasFilterOn",
"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 ], [ 0.2, 0.2, 0.2, 0.2 ] ]
}
]
}

71
Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json
View File

@@ -9,84 +9,23 @@
"states":[
{
"name":"pipeTJunction",
"directions":4,
"delays":[
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions":4
},
{
"name":"pipeHalf",
"directions":4,
"delays":[
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions":4
},
{
"name":"pipeBend",
"directions":4,
"delays":[
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions":4
},
{
"name":"pipeFourway",
"directions":1,
"delays":[
[
1.0
]
]
"directions":1
},
{
"name":"pipeStraight",
"directions":4,
"delays":[
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions":4
}
]
}

47
Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json
View File

@@ -1,47 +0,0 @@
{
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
"states":[
{
"name": "scrubber",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "vent",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

BIN
Resources/Textures/Constructible/Atmos/pipeitems.rsi/scrubber.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 649 B

BIN
Resources/Textures/Constructible/Atmos/pipeitems.rsi/vent.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

46
Resources/Textures/Constructible/Atmos/pump.rsi/meta.json
View File

@@ -1 +1,45 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "pumpDigitalValve", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpManualValve", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGate", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGateOn", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressure", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressureOn", "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]]}, {"name": "pumpVolume", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpVolumeOn", "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], [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]]}]}
{
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
"states":[
{
"name":"pumpDigitalValve",
"directions":4
},
{
"name":"pumpManualValve",
"directions":4
},
{
"name":"pumpPassiveGate",
"directions":4
},
{
"name":"pumpPassiveGateOn",
"directions":4
},
{
"name":"pumpPressure",
"directions":4
},
{
"name":"pumpPressureOn",
"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 ] ]
},
{
"name":"pumpVolume",
"directions":4
},
{
"name":"pumpVolumeOn",
"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 ], [ 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 ] ]
}
]
}

BIN
Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

32
Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
View File

@@ -9,40 +9,12 @@
"states":[
{
"name":"scrubOff",
"directions":1,
"delays":[ [ 1.0 ] ]
"directions":4
},
{
"name":"scrubOn",
"directions":1,
"delays":[
[
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08
]
]
"delays":[ [ 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08 ] ]
}
]
}

BIN
Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 6.0 KiB

12
Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
View File

@@ -9,20 +9,12 @@
"states":[
{
"name":"ventOff",
"directions":1,
"delays":[ [ 1.0 ] ]
"directions":4
},
{
"name":"ventOn",
"directions":1,
"delays":[
[
0.08,
0.08,
0.08,
0.08
]
]
"delays":[ [ 0.08, 0.08, 0.08, 0.08 ] ]
}
]
}

BIN
Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 612 B

After

Width:  |  Height:  |  Size: 6.4 KiB