From 9d1c01493848790f2776d010643640f201ca6cd2 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:00:48 +0000
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=B9=D0=BB=D1=8B=20=D0=BE=D1=82=20=D0=BF?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8C=20(#270)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - add: Bring back bullet trails.

* - add: Cvar, thinner trails.

* - add: Add option.
---
 .../Options/UI/Tabs/GraphicsTab.xaml          |  1 +
 .../Options/UI/Tabs/GraphicsTab.xaml.cs       |  7 +++++-
 Content.Client/_White/Trail/TrailOverlay.cs   | 12 ++++++++++
 Content.Client/_White/Trail/TrailSystem.cs    |  2 ++
 Content.Server/_White/Trail/TrailComponent.cs |  3 +++
 .../_White/Trail/SharedTrailComponent.cs      |  3 +++
 Content.Shared/_White/Trail/TrailSettings.cs  |  5 ++++
 Content.Shared/_White/WhiteCVars.cs           |  7 ++++++
 .../Ammunition/Projectiles/antimateriel.yml   |  2 +-
 .../Ammunition/Projectiles/caseless_rifle.yml |  6 ++---
 .../Guns/Ammunition/Projectiles/grenade.yml   |  6 ++---
 .../Ammunition/Projectiles/heavy_rifle.yml    |  4 ++--
 .../Ammunition/Projectiles/light_rifle.yml    | 10 ++++----
 .../Guns/Ammunition/Projectiles/magnum.yml    | 12 +++++-----
 .../Guns/Ammunition/Projectiles/pistol.yml    | 10 ++++----
 .../Guns/Ammunition/Projectiles/rifle.yml     | 14 +++++------
 .../Guns/Ammunition/Projectiles/shotgun.yml   | 18 +++++++--------
 .../Guns/Ammunition/Projectiles/trail.yml     | 23 +++++++++++++++++++
 18 files changed, 103 insertions(+), 42 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/trail.yml

diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index c40efb809b..843a3f084a 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -40,6 +40,7 @@
             <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
             <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
             <CheckBox Name="LogInChatCheckBox" Text="Логировать действия в чат" />
+            <CheckBox Name="ShowTrailsCheckBox" Text="Отображать трейлы от пуль" />
         </BoxContainer>
         <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <Button Name="ApplyButton"
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index c8f0aa4018..220b10d68b 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -74,6 +74,7 @@ namespace Content.Client.Options.UI.Tabs
             ParallaxLowQualityCheckBox.OnToggled += OnCheckBoxToggled;
             FpsCounterCheckBox.OnToggled += OnCheckBoxToggled;
             LogInChatCheckBox.OnToggled += OnCheckBoxToggled;
+            ShowTrailsCheckBox.OnToggled += OnCheckBoxToggled;
             ApplyButton.OnPressed += OnApplyButtonPressed;
             VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync);
             FullscreenCheckBox.Pressed = ConfigIsFullscreen;
@@ -86,6 +87,7 @@ namespace Content.Client.Options.UI.Tabs
             ParallaxLowQualityCheckBox.Pressed = _cfg.GetCVar(CCVars.ParallaxLowQuality);
             FpsCounterCheckBox.Pressed = _cfg.GetCVar(CCVars.HudFpsCounterVisible);
             LogInChatCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.LogChatActions);
+            ShowTrailsCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.ShowTrails);
             ViewportWidthSlider.Value = _cfg.GetCVar(CCVars.ViewportWidth);
 
             _cfg.OnValueChanged(CCVars.ViewportMinimumWidth, _ => UpdateViewportWidthRange());
@@ -119,6 +121,7 @@ namespace Content.Client.Options.UI.Tabs
             _cfg.SetCVar(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox.Pressed);
             _cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed);
             _cfg.SetCVar(WhiteCVars.LogChatActions, LogInChatCheckBox.Pressed);
+            _cfg.SetCVar(WhiteCVars.ShowTrails, ShowTrailsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ViewportWidth, (int) ViewportWidthSlider.Value);
 
             _cfg.SaveToFile();
@@ -149,6 +152,7 @@ namespace Content.Client.Options.UI.Tabs
             var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality);
             var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible);
             var isLogInChatSame = LogInChatCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.LogChatActions);
+            var isShowTrailsSame = ShowTrailsCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.ShowTrails);
             var isWidthSame = (int) ViewportWidthSlider.Value == _cfg.GetCVar(CCVars.ViewportWidth);
 
             ApplyButton.Disabled = isVSyncSame &&
@@ -162,7 +166,8 @@ namespace Content.Client.Options.UI.Tabs
                                    isPLQSame &&
                                    isFpsCounterVisibleSame &&
                                    isWidthSame &&
-                                   isLogInChatSame;
+                                   isLogInChatSame &&
+                                   isShowTrailsSame;
         }
 
         private bool ConfigIsFullscreen =>
diff --git a/Content.Client/_White/Trail/TrailOverlay.cs b/Content.Client/_White/Trail/TrailOverlay.cs
index 2af717bb15..2fc3e5460b 100644
--- a/Content.Client/_White/Trail/TrailOverlay.cs
+++ b/Content.Client/_White/Trail/TrailOverlay.cs
@@ -1,6 +1,8 @@
 using Content.Client._White.Trail.Line.Manager;
+using Content.Shared._White;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 
@@ -11,6 +13,9 @@ public sealed class TrailOverlay : Overlay
     private readonly IPrototypeManager _protoManager;
     private readonly IResourceCache _cache;
     private readonly ITrailLineManager _lineManager;
+    private readonly IConfigurationManager _cfg;
+
+    private bool _showTrails;
 
     private readonly Dictionary<string, ShaderInstance?> _shaderDict;
     private readonly Dictionary<string, Texture?> _textureDict;
@@ -20,13 +25,17 @@ public sealed class TrailOverlay : Overlay
     public TrailOverlay(
         IPrototypeManager protoManager,
         IResourceCache cache,
+        IConfigurationManager cfg,
         ITrailLineManager lineManager
     )
     {
         _protoManager = protoManager;
         _cache = cache;
+        _cfg = cfg;
         _lineManager = lineManager;
 
+        _cfg.OnValueChanged(WhiteCVars.ShowTrails, val => _showTrails = val, true);
+
         _shaderDict = new Dictionary<string, ShaderInstance?>();
         _textureDict = new Dictionary<string, Texture?>();
 
@@ -38,6 +47,9 @@ public sealed class TrailOverlay : Overlay
         var handle = args.WorldHandle;
         foreach (var item in _lineManager.Lines)
         {
+            if (!_showTrails && item.Settings.OptionsConcealable)
+                continue;
+
             item.Render(handle, GetCachedTexture(item.Settings.TexurePath ?? ""));
         }
     }
diff --git a/Content.Client/_White/Trail/TrailSystem.cs b/Content.Client/_White/Trail/TrailSystem.cs
index 6cffd39a27..ed89174414 100644
--- a/Content.Client/_White/Trail/TrailSystem.cs
+++ b/Content.Client/_White/Trail/TrailSystem.cs
@@ -2,6 +2,7 @@ using Content.Client._White.Trail.Line.Manager;
 using Content.Shared._White.Trail;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -23,6 +24,7 @@ public sealed class TrailSystem : EntitySystem
             new TrailOverlay(
                 IoCManager.Resolve<IPrototypeManager>(),
                 IoCManager.Resolve<IResourceCache>(),
+                IoCManager.Resolve<IConfigurationManager>(),
                 _lineManager
             ));
 
diff --git a/Content.Server/_White/Trail/TrailComponent.cs b/Content.Server/_White/Trail/TrailComponent.cs
index af89ff82cb..f17eda76bc 100644
--- 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; }
 }
diff --git a/Content.Shared/_White/Trail/SharedTrailComponent.cs b/Content.Shared/_White/Trail/SharedTrailComponent.cs
index 2c733914cd..e26878554b 100644
--- a/Content.Shared/_White/Trail/SharedTrailComponent.cs
+++ b/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]
diff --git a/Content.Shared/_White/Trail/TrailSettings.cs b/Content.Shared/_White/Trail/TrailSettings.cs
index deaae60ff5..0e84e99c7d 100644
--- a/Content.Shared/_White/Trail/TrailSettings.cs
+++ b/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
diff --git a/Content.Shared/_White/WhiteCVars.cs b/Content.Shared/_White/WhiteCVars.cs
index 4fa197a10e..98c13db7d3 100644
--- a/Content.Shared/_White/WhiteCVars.cs
+++ b/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
     */
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
index 9e6ffbaf53..b16de5c87a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -1,6 +1,6 @@
 - type: entity
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   id: BulletAntiMateriel
   name: bullet (.60 anti-materiel)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 5ce0bf82fe..4297a73e0c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletCaselessRifle
   name: bullet (.25 caseless)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletCaselessRiflePractice
   name: bullet (.25 caseless practice)
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: BulletCaselessRifleRubber
   name: bullet (.25 caseless rubber)
-  parent: BaseBulletRubber
+  parent: [BaseBulletRubber, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
index 47064b955c..d114205a81 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -2,7 +2,7 @@
   id: PelletClusterRubber
   name: pellet (ball, Rubber)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -23,7 +23,7 @@
   id: PelletClusterLethal
   name: pellet (ball, Lethal)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -41,7 +41,7 @@
   id: PelletClusterIncendiary
   name: pellet (ball, incendiary)
   noSpawn: true
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index be6a07e486..89317b2f0c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletHeavyRifle
   name: bullet (.20 rifle)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletMinigun
   name: minigun bullet (.10 rifle)
-  parent: BulletHeavyRifle
+  parent: [BulletHeavyRifle, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 3a0df2ac6c..a7b3bcc977 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletLightRifle
   name: bullet (.20 rifle)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletLightRiflePractice
   name: bullet (.20 rifle practice)
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: BulletLightRifleRubber
   name: bullet (.20 rifle rubber)
-  parent: BaseBulletRubber
+  parent: [BaseBulletRubber, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -33,7 +33,7 @@
 
 - type: entity
   id: BulletLightRifleIncendiary
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   name: bullet (.20 rifle incendiary)
   noSpawn: true
   components:
@@ -45,7 +45,7 @@
 
 - type: entity
   id: BulletLightRifleUranium
-  parent: BaseBulletUranium
+  parent: [BaseBulletUranium, BaseBulletTrail]
   name: bullet (.20 rifle uranium)
   noSpawn: true
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 8ed25153e2..7457891c6c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletMagnum
   name: bullet (.45 magnum)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletMagnumPractice
   name: bullet (.45 magnum practice)
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: BulletMagnumRubber
   name: bullet (.45 magnum rubber)
-  parent: BaseBulletRubber
+  parent: [BaseBulletRubber, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -36,7 +36,7 @@
 
 - type: entity
   id: BulletMagnumIncendiary
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   name: bullet (.45 magnum incendiary)
   noSpawn: true
   components:
@@ -49,7 +49,7 @@
 - type: entity
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)
-  parent: BaseBulletAP
+  parent: [BaseBulletAP, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -61,7 +61,7 @@
 - type: entity
   id: BulletMagnumUranium
   name: bullet (.45 magnum uranium)
-  parent: BaseBulletUranium
+  parent: [BaseBulletUranium, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 086a8dc914..2af39b276a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletPistol
   name: bullet (.35 auto)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletPistolPractice
   name: bullet (.35 auto practice)
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: BulletPistolRubber
   name: bullet (.35 auto rubber)
-  parent: BaseBulletRubber
+  parent: [BaseBulletRubber, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -33,7 +33,7 @@
 
 - type: entity
   id: BulletPistolIncendiary
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   name: bullet (.35 auto incendiary)
   noSpawn: true
   components:
@@ -45,7 +45,7 @@
 
 - type: entity
   id: BulletPistolUranium
-  parent: BaseBulletUranium
+  parent: [BaseBulletUranium, BaseBulletTrail]
   name: bullet (.35 auto uranium)
   noSpawn: true
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 2113916cf5..f626d2ccb4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BulletRifle
   name: bullet (0.20 rifle)
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -12,7 +12,7 @@
 - type: entity
   id: BulletRiflePractice
   name: bullet (0.20 rifle practice)
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -23,7 +23,7 @@
 - type: entity
   id: BulletRifleRubber
   name: bullet (0.20 rifle rubber)
-  parent: BaseBulletRubber
+  parent: [BaseBulletRubber, BaseBulletTrail]
   noSpawn: true
   components:
   - type: Projectile
@@ -33,7 +33,7 @@
 
 - type: entity
   id: BulletRifleIncendiary
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   name: bullet (0.20 rifle incendiary)
   noSpawn: true
   components:
@@ -42,10 +42,10 @@
       types:
         Blunt: 2
         Heat: 15
-  
+
 - type: entity
   id: BulletRifleUranium
-  parent: BaseBulletUranium
+  parent: [BaseBulletUranium, BaseBulletTrail]
   name: bullet (0.20 rifle uranium)
   noSpawn: true
   components:
@@ -54,4 +54,4 @@
       types:
         Radiation: 7
         Piercing: 8
-        
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 82dcf26dcc..698e6b7b19 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -2,7 +2,7 @@
   id: PelletShotgunSlug
   name: pellet (.50 slug)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -16,7 +16,7 @@
   id: PelletShotgunBeanbag
   name: beanbag (.50)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -33,7 +33,7 @@
   id: PelletShotgun
   name: pellet (.50)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -47,7 +47,7 @@
   id: PelletShotgunIncendiary
   name: pellet (.50 incendiary)
   noSpawn: true
-  parent: BaseBulletIncendiary
+  parent: [BaseBulletIncendiary, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -64,7 +64,7 @@
   id: PelletShotgunPractice
   name: pellet (.50 practice)
   noSpawn: true
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -78,7 +78,7 @@
   id: PelletShotgunImprovised
   name: improvised pellet
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -93,7 +93,7 @@
   id: PelletShotgunTranquilizer
   name: pellet (.50 tranquilizer)
   noSpawn: true
-  parent: BaseBulletPractice
+  parent: [BaseBulletPractice, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -167,7 +167,7 @@
   id: PelletShotgunUranium
   name: pellet (.50 uranium)
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -182,7 +182,7 @@
   id: PelletGrapeshot #tally fucking ho
   name: grapeshot pellet
   noSpawn: true
-  parent: BaseBullet
+  parent: [BaseBullet, BaseBulletTrail]
   components:
   - type: Sprite
     noRot: false
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/trail.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/trail.yml
new file mode 100644
index 0000000000..fb85f1e1e8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/trail.yml
@@ -0,0 +1,23 @@
+- type: entity
+  noSpawn: true
+  abstract: true
+  id: BaseBulletTrail
+  name: BaseBulletTrail
+  components:
+  - type: Trail
+    splineIteratorType: CatmullRom
+    splineRendererType: Continuous
+    creationMethod: OnMove
+    lengthStep: 0.1
+    scale: 0.03, 0.0
+    lifetime: 1
+    randomWalk: 0.03, 0.001
+    gravity: 0.001, 0.005
+    texturePath: /Textures/White/Effects/Trails/Continuous/trail.png
+    gradientIteratorType: Bezier
+    gradient:
+      - 1, 1, 1, 0
+      - 1, 1, 1, 2
+      - 1, 1, 1, 0
+      - 1, 1, 1, 0
+    optionsConcealable: true