Merge remote-tracking branch 'upstream/master'

2024-06-04 14:07:10 +03:00
parent edd5ffebf3 7477ee2acf
commit bcf4074eca
22 changed files with 141 additions and 42 deletions
--- a/Content.Server/_White/Trail/TrailComponent.cs
+++ b/Content.Server/_White/Trail/TrailComponent.cs
@@ -21,6 +21,7 @@ public sealed partial class TrailComponent : SharedTrailComponent
        TexurePath = defaultTrail.TexurePath;
        Gradient = defaultTrail.Gradient;
        GradientIteratorType = defaultTrail.GradientIteratorType;
+        OptionsConcealable = defaultTrail.OptionsConcealable;
    }

    public override Vector2 Gravity { get; set; }
@@ -48,4 +49,6 @@ public sealed partial class TrailComponent : SharedTrailComponent
    public override TrailSplineRendererType SplineRendererType { get; set; }

    public override Spline4DType GradientIteratorType { get; set; }
+
+    public override bool OptionsConcealable { get; set; }
 }