Moves SolutionContainerManagerComponent to Shared. (#20944)

Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs

@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;

Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;

Content.Server/Administration/Commands/AddReagent.cs

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Console;

Content.Server/Administration/Commands/SetSolutionCapacity.cs

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Console;
 

Content.Server/Administration/Commands/SetSolutionTemperature.cs

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands

Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands

Content.Server/Administration/Systems/AdminVerbSystem.cs

@@ -2,8 +2,6 @@ using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.UI;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Disposal.Tube;
 using Content.Server.Disposal.Tube.Components;
 using Content.Server.EUI;
@@ -13,6 +11,8 @@ using Content.Server.Prayer;
 using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Configurable;
 using Content.Shared.Database;
 using Content.Shared.Examine;

Content.Server/Administration/Toolshed/SolutionCommand.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Toolshed;

Content.Server/Administration/UI/EditSolutionsEui.cs

@@ -1,7 +1,7 @@
 using Content.Server.Administration.Systems;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.EUI;
 using Content.Shared.Administration;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
 

Content.Server/Animals/Systems/UdderSystem.cs

@@ -1,10 +1,10 @@
 using Content.Server.Animals.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;

Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Content.Server.Anomaly.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Anomaly.Components;
 
 namespace Content.Server.Anomaly.Effects;

Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Anomaly.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 
 namespace Content.Server.Anomaly.Effects;

Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs

@@ -1,8 +1,8 @@
 using Content.Server.Anomaly.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Prototypes;
 using Content.Shared.Sprite;
 using Robust.Server.GameObjects;

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -1,5 +1,4 @@
 using Content.Server.Body.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
@@ -7,6 +6,7 @@ using Content.Server.HealthExaminable;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -14,12 +14,9 @@ using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Content.Shared.Drunk;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Rejuvenate;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Content.Shared.Speech.EntitySystems;

Content.Server/Body/Systems/LungSystem.cs

@@ -1,8 +1,8 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Inventory.Events;
 
 namespace Content.Server.Body.Systems;

Content.Server/Body/Systems/MetabolizerSystem.cs

@@ -1,9 +1,9 @@
 using Content.Server.Body.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Organ;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;

Content.Server/Body/Systems/StomachSystem.cs

@@ -1,8 +1,8 @@
 using Content.Server.Body.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Body.Organ;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Body.Systems

Content.Server/Botany/Systems/BotanySystem.Seed.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Botany.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Kitchen.Components;
 using Content.Server.Popups;
 using Content.Shared.Botany;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Examine;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Physics;
@@ -17,10 +17,8 @@ using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Botany.Systems;
 

Content.Server/Botany/Systems/PlantHolderSystem.cs

@@ -1,13 +1,12 @@
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Botany.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Kitchen.Components;
 using Content.Server.Popups;
 using Content.Shared.Botany;
-using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Examine;

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -2,9 +2,9 @@
 using Content.Server.Administration;
 using Content.Server.Body.Systems;
 using Content.Server.Cargo.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Materials;
 using Content.Shared.Mobs.Components;

Content.Server/Chemistry/Components/RandomFillSolutionComponent.cs

@@ -2,7 +2,7 @@ using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Random;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Chemistry.Components.SolutionManager;
+namespace Content.Server.Chemistry.Components;
 
 /// <summary>
 ///     Fills a solution container randomly using a weighted random prototype

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

@@ -1,16 +0,0 @@
-namespace Content.Server.Chemistry.Components.SolutionManager
-{
-    /// <summary>
-    ///     Denotes the solution that can removed  be with syringes.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class DrawableSolutionComponent : Component
-    {
-        /// <summary>
-        /// Solution name that can be removed with syringes.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("solution")]
-        public string Solution { get; set; } = "default";
-    }
-}

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

@@ -1,10 +0,0 @@
-namespace Content.Server.Chemistry.Components.SolutionManager
-{
-    [RegisterComponent]
-    public sealed partial class ExaminableSolutionComponent: Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("solution")]
-        public string Solution { get; set; } = "default";
-    }
-}

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

@@ -1,17 +0,0 @@
-namespace Content.Server.Chemistry.Components.SolutionManager
-{
-    /// <summary>
-    ///     Denotes a solution which can be added with syringes.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class InjectableSolutionComponent : Component
-    {
-
-        /// <summary>
-        /// Solution name which can be added with syringes.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("solution")]
-        public string Solution { get; set; } = "default";
-    }
-}

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

@@ -1,14 +0,0 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
-
-namespace Content.Server.Chemistry.Components.SolutionManager
-{
-    [RegisterComponent]
-    [Access(typeof(SolutionContainerSystem))]
-    public sealed partial class SolutionContainerManagerComponent : Component
-    {
-        [DataField("solutions")]
-        [Access(typeof(SolutionContainerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public Dictionary<string, Solution> Solutions = new();
-    }
-}

Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs

@@ -7,6 +7,7 @@ using Content.Server.Storage.EntitySystems;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;

Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs

@@ -1,8 +1,9 @@
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Components;
-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.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;

Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs

@@ -4,6 +4,7 @@ using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Shared.CombatMode;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.DoAfter;
 using Content.Shared.Mobs.Systems;
 

Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs

@@ -1,8 +1,9 @@
 using System.Linq;
 using System.Diagnostics.CodeAnalysis;
 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.Database;
 using Content.Shared.FixedPoint;

Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

@@ -3,12 +3,12 @@ using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Components;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Dispenser;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
-using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Popups;
 using Robust.Shared.Random;

Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs

@@ -1,9 +1,10 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Placeable;
 
 namespace Content.Server.Chemistry.EntitySystems;

Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs

@@ -1,7 +1,8 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Physics.Dynamics;

Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Timing;
 

Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs

@@ -1,4 +1,5 @@
-using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;

Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs

@@ -1,6 +1,7 @@
 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.FixedPoint;
 using Robust.Shared.Timing;
 

Content.Server/Chemistry/EntitySystems/SolutionSpikableSystem.cs

@@ -1,8 +1,9 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Robust.Shared.Player;

Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs

@@ -1,10 +1,11 @@
 using Content.Server.Administration.Logs;
 using Content.Shared.Verbs;
-using Content.Server.Chemistry.Components.SolutionManager;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;

Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Chemistry.EntitySystems;

Content.Server/Chemistry/EntitySystems/VaporSystem.cs

@@ -1,8 +1,9 @@
 using System.Numerics;
 using Content.Server.Chemistry.Components;
-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.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Physics;

Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs

@@ -1,7 +1,7 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Audio;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Database;

Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs

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

Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs

@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Body.Prototypes;
-using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;

Content.Server/Chemistry/TileReactions/CleanTileReaction.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;

Content.Server/Destructible/DestructibleSystem.cs

@@ -2,7 +2,6 @@ using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
@@ -10,6 +9,7 @@ using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Stack;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Destructible;

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

@@ -1,6 +1,3 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Fluids.Components;
-using Content.Server.Fluids.EntitySystems;
 using Content.Server.Explosion.Components;
 using JetBrains.Annotations;
 

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

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors

Content.Server/Explosion/EntitySystems/TriggerSystem.cs

@@ -1,11 +1,12 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Explosion.Components;
 using Content.Server.Flash;
 using Content.Server.Flash.Components;
 using Content.Server.Radio.EntitySystems;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;

Content.Server/Extinguisher/FireExtinguisherSystem.cs

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

Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs

@@ -1,6 +1,6 @@
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;

Content.Server/Fluids/EntitySystems/DrainSystem.cs

@@ -1,10 +1,11 @@
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Fluids.Components;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Shared.FixedPoint;
 using Content.Shared.Audio;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;

Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs

@@ -2,6 +2,7 @@ using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Clothing.Components;

Content.Server/Fluids/EntitySystems/PuddleSystem.cs

@@ -1,10 +1,10 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reaction;
 using Content.Server.Spreader;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.Examine;

Content.Server/Fluids/EntitySystems/SmokeSystem.cs

@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
 using Content.Server.Spreader;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.FixedPoint;
 using Content.Shared.Smoking;
@@ -11,7 +11,6 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Spawners;
 using Robust.Shared.Timing;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
 

Content.Server/Fluids/EntitySystems/SpraySystem.cs

@@ -6,6 +6,7 @@ using Content.Server.Extinguisher;
 using Content.Server.Fluids.Components;
 using Content.Server.Gravity;
 using Content.Server.Popups;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Cooldown;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;

Content.Server/Glue/GlueSystem.cs

@@ -1,11 +1,10 @@
 using Content.Server.Administration.Logs;
-using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Content.Shared.Item;
 using Content.Shared.Glue;
 using Content.Shared.Interaction;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Hands;
 using Robust.Shared.Timing;

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

@@ -1,7 +1,5 @@
 using System.Linq;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Hands.Systems;
 using Content.Server.Kitchen.Components;
@@ -10,6 +8,8 @@ using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Destructible;
 using Content.Shared.FixedPoint;

Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs

@@ -1,11 +1,11 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Kitchen.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
@@ -17,7 +17,6 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Kitchen.EntitySystems

Content.Server/Lube/LubeSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;

Content.Server/Materials/MaterialReclaimerSystem.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Fluids.EntitySystems;
@@ -11,7 +10,8 @@ using Content.Server.Stack;
 using Content.Server.Wires;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;

Content.Server/Medical/CryoPodSystem.cs

@@ -5,8 +5,6 @@ using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.EntitySystems;
@@ -16,6 +14,8 @@ using Content.Server.Power.Components;
 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.Containers.ItemSlots;
 using Content.Shared.Database;

Content.Server/Medical/VomitSystem.cs

@@ -1,12 +1,11 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Stunnable;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;

Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs

@@ -1,13 +1,10 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.NPC.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.Emag.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Silicons.Bots;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
 

Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs

@@ -1,8 +1,8 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Pathfinding;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;

Content.Server/NPC/Systems/NPCUtilitySystem.cs

@@ -1,6 +1,4 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Examine;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.NPC.Queries;
 using Content.Server.NPC.Queries.Considerations;
@@ -9,6 +7,7 @@ using Content.Server.NPC.Queries.Queries;
 using Content.Server.Nutrition.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Storage.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Examine;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Hands.Components;

Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs

@@ -1,9 +1,9 @@
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;

Content.Server/Nutrition/EntitySystems/DrinkSystem.cs

@@ -1,6 +1,5 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Chemistry.ReagentEffects;
 using Content.Server.Fluids.EntitySystems;
@@ -12,6 +11,8 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
 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.Database;
 using Content.Shared.DoAfter;

Content.Server/Nutrition/EntitySystems/FoodSystem.cs

@@ -1,6 +1,5 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
@@ -9,6 +8,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;

Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs

@@ -1,8 +1,9 @@
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;

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

@@ -1,9 +1,8 @@
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;
-using Content.Shared.PDA;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;
 

Content.Server/Nutrition/EntitySystems/SmokingSystem.cs

@@ -1,9 +1,9 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;

Content.Server/Nutrition/EntitySystems/TrashOnEmptySystem.cs

@@ -1,7 +1,8 @@
-using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Tag;
 
 namespace Content.Server.Nutrition.EntitySystems

Content.Server/Payload/EntitySystems/PayloadSystem.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Payload.Components;

Content.Server/Power/EntitySystems/RiggableSystem.cs

@@ -1,10 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Kitchen.Components;
 using Content.Server.Power.Components;
-using Content.Server.Stunnable.Components;
+using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
 using Content.Shared.Rejuvenate;
 

Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs

@@ -1,4 +1,5 @@
-using Content.Server.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

Content.Server/Power/Generator/GeneratorSystem.cs

@@ -1,10 +1,10 @@
 using Content.Server.Audio;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Popups;
 using Content.Shared.Power.Generator;

Content.Server/Stunnable/Systems/StunbatonSystem.cs

@@ -1,9 +1,9 @@
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Power.Events;
 using Content.Server.Stunnable.Components;
 using Content.Shared.Audio;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
 using Content.Shared.Interaction.Events;

Content.Server/Tools/ToolSystem.Welder.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Tools.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
@@ -13,7 +13,6 @@ using Content.Shared.Temperature;
 using Content.Shared.Toggleable;
 using Content.Shared.Tools.Components;
 using Content.Shared.Weapons.Melee.Events;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;

Content.Server/Tools/ToolSystem.cs

@@ -1,7 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Tools.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Maps;
 using Content.Shared.Tools;
 using Robust.Server.GameObjects;

Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

@@ -4,18 +4,17 @@ using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.CombatMode.Disarm;
 using Content.Server.Contests;
 using Content.Server.Movement.Systems;
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
-using Content.Shared.FixedPoint;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;

Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs

@@ -1,7 +1,7 @@
 using System.Linq;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Server.Weapons.Ranged.Systems

Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs

@@ -1,6 +1,6 @@
 using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Vapor;
 using Content.Shared.Weapons.Ranged;

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

@@ -0,0 +1,15 @@
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+/// <summary>
+///     Denotes the solution that can removed  be with syringes.
+/// </summary>
+[RegisterComponent]
+public sealed partial class DrawableSolutionComponent : Component
+{
+    /// <summary>
+    /// Solution name that can be removed with syringes.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("solution")]
+    public string Solution { get; set; } = "default";
+}

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

@@ -0,0 +1,9 @@
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+[RegisterComponent]
+public sealed partial class ExaminableSolutionComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("solution")]
+    public string Solution { get; set; } = "default";
+}

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

@@ -0,0 +1,16 @@
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+/// <summary>
+///     Denotes a solution which can be added with syringes.
+/// </summary>
+[RegisterComponent]
+public sealed partial class InjectableSolutionComponent : Component
+{
+
+    /// <summary>
+    /// Solution name which can be added with syringes.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("solution")]
+    public string Solution { get; set; } = "default";
+}

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

@@ -0,0 +1,12 @@
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+[RegisterComponent]
+[Access(typeof(SolutionContainerSystem))]
+public sealed partial class SolutionContainerManagerComponent : Component
+{
+    [DataField("solutions")]
+    [Access(typeof(SolutionContainerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
+    public Dictionary<string, Solution> Solutions = new();
+}

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

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

Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs

@@ -1,10 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Examine;
-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;
@@ -15,7 +13,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Chemistry.EntitySystems;
+namespace Content.Shared.Chemistry.EntitySystems;
 
 /// <summary>
 /// This event alerts system that the solution was changed
@@ -38,14 +36,12 @@ public sealed class SolutionChangedEvent : EntityEventArgs
 [UsedImplicitly]
 public sealed partial class SolutionContainerSystem : EntitySystem
 {
-    [Dependency]
+    [Dependency] private readonly ChemicalReactionSystem _chemistrySystem = default!;
-    private readonly ChemicalReactionSystem _chemistrySystem = default!;
 
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
-    [Dependency]
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
-    [Dependency] private readonly ExamineSystem _examine = default!;
 
     public override void Initialize()
     {
@@ -145,8 +141,7 @@ public sealed partial class SolutionContainerSystem : EntitySystem
 
         if (!_prototypeManager.TryIndex(primaryReagent.Value.Prototype, out ReagentPrototype? primary))
         {
-            Logger.Error(
+            Log.Error($"{nameof(Solution)} could not find the prototype associated with {primaryReagent}.");
-                $"{nameof(Solution)} could not find the prototype associated with {primaryReagent}.");
             return;
         }
 
@@ -646,7 +641,7 @@ public sealed partial class SolutionContainerSystem : EntitySystem
         var removedSolution = new Solution();
 
         // RemoveReagent does a RemoveSwap, meaning we don't have to copy the list if we iterate it backwards.
-        for (var i = solution.Contents.Count-1; i >= 0; i--)
+        for (var i = solution.Contents.Count - 1; i >= 0; i--)
         {
             var (reagent, _) = solution.Contents[i];
             var removedQuantity = solution.RemoveReagent(reagent, quantity);
@@ -685,7 +680,7 @@ public sealed partial class SolutionContainerSystem : EntitySystem
 
         var getMixableSolutionAttempt = new GetMixableSolutionAttemptEvent(uid);
         RaiseLocalEvent(uid, ref getMixableSolutionAttempt);
-        if(getMixableSolutionAttempt.MixedSolution != null)
+        if (getMixableSolutionAttempt.MixedSolution != null)
         {
             solution = getMixableSolutionAttempt.MixedSolution;
             return true;

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -563,7 +563,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 65
+        maxVol: 65
         reagents:
         - ReagentId: Nutriment
           Quantity: 30

Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml

@@ -62,7 +62,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 25
+        maxVol: 25
         reagents:
         - ReagentId: Nutriment
           Quantity: 12
@@ -85,7 +85,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -111,7 +111,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -136,7 +136,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 7
@@ -159,7 +159,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -76,7 +76,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -101,7 +101,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -131,7 +131,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -161,7 +161,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -193,7 +193,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -221,7 +221,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -246,7 +246,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -271,7 +271,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 10
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
@@ -299,7 +299,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxVol: 15
         reagents:
         - ReagentId: Nutriment
           Quantity: 7
@@ -327,7 +327,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 38
+        maxVol: 38
         reagents:
         - ReagentId: Nutriment
           Quantity: 18
@@ -355,7 +355,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 25
+        maxVol: 25
         reagents:
         - ReagentId: Nutriment
           Quantity: 8
@@ -397,7 +397,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 4
@@ -425,7 +425,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 40
+        maxVol: 40
         reagents:
         - ReagentId: Nutriment
           Quantity: 18
@@ -457,7 +457,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 25
+        maxVol: 25
         reagents:
         - ReagentId: Nutriment
           Quantity: 9
@@ -487,7 +487,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
@@ -519,7 +519,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 20
+        maxVol: 20
         reagents:
         - ReagentId: Nutriment
           Quantity: 7
@@ -559,7 +559,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 6
@@ -584,7 +584,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 7
@@ -613,7 +613,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 1
@@ -639,7 +639,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 3
@@ -669,7 +669,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 30
+        maxVol: 30
         reagents:
         - ReagentId: Protein
           Quantity: 9
@@ -694,7 +694,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
@@ -720,7 +720,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
@@ -747,7 +747,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 12
+        maxVol: 12
         reagents:
         - ReagentId: Nutriment
           Quantity: 5