Fixed scrubber filter setting (SerbiaStrong-220#998)

Surani1 · May 12, 2024 · c31238d · c31238d
1 parent 9ce3e7b
commit c31238d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
@@ -19,10 +19,13 @@ public sealed partial class GasVentScrubberComponent : Component
         [DataField("outlet")]
         public string OutletName { get; set; } = "pipe";
 
-        //SS220-scrubber-mode begin
-        [ViewVariables(VVAccess.ReadOnly)]
-        public HashSet<Gas> FilterGases = new(GasVentScrubberData.DefaultFilterGases);
+        [ViewVariables]
+        public readonly HashSet<Gas> FilterGases = new(GasVentScrubberData.DefaultFilterGases);
 
+        //SS220-scrubber-mode begin
+        /// <summary>
+        /// Filter mode, which will be set on a scrubber on a map initialization (or spawn).
+        /// </summary>
         [DataField("initialFilter"), ViewVariables]
         public GasVentScrubberData.ScrubberFilter InitialFilter { get; set; } = GasVentScrubberData.ScrubberFilter.Default;
         //SS220-scrubber-mode end

diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -51,7 +51,11 @@ public override void Initialize()
         private void OnInit(Entity<GasVentScrubberComponent> entity, ref MapInitEvent args)
         {
             var scrubberMode = GasVentScrubberData.ScrubberFilters[entity.Comp.InitialFilter];
-            entity.Comp.FilterGases = scrubberMode;
+
+            var filterGases = entity.Comp.FilterGases;
+            filterGases.Clear();
+            foreach (var gas in scrubberMode)
+                filterGases.Add(gas);
         }
         //SS220-scrubber-mode end
 

diff --git a/Resources/Prototypes/SS220/Entities/Structures/unary.yml b/Resources/Prototypes/SS220/Entities/Structures/unary.yml
@@ -2,7 +2,7 @@
   parent: GasVentScrubber
   id: GasVentScrubberBasa
   suffix: WideFiltering
-  name: Скруббер
+  name: скруббер
   description: Он же вытяжка. Имеет клапан и прикрепленный к нему насос.
   components:
     - type: GasVentScrubber