From: Ɓukasz Lindert Date: Mon, 21 Apr 2025 15:50:07 +0000 (+0200) Subject: Solution drag and drop now checks if container is closed and drainable (#34683) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=04ea0b5e5a04ceb2c377b75ebcc4aa4f1b59e803;p=space-station-14.git Solution drag and drop now checks if container is closed and drainable (#34683) drainable fix --- diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs index b821735265..e850f058a8 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs @@ -2,11 +2,14 @@ using Content.Shared.Chemistry.Components; using Content.Shared.DragDrop; using Content.Shared.FixedPoint; using Content.Shared.Fluids; +using Content.Shared.Nutrition.EntitySystems; namespace Content.Server.Fluids.EntitySystems; public sealed partial class PuddleSystem { + [Dependency] private readonly OpenableSystem _openable = default!; + private void InitializeTransfers() { SubscribeLocalEvent(OnRefillableDragged); @@ -32,6 +35,12 @@ public sealed partial class PuddleSystem if (!_solutionContainerSystem.TryGetDumpableSolution((args.Target, dump, null), out var dumpableSoln, out var dumpableSolution)) return; + if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out _, out _)) + return; + + if (_openable.IsClosed(entity)) + return; + bool success = true; if (dump.Unlimited) {