Merge remote-tracking branch 'upstream/master'

Content.Shared/_White/Trail/SharedTrailComponent.cs

@@ -60,6 +60,9 @@ public abstract partial class SharedTrailComponent : Component, ITrailSettings
     [DataField("splineRendererType")]
     [ViewVariables(VVAccess.ReadWrite)]
     public virtual TrailSplineRendererType SplineRendererType { get; set; }
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public virtual bool OptionsConcealable { get; set; }
 }
 
 [Serializable, NetSerializable]

Content.Shared/_White/Trail/TrailSettings.cs

@@ -37,6 +37,8 @@ public sealed partial class TrailSettings : ITrailSettings
 
     public TrailSplineRendererType SplineRendererType { get; set; }
 
+    public bool OptionsConcealable { get; set; }
+
     public static void Inject(ITrailSettings into, ITrailSettings from)
     {
         into.Scale = from.Scale;
@@ -51,6 +53,7 @@ public sealed partial class TrailSettings : ITrailSettings
         into.Gradient = from.Gradient;
         into.SplineIteratorType = from.SplineIteratorType;
         into.SplineRendererType = from.SplineRendererType;
+        into.OptionsConcealable = from.OptionsConcealable;
     }
 }
 
@@ -81,6 +84,8 @@ public interface ITrailSettings
     Spline2DType SplineIteratorType { get; set; }
 
     TrailSplineRendererType SplineRendererType { get; set; }
+
+    bool OptionsConcealable { get; set; }
 }
 
 public enum SegmentCreationMethod : byte

Content.Shared/_White/WhiteCVars.cs

@@ -12,6 +12,13 @@ namespace Content.Shared._White;
 [CVarDefs]
 public sealed class WhiteCVars
 {
+    /*
+ * Bullet trails
+    */
+
+    public static readonly CVarDef<bool> ShowTrails =
+        CVarDef.Create("white.show_trails", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
     /*
  * Wiki rules
     */