diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs index afc8e766e04..a5352a811bf 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs @@ -1,5 +1,5 @@ using System; -using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Chemistry; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs index 2e805767db5..23e9e9facb7 100644 --- a/Content.Client/Entry/IgnoredComponents.cs +++ b/Content.Client/Entry/IgnoredComponents.cs @@ -140,6 +140,13 @@ namespace Content.Client.Entry "Spray", "Vapor", "DamageOnHighSpeedImpact", + "SolutionContainerManager", + "RefillableSolution", + "DrainableSolution", + "ExaminableSolution", + "FitsInDispenser", + "DrawableSolution", + "InjectableSolution", "Barotrauma", "GasSprayer", "GasVapor", diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs index a80c35b10e9..ffa869bb48f 100644 --- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using NUnit.Framework; using Robust.Shared.GameObjects; diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs index 83573a0b8c5..d9b81bfd9ef 100644 --- a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs +++ b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs @@ -1,7 +1,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Nutrition.Components; -using Content.Shared.Chemistry.EntitySystems; using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs index 0607e684d8d..d00d6a837cd 100644 --- a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs +++ b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs @@ -1,7 +1,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Nutrition.Components; -using Content.Shared.Chemistry.EntitySystems; using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.Considerations.Nutrition.Food diff --git a/Content.Server/Administration/AdminVerbSystem.cs b/Content.Server/Administration/AdminVerbSystem.cs index 598485b27b6..42e8c751641 100644 --- a/Content.Server/Administration/AdminVerbSystem.cs +++ b/Content.Server/Administration/AdminVerbSystem.cs @@ -2,6 +2,7 @@ using System.Threading; using Content.Server.Administration.Commands; using Content.Server.Administration.Managers; using Content.Server.Administration.UI; +using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Configurable; using Content.Server.Disposal.Tube.Components; using Content.Server.EUI; @@ -14,7 +15,6 @@ using Content.Server.Players; using Content.Server.Verbs; using Content.Shared.Administration; using Content.Shared.Body.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Interaction.Helpers; using Content.Shared.Popups; using Content.Shared.Verbs; diff --git a/Content.Server/Administration/UI/AdminAddReagentEui.cs b/Content.Server/Administration/UI/AdminAddReagentEui.cs index 0f675cb5cc8..5f433c192fd 100644 --- a/Content.Server/Administration/UI/AdminAddReagentEui.cs +++ b/Content.Server/Administration/UI/AdminAddReagentEui.cs @@ -1,9 +1,9 @@ using Content.Server.Administration.Managers; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.EUI; using Content.Shared.Administration; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Eui; using Robust.Shared.GameObjects; diff --git a/Content.Server/Body/Behavior/StomachBehavior.cs b/Content.Server/Body/Behavior/StomachBehavior.cs index 8631902c3b7..a9f44928260 100644 --- a/Content.Server/Body/Behavior/StomachBehavior.cs +++ b/Content.Server/Body/Behavior/StomachBehavior.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Body.Circulatory; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Body.Networks; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Body/Circulatory/BloodstreamComponent.cs b/Content.Server/Body/Circulatory/BloodstreamComponent.cs index 9b1577abdf6..0e71f884240 100644 --- a/Content.Server/Body/Circulatory/BloodstreamComponent.cs +++ b/Content.Server/Body/Circulatory/BloodstreamComponent.cs @@ -2,10 +2,10 @@ using System; using Content.Server.Atmos; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Respiratory; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Body.Networks; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Body/Metabolism/MetabolizerSystem.cs b/Content.Server/Body/Metabolism/MetabolizerSystem.cs index 1587528ca83..68a83b92356 100644 --- a/Content.Server/Body/Metabolism/MetabolizerSystem.cs +++ b/Content.Server/Body/Metabolism/MetabolizerSystem.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Content.Server.Body.Circulatory; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Body.Components; using Content.Shared.Body.Mechanism; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index cd94fa1951c..1c6a4d36a8a 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; using Content.Server.Atmos; using Content.Server.Atmos.EntitySystems; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Fluids.Components; using Content.Server.Hands.Components; using Content.Server.Plants; @@ -9,7 +10,6 @@ using Content.Server.Popups; using Content.Shared.ActionBlocker; using Content.Shared.Audio; using Content.Shared.Botany; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; using Content.Shared.Interaction; diff --git a/Content.Server/Botany/Components/ProduceComponent.cs b/Content.Server/Botany/Components/ProduceComponent.cs index 2ce8da9ee1e..e9b69d87fe8 100644 --- a/Content.Server/Botany/Components/ProduceComponent.cs +++ b/Content.Server/Botany/Components/ProduceComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 8946ba7bdac..c6d486d9879 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Popups; diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs index 59215a8aee2..cc38818e9c4 100644 --- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs @@ -1,8 +1,7 @@ using Content.Server.Body.Circulatory; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Inventory.Components; using Content.Server.Items; -using Content.Shared.Chemistry; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Foam; using Content.Shared.Inventory; diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index bc607c153bd..bf4ba3f9426 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs @@ -1,8 +1,8 @@ +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Interaction.Components; using Content.Server.Weapon.Melee; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.MobState.Components; using Content.Shared.Popups; diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs index 71eb2af01a8..ff157e6b328 100644 --- a/Content.Server/Chemistry/Components/InjectorComponent.cs +++ b/Content.Server/Chemistry/Components/InjectorComponent.cs @@ -1,10 +1,10 @@ using System; using System.Threading.Tasks; using Content.Server.Body.Circulatory; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Body.Networks; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index d892100ff52..f804d450b19 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -2,15 +2,15 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Dispenser; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Popups; diff --git a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs index 9b46d6316b6..33cf3ff5c4e 100644 --- a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs @@ -1,7 +1,7 @@ using Content.Server.Body.Circulatory; using Content.Server.Body.Respiratory; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Chemistry; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Smoking; using Robust.Server.GameObjects; diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs index 57349a7c5a1..47dde5ef236 100644 --- a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using Content.Server.Atmos.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Coordinates.Helpers; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs similarity index 91% rename from Content.Shared/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs index e2b6c525eea..6e09fd31731 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { /// /// Denotes the solution that can be easily removed through any reagent container. diff --git a/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs similarity index 91% rename from Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs index fcafa8724a0..dd15164f5f9 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { /// /// Denotes the solution that can removed be with syringes. diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs similarity index 87% rename from Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs index 87848932ada..7a23a6a38d7 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { [RegisterComponent] public class ExaminableSolutionComponent: Component diff --git a/Content.Shared/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs similarity index 94% rename from Content.Shared/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs index c3b3ce35285..4fada631682 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { /// Allows the entity with this component to be placed in a SharedReagentDispenserComponent. /// Otherwise it's considered to be too large or the improper shape to fit. diff --git a/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs similarity index 90% rename from Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs index 5e70702bf6c..8d93a4b722e 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { /// /// Denotes a solution which can be added with syringes. diff --git a/Content.Shared/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs similarity index 92% rename from Content.Shared/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs index 4e442141452..7465aef7ed8 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { /// /// Reagents that can be added easily. For example like diff --git a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs similarity index 78% rename from Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs rename to Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs index 2473ac428ce..9ddbc2a09a9 100644 --- a/Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs @@ -1,16 +1,15 @@ using System.Collections.Generic; -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.EntitySystems; +using Content.Shared.Chemistry.Components; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.Chemistry.Components.SolutionManager +namespace Content.Server.Chemistry.Components.SolutionManager { - [NetworkedComponent()] [RegisterComponent] - [DataDefinition] [Friend(typeof(SolutionContainerSystem))] public class SolutionContainerManagerComponent : Component { diff --git a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs index 1bbb2552279..0dc40ef2a07 100644 --- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs @@ -1,10 +1,10 @@ using System; using System.Threading.Tasks; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.UserInterface; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs index 00d6dda6661..f4b506ed154 100644 --- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs +++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs index 50fc5c250d0..5b678109938 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs @@ -1,9 +1,8 @@ using Content.Shared.Verbs; using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.Components.SolutionManager; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Content.Shared.Chemistry.Components.SolutionManager; using Robust.Shared.IoC; using Content.Shared.ActionBlocker; diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs index 90728479f19..b13ca0d869a 100644 --- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs +++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs @@ -1,5 +1,4 @@ using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Weapons.Melee; using JetBrains.Annotations; diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index 760cb111026..e4affc46781 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index 9a90dfaf0c2..27182c1c64a 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -1,10 +1,9 @@ using Content.Shared.Verbs; using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.Components.SolutionManager; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.ActionBlocker; namespace Content.Server.Chemistry.EntitySystems diff --git a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs index 57e14195ad9..27e249d66f3 100644 --- a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Chemistry.Components; using Content.Server.Popups; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs similarity index 97% rename from Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs rename to Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs index 06bee7b4e5b..f58bd879eb7 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs @@ -1,10 +1,10 @@ using System.Diagnostics.CodeAnalysis; +using Content.Server.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; using Robust.Shared.GameObjects; -namespace Content.Shared.Chemistry.EntitySystems +namespace Content.Server.Chemistry.EntitySystems { public partial class SolutionContainerSystem { diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs similarity index 90% rename from Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs rename to Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs index c8f8583d974..97527e47e78 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; @@ -16,7 +17,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; -namespace Content.Shared.Chemistry.EntitySystems +namespace Content.Server.Chemistry.EntitySystems { /// /// This event alerts system that the solution was changed @@ -318,41 +319,4 @@ namespace Content.Shared.Chemistry.EntitySystems return reagentQuantity; } } - - [Serializable, NetSerializable] - public enum SolutionContainerVisuals : byte - { - VisualState - } - - [Serializable, NetSerializable] - public class SolutionContainerVisualState - { - public readonly Color Color; - - /// - /// Represents how full the container is, as a fraction equivalent to /. - /// - public readonly byte FilledVolumeFraction; - - // do we really need this just to save three bytes? - public float FilledVolumePercent => (float) FilledVolumeFraction / byte.MaxValue; - - /// - /// Sets the solution state of a container. - /// - /// - /// The fraction of the container's volume that is filled. - public SolutionContainerVisualState(Color color, float filledVolumeFraction) - { - Color = color; - FilledVolumeFraction = (byte) (byte.MaxValue * filledVolumeFraction); - } - } - - public enum SolutionContainerLayers : byte - { - Fill, - Base - } } diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs index 8c4dc6b977c..7de40d52243 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Body.Circulatory; using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.Components.SolutionManager; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs index e2721e6dae0..6a277cb3fe6 100644 --- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 05668d22264..18cbbaf87e1 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Physics; using Content.Shared.Vapor; diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index 5539d8868a1..6605363fbf5 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -1,9 +1,9 @@ using System; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Coordinates.Helpers; using Content.Shared.Audio; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Sound; using JetBrains.Annotations; diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs index 15b08f0a29d..8dda50a59a5 100644 --- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Explosion; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reaction; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs index bab1f09a853..5927c86afab 100644 --- a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs +++ b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs index bdeb0127703..d5c8f768f52 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs @@ -1,5 +1,5 @@ +using Content.Server.Chemistry.EntitySystems; using Content.Server.Fluids.Components; -using Content.Shared.Chemistry.EntitySystems; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index 4f4a5cba6e5..c2ace0bae3d 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -1,9 +1,9 @@ using System; using System.Threading.Tasks; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.ActionBlocker; using Content.Shared.Audio; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Popups; diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index 33a0bb84094..95e8dd33010 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Content.Server.Chemistry.EntitySystems; using Content.Server.DoAfter; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index 457b86f6f2b..5b0905b6c27 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; +using Content.Server.Chemistry.EntitySystems; using Content.Server.DoAfter; using Content.Server.Fluids.EntitySystems; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Fluids/Components/SpillExtensions.cs b/Content.Server/Fluids/Components/SpillExtensions.cs index bc160842f01..a07ccfdd145 100644 --- a/Content.Server/Fluids/Components/SpillExtensions.cs +++ b/Content.Server/Fluids/Components/SpillExtensions.cs @@ -1,9 +1,9 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Coordinates.Helpers; using Content.Server.Fluids.EntitySystems; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/Fluids/Components/SpillableComponent.cs b/Content.Server/Fluids/Components/SpillableComponent.cs index 7b0af8c69c4..943e04d81d5 100644 --- a/Content.Server/Fluids/Components/SpillableComponent.cs +++ b/Content.Server/Fluids/Components/SpillableComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.EntitySystems; using Content.Shared.Interaction; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index 4f507aae3e3..45a046bb930 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -4,7 +4,6 @@ using Content.Server.Chemistry.Components; using Content.Server.Chemistry.EntitySystems; using Content.Shared.ActionBlocker; using Content.Shared.Audio; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Cooldown; using Content.Shared.Fluids; diff --git a/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs b/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs index ec95d5c32f3..59261fa8661 100644 --- a/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs +++ b/Content.Server/Fluids/EntitySystems/EvaporationSystem.cs @@ -1,5 +1,5 @@ -using Content.Server.Fluids.Components; -using Content.Shared.Chemistry.EntitySystems; +using Content.Server.Chemistry.EntitySystems; +using Content.Server.Fluids.Components; using Content.Shared.Chemistry.Reagent; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 70871910377..6e273f1aaf5 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Construction.Components; using Content.Server.Fluids.Components; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Directions; using Content.Shared.Examine; diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 8c22cea40ee..94217010d29 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Content.Server.Act; using Content.Server.Chat.Managers; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Popups; @@ -13,7 +14,6 @@ using Content.Shared.Acts; using Content.Shared.Body.Components; using Content.Shared.Body.Part; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Kitchen; diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 0f9e4691671..626122697b6 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -1,5 +1,5 @@ +using Content.Server.Chemistry.EntitySystems; using Content.Server.Kitchen.Components; -using Content.Shared.Chemistry.EntitySystems; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index e99321c2412..648d6a0a58f 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Kitchen.Components; @@ -8,7 +9,6 @@ using Content.Server.Kitchen.Events; using Content.Server.Power.Components; using Content.Server.Stack; using Content.Server.UserInterface; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Kitchen.Components; using Content.Shared.Popups; diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 31b38c3f98d..0204b2e9a71 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -1,8 +1,6 @@ using Content.Server.Body.Behavior; using Content.Server.Fluids.Components; using Content.Shared.Body.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; using Content.Shared.Interaction; @@ -21,6 +19,8 @@ using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using System.Linq; using System.Threading.Tasks; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; namespace Content.Server.Nutrition.Components { diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 411662dbc06..ccde83d80b1 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Server.Body.Behavior; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Shared.Body.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs index f82eaea5238..862e0a420c7 100644 --- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs +++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Hands.Components; using Content.Server.Items; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; using Content.Shared.Interaction; diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs index e4e7531380e..d7ef2d48383 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -1,8 +1,8 @@ +using Content.Server.Chemistry.EntitySystems; using Content.Server.Fluids.Components; using Content.Server.Nutrition.Components; using Content.Server.Popups; using Content.Shared.Audio; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 3a458f96818..89bebffc912 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -1,7 +1,7 @@ +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Fluids.Components; using Content.Server.Nutrition.Components; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Nutrition.Components; using Content.Shared.Throwing; using JetBrains.Annotations; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs index f62a179d889..8a0307159a6 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs @@ -1,5 +1,4 @@ using Content.Server.Nutrition.Components; -using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Interaction; using Content.Shared.Smoking; using Content.Shared.Temperature; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index 1be6fb88cc7..b07547f5eff 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Body.Circulatory; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Nutrition.Components; using Content.Shared.Chemistry; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; -using Content.Shared.Interaction; using Content.Shared.Smoking; using Content.Shared.Temperature; using Robust.Server.GameObjects; diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs index 1be44b05457..b954b518740 100644 --- a/Content.Server/PowerCell/PowerCellSystem.cs +++ b/Content.Server/PowerCell/PowerCellSystem.cs @@ -1,6 +1,6 @@ +using Content.Server.Chemistry.EntitySystems; using Content.Server.PowerCell.Components; using Content.Shared.ActionBlocker; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Tools/ToolSystem.Welder.cs b/Content.Server/Tools/ToolSystem.Welder.cs index 08bbb847561..65884be0a29 100644 --- a/Content.Server/Tools/ToolSystem.Welder.cs +++ b/Content.Server/Tools/ToolSystem.Welder.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.Components.SolutionManager; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Items; using Content.Server.Tools.Components; using Content.Shared.Audio; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; using Content.Shared.Interaction; diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs index c8a7337c340..06bdcbaa42e 100644 --- a/Content.Server/Tools/ToolSystem.cs +++ b/Content.Server/Tools/ToolSystem.cs @@ -2,13 +2,12 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.Atmos.EntitySystems; +using Content.Server.Chemistry.EntitySystems; using Content.Server.DoAfter; using Content.Server.Popups; using Content.Server.Tools.Components; using Content.Shared.ActionBlocker; using Content.Shared.Audio; -using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Tools; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 6a69eb155ff..74c58859b94 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Body.Circulatory; using Content.Server.Chemistry.Components; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Cooldown; using Content.Server.Weapon.Melee.Components; -using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage; using Content.Shared.Hands; using Content.Shared.Interaction; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs index fa4ec5e164c..6f5ffa1ecf8 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.Chemistry.EntitySystems; using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Shared/Chemistry/SolutionVisuals.cs b/Content.Shared/Chemistry/SolutionVisuals.cs new file mode 100644 index 00000000000..23d11e7f151 --- /dev/null +++ b/Content.Shared/Chemistry/SolutionVisuals.cs @@ -0,0 +1,43 @@ +using System; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; + +namespace Content.Shared.Chemistry +{ + [Serializable, NetSerializable] + public enum SolutionContainerVisuals : byte + { + VisualState + } + + [Serializable, NetSerializable] + public class SolutionContainerVisualState + { + public readonly Color Color; + + /// + /// Represents how full the container is, as a fraction equivalent to /. + /// + public readonly byte FilledVolumeFraction; + + // do we really need this just to save three bytes? + public float FilledVolumePercent => (float) FilledVolumeFraction / byte.MaxValue; + + /// + /// Sets the solution state of a container. + /// + /// + /// The fraction of the container's volume that is filled. + public SolutionContainerVisualState(Color color, float filledVolumeFraction) + { + Color = color; + FilledVolumeFraction = (byte) (byte.MaxValue * filledVolumeFraction); + } + } + + public enum SolutionContainerLayers : byte + { + Fill, + Base + } +}