From 4b50bef5fb8e71dd59f142a9b0b6255af24d370a Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 20 Jun 2022 22:03:54 -0400 Subject: [PATCH] Ignore puddles when prying floor tiles (#8896) --- Content.Server/Tools/ToolSystem.TilePrying.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Tools/ToolSystem.TilePrying.cs b/Content.Server/Tools/ToolSystem.TilePrying.cs index 9a9624f3ef..ed84b0a48d 100644 --- a/Content.Server/Tools/ToolSystem.TilePrying.cs +++ b/Content.Server/Tools/ToolSystem.TilePrying.cs @@ -1,4 +1,5 @@ using System.Threading; +using Content.Server.Fluids.Components; using Content.Server.Tools.Components; using Content.Shared.Interaction; using Content.Shared.Maps; @@ -39,7 +40,7 @@ public sealed partial class ToolSystem private void OnTilePryingAfterInteract(EntityUid uid, TilePryingComponent component, AfterInteractEvent args) { - if (args.Handled || !args.CanReach || args.Target != null) return; + if (args.Handled || !args.CanReach || (args.Target != null && !HasComp(args.Target))) return; if (TryPryTile(args.User, component, args.ClickLocation)) args.Handled = true;