From 53083ef771634e97dfed25467e7cd2a3eb6896b0 Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Thu, 6 Nov 2025 00:20:37 -0600 Subject: [PATCH] Gas analyzer fix for gas pipe manifolds (#41325) Initial commit --- .../Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs | 5 +++-- .../Entities/Structures/Piping/Atmospherics/pipes.yml | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs index bb7678d28d..6dfb1afa86 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs @@ -51,6 +51,7 @@ public sealed partial class GasPipeManifoldSystem : EntitySystem return; var pipeNames = ent.Comp.InletNames.Union(ent.Comp.OutletNames); + var pipeCount = pipeNames.Count(); foreach (var pipeName in pipeNames) { @@ -58,8 +59,8 @@ public sealed partial class GasPipeManifoldSystem : EntitySystem continue; var pipeLocal = pipe.Air.Clone(); - pipeLocal.Multiply(pipe.Volume / pipe.Air.Volume); - pipeLocal.Volume = pipe.Volume; + pipeLocal.Multiply(pipe.Volume * pipeCount / pipe.Air.Volume); + pipeLocal.Volume = pipe.Volume * pipeCount; args.GasMixtures.Add((Name(ent), pipeLocal)); break; diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index 6d9d596760..0e7db8d02b 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -366,31 +366,37 @@ nodeGroupID: Pipe pipeDirection: South pipeLayer: 0 + volume: 50 south1: !type:PipeNode nodeGroupID: Pipe pipeDirection: South pipeLayer: 1 + volume: 50 south2: !type:PipeNode nodeGroupID: Pipe pipeDirection: South pipeLayer: 2 + volume: 50 north0: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 0 + volume: 50 north1: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 1 + volume: 50 north2: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 2 + volume: 50 - type: GasPipeManifold - type: AtmosMonitoringConsoleDevice navMapBlip: GasPipeManifold -- 2.51.2