Refactor Solution from Shared -> Server (#5078)

* Move entity solution entity systems to shared

* Move SolutionComponents to Server

* Fix namespaces

* Remove Networked Component.

* Fixes

* Add components to ignore list

Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs

@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Maths;

Content.Client/Entry/IgnoredComponents.cs

@@ -140,6 +140,13 @@ namespace Content.Client.Entry
             "Spray",
             "Vapor",
             "DamageOnHighSpeedImpact",
+            "SolutionContainerManager",
+            "RefillableSolution",
+            "DrainableSolution",
+            "ExaminableSolution",
+            "FitsInDispenser",
+            "DrawableSolution",
+            "InjectableSolution",
             "Barotrauma",
             "GasSprayer",
             "GasVapor",

Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;

Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs

@@ -1,7 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink

Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs

@@ -1,7 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Food

Content.Server/Administration/AdminVerbSystem.cs

@@ -2,6 +2,7 @@ using System.Threading;
 using Content.Server.Administration.Commands;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.UI;
+using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Configurable;
 using Content.Server.Disposal.Tube.Components;
 using Content.Server.EUI;
@@ -14,7 +15,6 @@ using Content.Server.Players;
 using Content.Server.Verbs;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Interaction.Helpers;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;

Content.Server/Administration/UI/AdminAddReagentEui.cs

@@ -1,9 +1,9 @@
 using Content.Server.Administration.Managers;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Eui;
 using Robust.Shared.GameObjects;

Content.Server/Body/Behavior/StomachBehavior.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Body.Networks;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Body/Circulatory/BloodstreamComponent.cs

@@ -2,10 +2,10 @@ using System;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Respiratory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Networks;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Body/Metabolism/MetabolizerSystem.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;

Content.Server/Botany/Components/PlantHolderComponent.cs

@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Hands.Components;
 using Content.Server.Plants;
@@ -9,7 +10,6 @@ using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
 using Content.Shared.Botany;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;

Content.Server/Botany/Components/ProduceComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/Chemistry/Components/ChemMasterComponent.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;

Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs

@@ -1,8 +1,7 @@
 using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Inventory.Components;
 using Content.Server.Items;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Foam;
 using Content.Shared.Inventory;

Content.Server/Chemistry/Components/HyposprayComponent.cs

@@ -1,8 +1,8 @@
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Interaction.Components;
 using Content.Server.Weapon.Melee;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;

Content.Server/Chemistry/Components/InjectorComponent.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Body.Networks;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;

Content.Server/Chemistry/Components/ReagentDispenserComponent.cs

@@ -2,15 +2,15 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Dispenser;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;

Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs

@@ -1,7 +1,7 @@
 using Content.Server.Body.Circulatory;
 using Content.Server.Body.Respiratory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Smoking;
 using Robust.Server.GameObjects;

Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using Content.Server.Atmos.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Coordinates.Helpers;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     /// <summary>
     ///     Denotes the solution that can be easily removed through any reagent container.

Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     /// <summary>
     ///     Denotes the solution that can removed  be with syringes.

Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     [RegisterComponent]
     public class ExaminableSolutionComponent: Component

Content.Server/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     /// Allows the entity with this component to be placed in a <c>SharedReagentDispenserComponent</c>.
     /// <para>Otherwise it's considered to be too large or the improper shape to fit.</para>

Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     /// <summary>
     ///     Denotes a solution which can be added with syringes.

Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
     /// <summary>
     ///     Reagents that can be added easily. For example like

Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs

@@ -1,16 +1,15 @@
 using System.Collections.Generic;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Components;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry.Components.SolutionManager
+namespace Content.Server.Chemistry.Components.SolutionManager
 {
-    [NetworkedComponent()]
     [RegisterComponent]
-    [DataDefinition]
     [Friend(typeof(SolutionContainerSystem))]
     public class SolutionContainerManagerComponent : Component
     {

Content.Server/Chemistry/Components/SolutionTransferComponent.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.UserInterface;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;

Content.Server/Chemistry/Components/TransformableContainerComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs

@@ -1,9 +1,8 @@
 using Content.Shared.Verbs;
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.Components.SolutionManager;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Robust.Shared.IoC;
 using Content.Shared.ActionBlocker;
 

Content.Server/Chemistry/EntitySystems/HypospraySystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Weapons.Melee;
 using JetBrains.Annotations;

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 

Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

@@ -1,10 +1,9 @@
 using Content.Shared.Verbs;
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.Components.SolutionManager;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.ActionBlocker;
 
 namespace Content.Server.Chemistry.EntitySystems

Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs

@@ -1,6 +1,5 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Popups;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;

Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Chemistry.EntitySystems
+namespace Content.Server.Chemistry.EntitySystems
 {
     public partial class SolutionContainerSystem
     {

Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
@@ -16,7 +17,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Chemistry.EntitySystems
+namespace Content.Server.Chemistry.EntitySystems
 {
     /// <summary>
     /// This event alerts system that the solution was changed
@@ -318,41 +319,4 @@ namespace Content.Shared.Chemistry.EntitySystems
             return reagentQuantity;
         }
     }
-
-    [Serializable, NetSerializable]
-    public enum SolutionContainerVisuals : byte
-    {
-        VisualState
-    }
-
-    [Serializable, NetSerializable]
-    public class SolutionContainerVisualState
-    {
-        public readonly Color Color;
-
-        /// <summary>
-        ///     Represents how full the container is, as a fraction equivalent to <see cref="FilledVolumeFraction"/>/<see cref="byte.MaxValue"/>.
-        /// </summary>
-        public readonly byte FilledVolumeFraction;
-
-        // do we really need this just to save three bytes?
-        public float FilledVolumePercent => (float) FilledVolumeFraction / byte.MaxValue;
-
-        /// <summary>
-        ///     Sets the solution state of a container.
-        /// </summary>
-        /// <param name="color"></param>
-        /// <param name="filledVolumeFraction">The fraction of the container's volume that is filled.</param>
-        public SolutionContainerVisualState(Color color, float filledVolumeFraction)
-        {
-            Color = color;
-            FilledVolumeFraction = (byte) (byte.MaxValue * filledVolumeFraction);
-        }
-    }
-
-    public enum SolutionContainerLayers : byte
-    {
-        Fill,
-        Base
-    }
 }

Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs

@@ -1,7 +1,6 @@
 using Content.Server.Body.Circulatory;
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;

Content.Server/Chemistry/EntitySystems/VaporSystem.cs

@@ -1,7 +1,6 @@
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Physics;
 using Content.Shared.Vapor;

Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs

@@ -1,9 +1,9 @@
 using System;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Coordinates.Helpers;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Sound;
 using JetBrains.Annotations;

Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs

@@ -1,8 +1,8 @@
 using System;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Explosion;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;

Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs

@@ -1,5 +1,5 @@
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Extinguisher/FireExtinguisherComponent.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;

Content.Server/Fluids/Components/BucketComponent.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;

Content.Server/Fluids/Components/MopComponent.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;

Content.Server/Fluids/Components/SpillExtensions.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Coordinates.Helpers;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/Fluids/Components/SpillableComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Fluids/Components/SprayComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Cooldown;
 using Content.Shared.Fluids;

Content.Server/Fluids/EntitySystems/EvaporationSystem.cs

@@ -1,5 +1,5 @@
-using Content.Server.Fluids.Components;
+using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;

Content.Server/Fluids/EntitySystems/PuddleSystem.cs

@@ -2,10 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction.Components;
 using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Directions;
 using Content.Shared.Examine;

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Content.Server.Act;
 using Content.Server.Chat.Managers;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Popups;
@@ -13,7 +14,6 @@ using Content.Shared.Acts;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen;

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

@@ -1,5 +1,5 @@
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Kitchen.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 

Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Server.Kitchen.Components;
@@ -8,7 +9,6 @@ using Content.Server.Kitchen.Events;
 using Content.Server.Power.Components;
 using Content.Server.Stack;
 using Content.Server.UserInterface;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Popups;

Content.Server/Nutrition/Components/DrinkComponent.cs

@@ -1,8 +1,6 @@
 using Content.Server.Body.Behavior;
 using Content.Server.Fluids.Components;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
@@ -21,6 +19,8 @@ using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 
 namespace Content.Server.Nutrition.Components
 {

Content.Server/Nutrition/Components/FoodComponent.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Body.Behavior;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Helpers;

Content.Server/Nutrition/Components/SliceableFoodComponent.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Hands.Components;
 using Content.Server.Items;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;

Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs

@@ -1,8 +1,8 @@
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;

Content.Server/Nutrition/EntitySystems/DrinkSystem.cs

@@ -1,7 +1,7 @@
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Throwing;
 using JetBrains.Annotations;

Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs

@@ -1,5 +1,4 @@
 using Content.Server.Nutrition.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Interaction;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;

Content.Server/Nutrition/EntitySystems/SmokingSystem.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Interaction;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;
 using Robust.Server.GameObjects;

Content.Server/PowerCell/PowerCellSystem.cs

@@ -1,6 +1,6 @@
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.PowerCell.Components;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;

Content.Server/Tools/ToolSystem.Welder.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Items;
 using Content.Server.Tools.Components;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;

Content.Server/Tools/ToolSystem.cs

@@ -2,13 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Server.Tools.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Tools;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Weapon/Melee/MeleeWeaponSystem.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Circulatory;
 using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Cooldown;
 using Content.Server.Weapon.Melee.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;

Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Weapon.Ranged.Barrels.Components;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 

Content.Shared/Chemistry/SolutionVisuals.cs

@@ -0,0 +1,43 @@
+using System;
+using Robust.Shared.Maths;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry
+{
+    [Serializable, NetSerializable]
+    public enum SolutionContainerVisuals : byte
+    {
+        VisualState
+    }
+
+    [Serializable, NetSerializable]
+    public class SolutionContainerVisualState
+    {
+        public readonly Color Color;
+
+        /// <summary>
+        ///     Represents how full the container is, as a fraction equivalent to <see cref="FilledVolumeFraction"/>/<see cref="byte.MaxValue"/>.
+        /// </summary>
+        public readonly byte FilledVolumeFraction;
+
+        // do we really need this just to save three bytes?
+        public float FilledVolumePercent => (float) FilledVolumeFraction / byte.MaxValue;
+
+        /// <summary>
+        ///     Sets the solution state of a container.
+        /// </summary>
+        /// <param name="color"></param>
+        /// <param name="filledVolumeFraction">The fraction of the container's volume that is filled.</param>
+        public SolutionContainerVisualState(Color color, float filledVolumeFraction)
+        {
+            Color = color;
+            FilledVolumeFraction = (byte) (byte.MaxValue * filledVolumeFraction);
+        }
+    }
+
+    public enum SolutionContainerLayers : byte
+    {
+        Fill,
+        Base
+    }
+}