From 595ec5c0347173b2b704838d14fd587986f3830e Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Sat, 12 Sep 2020 12:14:58 +0000
Subject: [PATCH 1/5] Fixes "Large Bar Sign" not being abstract (#2033)

---
 Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
index a359afb625..85b1ad4e66 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
@@ -18,6 +18,7 @@
 - type: entity
   id: LargeBarSign
   name: large bar sign
+  abstract: true
   components:
   - type: Clickable
   - type: InteractionOutline

From b288975cb7dfb13c035f93323225f2e6db5062b8 Mon Sep 17 00:00:00 2001
From: py01 <60152240+collinlunn@users.noreply.github.com>
Date: Sat, 12 Sep 2020 06:26:50 -0600
Subject: [PATCH 2/5] Siphon and Vent Visualizers (#2062)

* scrubber sprites

* vent sprites

* Vent visualstate

* scrubber visual state

* Vent and siphon respect being disabled

* Vent and Siphon Visualizer

* Fix typo

Co-authored-by: py01 <pyronetics01@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
---
 .../Components/Atmos/SiphonVisualizer.cs      |  68 ++++++++++++++++++
 .../Components/Atmos/VentVisualizer.cs        |  68 ++++++++++++++++++
 .../Piping/Scrubbers/BaseSiphonComponent.cs   |  26 +++++++
 .../Atmos/Piping/Vents/BaseVentComponent.cs   |  26 +++++++
 .../Atmos/SharedSiphonComponent.cs            |  22 ++++++
 .../GameObjects/Atmos/SharedVentComponent.cs  |  22 ++++++
 .../Constructible/Ground/scrubbers.yml        |   7 +-
 .../Entities/Constructible/Ground/vents.yml   |   7 +-
 .../Atmos/scrubber.rsi/meta.json              |  48 +++++++++++++
 .../Atmos/scrubber.rsi/scrubOff.png           | Bin 0 -> 767 bytes
 .../Atmos/scrubber.rsi/scrubOn.png            | Bin 0 -> 4890 bytes
 .../Constructible/Atmos/vent.rsi/meta.json    |  28 ++++++++
 .../Constructible/Atmos/vent.rsi/ventOff.png  | Bin 0 -> 612 bytes
 .../Constructible/Atmos/vent.rsi/ventOn.png   | Bin 0 -> 1272 bytes
 14 files changed, 320 insertions(+), 2 deletions(-)
 create mode 100644 Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
 create mode 100644 Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
 create mode 100644 Content.Shared/GameObjects/Atmos/SharedSiphonComponent.cs
 create mode 100644 Content.Shared/GameObjects/Atmos/SharedVentComponent.cs
 create mode 100644 Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
 create mode 100644 Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png
 create mode 100644 Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOn.png
 create mode 100644 Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
 create mode 100644 Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png
 create mode 100644 Resources/Textures/Constructible/Atmos/vent.rsi/ventOn.png

diff --git a/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
new file mode 100644
index 0000000000..07a8c04578
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs
@@ -0,0 +1,68 @@
+using Content.Shared.GameObjects.Atmos;
+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 YamlDotNet.RepresentationModel;
+
+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<IResourceCache>();
+                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
+                _siphonRSI = resource.RSI;
+            }
+            catch (Exception e)
+            {
+                Logger.ErrorS("go.siphonvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
+            }
+        }
+
+        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";
+
+            sprite.LayerMapReserveBlank(Layer.SiphonBase);
+            var baseSiphonLayer = sprite.LayerMapGet(Layer.SiphonBase);
+            sprite.LayerSetRSI(baseSiphonLayer, _siphonRSI);
+            sprite.LayerSetState(baseSiphonLayer, siphonBaseState);
+            sprite.LayerSetVisible(baseSiphonLayer, true);
+        }
+
+        private enum Layer
+        {
+            SiphonBase,
+        }
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
new file mode 100644
index 0000000000..a30b2b9f9d
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs
@@ -0,0 +1,68 @@
+using Content.Shared.GameObjects.Atmos;
+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 YamlDotNet.RepresentationModel;
+
+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<IResourceCache>();
+                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
+                _ventRSI = resource.RSI;
+            }
+            catch (Exception e)
+            {
+                Logger.ErrorS("go.ventvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
+            }
+        }
+
+        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";
+
+            sprite.LayerMapReserveBlank(Layer.VentBase);
+            var baseVentLayer = sprite.LayerMapGet(Layer.VentBase);
+            sprite.LayerSetRSI(baseVentLayer, _ventRSI);
+            sprite.LayerSetState(baseVentLayer, ventBaseState);
+            sprite.LayerSetVisible(baseVentLayer, true);
+        }
+
+        private enum Layer
+        {
+            VentBase,
+        }
+    }
+}
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
index da90efdad2..921a7c92be 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
@@ -2,6 +2,8 @@
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Atmos;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
@@ -23,6 +25,20 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
 
         private AtmosphereSystem _atmosSystem;
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool SiphonEnabled
+        {
+            get => _siphonEnabled;
+            set
+            {
+                _siphonEnabled = value;
+                UpdateAppearance();
+            }
+        }
+        private bool _siphonEnabled = true;
+
+        private AppearanceComponent _appearance;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -40,10 +56,15 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
                 Logger.Error($"{typeof(BaseSiphonComponent)} on entity {Owner.Uid} could not find compatible {nameof(PipeNode)}s on its {nameof(NodeContainerComponent)}.");
                 return;
             }
+            Owner.TryGetComponent(out _appearance);
+            UpdateAppearance();
         }
 
         public override void Update()
         {
+            if (!SiphonEnabled)
+                return;
+
             var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere(_entityManager);
             if (tileAtmos == null)
                 return;
@@ -52,5 +73,10 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
         }
 
         protected abstract void ScrubGas(GasMixture inletGas, GasMixture outletGas);
+
+        private void UpdateAppearance()
+        {
+            _appearance?.SetData(SiphonVisuals.VisualState, new SiphonVisualState(SiphonEnabled));
+        }
     }
 }
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
index a9240c3556..8176cdd315 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
@@ -2,6 +2,8 @@
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Atmos;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
@@ -23,6 +25,20 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
 
         private AtmosphereSystem _atmosSystem;
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool VentEnabled
+        {
+            get => _ventEnabled;
+            set
+            {
+                _ventEnabled = value;
+                UpdateAppearance();
+            }
+        }
+        private bool _ventEnabled = true;
+
+        private AppearanceComponent _appearance;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -40,10 +56,15 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
                 Logger.Error($"{typeof(BaseVentComponent)} on entity {Owner.Uid} could not find compatible {nameof(PipeNode)}s on its {nameof(NodeContainerComponent)}.");
                 return;
             }
+            Owner.TryGetComponent(out _appearance);
+            UpdateAppearance();
         }
 
         public override void Update()
         {
+            if (!VentEnabled)
+                return;
+
             var tileAtmos = Owner.Transform.Coordinates.GetTileAtmosphere(_entityManager);
             if (tileAtmos == null)
                 return;
@@ -52,5 +73,10 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping
         }
 
         protected abstract void VentGas(GasMixture inletGas, GasMixture outletGas);
+
+        private void UpdateAppearance()
+        {
+            _appearance?.SetData(VentVisuals.VisualState, new VentVisualState(VentEnabled));
+        }
     }
 }
diff --git a/Content.Shared/GameObjects/Atmos/SharedSiphonComponent.cs b/Content.Shared/GameObjects/Atmos/SharedSiphonComponent.cs
new file mode 100644
index 0000000000..39be0e6ca7
--- /dev/null
+++ b/Content.Shared/GameObjects/Atmos/SharedSiphonComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization;
+using System;
+
+namespace Content.Shared.GameObjects.Atmos
+{
+    [Serializable, NetSerializable]
+    public enum SiphonVisuals
+    {
+        VisualState
+    }
+
+    [Serializable, NetSerializable]
+    public class SiphonVisualState
+    {
+        public readonly bool SiphonEnabled;
+
+        public SiphonVisualState(bool siphonEnabled)
+        {
+            SiphonEnabled = siphonEnabled;
+        }
+    }
+}
diff --git a/Content.Shared/GameObjects/Atmos/SharedVentComponent.cs b/Content.Shared/GameObjects/Atmos/SharedVentComponent.cs
new file mode 100644
index 0000000000..03c7d9d320
--- /dev/null
+++ b/Content.Shared/GameObjects/Atmos/SharedVentComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization;
+using System;
+
+namespace Content.Shared.GameObjects.Atmos
+{
+    [Serializable, NetSerializable]
+    public enum VentVisuals
+    {
+        VisualState
+    }
+
+    [Serializable, NetSerializable]
+    public class VentVisualState
+    {
+        public readonly bool VentEnabled;
+
+        public VentVisualState(bool ventEnabled)
+        {
+            VentEnabled = ventEnabled;
+        }
+    }
+}
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
index 2372c3e65d..2dc4f1f3e9 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
@@ -12,7 +12,12 @@
   - type: Icon
     texture: Constructible/Power/eightdirwire.png
   - type: Sprite
-    texture: Constructible/Power/eightdirwire.png
+  - type: Appearance
+    visuals:
+    - type: PipeVisualizer
+      pipeRSI: Constructible/Atmos/pipe.rsi
+    - type: SiphonVisualizer
+      siphonRSI: Constructible/Atmos/scrubber.rsi
   - type: Destructible
     thresholdvalue: 100
 
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
index 2940ec1b08..4c02001688 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
@@ -12,7 +12,12 @@
   - type: Icon
     texture: Constructible/Power/eightdirwire.png
   - type: Sprite
-    texture: Constructible/Power/eightdirwire.png
+  - type: Appearance
+    visuals:
+    - type: PipeVisualizer
+      pipeRSI: Constructible/Atmos/pipe.rsi
+    - type: VentVisualizer
+      ventRSI: Constructible/Atmos/vent.rsi
   - type: Destructible
     thresholdvalue: 100
 
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json b/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
new file mode 100644
index 0000000000..2feeef5cfa
--- /dev/null
+++ b/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
@@ -0,0 +1,48 @@
+{
+   "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":"scrubOff",
+         "directions":1,
+         "delays":[ [ 1.0 ] ]
+      },
+      {
+         "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
+            ]
+         ]
+      }
+   ]
+}
diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4b16c7d0e64fdd1ceccbfb15f9f18e1db900feb
GIT binary patch
literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008UNkl<Zc%1E)
zzi-<{9K}CwIuW?xfHLC1LA*sF%*2CXK!fc?gU}ZIV*=!F>R6!QBm`Qb3|ehdpt+nh
z+(3Z?heK{F)WOviE@1r#T4adcM&9w><NH3`_X{VS@V(>g*bnkN-vBgC<KIP51VB*~
zN1ylOF~m*NAf-epMGypj%{hnGnyag;O%z2(2{~wEp644WC0Ul?oWoj6+qQIFhm?{q
z3=u*Q1Oa7P(skXzBKA6v=lSOH^3oq3h9Pa+Qa@HKYQy;;_ItI~UL>$NM8psK$fcB?
zynd`$Ej3Ch7PSFjQ5%#}td^Skv7#(Xf*?Rj>GSf{0-B~F%Q8>Cs11|p9BVD((GY;~
zXo$6z$#l-5HeN)QWzT|ow17O%H))#UoFfcF;`kq{KhHkVPZZ<Pkba{0Jp1I=;y5M@
zL!5J@X}Z^iof*iojP-g=+qS%Ycj3vlV&1;Hz*_5{uWxP<LZG$w-_K^VoesPxplKSG
z%Rl+@<tcE#|M8LWXvp==EdW9Y9`5hFuzvECgUNL6gX!E)d&{sh0{~su`M^!4b5=|J
zjQrvL4k3gmho@k6UAOP(!vshv{U2>>Zmsp?+cIo30dPKuky0Kc;KdR|QACowV!aLl
z`1zM#vDW$w^b_UDS4)jChU=SKKD@s`YfTu2^m?x_Ci*%70A*RClmg)4{?1zr&`%T(
z_jmLYg)xRjZCKR5d6$F`lx4Zsffq|q6vbIpRRlpm+qM{E{Mz-+t*`lNseLd3j4`xr
zOArK9Rkim@-swOTMgCIRB93E(5Z;Z+bk2wO7mP<kj4=$}r2g{ScFA4X8N#9{&bqF{
zIY*Xd4Bn*l6NT2=2lIRoqqU}=C{OO3JGde3ZAO0|@~j(f@wyj1>xR8v@91uLaNpj}
x18JJRI1f}+#s4x7{96e8cN5VGC!Fxj@fX&mfot!0*Ny-H002ovPDHLkV1m4Lc^&`&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOn.png b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..06a975cc5ad5b3306ef406fef654051f477c3fbf
GIT binary patch
literal 4890
zcmbW5cT^Kk*T+MV0E%=$K#C}e4e1CWK@<f=W1&cqCQVS9Kv1#-_#wR`N|B-{MFa$-
zV?tA!6h&GnA%GMSlL)4hyzBFp^ZfDr^`0|3yE|uhX7<kge(s%3xOVlTh_IY61OgGU
zFh73-JQx2x1O>o4X~gR!1R_DSIDghE?D^&#$@#{^`Cf|tQH}{RHdaB3eO5ikb4wMa
zReQfaIDeY+ta6&+MWsyTPd0=vwJL^h-V0y)T6Z_IuGG_WOe!4~uRv5jHZ6Ybdb3|~
zug}+S2CHp`MU%#Zj~=ZZRqjPW%&trQPua2mdSF|0w*8?t6q0#J9rtMq23eqP&OkY=
zK5hu>BQ)x;MRdP=bT={bi?>yTM)sw%V*J4&A>YFaZNJAVbHkXdN4@#_{wtPhl7@zc
z>6czB4{9w^3?vfx!IsaS+6JlreDUr{lF>*vKP3D}H64TA5slc@{&36l*VYKamJ?Jz
zog4<+iyKK2!o`P{U3utyR_uwWgh{oSewQD11d-BTVfVg?Y{~97*%QSOY4%yPL_53e
z<E#lhf66cKd`b2FKsQ$E<8&JNk5bnawXEpyvaTE<;Q#}L9C8vQQV1s)*BzBx3;_p_
z(QxYU*6DKBQcshCuPhL@fv7VdX~WgtBxp&ZQo2pXl_RGqTBW(9qTK6f!t>;NhCKcO
z*NvR>Y|&o=c;yGL^Sf2(qX|(v#z+&3%+W7jG7t=2am%ukvU1YkR|_yt@j}4L^r^?5
zy@*dS&Q^Xgsi~<=isg!>`aqG`$K?6cwmU+7b;%q*X!_i@&$P>1@w$!O_1E^=Jq_F(
z^I5*JCENTvL67r!k7sjM*t_(Y6NAkWFL+uSJht0z<7YXYM_<{?6k1c#J@(IiAME>#
z>uDH12KM(N!@`pPC6tQ#uzMcPx>+Fw+CB5Q78_xy^2{mHYnf;E!!ylMsE)4D!v2TF
z>@)d80-)8cjy-N{)FZ<%<!#Y4Mt#Dbpba5UtoyC*3--~y+9FLeDN&VpW|ygie9b;0
zB`k;jf(+BUApwiknVowUVBA(gZwX;s<5VAUp*|66#S%<84<#sJ3af@A$8(0BVrEg*
zTQGM!oB2?hlR$5v7(WlBc!PVguA88=J%yrq>@VEbxffy+id7MjckUggg}GFEts`Z&
z=_q5KXLb4IT9Ya^Itd;20;18E>1eZ<HkuYBa>*b$&Di$p=h7ASQe-Ew*BgaT|31{0
zxAE@D9PFD2xe=EN{dy4Y@MPiF`j^?F%&*ODvKLScEpW!~X?*o`){c-PZWPiqQ`JJ+
z-9z3q7o3DwoodFd-Z6pPx~eAbe?PVwAL&Za@r>?rpwp)w1Spg(m~aw0gR~x&^I?jV
zbjf`^H|Ty^Jw2jTg*|z)-J{)sYFI>T)GYp(0Lj>65xSzEeml#Wf(YZav9{`fNuT#q
z{|7#K7c{=|U|qC7X1||L=uxC4zCh2)+6vv{iraKJ=<4of;TVF?p;L#B>Sd~Lql!Eh
zjZQ*>?DjZrx-GW(WcF35Sy8~{t)7tS6iZw9rdF(>yKv!wuKRQ`OyC~aA>Hy?<k1yU
zA+9AvF<QB!UFbxQYWalBfgc@&-}j~I0~v?_HO{&Zo5<W1iXDs6@OQkk+GZcPG)Smi
zBt7E&AtTWz0*DS1ArR2Oy#-39ebqgX<su*@&G_QYdcK!O-MTc~y0|iXwr`&Y?-hDg
z;M>OA2|a#2g&!s{YAS6KUMr$0md8e@x9Bsdz}|kspHp;@BZf7TyGy>rhrv>(%aa%L
zY}N*lopa%KEh9xj!UK|$5HT}x&}S}`h&$ELMm2;!Y{aeZD?WZI?yA4bV$z~Qki0s?
zWjSepbl?bP<k=z!9c+alBuBX9g%KvyAEWnIX!=dVcZx{|&tH!j8!ts~1+k7LbW^Kq
z1{tobSO4USF1yrE%Q6i@IfY15KLWPu@*xTH*EiPI)=V5K4_q1AD;QneE-?G+J;*h1
zjig}Nm!y|>QBXkHVE>fADz1YA)wnRlygc73=hkMwn>#TswlC@Rg6*AjO#2RiNuQbg
zr=g)?^O14R<i=zCWJw059o>2`kFEOs=KnJG|6u#y7n}QUi=2bsETZ!Cd;J)LD>E#2
zx=DQ1RjT$Oa{Dyjw%0sm1#_0=7OVAg9*adbuV8I0589yQCUk}3eM!ix8Y+(NW=r_v
zr_XRqq{b@bo=5x%WW_-7&}|_jR+whi{(Ou5FRcHm6J6bcTF*nJq!IQ`DMOPM=LaiM
z?8x$JlIXDr@A1f?SIIg3?Mu6_htL>kYyr@9OBf_ve5|Aq3;nfy0BcLxd2oCRZ5;RP
zvb+(8-MIsh_?Wy8a{9-YT)PDAo>Hb?#(eu`@Q4ut0?26O5PeC24n%}d*Go+W`;KVB
zIKp)&N_=%wvsaha>{HHxOiaU>n!tq!R^|l&yhw@D%!4Yl07>?NZFuA668)Ygm)ad8
zuHEv8&imjP!wCeMtX%GAl4PijD*%uD_1gm+$IBW95)j>4{s`;bvp~+O0!$V22VEUQ
zR%jAML9oTm)hAik3V@E<TsGYKk=(CB#Wg+s(QmVRM*8^NZ5Kz^Mcx5lU*O>dBs>0=
zZ@e&7i{|j~z{70`rJpW@UAXWr_g3_9PV9&AH+cy4c9T>2*Qr7^2jfa(1;P~J=Z|H^
zR`>9Sms#jyx)5=*t#9c&CLH=jCD+3@Qx}62Lm#|O#0n}m)sF}+b9a=CyL>!!2Sy?J
zwT?qTN7a2X8y0#1?z&?XVH~M2`@vX_LHemWVHfpQ5Jg(Ohc1M!91K9&P19`@<1Ymi
z1x5M7o#{Y_I#-878-B2jGMf6y$84w1AYwHG{^%=FNjs6$iPkO_VZPIZ@KKa`u7npa
zcPy8I!Z?}kb{3G4M8t=4bcU^DWI~k!f_(P1j2{NI;#!B)C(1-Q+Dspu9vkr(r$hmC
zWV*xcuH|nh<hk=V-6!4oSM;aoG>oZUL-hKj^y4|`J%3`<PXPfY)};>FWXxClp?#aQ
zf#Gr2AD!>2r__Y1H04EBs`Y=u{Z<dkmp8cYc!CTst`yP7vJ;8$0}K|`XqxG)G>RC7
zF9gn(sp8T(&e`Gp(Ih^_Nx<;;?)6oxd1w!1rcAY{3R4VpEHxu9!X5ri9KioaP0Z2-
zhqoq|Hw}mVKGc-5BH<cpyb{BWdPhl>EhL%jq7-H4e}E2s8d1&ZQ~H%7V(B(0Dka*7
zwDf`KKV%l>Wjj9weLgl@L{3U16$oqpX)2>kF`WKTc~DfM;$LTWWPlC?s|M@~xCxAp
zK|OLa*%{~mP}dvT*d&us$(=byMLZbnKd)^Ln7>kk|9&7{cjAt>RYx$M*I&8o6Nb!-
zeJt#8$jTQJKo<h%#)cE3*td}#e^V(u9{&Vr-n2LcAt%GGHJaz;9UzCnrpzrOT}2uP
znrOtmEW2h6%tjg6SXDIL0cql#8TFy@#yRd{YLQdNr$s5bw+ixz{Ih<lBH=sgYH-L}
zV#>SeAEL`j0ZIYSfM%wlN#;VeUbHW43hsCooi8$ak;qB*s!uCpz!&{EuT@cO79KiF
zgF7CL`4TLBFIT4yrb8&(Jv_WvCa3tcA;dlDJ<ZEAnqK==V9-7`MQM-Q`D17A*u~Dl
ziBnqkCq4lr$zQ%o0XS9wN)g+UCwtEO&!H@!m85nK44(0FVQQRr{&KB8e2Y~>mhA8d
zae>Rb+(JUtIHPNa5|1Yf%Gm907i}H^nm6X|Pnnmx5R$c~%i4atSCPEjB_X6uVL6s%
zI1GTH)qRos>z?YKeX4KwCnOLE5B9#++buWfR67H0AMe+kD>LfFuNnw;9pBtBmjYQ3
z9HbEQt&WO4)Hw&--Js|G<QsO?q9eCyg&y@tn%3T$ZNW(m@;!EiV0#8BU`Id25?%8?
zbrdP_$TFJBapc#imrj3rqgf1=<2(v<%w7<FY0&FlbhS+1#MUvDJj*MOV@oCa+H1;Z
z>uwkQq#ssupA-=ssqtPVgy+%b{G^_3nUqQ`UdkJXFUUBs0#2#1f_I)7DJO~>6kOGd
zXyU8Skj2~o#50&~ds2kycUB)dZs@2eh;)zNs7b+aok#ck2GUj!&;Edk($sl~qx{c@
zCY-n6#aR`E37^SXf8TN|_GT7RlAFAX86;^>uRDO*SS|rfem77EEpoA7xIqNLZ;M~y
zWc*f7e0lUg6>4&ItV&S@k`=kE{pYSyI=Yl|@h6{R8Yt9hW*h-}Vic~x!1-~>tVrBc
zTzIk&t{g3fCyixbq;}F~plC0py?xx-qm|(EX@$-?KnErtfc;L(bDjb^iX&ChMDGvj
zex|Mqkhr@yy-xgO|0{v(^Qsj!2qUQ%k98~Yfo{?nj(l-kyR+$5=O?8I-nAr6@pM@R
zqa|Gkck32HnTP4-kyM%<ahApdtqwhFYcEjNkkb#J>li<^cKOWvZ(6@u*vRU)a$XMd
z!laFD7FmPW&=_CP7|jG*ijP;?=(W(cqxcw)XQ0oMIyOU>HiozEQ5lVFhqvr1paY>r
z#W6&s(W`gS54&p-+=)(h7w9Kur?clH$-xTGkk;kRNZRra_7Ksdkym@<Wx!;4Q=0zv
z!mgm{&l;egIo&;g^~dxyT+Q;~6nI@<z99r@MNxTHPpcnV$W~lr?yB_R%+>M-ZEQrs
zne)IW3!>5*ZuSKczL3ufIO1EpI-q>&#G58$nMQPV%uTjYiPPs8(*TsSsYjfo2h~1i
z$!BxPtQg@MhyB|69U3@-h+Fu1V%FIBbm1?Piq}HKHD7CXfV+^{kssIG>$>M=l5(#J
z(o~ZeOQcP+jQ-S@k|BZ@pMIm1)Li$u8%+s@g0BjK!Y;(@)$UXV_X#g*-kV~&_Fhl+
zt`{{}rho>1Y&7CY2?4zkZp{<uDn4AQCQVxp27%HUsPHTGWcRgjfs*xO&zB4w1%<_I
zze4BBjN*&7psqC|Tw5{K8$!udtK^$0;spwEidm6lc48|F%_B~o$XYPiiyZu14)gCE
zbKkdWuoqapdQbt_WqY~g5%x5+twKVfmk9Fa(}bjKMyA1JKbX2I5?dbgk+dVo^>>;k
zd4UKXj_ktwecj_<i`h)7Zxn(<zjM|}j4)L6+{v`LFY!~IZ2;wa9?MBH;a0(ciDZ7S
zy9p~;L`!UQiMXc<zn57Bm4i2YDWLe&T=srr;yIR5gQ$1K4jpLjW_t15l9U(&U~tW$
z(X^6@Rgcx)rSdD5-R^%CmG%y4dp-;E3jLo%1S+fCxTMmx&r5ETFLOi(4?R?L_r0h&
ze9T*kY|e<d0-SsabO0>4CI6wnF?o^2K1<(s?DY1+V^8e91GRw3fpa*;RyS2`f)hr#
zB}FG_I#~^C^W|@*II{|0km68B#K8a*(+@8|h<zlGpaDC)BR#Y$8pN542dhJDYR^Py
zCUC>o&uQSQb8D<YmT#Z5F|qZ$(dhDizAXRhxQVS*awiL+P3bnXk+PNDa?shs1`Pya
z_!q-$2xyp@gu7h6uetqNL7+NR8m;7q;H*nptfgdw+tdA$xZ0o6m+tR#B(1wFI%rFP
z_>Dj{UVq@cNo^9Ha_dwQXrvNhic>!}gd0VhG;q@~HOxl##Wa`t-*_ha3^sU5W$*}b
zKfo_vQ|oLWEsqviPLu%itC*_cH?1|+Z4tYys6>Okp7r~e?u<~1kR@TcRgukqwj<C#
z&p?)GMD_#vSP?goQoA~UT6u7ea1KY#U<LcrxgXL^-_^;vZ3EbN#12E_4U=2{q-)Uf
zOizoTBo`NvxsdWIy8@;QRN-lG7Xxf`U97!Tr~&a8HU^Z)xsogf&@n$anjH{{6?}R0
zP5sETOC@xx!vjC$7O=rW+MUI}b53(RU?b%#HLs#9)e}=-vwpN0R=fjp&$sRFt>b;w
zAYL>#e`@>P*Q+G@ju)o!5N6{Z=sI+cumW7|czXk7uh_nL)wm1Q`xI0TGkoObhmXQ#
zl~=L>L$CWMKT9sHWo~hdF>+?sp|cO4V#13_yWbn#|G_|?Jn=%P+4n00=qh?vtUcjI
z=HMFHNpF~^;-s%kpRNwc`^`!&;VstaS|HyUN1w!R@wWr4##0&Q%GsCHxq|=N<3Jo%
zbQ3Gzde_RT2r}#(%LZS!@3V`S>A?^uf6=|(BwY`FsW{9W&}Zve1Ge?n6bHK2+Tay$
z#GNn0{uQ?D#@I^`#t{V{hW)lUD>CqwgoI_OPb>>9lw)ZV%8DtIIGy_=_W<s7qx~Pi
qq~WhbaxZ`iLH_&J=Kz<ZRBlbUchAn3AN=P9u`s)OzS`6!`o91&7u47Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json b/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
new file mode 100644
index 0000000000..b5dbb04a19
--- /dev/null
+++ b/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+   "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":"ventOff",
+         "directions":1,
+         "delays":[ [ 1.0 ] ]
+      },
+      {
+         "name":"ventOn",
+         "directions":1,
+         "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
new file mode 100644
index 0000000000000000000000000000000000000000..e8e469dc4b685f7ecdff3a39a1a3fe0baf8f20d1
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006jNkl<Zc%1E)
zPiqrF7>6H0@K80(r5j{WSdgeCiLjSqu_&PpDnUi;2k1q56ngh82p+|YAHYkMke0NB
zl#19x_mG4rLD<tEn?MQi&!MM!D6{UGWOtJaJ(%BVcK6+Pp83r??=DO<(f_VfVGj$1
z!l53!t{XdPGMV(o#bPmZj?-b2Tb2cY<2VQ*Vgmq}rm2UAVGu(Bv>Npq<;w0zlLO>)
zv!pZG$hc4d$8k_f#ZIQxsMk<RF?IIb_yDf!B7~sXQZ!o%^U}q@^H*=)4t#HAdC7Au
zb>(Vg?L=<DOiCi9WGW#7#r5L(v!USm+$>6|sMOH_-EP-&K(FfB<qISd2>?Freeq)T
z{p*>u7dvev`;(3Wpie=k?INWloyi7VIG-r9u$cF*UDu^iuQ8L7OdClo%c4{&jStXn
zp8@D|0q|_z+ANd1eT%hs?|Jy(eqi<b{jmYGbRFoEpsW1O-Fs}Tm#9>?nY%epXTLkr
z{>KK;4)|AEscy5eUP4Mqxw6~WE8^^bB!FQYpwu4+I{RH7JzfG}VKL9v=1~pkI?y$s
z9Wac8;{n*VO?77vfcd!_eEhIOuh--A*Kc0T_g)X6?|!rO500S_BG3o)>cixBK?rgD
zM&$2=t1n*<j9FO@g84gPl!gN6^X_+G_34wygh1dV`1{640C4n4{q^(5z$%XeVVWkk
yZI2HCkj`XdebxS!?|&dvC;mq?(L@uSxPAkQ$Mv5<Ta|zS0000<MNUMnLSTaKN-1gp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/ventOn.png b/Resources/Textures/Constructible/Atmos/vent.rsi/ventOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..33d42b8b1005a9e402e86b0c157ae855f204afc3
GIT binary patch
literal 1272
zcmV<U1PA+xP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000EPNkl<Zc%1E;
z-A~(A7{;HjiK;?U=_nyF!)Y3ev`hI^QfQgRRB0?-L1;I-@84LVc1l>KYMs<-3|7c!
z)H0>4G2)~UMQQ@5iX(PW9nW@R`<M|bk@MV;*u=m0eEPND2M`hx5)$fNU2r<NxVU)C
zK2u7$FDglr{&{I>$&vB7`93FjCX)dGlu9KKLbw9}07X&Q$K#W9!ddZcJAkRMv5wr6
z7y9@9zDwx496;*2tRE}BQE_<Gz`@~1{n)+l?qF<u!c)*Z{DDvisp~R=fq;Ij-e{os
zM#WyW>Y4A@0i{w2s;atPZ2C@n(5kAUKM-^c;57Kw7`*UpJAhIOLI^frtJr+4V(sM?
z?#`xBtJSc-Uv2yUa5w})2%bJ$(?{aQS1C_x*N(qk-a|{%0Kmi!heH4WLI`TLntuHG
zN&yFlAG!FhOJL-N3|W>jHa=n6T<jE2DEbJThP?7ArMT$xaq}HJpjNA4yS#^+sT5wW
zt#%xF;J?vlqd*A3c6kqxsC&R}{P+7uxS0y#mweulYm6<K9LD?oBSZ|d!cO)b5c?8=
z9~UqU;8n2*S(Y)E&6-AGIiJJ#*?anTN+}8(>v&ZxV*1t?0zWMR4<7+5oGtFaAH|Z+
zx6Xp)d=9r~zV65$9Z7KUZ9Bjh44^+YgvQk&3|;^#w1Sql3gFW^j7m|cs*2@&4lPYH
zjliHJp%oiKe{2Z8V89OHC?nrrt)fCJsL;H=?%6b7&gW2}71MA1K0k1kkN*WvFuRl@
zDn&7w&R{Z~(Hnn%egUeg;-b%oxoj45*({<`6uT$f`0UiwnutnK%w@BfOlS1QGd?@V
z_)V?JeQnoG5co8rYy_BOS;o(gA3>Jow%IW#NoaX&q?7zUzlk3XhfMsIrkVCAzt7Ko
zZQBme>J1!}cYt?0*sW08HP~qnP*oL?W8k2?1Fhch++ZuesWm<G@otBUZ<``cO-&t3
zl7!#?C}2MOt!byV+kK7a9_N3>^sO;aO0lxC;yD#&{J%Ee;_hr3TU&oSa*awRhw=2;
z8b(JFu6)NOKnTIL*Z@A%>zGVuxbMS-jdfg$4S*1G;zWq?BVmdU^?KVK$c-NfU*_Vw
z?g5=LLE}B&IxDQ1;Qy616ErfdVs{8*Cg>*H4q&})%)|g7o`C7ERSztgAkV0I;q%Ct
z3A*teXMmz8IB3+7d-6hmBJ=Vzs3;0nS68_M=iz&K8sy=-E`hP}3D>8p*+`^g@TVaj
z{-wUYwitN%J^w~XNJvOXNJvOXNJvPiC)M*$gTf!+b|K*p5dHvXe}M5_eK-99SAs#;
z+5|iH+w(uqpFbd;P;h&OuP*S-Ouc*lfN(g(H45GG2Qa=<mFP_U0e1EIv+@W0Fu%}|
z-xYs=u{!HipYNtWfQRqJAHY=}-=)-4ondSI{``VoqPCuk#D+XK+D^vmFfX51C-Mha
z>+@Fcz-jvf1|<nCO~XHLO8|hDraAJ@oj-u_;|b;S`va26;kI4BQ(kb|{s1>mfH979
z=@0PA@2WqblPiP;+%12=m0-}(tH|Q8W`b@yu|L30-SP*-6N)RF$(RWWe}M1@IIHL1
i2nh)Z2?+`Hu>J+*FN#YoJmHoA0000<MNUMnLSTY5>~Syv

literal 0
HcmV?d00001


From 1d4700493bc855c08006d4c7a38bb6c9e4422be5 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:47:37 +0200
Subject: [PATCH 3/5] Ignore client unknown components (#2069)

---
 Content.Client/IgnoredComponents.cs | 2 ++
 SpaceStation14.sln.DotSettings      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs
index 7dea6c8738..49f804ca64 100644
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/IgnoredComponents.cs
@@ -176,6 +176,8 @@
             "ExtinguisherCabinet",
             "ExtinguisherCabinetFilled",
             "FireExtinguisher",
+            "AtmosPlaque",
+            "Spillable",
         };
     }
 }
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings
index 70e73486b8..f0a586f719 100644
--- a/SpaceStation14.sln.DotSettings
+++ b/SpaceStation14.sln.DotSettings
@@ -101,6 +101,7 @@
     <s:Boolean x:Key="/Default/UserDictionary/Words/=soundfonts/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=spawnable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Spawner/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Spillable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strippable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=stunnable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Superconduct/@EntryIndexedValue">True</s:Boolean>

From ca8018f9f9e9b742e3da82bd57fb6ae74b7f7330 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:47:57 +0200
Subject: [PATCH 4/5] Make PostMapInitTest ignore test maps instead of those in
 an array (#2066)

---
 Content.IntegrationTests/Tests/PostMapInitTest.cs | 11 +++++------
 Resources/Maps/{ => Test}/Pathfinding/simple.yml  |  0
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename Resources/Maps/{ => Test}/Pathfinding/simple.yml (100%)

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index e29926951e..feddf591e5 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -11,10 +11,8 @@ namespace Content.IntegrationTests.Tests
     [TestFixture]
     public class PostMapInitTest : ContentIntegrationTest
     {
-        public readonly string[] SkippedMaps =
-        {
-            "/Maps/Pathfinding/simple.yml"
-        };
+        public const bool SkipTestMaps = true;
+        public const string TestMapsPath = "/Maps/Test/";
 
         [Test]
         public async Task NoSavedPostMapInitTest()
@@ -34,7 +32,8 @@ namespace Content.IntegrationTests.Tests
             {
                 var rootedPath = map.ToRootedPath();
 
-                if (SkippedMaps.Contains(rootedPath.ToString()))
+                // ReSharper disable once RedundantLogicalConditionalExpressionOperand
+                if (SkipTestMaps && rootedPath.ToString().StartsWith(TestMapsPath))
                 {
                     continue;
                 }
@@ -53,7 +52,7 @@ namespace Content.IntegrationTests.Tests
                 var meta = root["meta"];
                 var postMapInit = meta["postmapinit"].AsBool();
 
-                Assert.False(postMapInit);
+                Assert.False(postMapInit, $"Map {map.Filename} was saved postmapinit");
             }
         }
     }
diff --git a/Resources/Maps/Pathfinding/simple.yml b/Resources/Maps/Test/Pathfinding/simple.yml
similarity index 100%
rename from Resources/Maps/Pathfinding/simple.yml
rename to Resources/Maps/Test/Pathfinding/simple.yml

From 7cd98a4bceedb25b43969c35d19909a3c64f674f Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Sat, 12 Sep 2020 15:48:22 +0200
Subject: [PATCH 5/5] Add extension method to popup a message for the source
 and everyone else around it (#2063)

* Add extension method to popup a message for the source and everyone around

* Add IPlayerManager as a parameter
---
 Content.Server/Utility/NotifyExtensions.cs | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Utility/NotifyExtensions.cs b/Content.Server/Utility/NotifyExtensions.cs
index d4ae473f31..ef076ce1aa 100644
--- a/Content.Server/Utility/NotifyExtensions.cs
+++ b/Content.Server/Utility/NotifyExtensions.cs
@@ -13,12 +13,17 @@ namespace Content.Server.Utility
         /// </summary>
         /// <param name="source">The entity on which to popup the message.</param>
         /// <param name="message">The message to show.</param>
+        /// <param name="playerManager">
+        ///     The instance of player manager to use, will be resolved automatically
+        ///     if null.
+        /// </param>
         /// <param name="range">
         ///     The range in which to search for players, defaulting to one screen.
         /// </param>
-        public static void PopupMessageOtherClients(this IEntity source, string message, int range = 15)
+        public static void PopupMessageOtherClients(this IEntity source, string message, IPlayerManager playerManager = null, int range = 15)
         {
-            var playerManager = IoCManager.Resolve<IPlayerManager>();
+            playerManager ??= IoCManager.Resolve<IPlayerManager>();
+
             var viewers = playerManager.GetPlayersInRange(source.Transform.Coordinates, range);
 
             foreach (var viewer in viewers)
@@ -33,5 +38,24 @@ namespace Content.Server.Utility
                 source.PopupMessage(viewer.AttachedEntity, message);
             }
         }
+
+        /// <summary>
+        ///     Pops up a message at the given entity's location for everyone,
+        ///     including itself, to see.
+        /// </summary>
+        /// <param name="source">The entity above which to show the message.</param>
+        /// <param name="message">The message to be seen.</param>
+        /// <param name="playerManager">
+        ///     The instance of player manager to use, will be resolved automatically
+        ///     if null.
+        /// </param>
+        /// <param name="range">
+        ///     The range in which to search for players, defaulting to one screen.
+        /// </param>
+        public static void PopupMessageEveryone(this IEntity source, string message, IPlayerManager playerManager = null, int range = 15)
+        {
+            source.PopupMessage(message);
+            source.PopupMessageOtherClients(message, playerManager, range);
+        }
     }
 }