diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs index 8d0bbbd067..8b489d27fc 100644 --- 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 30c15e8da3..5213747588 100644 --- 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 f18dd3e99d..b75e46ad90 100644 --- 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 0c439227ff..e1e644f84f 100644 --- 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 6c6c618d17..e8f58a50cf 100644 --- 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 07b51016cc..c2b7f9d25c 100644 --- 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 709602a1b3..3a419b93f6 100644 --- 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 5cbd931a70..1edf958c95 100644 --- 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 5fa386aae7..5136b347a2 100644 --- 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 b57eeaf299..4a90c3c3d8 100644 --- 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 acc0e2f0c3..0cc7883808 100644 --- 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 deae38e5c8..9855e66cfe 100644 --- 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 fdfff42d7c..c87dcf4eae 100644 --- 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 9ed92da8fc..39403288e9 100644 --- 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 042c90857b..a66efbac08 100644 --- 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 1b4f85ae28..5233b0166c 100644 --- 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 e33931315a..1d793887ee 100644 --- 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 b2cad7e012..752d8e4004 100644 --- 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 586fa9c2b0..506b88f78b 100644 --- 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 f66e6f02ac..289f383d29 100644 --- 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 e4ee6bfc0b..d0f8c4ceb5 100644 --- 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; /// /// 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 index 2ecb7e8c43..0000000000 --- a/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Content.Server.Chemistry.Components.SolutionManager -{ - /// - /// Denotes the solution that can removed be with syringes. - /// - [RegisterComponent] - public sealed partial class DrawableSolutionComponent : Component - { - /// - /// Solution name that can be removed with syringes. - /// - [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 index 52b8affb24..0000000000 --- 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 index 17fc34b506..0000000000 --- a/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Content.Server.Chemistry.Components.SolutionManager -{ - /// - /// Denotes a solution which can be added with syringes. - /// - [RegisterComponent] - public sealed partial class InjectableSolutionComponent : Component - { - - /// - /// Solution name which can be added with syringes. - /// - [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 index d76237a80b..0000000000 --- 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 Solutions = new(); - } -} diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs index 541fa4f3e7..c22e36c993 100644 --- 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 eb4c274c94..708651d5cd 100644 --- 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 b4425f66ce..fc4ea0a0b2 100644 --- 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 a352d51368..fcc3c58fa7 100644 --- 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 a84dff49d8..ee3b038acc 100644 --- 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 85f823f7aa..b75aa311e3 100644 --- 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 31698cf175..3e839bee50 100644 --- 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 666a90ce73..20d9246739 100644 --- 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 4dde86eadb..c918fa929c 100644 --- 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 efd7857147..c2b8efac6f 100644 --- 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 7e11044dc9..95908dd703 100644 --- 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 b24a07b335..e27063b1b5 100644 --- 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 893834f176..99f8c1a517 100644 --- 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 13246c22e1..ac1cc1edd5 100644 --- 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 d95490e9a0..f9256c8ce7 100644 --- 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 103433c9a5..e6eaab8a59 100644 --- 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 e2d3af58f1..d150854e1e 100644 --- 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 c79dd24332..5a216b9753 100644 --- 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 b179adc370..4e2f52d3bc 100644 --- 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 0ef0d621f3..74e88292df 100644 --- 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 024cb928d0..97ea392450 100644 --- 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 588d26e6f4..66f42857cf 100644 --- 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 b3027523f6..91b32af870 100644 --- 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 ea0fa7b195..7b96b8b921 100644 --- 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 58757af660..bf54a18f1a 100644 --- 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 6ed72f4a3c..cefc918b17 100644 --- 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 825c79e2ca..39485d60f7 100644 --- 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 1fb56a7aa1..4870f4286f 100644 --- 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 2f62f54fd1..f7732fec62 100644 --- 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 ad17b717e5..8ae9b4b3da 100644 --- 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 ba8549be8e..eaf95a1f1d 100644 --- 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 4af1584eae..1c8dbfb4df 100644 --- 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 68d9577dd6..2f34b4285d 100644 --- 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 6775b858d0..10a30dc25c 100644 --- 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 bb2bce544f..ce1f285fcf 100644 --- 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 98f8e305b6..7dbaf03a2e 100644 --- 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 37ad658825..d754bfd05e 100644 --- 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 fa43c111b9..311fd23468 100644 --- 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 2103cd737f..dccd9f3fa4 100644 --- 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 e967964d90..d8ba19d238 100644 --- 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 ee0e18e998..586f965096 100644 --- 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 2c8a0a768f..e493a18ae7 100644 --- 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 6213b4e9c6..8406ce222d 100644 --- 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 c344f1b325..81bba0eb79 100644 --- 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 4817f2c246..772847e8df 100644 --- 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 96c7f8a64c..276393b728 100644 --- 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 67f95b2764..e702247900 100644 --- 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 2bf78b2e93..6e0b5cc515 100644 --- 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 b35d936ace..995aeb7700 100644 --- 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 dd922368da..abaf1c4d94 100644 --- 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 591fd7f300..7d88061f62 100644 --- 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 1fef8f1159..7a801765d8 100644 --- 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 bd626258ec..8a4b881f9f 100644 --- 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 a56dabaf8b..63642338f3 100644 --- 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 94ddc09e73..ab7831b2a4 100644 --- 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 c6bc89ffe4..3d8601cc8e 100644 --- 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 4434c23ba5..734a01602c 100644 --- 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 index 0000000000..f9cd6e8e8e --- /dev/null +++ b/Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs @@ -0,0 +1,15 @@ +namespace Content.Shared.Chemistry.Components.SolutionManager; + +/// +/// Denotes the solution that can removed be with syringes. +/// +[RegisterComponent] +public sealed partial class DrawableSolutionComponent : Component +{ + /// + /// Solution name that can be removed with syringes. + /// + [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 index 0000000000..b12a5bd6e4 --- /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 index 0000000000..a696244956 --- /dev/null +++ b/Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs @@ -0,0 +1,16 @@ +namespace Content.Shared.Chemistry.Components.SolutionManager; + +/// +/// Denotes a solution which can be added with syringes. +/// +[RegisterComponent] +public sealed partial class InjectableSolutionComponent : Component +{ + + /// + /// Solution name which can be added with syringes. + /// + [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 index 0000000000..9dfa4a71fd --- /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 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 3b8505efd4..3647ddb852 100644 --- 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 7ca92fab4e..d4c599557b 100644 --- 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; /// /// 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 595f6ec363..a55c535421 100644 --- 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 7b9cdb51a2..2fb16c7846 100644 --- 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 43e3dc9deb..92946f6f7a 100644 --- 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