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

Flipped mixers/filters + proper mixer sprite (#5277)

Browse Source 
* bart simpson

* fixes + jank

* figsed
This commit is contained in:
mirrorcult
2021-11-11 20:46:40 -07:00
committed by GitHub
parent 1194ce737b
commit d67f89e00e
12 changed files with 201 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Resources/Maps/saltern.yml
View File

@@ -67210,7 +67210,7 @@ entities:
- uid: 6376
type: GasMixer
components:
- rot: 3.141592653589793 rad
- rot: -1.5707963267948966 rad
pos: 41.5,17.5
parent: 853
type: Transform
@@ -67224,7 +67224,7 @@ entities:
- uid: 6377
type: GasMixer
components:
- rot: 3.141592653589793 rad
- rot: -1.5707963267948966 rad
pos: 37.5,17.5
parent: 853
type: Transform
@@ -67238,7 +67238,7 @@ entities:
- uid: 6378
type: GasFilter
components:
- rot: 3.141592653589793 rad
- rot: -1.5707963267948966 rad
pos: 39.5,18.5
parent: 853
type: Transform
@@ -67249,7 +67249,7 @@ entities:
- uid: 6379
type: GasFilter
components:
- rot: 3.141592653589793 rad
- rot: -1.5707963267948966 rad
pos: 43.5,18.5
parent: 853
type: Transform
@@ -67804,7 +67804,7 @@ entities:
- uid: 6439
type: GasFilter
components:
- rot: 3.141592653589793 rad
- rot: -1.5707963267948966 rad
pos: 47.5,18.5
parent: 853
type: Transform

95
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
View File

@@ -11,15 +11,15 @@
inlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: West
pipeDirection: North
filter:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: South
pipeDirection: West
outlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: East
pipeDirection: South
- type: entity
parent: GasTrinaryBase
@@ -36,6 +36,7 @@
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeTJunction
rotation: -90 # fuck you!!! who cares
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: gasFilter
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
@@ -52,6 +53,51 @@
- key: enum.GasFilterUiKey.Key
type: GasFilterBoundUserInterface
- type: GasFilter
- type: Flippable
mirrorEntity: GasFilterFlipped
- type: entity
parent: GasFilter
id: GasFilterFlipped
name: gas filter
suffix: Flipped
placement:
mode: SnapgridCenter
components:
- type: Sprite
netsync: false
sprite: Structures/Piping/Atmospherics/gasfilter.rsi
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeTJunction
rotation: -90
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: gasFilterF
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
- type: Flippable
mirrorEntity: GasFilter
- type: Appearance
visuals:
- type: SubFloorShowLayerVisualizer
- type: PipeConnectorVisualizer
- type: PipeColorVisualizer
- type: GasFilterVisualizer
disabledState: gasFilterF
enabledState: gasFilterFOn
- type: NodeContainer
nodes:
inlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: South
filter:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: West
outlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: North
- type: entity
parent: GasTrinaryBase
@@ -61,15 +107,15 @@
placement:
mode: SnapgridCenter
components:
# TODO ATMOS Give this its actual sprite...
- type: Sprite
netsync: false
sprite: Structures/Piping/Atmospherics/gasfilter.rsi
sprite: Structures/Piping/Atmospherics/gasmixer.rsi
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeTJunction
rotation: -90
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: gasFilter
- state: gasMixer
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer" ]
- type: Appearance
visuals:
@@ -83,3 +129,40 @@
- type: GasMixer
inletOne: inlet
inletTwo: filter
- type: Flippable
mirrorEntity: GasMixerFlipped
- type: entity
parent: GasMixer
id: GasMixerFlipped
name: gas mixer
suffix: Flipped
placement:
mode: SnapgridCenter
components:
- type: Sprite
netsync: false
sprite: Structures/Piping/Atmospherics/gasmixer.rsi
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeTJunction
rotation: -90
map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
- state: gasMixerF
map: [ "enum.SubFloorShowLayerVisualizer+Layers.FirstLayer", "enum.GasFilterVisualizer+Layers.Enabled" ]
- type: Flippable
mirrorEntity: GasMixer
- type: NodeContainer
nodes:
inlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: South
filter:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: West
outlet:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: North

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 849 B

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterF.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 850 B

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterFOn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

47
Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json
View File

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

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 990 B

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerF.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerFOn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerOn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

79
Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/meta.json Normal file
View File

@@ -0,0 +1,79 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f0.295f818e573da",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "gasMixer",
"directions": 4
},
{
"name": "gasMixerF",
"directions": 4
},
{
"name": "gasMixerOn",
"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
]
]
},
{
"name": "gasMixerFOn",
"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
]
]
}
]
}