diff --git a/Content.Client/GameObjects/Components/Atmos/GasFilterVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs similarity index 98% rename from Content.Client/GameObjects/Components/Atmos/GasFilterVisualizer.cs rename to Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs index 9f9aa09c64..cc99c6c827 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasFilterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs @@ -5,7 +5,6 @@ using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs similarity index 89% rename from Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs rename to Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs index 0ff952ce6a..b0f3de2c2a 100644 --- a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs @@ -10,6 +10,7 @@ using Robust.Shared.GameObjects.Components.Renderable; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Serialization; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; @@ -18,14 +19,18 @@ namespace Content.Client.GameObjects.Components.Atmos [UsedImplicitly] public class PipeVisualizer : AppearanceVisualizer { + private string _rsiString; + private RSI _pipeRSI; public override void LoadData(YamlMappingNode node) { base.LoadData(node); - var rsiString = node.GetNode("pipeRSI").ToString(); - var rsiPath = SharedSpriteComponent.TextureRoot / rsiString; + var serializer = YamlObjectSerializer.NewReader(node); + serializer.DataField(ref _rsiString, "rsiString", "Constructible/Atmos/pipe.rsi"); + + var rsiPath = SharedSpriteComponent.TextureRoot / _rsiString; try { var resourceCache = IoCManager.Resolve(); diff --git a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs similarity index 85% rename from Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs rename to Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs index 2f4f38ccd6..e3ce6d930a 100644 --- a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs @@ -1,9 +1,9 @@ -using Content.Shared.GameObjects.Components.Atmos; +using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Utility; +using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Atmos @@ -16,7 +16,9 @@ namespace Content.Client.GameObjects.Components.Atmos public override void LoadData(YamlMappingNode node) { base.LoadData(node); - _pumpEnabledState = node.GetNode("pumpEnabledState").ToString(); + + var serializer = YamlObjectSerializer.NewReader(node); + serializer.DataField(ref _pumpEnabledState, "pumpEnabledState", "pumpPressureOn"); } public override void InitializeEntity(IEntity entity) diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs new file mode 100644 index 0000000000..965810bf59 --- /dev/null +++ b/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs @@ -0,0 +1,51 @@ +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Content.Shared.GameObjects.Components.Atmos; +using YamlDotNet.RepresentationModel; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Client.GameObjects.Components.Atmos +{ + [UsedImplicitly] + public class SiphonVisualizer : AppearanceVisualizer + { + private string _siphonOnState; + + public override void LoadData(YamlMappingNode node) + { + base.LoadData(node); + + var serializer = YamlObjectSerializer.NewReader(node); + serializer.DataField(ref _siphonOnState, "siphonOnState", "scrubOn"); + } + + public override void InitializeEntity(IEntity entity) + { + base.InitializeEntity(entity); + + if (!entity.TryGetComponent(out ISpriteComponent sprite)) return; + + sprite.LayerMapReserveBlank(Layer.SiphonEnabled); + var layer = sprite.LayerMapGet(Layer.SiphonEnabled); + sprite.LayerSetState(layer, _siphonOnState); + } + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return; + if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return; + + var layer = sprite.LayerMapGet(Layer.SiphonEnabled); + sprite.LayerSetVisible(layer, siphonVisualState.SiphonEnabled); + } + + private enum Layer : byte + { + SiphonEnabled, + } + } +} diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs new file mode 100644 index 0000000000..7a9cc36e10 --- /dev/null +++ b/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs @@ -0,0 +1,51 @@ +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Content.Shared.GameObjects.Components.Atmos; +using YamlDotNet.RepresentationModel; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Client.GameObjects.Components.Atmos +{ + [UsedImplicitly] + public class VentVisualizer : AppearanceVisualizer + { + private string _ventOnstate; + + public override void LoadData(YamlMappingNode node) + { + base.LoadData(node); + + var serializer = YamlObjectSerializer.NewReader(node); + serializer.DataField(ref _ventOnstate, "ventOnState", "ventOn"); + } + + public override void InitializeEntity(IEntity entity) + { + base.InitializeEntity(entity); + + if (!entity.TryGetComponent(out ISpriteComponent sprite)) return; + + sprite.LayerMapReserveBlank(Layer.VentEnabled); + var layer = sprite.LayerMapGet(Layer.VentEnabled); + sprite.LayerSetState(layer, _ventOnstate); + } + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return; + if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return; + + var layer = sprite.LayerMapGet(Layer.VentEnabled); + sprite.LayerSetVisible(layer, ventVisualState.VentEnabled); + } + + private enum Layer : byte + { + VentEnabled, + } + } +} diff --git a/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs deleted file mode 100644 index 8dcee9a7b3..0000000000 --- a/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs +++ /dev/null @@ -1,72 +0,0 @@ -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Utility; -using System; -using Content.Shared.GameObjects.Components.Atmos; -using YamlDotNet.RepresentationModel; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Client.GameObjects.Components.Atmos -{ - [UsedImplicitly] - public class SiphonVisualizer : AppearanceVisualizer - { - private RSI _siphonRSI; - - public override void LoadData(YamlMappingNode node) - { - base.LoadData(node); - - var rsiString = node.GetNode("siphonRSI").ToString(); - var rsiPath = SharedSpriteComponent.TextureRoot / rsiString; - try - { - var resourceCache = IoCManager.Resolve(); - var resource = resourceCache.GetResource(rsiPath); - _siphonRSI = resource.RSI; - } - catch (Exception e) - { - Logger.ErrorS("go.siphonvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e); - } - } - - public override void InitializeEntity(IEntity entity) - { - base.InitializeEntity(entity); - if (!entity.TryGetComponent(out ISpriteComponent sprite)) return; - sprite.LayerMapReserveBlank(Layer.SiphonBase); - var pipeBaseLayer = sprite.LayerMapGet(Layer.SiphonBase); - sprite.LayerSetRSI(pipeBaseLayer, _siphonRSI); - sprite.LayerSetVisible(pipeBaseLayer, true); - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return; - if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return; - - var siphonBaseState = "scrub"; - siphonBaseState += siphonVisualState.SiphonEnabled ? "On" : "Off"; - - var baseSiphonLayer = sprite.LayerMapGet(Layer.SiphonBase); - sprite.LayerSetRSI(baseSiphonLayer, _siphonRSI); - sprite.LayerSetState(baseSiphonLayer, siphonBaseState); - sprite.LayerSetVisible(baseSiphonLayer, true); - } - - private enum Layer : byte - { - SiphonBase, - } - } -} diff --git a/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs deleted file mode 100644 index aee70602d8..0000000000 --- a/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs +++ /dev/null @@ -1,72 +0,0 @@ -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Utility; -using System; -using Content.Shared.GameObjects.Components.Atmos; -using YamlDotNet.RepresentationModel; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Client.GameObjects.Components.Atmos -{ - [UsedImplicitly] - public class VentVisualizer : AppearanceVisualizer - { - private RSI _ventRSI; - - public override void LoadData(YamlMappingNode node) - { - base.LoadData(node); - - var rsiString = node.GetNode("ventRSI").ToString(); - var rsiPath = SharedSpriteComponent.TextureRoot / rsiString; - try - { - var resourceCache = IoCManager.Resolve(); - var resource = resourceCache.GetResource(rsiPath); - _ventRSI = resource.RSI; - } - catch (Exception e) - { - Logger.ErrorS("go.ventvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e); - } - } - - public override void InitializeEntity(IEntity entity) - { - base.InitializeEntity(entity); - if (!entity.TryGetComponent(out ISpriteComponent sprite)) return; - sprite.LayerMapReserveBlank(Layer.VentBase); - var pipeBaseLayer = sprite.LayerMapGet(Layer.VentBase); - sprite.LayerSetRSI(pipeBaseLayer, _ventRSI); - sprite.LayerSetVisible(pipeBaseLayer, true); - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return; - if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return; - - var ventBaseState = "vent"; - ventBaseState += ventVisualState.VentEnabled ? "On" : "Off"; - - var baseVentLayer = sprite.LayerMapGet(Layer.VentBase); - sprite.LayerSetRSI(baseVentLayer, _ventRSI); - sprite.LayerSetState(baseVentLayer, ventBaseState); - sprite.LayerSetVisible(baseVentLayer, true); - } - - private enum Layer : byte - { - VentBase, - } - } -} diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml index e23edfc1e3..52fbfd854c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml @@ -10,15 +10,12 @@ - type: SnapGrid offset: Center - type: Sprite + netsync: false sprite: Constructible/Atmos/gascanisterport.rsi - state: gasCanisterPort - - type: Icon - sprite: Constructible/Atmos/gascanisterport.rsi - state: gasCanisterPort - - type: Appearance - visuals: - - type: PipeVisualizer - pipeRSI: Constructible/Atmos/pipe.rsi + layers: + - sprite: Constructible/Atmos/pipe.rsi + state: pipeHalf + - state: gasCanisterPort - type: Damageable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml index ce2d6dafd5..19a2f0e1cb 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml @@ -17,19 +17,23 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - + - type: Sprite + netsync: false + sprite: Constructible/Atmos/gasfilter.rsi + layers: + - sprite: Constructible/Atmos/pipe.rsi + state: pipeTJunction + - state: gasFilter + - type: Appearance + visuals: + - type: GasFilterVisualizer + - type: entity parent: GasFilterBase id: GasFilter name: Gas Filter description: It filters gases. components: - - type: Sprite - sprite: Constructible/Atmos/gasfilter.rsi - state: gasFilter - - type: Icon - sprite: Constructible/Atmos/gasfilter.rsi - state: gasFilter - type: NodeContainer nodes: - !type:PipeNode @@ -45,7 +49,3 @@ inletDirection: South filterOutletDirection: East outletDirection: North - - type: Appearance - visuals: - - type: GasFilterVisualizer - filerEnabledState: gasFilterOn \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml index 952ca8cce9..1d0732e4d3 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml @@ -19,10 +19,10 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite + netsync: false - type: Appearance visuals: - type: PipeVisualizer - pipeRSI: Constructible/Atmos/pipe.rsi - type: Icon sprite: Constructible/Atmos/pipe.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml index d79302849c..fc5f3d712c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml @@ -18,9 +18,15 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite + netsync: false sprite: Constructible/Atmos/pump.rsi - - type: Icon - sprite: Constructible/Atmos/pump.rsi + layers: + - sprite: Constructible/Atmos/pipe.rsi + state: pipeStraight + - state: pumpPressure + - type: Appearance + visuals: + - type: PumpVisualizer - type: entity parent: PumpBase @@ -38,11 +44,4 @@ - type: PressurePump inletDirection: West outletDirection: East - - type: Sprite - state: pumpPressure - - type: Icon - state: pumpPressure - - type: Appearance - visuals: - - type: PumpVisualizer - pumpEnabledState: pumpPressureOn + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml index 9a6858382f..f83102c2b7 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml @@ -9,16 +9,6 @@ - type: Physics - type: SnapGrid offset: Center - - - type: Sprite - sprite: Constructible/Atmos/pipeitems.rsi - state: scrubber - - type: Appearance - visuals: - - type: PipeVisualizer - pipeRSI: Constructible/Atmos/pipe.rsi - - type: SiphonVisualizer - siphonRSI: Constructible/Atmos/scrubber.rsi - type: Damageable resistances: metallicResistances - type: Destructible @@ -27,7 +17,17 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - + - type: Sprite + netsync: false + sprite: Constructible/Atmos/scrubber.rsi + layers: + - sprite: Constructible/Atmos/pipe.rsi + state: pipeHalf + - state: scrubOff + - type: Appearance + visuals: + - type: SiphonVisualizer + - type: entity parent: ScrubberBase id: Scrubber diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml index 030275ec7c..08c981107a 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml @@ -9,16 +9,6 @@ - type: Physics - type: SnapGrid offset: Center - - - type: Sprite - sprite: Constructible/Atmos/pipeitems.rsi - state: vent - - type: Appearance - visuals: - - type: PipeVisualizer - pipeRSI: Constructible/Atmos/pipe.rsi - - type: VentVisualizer - ventRSI: Constructible/Atmos/vent.rsi - type: Damageable resistances: metallicResistances - type: Destructible @@ -27,7 +17,17 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - + - type: Sprite + netsync: false + sprite: Constructible/Atmos/vent.rsi + layers: + - sprite: Constructible/Atmos/pipe.rsi + state: pipeHalf + - state: ventOff + - type: Appearance + visuals: + - type: VentVisualizer + - type: entity parent: VentBase id: Vent diff --git a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json b/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json index 6e45e0d979..6cbbd9f2e8 100644 --- a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json @@ -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]]}]} \ No newline at end of file +{ + "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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png index 0735d1b17b..2c65982213 100644 Binary files a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png and b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png differ diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png index 9688ee0b37..891eface87 100644 Binary files a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png and b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png differ diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json index f715b8af46..c65ad1d7e1 100644 --- a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json @@ -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]]}]} \ No newline at end of file +{ + "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 diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json b/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json index 7b7c971c8d..d9f1869ab8 100644 --- a/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json @@ -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 } ] } \ No newline at end of file diff --git a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json b/Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json deleted file mode 100644 index e395e59a0f..0000000000 --- a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json +++ /dev/null @@ -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 - ] - ] - } - ] -} diff --git a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/scrubber.png b/Resources/Textures/Constructible/Atmos/pipeitems.rsi/scrubber.png deleted file mode 100644 index 4a5d1d9d9e..0000000000 Binary files a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/scrubber.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/vent.png b/Resources/Textures/Constructible/Atmos/pipeitems.rsi/vent.png deleted file mode 100644 index f639ab114d..0000000000 Binary files a/Resources/Textures/Constructible/Atmos/pipeitems.rsi/vent.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json b/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json index 5ad04657cb..8f00e4796d 100644 --- a/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json @@ -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]]}]} \ No newline at end of file +{ + "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 ] ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png b/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png index 7401c6bfd2..8903bc8564 100644 Binary files a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png and b/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png differ diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json b/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json index 2feeef5cfa..68be919ebc 100644 --- a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json @@ -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 ] ] } ] } diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png index c4b16c7d0e..2cf6dd0f17 100644 Binary files a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png and b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png differ diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json b/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json index b5dbb04a19..0346b40ada 100644 --- a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json +++ b/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json @@ -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 ] ] } ] } \ No newline at end of file diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png b/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png index e8e469dc4b..bda0e14826 100644 Binary files a/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png and b/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png differ