Moves SolutionContainerManagerComponent to Shared. (#20944)

diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
index 8d0bbbd067f465dd1e724b3331fd5decb5577097..8b489d27fc7d820f5f905261b02b38577f75c5f2 100644 (file)
--- a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
+++ b/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;

diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
index 30c15e8da31cbf236887631fbe5db1e99be57223..5213747588a1d00b3106c29f2d5c15105cfb357d 100644 (file)
--- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
+++ b/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;

diff --git a/Content.Server/Administration/Commands/AddReagent.cs b/Content.Server/Administration/Commands/AddReagent.cs
index f18dd3e99d3fa3251edff477d6377d7dd44073c2..b75e46ad9084a67cbe0d42b90be4445d336f5be9 100644 (file)
--- a/Content.Server/Administration/Commands/AddReagent.cs
+++ b/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;

diff --git a/Content.Server/Administration/Commands/SetSolutionCapacity.cs b/Content.Server/Administration/Commands/SetSolutionCapacity.cs
index 0c439227ff9ec73083ae67c5c1354f818cb6f3ac..e1e644f84f4cb16fd45b69abb40e3ed528ea1446 100644 (file)
--- a/Content.Server/Administration/Commands/SetSolutionCapacity.cs
+++ b/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;
 

diff --git a/Content.Server/Administration/Commands/SetSolutionTemperature.cs b/Content.Server/Administration/Commands/SetSolutionTemperature.cs
index 6c6c618d17a24b335c5764f2ff46912266e03696..e8f58a50cfd3d2c8c810943f6843fb13786132a9 100644 (file)
--- a/Content.Server/Administration/Commands/SetSolutionTemperature.cs
+++ b/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

diff --git a/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs b/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs
index 07b51016cc9161405253d55fd3cd377feacd5049..c2b7f9d25c2e469f43a5537ae5f027aef94b595e 100644 (file)
--- a/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs
+++ b/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

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 709602a1b3c06051586f7413ae36a06f567964fb..3a419b93f6f9afc59fbba78f96fc817c1c1ae457 100644 (file)
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/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;

diff --git a/Content.Server/Administration/Toolshed/SolutionCommand.cs b/Content.Server/Administration/Toolshed/SolutionCommand.cs
index 5cbd931a7014dd90179e95aa25df50e377a22c18..1edf958c95e6562a909ae32706e27db6432b4317 100644 (file)
--- a/Content.Server/Administration/Toolshed/SolutionCommand.cs
+++ b/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;

diff --git a/Content.Server/Administration/UI/EditSolutionsEui.cs b/Content.Server/Administration/UI/EditSolutionsEui.cs
index 5fa386aae7477efce29feecc993c80138197f103..5136b347a2e45a5ebf4902d7c6ebca71b9091838 100644 (file)
--- a/Content.Server/Administration/UI/EditSolutionsEui.cs
+++ b/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;
 

diff --git a/Content.Server/Animals/Systems/UdderSystem.cs b/Content.Server/Animals/Systems/UdderSystem.cs
index b57eeaf299ada4158a1a6f633b4f1687a6ba191a..4a90c3c3d8532cc28d5d17c392d50f83370905c6 100644 (file)
--- a/Content.Server/Animals/Systems/UdderSystem.cs
+++ b/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;

diff --git a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
index acc0e2f0c383fc511ec6d572651dc0533375213c..0cc7883808ade1ba4423094c8f9a4f55d18e5bbc 100644 (file)
--- a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
+++ b/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.Server.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Anomaly.Components;
 
 namespace Content.Server.Anomaly.Effects;

diff --git a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
index deae38e5c8c851798412785733b74877cdae1db4..9855e66cfe33c462304a04ee9e31f110bf8f022e 100644 (file)
--- a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
+++ b/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;

diff --git a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs
index fdfff42d7ca03b6268c6d911bbc9ca74df3ed0ea..c87dcf4eaeb95083e565c5f2282dd465cb1a9687 100644 (file)
--- a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs
+++ b/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;
@@ -32,7 +32,7 @@ public sealed class ReagentProducerAnomalySystem : EntitySystem
     [Dependency] private readonly PointLightSystem _light = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    
+
     public const string FallbackReagent = "Water";
 
     public override void Initialize()

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index 9ed92da8fc40e4ea162862d72ad5c38327a8b1a2..39403288e95fdf6f16b5f9bff153a1a5b23b8312 100644 (file)
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/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;

diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index 042c90857ba51c85bf84d1801ebf27b2c90f183b..a66efbac0891514b27f58f9789354ccf70293ecb 100644 (file)
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/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;

diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index 1b4f85ae2854e085759e2bcefaf9674802acc389..5233b0166c13998fc1d610245a27ed9a986fcb89 100644 (file)
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/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;

diff --git a/Content.Server/Body/Systems/StomachSystem.cs b/Content.Server/Body/Systems/StomachSystem.cs
index e33931315a6ef0bb8549afe9852b7eb611952e13..1d793887eef48c62c6c3b076f5006f57116b3c20 100644 (file)
--- a/Content.Server/Body/Systems/StomachSystem.cs
+++ b/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

diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index b2cad7e01205034f0af8073a6127ac556dad1753..752d8e40043b19f8c00390b3f35994a179e58537 100644 (file)
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/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;
 

diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 586fa9c2b0dbedd7c05df1f939f6b4378979a928..506b88f78b852da1232e02c4ca934b6c8da1f2db 100644 (file)
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/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;

diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index f66e6f02ac9aa410a5d4dc9c8d199484d55093da..289f383d29cfef27cd01337313e1e6ed5ee29858 100644 (file)
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/Components/SolutionManager/RandomFillSolutionComponent.cs b/Content.Server/Chemistry/Components/RandomFillSolutionComponent.cs
similarity index 93%
rename from Content.Server/Chemistry/Components/SolutionManager/RandomFillSolutionComponent.cs
rename to Content.Server/Chemistry/Components/RandomFillSolutionComponent.cs
index e4ee6bfc0b1c5b26009a10f4e38d39ebefb6bee3..d0f8c4ceb5ed09d1d66ff7618c04884ac132bc83 100644 (file)
--- a/Content.Server/Chemistry/Components/SolutionManager/RandomFillSolutionComponent.cs
+++ b/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

diff --git a/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
deleted file mode 100644 (file)
index 2ecb7e8..0000000
--- a/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
+++ /dev/null
@@ -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";
-    }
-}

diff --git a/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
deleted file mode 100644 (file)
index 52b8aff..0000000
--- a/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ /dev/null
@@ -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";
-    }
-}

diff --git a/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
deleted file mode 100644 (file)
index 17fc34b..0000000
--- a/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
+++ /dev/null
@@ -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";
-    }
-}

diff --git a/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
deleted file mode 100644 (file)
index d76237a..0000000
--- a/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
+++ /dev/null
@@ -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();
-    }
-}

diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 541fa4f3e7315c90ded496bc82660c78f6f1d3b2..c22e36c993c179a73a9b03cd69ff1de2aded3589 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
index eb4c274c9405badf8a9441dc8ee523c8671ab739..708651d5cd06b6268093af29c127435881d45679 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
index b4425f66ce5f1a1bf6edbf44d6b131f12da37113..fc4ea0a0b2a13ed726827e2978031599fc831e0e 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
+++ b/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;
 

diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs
index a352d51368e073aade7b4d8d86769480011b72bc..fcc3c58fa7b38a6c5b6830972f4ad34920b0bced 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
index a84dff49d8bf674be05ad7537362a79c86953461..ee3b038acc93aac3dd631dcbad1e297ded3e9945 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
index 85f823f7aa94418ab1d10b0b8a1a536b24419000..b75aa311e336a062872a3e13ee605a8b7f707bc1 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
index 31698cf175765c1c9f34db915c0af801eb07a06f..3e839bee50e4c4df16a8fadea8c109795af8cf90 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
index 666a90ce73d3176c38124172ae8634a5e3b0e9be..20d9246739d794344f0408f8d958fa234b6ad408 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
index 4dde86eadbdf4c34a2d3d991ab3b7db782551e50..c918fa929c5459a531ea9f3897f165db08f00235 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
+++ b/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;
 

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs
index efd7857147de8a7ddd3e575a219ae7aac9a1eeac..c2b8efac6fe363a088babde70dfe20ab6a429920 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
index 7e11044dc9367545a49c04ee9d2a682d7fe8f6b1..95908dd703185bfebfe6ba734d15910aa332f41d 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
+++ b/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;
 

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionSpikableSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionSpikableSystem.cs
index b24a07b3359cd9b88dee35cd5a5a6a687cb07ed7..e27063b1b5766f8bd0cb7676570f3dd85acba24f 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionSpikableSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
index 893834f1767f4221a90818a060dd91cfa3240c96..99f8c1a517b8c3f0279a06604800dd220926bfe8 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
index 13246c22e129e1376c7ae4a1c45631620d9f78d0..ac1cc1edd5f82ba7e7f7136b7fc11d0c0d40514e 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index d95490e9a01ae36a8b6bfcef5b2e07f5e47750d2..f9256c8ce7a656352b8592ec994dcc746fc1a45e 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index 103433c9a53d75d50c63aa94eeec4619f5d76c25..e6eaab8a59bb8496c882816ca9dd7d10b6b2ac5c 100644 (file)
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
index e2d3af58f1598573c3cf8a1b837462c05c999ce6..d150854e1eacdf91303c33be5068db9cbd0ab230 100644 (file)
--- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs b/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
index c79dd243329423316a75072594c721f9b799929c..5a216b9753e2a3256b888186f346f230b33adf39 100644 (file)
--- a/Content.Server/Chemistry/ReagentEffects/AdjustReagent.cs
+++ b/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;

diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
index b179adc37003cee3568fcb45d31463f739a881c3..4e2f52d3bcc39ad39fdf7a8fcc27285166eafb9a 100644 (file)
--- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
+++ b/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;

diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 0ef0d621f315add9859e51f5baabb77a111ab4ea..74e88292df35e8980e38942d48f5bb94aff4844f 100644 (file)
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/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;

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SolutionExplosionBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SolutionExplosionBehavior.cs
index 024cb928d09122e4186fc6232028f5c902d3cb57..97ea392450c6222b252bf6e3044289e08f5eb727 100644 (file)
--- a/Content.Server/Destructible/Thresholds/Behaviors/SolutionExplosionBehavior.cs
+++ b/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;
 

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
index 588d26e6f474e26d381fe9bb4a2e28033a8591ec..66f42857cfbda2fa4b980e5506bad8ee94346cda 100644 (file)
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
+++ b/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

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index b3027523f6155523f4dbf53c89e443e2447bd962..91b32af870818faa64c0dcf0a0ec356734c81376 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/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;

diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
index ea0fa7b195ca82e26e32714c9254523619d5edbd..7b96b8b921787cae2ea55294df6a9819f2b44438 100644 (file)
--- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs
+++ b/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;

diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 58757af66036e86bb475c0e755c91e8c6570fcd9..bf54a18f1af7c7218cc0f990cd609060aea3745f 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/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;

diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 6ed72f4a3c9c83402f299d14c312de1380255ce7..cefc918b17b1cd01acd5c607f6b8a7389e08bace 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/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;

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 825c79e2ca15e118ab3437949b5dbafcc1c9ffaf..39485d60f790c12cbe250b382bff19a19a69ae47 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/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;

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 1fb56a7aa1f1d99fb4932e76697d5b1fe092bab3..4870f4286fd4e79dece54f5f0d248703941a557c 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/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;

diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 2f62f54fd160220930f340af97a6f1417763ade9..f7732fec62f04604f28ed5cd7dcd8e449ff5632d 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/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;
 

diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
index ad17b717e5ff1578fb42e9c07e521d3c20d48f1f..8ae9b4b3da2fc41395c5da391e63655bb3cea5ab 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs
+++ b/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;

diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs
index ba8549be8e1ff412d32db0455cb0f3b4378d6451..eaf95a1f1dcab2e9632b80fd9913f43330dd2a99 100644 (file)
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/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;

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 4af1584eae7a2f2efbfa9aab71de7315cfafa191..1c8dbfb4df95dbdd2d3a1638440fa88132e62e00 100644 (file)
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/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;

diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 68d9577dd6508036353e196bc98f58e1f5d270e6..2f34b4285d1a3fe90004843716637827464fd814 100644 (file)
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/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

diff --git a/Content.Server/Lube/LubeSystem.cs b/Content.Server/Lube/LubeSystem.cs
index 6775b858d0d51c9d6c021f4414142e9933e140aa..10a30dc25cbdcac5e03868641c5caa647e4e3671 100644 (file)
--- a/Content.Server/Lube/LubeSystem.cs
+++ b/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;

diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index bb2bce544f244734ac30417ab388f15d7753368f..ce1f285fcf6123da635e17e1c3b69eedc2298349 100644 (file)
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/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;

diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 98f8e305b631b77a6ae4d2167e01d82ad65f801b..7dbaf03a2e0a80fe26cc9053b1f80544c678f6f1 100644 (file)
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/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;

diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 37ad658825b57f0790e153cbecde04a8781f166c..d754bfd05ef80fe4f156e6f6a0ba9e61edab5e37 100644 (file)
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/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;

diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
index fa43c111b9567dbbcae5ab7a08c9714fafd2cfac..311fd234684dbd34c1b392785cea62db042ad1a8 100644 (file)
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
+++ b/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;
 

diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
index 2103cd737fa7abf87be20f9aba18fec29fdc583d..dccd9f3fa4f22efff6ef6d3726c6638b90f61931 100644 (file)
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
+++ b/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;

diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index e967964d90b059945174c23ae231e7780ada2fc0..d8ba19d2388a88de7223dc221bec80b655e7addd 100644 (file)
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index ee0e18e998fab81b7e078ce609224ace3e727707..586f965096c7b516c9297dc9dea970db158e2784 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 2c8a0a768f61a59ae6b083a12afc287ed1896fcd..e493a18ae70aaf154e56c0b4fded73fd5b7799f0 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 6213b4e9c62bf796442596d0d0f97338c7de8441..8406ce222d8c677a5263825fa75ae97730da360d 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index c344f1b325ec5ce88b159d1d71262ddce69174e9..81bba0eb79dc7b686501b93515e25a34f1f08f08 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
index 4817f2c246c0ef32187dad0c4c466bc58e79e5f4..772847e8df2abc8a799fac2f7cd2f36ff541d34d 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
+++ b/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;
 

diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index 96c7f8a64c4bd0f30dbc26fd0ebf1ac8d8bdff9b..276393b728b00195ee424e0790ea59e02d0c41f6 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/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;

diff --git a/Content.Server/Nutrition/EntitySystems/TrashOnEmptySystem.cs b/Content.Server/Nutrition/EntitySystems/TrashOnEmptySystem.cs
index 67f95b276479fc927fba7326972ee7bc996a8524..e702247900468c97922305f16e3343bf6eef448f 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/TrashOnEmptySystem.cs
+++ b/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

diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
index 2bf78b2e9359a9c608aed079edeb3d5b59a4be16..6e0b5cc51579dfde154e48eece48256f261b8691 100644 (file)
--- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs
+++ b/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;

diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs
index b35d936ace07843fae54f5b8b568007fecbe2721..995aeb7700014ee17c84d8f89dda94bab2069567 100644 (file)
--- a/Content.Server/Power/EntitySystems/RiggableSystem.cs
+++ b/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.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Rejuvenate;
 

diff --git a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs
index dd922368dab14cd52e14919fddb6cb6f7ef1fd9c..abaf1c4d948eac8d0f1d9fae411b8698d8607456 100644 (file)
--- a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs
+++ b/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;

diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
index 591fd7f300ba3464948a60fda2d880fc8a54ede0..7d88061f6223581b41403366733522e38b8bedd6 100644 (file)
--- a/Content.Server/Power/Generator/GeneratorSystem.cs
+++ b/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;

diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index 1fef8f1159b08a4a25d6a6f31ed43821657d3c2e..7a801765d85cd0828488c799e902f8f766d4dae0 100644 (file)
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/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;

diff --git a/Content.Server/Tools/ToolSystem.Welder.cs b/Content.Server/Tools/ToolSystem.Welder.cs
index bd626258ecd450893303ca92dd34b886a1871f8b..8a4b881f9f4310ac5d47e1d9da94e66f6a4902a7 100644 (file)
--- a/Content.Server/Tools/ToolSystem.Welder.cs
+++ b/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;

diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs
index a56dabaf8b74d76a702e281af170278c74dc330e..63642338f38714607d37c4069729dc582ea9dd1f 100644 (file)
--- a/Content.Server/Tools/ToolSystem.cs
+++ b/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;

diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 94ddc09e732665121f7ba29ca08c9e1313167b65..ab7831b2a484f8ac1640cb10a7c5e230a394768b 100644 (file)
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/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;

diff --git a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
index c6bc89ffe40189fa5c8090ce0a0a2b288a71c0b8..3d8601cc8e7dca09a0db2cd4cadd607d009b5405 100644 (file)
--- a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs
+++ b/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

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
index 4434c23ba5ef7398144c28a60fcfcc03f385e189..734a01602c8bc4207f5b457adf359c661ba81360 100644 (file)
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs
+++ b/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;

diff --git a/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
new file mode 100644 (file)
index 0000000..f9cd6e8
--- /dev/null
+++ b/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";
+}

diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
new file mode 100644 (file)
index 0000000..b12a5bd
--- /dev/null
+++ b/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";
+}

diff --git a/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
new file mode 100644 (file)
index 0000000..a696244
--- /dev/null
+++ b/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";
+}

diff --git a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
new file mode 100644 (file)
index 0000000..9dfa4a7
--- /dev/null
+++ b/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();
+}

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs b/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs
similarity index 98%
rename from Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs
rename to Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs
index 3b8505efd4098e6ce561d9963be3a56da29ad9b6..3647ddb852118145c52fa77681a4563c4b1599a8 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs
+++ b/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
 {

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs
similarity index 97%
rename from Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
rename to Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs
index 7ca92fab4e91744d368dc33829d9609c6e779015..d4c599557bc49987f7e013f513f8480e7b48e283 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
+++ b/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]
-    private readonly ChemicalReactionSystem _chemistrySystem = default!;
+    [Dependency] private readonly ChemicalReactionSystem _chemistrySystem = default!;
 
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
-    [Dependency]
-    private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ExamineSystem _examine = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ExamineSystemShared _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(
-                $"{nameof(Solution)} could not find the prototype associated with {primaryReagent}.");
+            Log.Error($"{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;

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 595f6ec363ebbb3b4f34d9ec9d3488c39695a68b..a55c53542138e60b1241a52c73613404c26e7d29 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index 7b9cdb51a23ef26a10267dd47df7246df23c6b47..2fb16c7846c4cc70c495dd6283ec72efff39d3e2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 43e3dc9debb5f9de2557feecd01520eecf3c0a0c..92946f6f7a2de5cef066e070fbe245ca6f6a96b7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/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