diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 3950c2396d..d2bf3800f6 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml index b50e80821c..e4c0a77cb0 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml @@ -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 diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png index 2c65982213..f47460c82a 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png and b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterF.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterF.png new file mode 100644 index 0000000000..ac4d4affd5 Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterF.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterFOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterFOn.png new file mode 100644 index 0000000000..132c25e737 Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterFOn.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png index 06cdacf03e..7aed631057 100644 Binary files a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png and b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json index c65ad1d7e1..5d1956f4d4 100644 --- a/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json @@ -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 ] ] - } - ] -} \ No newline at end of file + "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 ] ] + } + ] +} diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixer.png b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixer.png new file mode 100644 index 0000000000..6825d992e2 Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixer.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerF.png b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerF.png new file mode 100644 index 0000000000..f816189c5d Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerF.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerFOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerFOn.png new file mode 100644 index 0000000000..6f93dccce9 Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerFOn.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerOn.png new file mode 100644 index 0000000000..2afb6fb00d Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/gasMixerOn.png differ diff --git a/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/meta.json new file mode 100644 index 0000000000..d334b2ecb2 --- /dev/null +++ b/Resources/Textures/Structures/Piping/Atmospherics/gasmixer.rsi/meta.json @@ -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 + ] + ] + } + ] +}