Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream

# Conflicts: # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-10-03 17:34:08 +03:00
parent b603233480 1c41d3381f
commit ab1e071fdf
284 changed files with 3117 additions and 1387 deletions
--- a/Content.Shared/Fluids/Components/DrainComponent.cs
+++ b/Content.Shared/Fluids/Components/DrainComponent.cs
@@ -52,7 +52,7 @@ public sealed partial class DrainComponent : Component
    /// drain puddles from.
    /// </summary>
    [DataField]
-    public float Range = 2f;
+    public float Range = 2.5f;

    /// <summary>
    /// How often in seconds the drain checks for puddles around it.