Gas analyzer fix for gas pipe manifolds (#41325)

Initial commit

diff --git a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs
index bb7678d28d1497ba67a009ce308ca67dde38b964..6dfb1afa8666bc3f6a5c849f0cc4c13604051d2f 100644 (file)
--- 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 6d9d596760ad8f4e3e1e3686eacdb918257d1afd..0e7db8d02bee37a9588b516edd839d9502a84132 100644 (file)
--- 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