Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
@@ -115,7 +115,7 @@ namespace Content.Server.Chemistry.Components
        {
            var solutionsSys = EntitySystem.Get<SolutionContainerSystem>();

-            if (!eventArgs.InRangeUnobstructed() || eventArgs.Target == null)
+            if (!eventArgs.CanReach || eventArgs.Target == null)
                return false;

            if (!_entities.HasComponent<SolutionContainerManagerComponent>(Owner))