From 7ee91ce4f19f67fb914340bd1ed3e3a73f287aa3 Mon Sep 17 00:00:00 2001 From: Slava0135 <40753025+Slava0135@users.noreply.github.com> Date: Wed, 5 Jul 2023 16:59:48 +0300 Subject: [PATCH] make puddles not appear on space tiles (#17822) --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 2bbf139230..c88acdf6f5 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -27,6 +27,7 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared.Movement.Components; using Content.Shared.Movement.Systems; +using Content.Shared.Maps; namespace Content.Server.Fluids.EntitySystems; @@ -50,6 +51,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly TileFrictionController _tile = default!; [Dependency] private readonly SlowContactsSystem _slowContacts = default!; + [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; public static float PuddleVolume = 1000; @@ -562,7 +564,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem } // If space return early, let that spill go out into the void - if (tileRef.Tile.IsEmpty) + if (tileRef.Tile.IsEmpty || tileRef.IsSpace(_tileDefMan)) { puddleUid = EntityUid.Invalid; return false;