From b73b8cf17267f4d5a4c8c1370ba167296e7faf1b Mon Sep 17 00:00:00 2001 From: Injazz Date: Thu, 9 Apr 2020 20:38:31 +0500 Subject: [PATCH] fixes --- .../Components/Chemistry/SolutionComponent.cs | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index 66843b3b54..81f8656a0e 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -42,15 +42,15 @@ namespace Content.Server.GameObjects.Components.Chemistry private SpriteComponent _spriteComponent; - [ViewVariables] - protected Solution _containedSolution = new Solution(); - protected int _maxVolume; + private Solution _containedSolution = new Solution(); + private int _maxVolume; private SolutionCaps _capabilities; private string _fillInitState; private int _fillInitSteps; private string _fillPathString = "Objects/Chemistry/fillings.rsi"; private ResourcePath _fillPath; private SpriteSpecifier _fillSprite; + /// /// The maximum volume of the container. /// @@ -89,6 +89,13 @@ namespace Content.Server.GameObjects.Components.Chemistry set => _capabilities = value; } + [ViewVariables] + public Solution Solution + { + get => _containedSolution; + set => _containedSolution = value; + } + public IReadOnlyList ReagentList => _containedSolution.Contents; /// @@ -142,15 +149,6 @@ namespace Content.Server.GameObjects.Components.Chemistry } } - /// - protected override void Shutdown() - { - base.Shutdown(); - - _containedSolution.RemoveAllSolution(); - _containedSolution = new Solution(); - } - public void RemoveAllSolution() { _containedSolution.RemoveAllSolution();