From a21b52a79a6b415040ad2c5d4906b71c75e6d86a Mon Sep 17 00:00:00 2001
From: Rinary <rinary.super@gmail.com>
Date: Tue, 24 Mar 2026 23:21:22 +0200
Subject: [PATCH] Revert "Revert shooting 3.0 and (Hotfix) Migration.yml entry
 for removed Lionhunter Rifle (#3909)"

This reverts commit 2b3982de31fca6d9e57381927a11a211f20e1935.

# Conflicts:
#	Resources/Locale/en-US/_Starlight/escape-menu/ui/options-menu.ftl
---
 .../CombatMode/CombatModeIndicatorsOverlay.cs | 180 ++++++++++++----
 Content.Client/CombatMode/CombatModeSystem.cs | 111 +++++++++-
 Content.Client/Options/UI/OptionsMenu.xaml    |  12 +-
 Content.Client/Options/UI/OptionsMenu.xaml.cs |  14 +-
 .../Options/UI/Tabs/GraphicsTab.xaml          |  56 +++--
 .../Options/UI/Tabs/GraphicsTab.xaml.cs       |   4 +
 Content.Client/Options/UI/Tabs/MiscTab.xaml   |  33 ++-
 .../Options/UI/Tabs/MiscTab.xaml.cs           |  27 +--
 .../Weapons/Ranged/Systems/GunSystem.cs       |  54 ++++-
 .../Options/UI/OptionsSightPreview.xaml       |  16 ++
 .../Options/UI/OptionsSightPreview.xaml.cs    | 113 ++++++++++
 .../_Starlight/Options/UI/Tabs/UITab.xaml     |  79 +++++++
 .../_Starlight/Options/UI/Tabs/UITab.xaml.cs  | 194 ++++++++++++++++++
 .../Weapons/Ranged/Systems/GunSystem.cs       |  20 +-
 .../Weapons/Ranged/Components/GunComponent.cs |   8 +
 .../Components/GunWieldBonusComponent.cs      |  14 ++
 .../Weapons/Ranged/Systems/SharedGunSystem.cs |  38 ++++
 .../Wieldable/SharedWieldableSystem.cs        |   6 +
 .../CCVar/StarlightCCVars.Graphics.cs         |   6 +
 .../CCVar/StarlightCCVars.Interface.cs        |  13 --
 .../_Starlight/CCVar/StarlightCCVars.UI.cs    |  27 +++
 .../_Starlight/CombatMode/SightPrototype.cs   |  45 ++++
 .../escape-menu/ui/options-menu.ftl           |  14 ++
 .../en-US/_Starlight/overlay/sights_melee.ftl |   2 +
 .../_Starlight/overlay/sights_ranged.ftl      |   8 +
 .../_Starlight/overlay/sights_universal.ftl   |   6 +
 .../_Starlight/ui-options/ui-options-tts.ftl  |  15 --
 .../en-US/escape-menu/ui/options-menu.ftl     |   3 -
 .../Catalog/Fills/Lockers/heads.yml           |   2 +-
 .../Catalog/Fills/Lockers/security.yml        |   2 +-
 .../Weapons/Guns/Basic/base_wieldable.yml     |  11 +-
 .../Objects/Weapons/Guns/Pistols/pistols.yml  |  22 +-
 .../Weapons/Guns/Projectiles/hitscan.yml      |   6 +
 .../Weapons/Guns/Revolvers/revolvers.yml      |  14 +-
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |   4 +-
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |  17 +-
 .../Entities/Structures/Walls/walls.yml       |   8 +
 .../Entities/Structures/base_structure.yml    |   2 +
 .../Prototypes/Roles/Jobs/CentComm/cburn.yml  |   2 +-
 .../Catalog/Fills/Crates/armory.yml           |   2 +-
 .../Catalog/Fills/Lockers/security.yml        |   2 +-
 .../VendingMachines/Inventories/salvage.yml   |   4 +-
 .../_Starlight/Entities/Effects/weapon.yml    |  55 +++++
 .../Weapons/Guns/Battery/battery_guns.yml     |  68 +++---
 .../Objects/Weapons/Guns/LMGs/lmgs.yml        |   7 +-
 .../Objects/Weapons/Guns/Pistols/pistols.yml  | 144 +++++--------
 .../Weapons/Guns/Projectiles/effects.yml      |  24 ---
 .../Weapons/Guns/Projectiles/hitscan.yml      |  28 ++-
 .../Objects/Weapons/Guns/Rifles/rifles.yml    |  65 +-----
 .../Objects/Weapons/Guns/SMGs/smgs.yml        |   9 +-
 .../Weapons/Guns/Shotguns/shotguns.yml        |   1 -
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |  56 ++++-
 .../_Starlight/Overlay/sights_melee.yml       |  17 ++
 .../_Starlight/Overlay/sights_ranged.yml      |  82 ++++++++
 .../_Starlight/Overlay/sights_universal.yml   |  53 +++++
 .../SecuritySOP/HeadOfSecurity.xml            |   2 +-
 .../crosshair_pointers.rsi/melee_sight.png    | Bin 16635 -> 0 bytes
 .../Effects/bullet_hole.rsi/bullet_hole.png   | Bin 0 -> 110 bytes
 .../Effects/bullet_hole.rsi/meta.json         |  17 ++
 .../Effects/impact_sparks.rsi/effect.png      | Bin 0 -> 207 bytes
 .../Effects/impact_sparks.rsi/meta.json       |  22 ++
 .../Misc/crosshair_pointers.rsi/arrows.png    | Bin 0 -> 228 bytes
 .../crosshair_pointers.rsi/arrows_dot.png     | Bin 0 -> 270 bytes
 .../crosshair_pointers.rsi/arrows_outer.png   | Bin 0 -> 217 bytes
 .../arrows_outer_double.png                   | Bin 0 -> 250 bytes
 .../Misc/crosshair_pointers.rsi/basic.png     | Bin 0 -> 167 bytes
 .../Misc/crosshair_pointers.rsi/basic_dot.png | Bin 0 -> 167 bytes
 .../Misc/crosshair_pointers.rsi/brackets.png  | Bin 0 -> 252 bytes
 .../Misc/crosshair_pointers.rsi/cross_dot.png | Bin 0 -> 291 bytes
 .../crosshair_pointers.rsi/cross_small.png    | Bin 0 -> 184 bytes
 .../crosshair_pointers.rsi/cross_small2.png   | Bin 0 -> 237 bytes
 .../Misc/crosshair_pointers.rsi/dot.png       | Bin 0 -> 177 bytes
 .../crosshair_pointers.rsi/double_dot.png     | Bin 0 -> 197 bytes
 .../crosshair_pointers.rsi/melee_sight.png    | Bin 0 -> 621 bytes
 .../Misc/crosshair_pointers.rsi/meta.json     | 143 +++++++++++++
 .../Misc/crosshair_pointers.rsi/triple.png    | Bin 0 -> 186 bytes
 .../crosshair_pointers.rsi/triple_dot.png     | Bin 0 -> 251 bytes
 .../gun_bolt_sight.png                        | Bin
 .../crosshair_pointers_big.rsi}/gun_sight.png | Bin
 .../crosshair_pointers_big.rsi}/meta.json     |   3 -
 Resources/_Starlight/migration.yml            |   7 +
 git                                           |   0
 82 files changed, 1584 insertions(+), 435 deletions(-)
 create mode 100644 Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml
 create mode 100644 Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml.cs
 create mode 100644 Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml
 create mode 100644 Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml.cs
 delete mode 100644 Content.Shared/_Starlight/CCVar/StarlightCCVars.Interface.cs
 create mode 100644 Content.Shared/_Starlight/CombatMode/SightPrototype.cs
 create mode 100644 Resources/Locale/en-US/_Starlight/overlay/sights_melee.ftl
 create mode 100644 Resources/Locale/en-US/_Starlight/overlay/sights_ranged.ftl
 create mode 100644 Resources/Locale/en-US/_Starlight/overlay/sights_universal.ftl
 delete mode 100644 Resources/Locale/en-US/_Starlight/ui-options/ui-options-tts.ftl
 create mode 100644 Resources/Prototypes/_Starlight/Entities/Effects/weapon.yml
 delete mode 100644 Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml
 create mode 100644 Resources/Prototypes/_Starlight/Overlay/sights_melee.yml
 create mode 100644 Resources/Prototypes/_Starlight/Overlay/sights_ranged.yml
 create mode 100644 Resources/Prototypes/_Starlight/Overlay/sights_universal.yml
 delete mode 100644 Resources/Textures/Interface/Misc/crosshair_pointers.rsi/melee_sight.png
 create mode 100644 Resources/Textures/_Starlight/Effects/bullet_hole.rsi/bullet_hole.png
 create mode 100644 Resources/Textures/_Starlight/Effects/bullet_hole.rsi/meta.json
 create mode 100644 Resources/Textures/_Starlight/Effects/impact_sparks.rsi/effect.png
 create mode 100644 Resources/Textures/_Starlight/Effects/impact_sparks.rsi/meta.json
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_dot.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer_double.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic_dot.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/brackets.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_dot.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small2.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/dot.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/double_dot.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/melee_sight.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/meta.json
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple.png
 create mode 100644 Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple_dot.png
 rename Resources/Textures/{Interface/Misc/crosshair_pointers.rsi => _Starlight/Interface/Misc/crosshair_pointers_big.rsi}/gun_bolt_sight.png (100%)
 rename Resources/Textures/{Interface/Misc/crosshair_pointers.rsi => _Starlight/Interface/Misc/crosshair_pointers_big.rsi}/gun_sight.png (100%)
 rename Resources/Textures/{Interface/Misc/crosshair_pointers.rsi => _Starlight/Interface/Misc/crosshair_pointers_big.rsi}/meta.json (85%)
 delete mode 100644 git

diff --git a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
index d852e20c4577..a1ca51d1184e 100644
--- a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
+++ b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
@@ -6,7 +6,14 @@
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
 using Robust.Shared.Enums;
-using Robust.Shared.Utility;
+
+#region Starlight
+using Content.Shared._Starlight.CombatMode;
+using Robust.Shared.Prototypes;
+using SixLabors.ImageSharp.PixelFormats;
+using Robust.Shared.Graphics.RSI;
+using Content.Client.Weapons.Ranged.Systems;
+#endregion
 
 namespace Content.Client.CombatMode;
 
@@ -23,42 +30,48 @@ public sealed class CombatModeIndicatorsOverlay : Overlay
     private readonly IEyeManager _eye;
     private readonly CombatModeSystem _combat;
     private readonly HandsSystem _hands = default!;
-
-    private readonly Texture _gunSight;
-    private readonly Texture _gunBoltSight;
-    private readonly Texture _meleeSight;
+    private readonly IClyde _clyde = default!; // Starlight-edit
+
+    #region Starlight
+    private readonly SightPrototype? _gunSight;
+    private readonly SightPrototype? _gunBoltSight;
+    private readonly SightPrototype? _meleeSight;
+    private readonly float? _scale;
+    private readonly float? _offset;
+    private readonly Color? _main;
+    private readonly Color? _second;
+    private readonly bool _rotation = true;
+    #endregion
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-    public Color MainColor = Color.White.WithAlpha(0.3f);
-    public Color StrokeColor = Color.Black.WithAlpha(0.5f);
-    public float Scale = 0.6f;  // 1 is a little big
-
-    public CombatModeIndicatorsOverlay(IInputManager input, IEntityManager entMan,
-            IEyeManager eye, CombatModeSystem combatSys, HandsSystem hands)
+    public CombatModeIndicatorsOverlay(IInputManager input, IEntityManager entMan, IPrototypeManager prototypes,
+            IEyeManager eye, CombatModeSystem combatSys, HandsSystem hands, IClyde clyde, SightPrototype gunSight, SightPrototype meleeSight, float scale, float offset, Color main, Color second, bool rotation = true) // Starlight-edit
     {
         _inputManager = input;
         _entMan = entMan;
         _eye = eye;
         _combat = combatSys;
         _hands = hands;
-
-        var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
-        _gunSight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/crosshair_pointers.rsi"),
-            "gun_sight"));
-        _gunBoltSight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/crosshair_pointers.rsi"),
-            "gun_bolt_sight"));
-        _meleeSight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/crosshair_pointers.rsi"),
-             "melee_sight"));
+        // Starlight-start: replace Texture to Proto
+        _gunSight = gunSight;
+        _meleeSight = meleeSight;
+        _clyde = clyde;
+        _scale = scale;
+        _offset = offset;
+        _main = main;
+        _second = second;
+        _rotation = rotation;
+
+        if (_gunSight.BoltVariant != null)
+            prototypes.TryIndex(_gunSight.BoltVariant, out _gunBoltSight);
+        // Starlight-end
     }
 
-    protected override bool BeforeDraw(in OverlayDrawArgs args)
-    {
-        if (!_combat.IsInCombatMode())
-            return false;
-
-        return base.BeforeDraw(in args);
-    }
+    // Starlight-start: Make it lambda
+    protected override bool BeforeDraw(in OverlayDrawArgs args) 
+        => !_combat.IsInCombatMode() ? false : base.BeforeDraw(in args);
+    // Starlight-end
 
     protected override void Draw(in OverlayDrawArgs args)
     {
@@ -68,28 +81,121 @@ protected override void Draw(in OverlayDrawArgs args)
             return;
 
         var handEntity = _hands.GetActiveHandEntity();
-        var isHandGunItem = _entMan.HasComponent<GunComponent>(handEntity);
+        var isHandGunItem = _entMan.TryGetComponent<GunComponent>(handEntity, out var gun); // Starlight-edit
         var isGunBolted = true;
         if (_entMan.TryGetComponent(handEntity, out ChamberMagazineAmmoProviderComponent? chamber))
             isGunBolted = chamber.BoltClosed ?? true;
 
-
         var mousePos = mouseScreenPosition.Position;
         var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
         var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
 
-        var sight = isHandGunItem ? (isGunBolted ? _gunSight : _gunBoltSight) : _meleeSight;
-        DrawSight(sight, args.ScreenHandle, mousePos, limitedScale * Scale);
+        #region Starlight
+
+        var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
+
+        var sight = isHandGunItem ? (isGunBolted || _gunBoltSight == null ? _gunSight : _gunBoltSight) : _meleeSight;
+        if (sight != null)
+        {
+            if (!sight.ShowCursor)
+                _clyde.SetCursor(_clyde.CreateCursor(new SixLabors.ImageSharp.Image<Rgba32>(32, 32), Vector2i.Zero));
+            else
+                _clyde.SetCursor(null);
+
+            var scale = limitedScale * Math.Clamp(_scale ?? 0.6f, 0f, 1f);
+
+            var eyePos = _eye.CurrentEye.Position;
+            var eyeScreen = _eye.MapToScreen(eyePos);
+            var rot = MathF.Atan2(eyeScreen.Y - mousePos.Y, eyeScreen.X - mousePos.X);
+            rot -= MathF.PI / 2f;
+            var rsiState = spriteSys.RsiStateLike(sight.Sprite);
+            if (rsiState.IsAnimated && rsiState.AnimationFrameCount >= 3)
+            {
+
+                var currentAngle = 0f;
+                if (isHandGunItem && handEntity != null)
+                    currentAngle = (float)_entMan.System<GunSystem>().GetCurrentAngle(handEntity.Value).Degrees;
+
+                var bracket1 = rsiState.GetFrame(RsiDirection.South, 0); // Left
+                var sightTexture = rsiState.GetFrame(RsiDirection.South, 1); // Center
+                var bracket2 = rsiState.GetFrame(RsiDirection.South, 2); // Right
+
+                Texture? bracket3 = null; // Down
+                Texture? bracket4 = null; // Up
+
+                if (rsiState.AnimationFrameCount >= 4)
+                    bracket3 = rsiState.GetFrame(RsiDirection.South, 3);
+
+                if (rsiState.AnimationFrameCount >= 5)
+                    bracket4 = rsiState.GetFrame(RsiDirection.South, 4);
+
+                var offset = CalculateOffset(currentAngle, (eyeScreen.Position - mousePos).Length(), scale);
+                DrawSightPartial(sightTexture, bracket1, bracket2, args.ScreenHandle, rot, mousePos, scale,_main ?? sight.MainColor,_second ?? sight.StrokeColor, offset, bracket3, bracket4);
+            }
+            else
+            {
+                var sightTexture = spriteSys.Frame0(sight.Sprite);
+                DrawOverlayPart(sightTexture, args.ScreenHandle, mousePos, scale, _main ?? sight.MainColor, _second ?? sight.StrokeColor);
+            }
+        }
+
+        #endregion
+    }
+
+    #region Starlight
+    private float CalculateOffset(float currentAngle, float distance, float scale)
+    {
+        var angleRad = currentAngle * MathF.PI / 180f;
+        var offset = MathF.Tan(angleRad) * distance;
+        offset *= scale;
+        // So if slider is in center: 0.5 + 0.5 = 1, meaning no change. If slider is at minimum: 0 + 0.5 = 0.5, meaning offset is halved. If slider is at maximum: 1 + 0.5 = 1.5, meaning offset is increased by 50%.
+        offset *= (_offset ?? 0.5f) + 0.5f;
+        return offset;
+    }
+
+    private void DrawSightPartial(Texture sight, Texture bracket1, Texture bracket2, DrawingHandleScreen screen, float rotation, Vector2 centerPos, float scale, Color mainColor, Color strokeColor, float offset, Texture? bracket3 = null, Texture? bracket4 = null)
+    {
+        DrawOverlayPart(sight, screen, centerPos, scale, mainColor, strokeColor);
+
+        var bracketSize1 = bracket1.Size * scale;
+        var bracketSize2 = bracket2.Size * scale;
+
+        if (_rotation)
+            screen.SetTransform(Matrix3x2.CreateRotation(rotation, centerPos));
+
+        var bracket1Pos = centerPos + new Vector2(-offset - bracketSize1.X * 0.5f, 0f);
+        var bracket2Pos = centerPos + new Vector2(offset + bracketSize2.X * 0.5f, 0f);
+        DrawOverlayPart(bracket1, screen, bracket1Pos, scale, mainColor, strokeColor);
+        DrawOverlayPart(bracket2, screen, bracket2Pos, scale, mainColor, strokeColor);
+
+        if (bracket3 != null)
+        {
+            var bracket3Pos = centerPos + new Vector2(0f, offset + bracketSize1.Y * 0.5f);
+            DrawOverlayPart(bracket3, screen, bracket3Pos, scale, mainColor, strokeColor);
+        }
+
+        if (bracket4 != null)
+        {
+            var bracket4Pos = centerPos + new Vector2(0f, -offset - bracketSize2.Y * 0.5f);
+            DrawOverlayPart(bracket4, screen, bracket4Pos, scale, mainColor, strokeColor);
+        }
     }
 
-    private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
+    private static void DrawOverlayPart(Texture texture, DrawingHandleScreen screen, Vector2 position, float scale, Color mainColor, Color strokeColor)
     {
-        var sightSize = sight.Size * scale;
-        var expandedSize = sightSize + new Vector2(7f, 7f);
+        var size = texture.Size * scale;
+        screen.DrawTextureRect(texture,
+            UIBox2.FromDimensions(position - size * 0.5f, size), strokeColor);
+        screen.DrawTextureRect(texture,
+            UIBox2.FromDimensions(position - size * 0.5f - new Vector2(3f, 3f), size + new Vector2(7f, 7f)), mainColor);
+    }
 
-        screen.DrawTextureRect(sight,
-            UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), StrokeColor);
-        screen.DrawTextureRect(sight,
-            UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), MainColor);
+    private sealed class DummyCursor : ICursor
+    {
+        public void Dispose()
+        {
+        }
     }
+
+    #endregion
 }
diff --git a/Content.Client/CombatMode/CombatModeSystem.cs b/Content.Client/CombatMode/CombatModeSystem.cs
index 2c938b1b9378..3a91d7186584 100644
--- a/Content.Client/CombatMode/CombatModeSystem.cs
+++ b/Content.Client/CombatMode/CombatModeSystem.cs
@@ -7,6 +7,12 @@
 using Robust.Client.Player;
 using Robust.Shared.Configuration;
 
+#region Starlight
+using Content.Shared._Starlight.CombatMode;
+using Content.Shared.Starlight.CCVar;
+using Robust.Shared.Prototypes;
+#endregion
+
 namespace Content.Client.CombatMode;
 
 public sealed class CombatModeSystem : SharedCombatModeSystem
@@ -16,12 +22,27 @@ public sealed class CombatModeSystem : SharedCombatModeSystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
     [Dependency] private readonly IEyeManager _eye = default!;
+    #region Starlight
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IClyde _clyde = default!;
+    #endregion
 
     /// <summary>
     /// Raised whenever combat mode changes.
     /// </summary>
     public event Action<bool>? LocalPlayerCombatModeUpdated;
 
+    #region Starlight
+    private bool _lastState = false;
+    private string _rangedSight = "GunSight";
+    private string _meleeSight = "MeleeSight";
+    private float _scale = 0.6f;
+    private float _offset = 0.5f;
+    private bool _rotation = true;
+    private Color _main = Color.White.WithAlpha(0.3f);
+    private Color _second = Color.Black.WithAlpha(0.5f);
+    #endregion
+
     public override void Initialize()
     {
         base.Initialize();
@@ -29,6 +50,15 @@ public override void Initialize()
         SubscribeLocalEvent<CombatModeComponent, AfterAutoHandleStateEvent>(OnHandleState);
 
         Subs.CVar(_cfg, CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged, true);
+        // Starlight-start
+        Subs.CVar(_cfg, StarlightCCVars.RangedSight, OnRangedSightChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.RangedSightScale, OnRangedSightScaleChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.RangedSightOffset, OnRangedSightOffsetChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.SightMainColor, OnSightMainColorChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.SightSecondColor, OnSightSecondColorChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.MeleeSight, OnMeleeSightChanged, true);
+        Subs.CVar(_cfg, StarlightCCVars.SightRotation, OnRotationChanged, true);
+        // Starlight-end
     }
 
     private void OnHandleState(EntityUid uid, CombatModeComponent component, ref AfterAutoHandleStateEvent args)
@@ -72,23 +102,88 @@ private void UpdateHud(EntityUid entity)
         }
 
         var inCombatMode = IsInCombatMode();
+        // Starlight-start
+        if (!inCombatMode)
+            _clyde.SetCursor(null);
+        // Starlight-end
         LocalPlayerCombatModeUpdated?.Invoke(inCombatMode);
     }
 
-    private void OnShowCombatIndicatorsChanged(bool isShow)
+    private void OnShowCombatIndicatorsChanged(bool isShow) // Starlight-edit: moved into another method
+        => UpdateCombatIndicators(isShow);
+
+    #region Starlight
+
+    private void OnRangedSightChanged(string sight)
+    {
+        _rangedSight = sight;
+        UpdateCombatIndicators();
+    }
+
+    private void OnRangedSightScaleChanged(int scale)
+    {
+        float fScale = scale * 0.01f;
+        _scale = fScale;
+        UpdateCombatIndicators();
+    }
+
+    private void OnRangedSightOffsetChanged(int offset)
+    {
+        float fOffset = offset * 0.01f;
+        _offset = fOffset;
+        UpdateCombatIndicators();
+    }
+
+    private void OnSightMainColorChanged(string color)
+    {
+        _main = Color.FromHex(color).WithAlpha(0.3f);
+        UpdateCombatIndicators();
+    }
+
+    private void OnSightSecondColorChanged(string color)
     {
-        if (isShow)
+        _second = Color.FromHex(color).WithAlpha(0.5f);
+        UpdateCombatIndicators();
+    }
+
+    private void OnMeleeSightChanged(string sight)
+    {
+        _meleeSight = sight;
+        UpdateCombatIndicators();
+    }
+
+    private void OnRotationChanged(bool rotation)
+    {
+        _rotation = rotation;
+        UpdateCombatIndicators();
+    }
+
+    private void UpdateCombatIndicators(bool? isShow = null)
+    {
+        if (isShow != null && isShow != _lastState)
+            _lastState = isShow.Value;
+
+        if ((isShow == null || !_lastState) && _overlayManager.HasOverlay<CombatModeIndicatorsOverlay>())
+            _overlayManager.RemoveOverlay<CombatModeIndicatorsOverlay>();
+        if ((isShow == null || _lastState) && _prototypeManager.TryIndex<SightPrototype>(_rangedSight, out var ranged) && _prototypeManager.TryIndex<SightPrototype>(_meleeSight, out var melee))
         {
             _overlayManager.AddOverlay(new CombatModeIndicatorsOverlay(
                 _inputManager,
                 EntityManager,
+                _prototypeManager,
                 _eye,
                 this,
-                EntityManager.System<HandsSystem>()));
-        }
-        else
-        {
-            _overlayManager.RemoveOverlay<CombatModeIndicatorsOverlay>();
+                EntityManager.System<HandsSystem>(),
+                _clyde,
+                ranged,
+                melee,
+                _scale,
+                _offset,
+                _main,
+                _second,
+                _rotation));
         }
     }
-}
+
+    #endregion
+}
\ No newline at end of file
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
index 21c4b64ce8fa..4c0536f10866 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -1,9 +1,13 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-            xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-            Title="{Loc 'ui-options-title'}"
-            MinSize="800 450">
+<DefaultWindow
+    xmlns="https://spacestation14.io"
+    xmlns:stabs="clr-namespace:Content.Client._Starlight.Options.UI.Tabs"
+    xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+    Title="{Loc 'ui-options-title'}"
+    MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
         <tabs:MiscTab Name="MiscTab" />
+        <!--  Starlight-edit: UI Tab  -->
+        <stabs:UITab Name="UITab" />
         <tabs:GraphicsTab Name="GraphicsTab" />
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index 9efd04fd0b81..b745b665d7bb 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -15,12 +15,15 @@ public OptionsMenu()
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
+            // Starlight-edit: UI Tab
             Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-misc"));
-            Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics"));
-            Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
-            Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
-            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));
-            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-admin"));
+            Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-ui"));
+            Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-graphics"));
+            Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-controls"));
+            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-audio"));
+            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-accessibility"));
+            Tabs.SetTabTitle(6, Loc.GetString("ui-options-tab-admin"));
+            // Starlight-end
 
             UpdateTabs();
         }
@@ -32,6 +35,7 @@ public void UpdateTabs()
 
             GraphicsTab.Control.ReloadValues();
             MiscTab.Control.ReloadValues();
+            UITab.Control.ReloadValues(); // Starlight-edit: UI Tab
             AccessibilityTab.Control.ReloadValues();
             AudioTab.Control.ReloadValues();
             AdminOptionsTab.Control.ReloadValues();
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index fcda72d94bd6..82b56894b50c 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -1,39 +1,51 @@
-<tabs:GraphicsTab xmlns="https://spacestation14.io"
-          xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-          xmlns:ui="clr-namespace:Content.Client.Options.UI">
+<tabs:GraphicsTab
+    xmlns="https://spacestation14.io"
+    xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+    xmlns:ui="clr-namespace:Content.Client.Options.UI">
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Margin="8 8 8 8">
-                <!-- Display -->
-                <Label Text="{Loc 'ui-options-display-label'}" StyleClasses="LabelKeyText"/>
+            <BoxContainer Margin="8,8,8,8" Orientation="Vertical">
+                <!--  Display  -->
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-display-label'}" />
                 <CheckBox Name="VSyncCheckBox" Text="{Loc 'ui-options-vsync'}" />
                 <CheckBox Name="FullscreenCheckBox" Text="{Loc 'ui-options-fullscreen'}" />
 
-                <!-- Quality -->
-                <Label Text="{Loc 'ui-options-quality-label'}" StyleClasses="LabelKeyText"/>
+                <!--  Quality  -->
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-quality-label'}" />
                 <ui:OptionDropDown Name="DropDownLightingQuality" Title="{Loc 'ui-options-lighting-label'}" />
                 <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
                 <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
                 <CheckBox Name="AmbientOcclusionCheckBox" Text="{Loc 'ui-options-ambient-occlusion'}" />
-                <!-- Starlight -->
-                <CheckBox Name="TracesCheckBox"
-                          Text="{Loc 'ui-options-trace'}"
-                          ToolTip="{Loc 'ui-options-trace-tooltip'}" />
-                <!-- Interface -->
-                <Label Text="{Loc 'ui-options-interface-label'}" StyleClasses="LabelKeyText"/>
+                <!--  Starlight  -->
+                <CheckBox
+                    Name="TracesCheckBox"
+                    Text="{Loc 'ui-options-trace'}"
+                    ToolTip="{Loc 'ui-options-trace-tooltip'}" />
+                <CheckBox
+                    Name="HolesCheckBox"
+                    Text="{Loc 'ui-options-holes'}"
+                    ToolTip="{Loc 'ui-options-holes-tooltip'}" />
+                <CheckBox
+                    Name="SparksCheckBox"
+                    Text="{Loc 'ui-options-sparks'}"
+                    ToolTip="{Loc 'ui-options-sparks-tooltip'}" />
+                <!--  Interface  -->
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-interface-label'}" />
                 <ui:OptionDropDown Name="DropDownUIScale" Title="{Loc 'ui-options-scale-label'}" />
                 <CheckBox Name="ViewportStretchCheckBox" Text="{Loc 'ui-options-vp-stretch'}" />
                 <ui:OptionSlider Name="ViewportScaleSlider" Title="{Loc ui-options-vp-scale}" />
                 <ui:OptionSlider Name="ViewportWidthSlider" Title="{Loc ui-options-vp-width}" />
-                <CheckBox Name="IntegerScalingCheckBox"
-                          Text="{Loc 'ui-options-vp-integer-scaling'}"
-                          ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <CheckBox
+                    Name="IntegerScalingCheckBox"
+                    Text="{Loc 'ui-options-vp-integer-scaling'}"
+                    ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
                 <ui:OptionDropDown Name="DropDownFilterMode" Title="{Loc 'ui-options-filter-label'}" />
-                <CheckBox Name="ViewportVerticalFitCheckBox"
-                          Text="{Loc 'ui-options-vp-vertical-fit'}"
-                          ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
-                <!-- Misc -->
-                <Label Text="{Loc 'ui-options-misc-label'}" StyleClasses="LabelKeyText"/>
+                <CheckBox
+                    Name="ViewportVerticalFitCheckBox"
+                    Text="{Loc 'ui-options-vp-vertical-fit'}"
+                    ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
+                <!--  Misc  -->
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-misc-label'}" />
                 <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
             </BoxContainer>
         </ScrollContainer>
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 36d58c6c9f3d..6ce1ba4067bf 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -70,7 +70,11 @@ public GraphicsTab()
         Control.AddOption(new OptionIntegerScaling(Control, _cfg, IntegerScalingCheckBox));
         Control.AddOptionCheckBox(CCVars.ViewportScaleRender, ViewportLowResCheckBox, invert: true);
         Control.AddOptionCheckBox(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox);
+        // Starlight-start
         Control.AddOptionCheckBox(StarlightCCVars.TracesEnabled, TracesCheckBox);
+        Control.AddOptionCheckBox(StarlightCCVars.HolesEnabled, HolesCheckBox);
+        Control.AddOptionCheckBox(StarlightCCVars.SparksEnabled, SparksCheckBox);
+        // Starlight-end
         Control.AddOptionCheckBox(CCVars.HudFpsCounterVisible, FpsCounterCheckBox);
 
         Control.Initialize();
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 1f56c4f465a2..ff5357c6cd61 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -1,30 +1,25 @@
-<tabs:MiscTab xmlns="https://spacestation14.io"
-              xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:ui="clr-namespace:Content.Client.Options.UI">
+<tabs:MiscTab
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+    xmlns:ui="clr-namespace:Content.Client.Options.UI">
     <BoxContainer Orientation="Vertical">
-        <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
-            <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
-                <Label Text="{Loc 'ui-options-general-ui-style'}"
-                       StyleClasses="LabelKeyText"/>
-                <ui:OptionDropDown Name="DropDownHudTheme" Title="{Loc 'ui-options-hud-theme'}" />
-                <ui:OptionDropDown Name="DropDownHudLayout" Title="{Loc 'ui-options-hud-layout'}" />
-                <ui:OptionSlider Name="SeparatedChatWidthSlider" Title="Seperated Style Chat Minimum Width" />
-                <Label Text="{Loc 'ui-options-general-discord'}"
-                       StyleClasses="LabelKeyText"/>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer
+                Margin="8,8,8,8"
+                Orientation="Vertical"
+                VerticalExpand="True">
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-general-discord'}" />
                 <CheckBox Name="DiscordRich" Text="{Loc 'ui-options-discordrich'}" />
-                <Label Text="{Loc 'ui-options-general-speech'}"
-                       StyleClasses="LabelKeyText"/>
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-general-speech'}" />
                 <CheckBox Name="ShowOocPatronColor" Text="{Loc 'ui-options-show-ooc-patron-color'}" />
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
-                <Label Text="{Loc 'ui-options-general-cursor'}"
-                       StyleClasses="LabelKeyText"/>
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-general-cursor'}" />
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
-                <Label Text="{Loc 'ui-options-general-storage'}"
-                       StyleClasses="LabelKeyText"/>
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-general-storage'}" />
                 <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
                 <CheckBox Name="StaticStorageUI" Text="{Loc 'ui-options-static-storage-ui'}" />
                 <!-- <CheckBox Name="ToggleWalk" Text="{Loc 'ui-options-hotkey-toggle-walk'}" /> -->
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index d79f9a3b0b3a..5ffd413752da 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -1,8 +1,4 @@
-using System.Linq;
-using Content.Client.UserInterface.Screens;
-using Content.Shared.CCVar;
-using Content.Shared.HUD;
-using Content.Shared.Starlight.CCVar;
+using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -16,34 +12,16 @@ namespace Content.Client.Options.UI.Tabs;
 public sealed partial class MiscTab : Control
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public MiscTab()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
-        themes.Sort();
-        var themeEntries = new List<OptionDropDownCVar<string>.ValueOption>();
-        foreach (var gear in themes)
-        {
-            themeEntries.Add(new OptionDropDownCVar<string>.ValueOption(gear.ID, Loc.GetString(gear.Name)));
-        }
-
-        var layoutEntries = new List<OptionDropDownCVar<string>.ValueOption>();
-        foreach (var layout in Enum.GetValues(typeof(ScreenType)))
-        {
-            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, Loc.GetString($"ui-options-hud-layout-{layout.ToString()!.ToLower()}")));
-        }
-
         // Channel can be null in replays so.
         // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
         ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
 
-        Control.AddOptionDropDown(CVars.InterfaceTheme, DropDownHudTheme, themeEntries);
-        Control.AddOptionDropDown(CCVars.UILayout, DropDownHudLayout, layoutEntries);
-
         Control.AddOptionCheckBox(CVars.DiscordEnabled, DiscordRich);
         Control.AddOptionCheckBox(CCVars.ShowOocPatronColor, ShowOocPatronColor);
         Control.AddOptionCheckBox(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox);
@@ -53,9 +31,6 @@ public MiscTab()
         Control.AddOptionCheckBox(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox);
         Control.AddOptionCheckBox(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox);
         Control.AddOptionCheckBox(CCVars.StaticStorageUI, StaticStorageUI);
-        //starlight
-        Control.AddOptionSlider(StarlightCCVars.ChatSeparatedMinWidth, SeparatedChatWidthSlider, 300, 580);
-        //starlight end
 
         Control.Initialize();
     }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 2a5b815dadd7..116fe6229cee 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -31,13 +31,14 @@
 #region Starlight
 using Content.Client.DisplacementMap;
 using Content.Shared._Starlight.Effects;
-using Content.Shared._Starlight.Weapon.Components;
 using Content.Shared.Mech.Components;
 using Content.Shared.Starlight.Utility;
 using Content.Shared.Starlight.CCVar;
 using Content.Shared.Weapons.Hitscan.Events;
 using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
+using Robust.Shared.Random;
+using Content.Shared._Starlight.Combat.Ranged.Pierce;
 #endregion Starlight
 
 namespace Content.Client.Weapons.Ranged.Systems;
@@ -62,20 +63,34 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly DisplacementMapSystem _displacement = default!;
-#endregion Starlight
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public static readonly EntProtoId HitscanProto = "HitscanEffect";
     public const string ImpactProto = "ImpactEffect";
+    public const string BulletHoleProto = "BulletHoleEffect";
+    public const string SparksProto = "ImpactSparksEffect";
     private DisplacementEffect _displacementEffect = null!;
     private bool _tracesEnabled = true;
+    private bool _holesEnabled = true;
+    private bool _sparksEnabled = true;
     public override void Shutdown()
     {
         base.Shutdown();
         _cfg.UnsubValueChanged(StarlightCCVars.TracesEnabled, OnTracesEnabledChanged);
+        _cfg.UnsubValueChanged(StarlightCCVars.HolesEnabled, OnHolesEnabledChanged);
+        _cfg.UnsubValueChanged(StarlightCCVars.SparksEnabled, OnSparksEnabledChanged);
     }
     private void OnTracesEnabledChanged(bool tracesEnabled)
         => _tracesEnabled = tracesEnabled;
 
+    private void OnHolesEnabledChanged(bool holesEnabled) 
+        => _holesEnabled = holesEnabled;
+
+    private void OnSparksEnabledChanged(bool sparksEnabled)
+        => _sparksEnabled = sparksEnabled;
+
+    #endregion Starlight
+
     public bool SpreadOverlay
     {
         get => _spreadOverlay;
@@ -109,7 +124,9 @@ public bool SpreadOverlay
     public override void Initialize()
     {
         base.Initialize();
-        _cfg.OnValueChanged(StarlightCCVars.TracesEnabled, OnTracesEnabledChanged, true);
+        _cfg.OnValueChanged(StarlightCCVars.TracesEnabled, OnTracesEnabledChanged, true); // Starlight-edit
+        _cfg.OnValueChanged(StarlightCCVars.HolesEnabled, OnHolesEnabledChanged, true); // Starlight-edit
+        _cfg.OnValueChanged(StarlightCCVars.SparksEnabled, OnSparksEnabledChanged, true); // Starlight-edit
 
         UpdatesOutsidePrediction = true;
         SubscribeLocalEvent<AmmoCounterComponent, ItemStatusCollectMessage>(OnAmmoCounterCollect);
@@ -121,7 +138,7 @@ public override void Initialize()
         InitializeMagazineVisuals();
         InitializeSpentAmmo();
 
-        _displacementEffect = _proto.Index<DisplacementEffect>("displacementEffect");
+        _displacementEffect = _proto.Index<DisplacementEffect>("ImpactDisplacement"); // Starlight-edit
     }
 
 
@@ -164,20 +181,18 @@ private float FireEffect(HitscanEvent visuals, float delay, HitscanTrace trace)
                     RenderFlash(trace.ImpactCoordinates, trace.Angle, impact, 1f, false, true, length, delay);
 
                 if (trace.ImpactedEnt is { } netEnt && GetEntity(netEnt) is EntityUid ent)
-                    RenderDisplacementImpact(GetCoordinates(trace.ImpactCoordinates), trace.Angle, ent);
+                    RenderDisplacements(GetCoordinates(trace.ImpactCoordinates), trace.Angle, ent);
             });
         return delay;
     }
 
-    private void RenderDisplacementImpact(EntityCoordinates coords, Angle angle, EntityUid target)
+    private void RenderDisplacements(EntityCoordinates coords, Angle angle, EntityUid target)
     {
-        if (!TryComp<SpriteComponent>(target, out var sprite))
-            return;
-
-        if (!TryComp(coords.EntityId, out TransformComponent? relativeXform))
+        if (!TryComp<SpriteComponent>(target, out var sprite) 
+            || !TryComp(coords.EntityId, out TransformComponent? relativeXform))
             return;
 
-        if (!sprite!.AllLayers.TryFirstOrDefault(x => (x.ActualRsi ?? x.Rsi) != null && x.RsiState != null, out var layer))
+        if (!sprite.AllLayers.TryFirstOrDefault(x => (x.ActualRsi ?? x.Rsi) != null && x.RsiState != null, out var layer))
             return;
 
         if (layer.PixelSize.X != 32 || layer.PixelSize.Y != 32)
@@ -195,6 +210,18 @@ private void RenderDisplacementImpact(EntityCoordinates coords, Angle angle, Ent
         _sprite.LayerSetRsiState((ent, spriteComp), "unshaded", layer.RsiState);
         spriteComp["unshaded"].Visible = true;
         _displacement.TryAddDisplacement(_displacementEffect.Displacement, (ent, spriteComp), 0, "unshaded", out _);
+
+        if (_holesEnabled)
+        {
+            var radians = MathF.PI / 180f * (float)angle.Degrees;
+            var holeCoords = coords.Offset(new Vector2(MathF.Cos(radians), MathF.Sin(radians)) * _random.NextFloat(0f, 0.5f));
+            Spawn(BulletHoleProto, holeCoords);
+        }
+
+        if (_sparksEnabled 
+            && TryComp<PierceableComponent>(target, out var pierceable) 
+            && pierceable.Level >= PierceLevel.Metal)
+            Spawn(SparksProto, coords);
     }
     private void RenderBullet(NetCoordinates coordinates, Angle angle, ExtendedSpriteSpecifier sprite, float distance, float length, float delay)
     {
@@ -435,6 +462,11 @@ public override void Shoot(Entity<GunComponent> gun, List<(EntityUid? Entity, IS
         var direction = TransformSystem.ToMapCoordinates(fromCoordinates).Position - TransformSystem.ToMapCoordinates(toCoordinates).Position;
         var worldAngle = direction.ToAngle().Opposite();
 
+        // Starlight-start: Update angle on client
+        GetCurrentAngle(gun.AsNullable());
+        gun.Comp.LastFire = gun.Comp.NextFire;
+        // Starlight-end
+
         foreach (var (ent, shootable) in ammo)
         {
             if (throwItems)
diff --git a/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml b/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml
new file mode 100644
index 000000000000..4c57207c36ac
--- /dev/null
+++ b/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml
@@ -0,0 +1,16 @@
+<Control xmlns="https://spacestation14.io" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer
+        Name="SightPanel"
+        Margin="6"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Access="Public"
+        MinSize="140 140">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat
+                BackgroundColor="#1B1B1E"
+                BorderColor="#3A3A42"
+                BorderThickness="2" />
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml.cs b/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml.cs
new file mode 100644
index 000000000000..3b82d9dc74c8
--- /dev/null
+++ b/Content.Client/_Starlight/Options/UI/OptionsSightPreview.xaml.cs
@@ -0,0 +1,113 @@
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._Starlight.Options.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class OptionsSightPreview : Control
+{
+    private readonly SightRender _render;
+
+    public OptionsSightPreview()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+        MinSize = new Vector2(64, 64);
+
+        _render = new SightRender();
+        SightPanel.Children.Add(_render);
+    }
+
+    public void UpdateTexture(Texture sight, float scale, float offset, Color main, Color second) 
+        => _render.UpdateTexture(sight, scale, offset, main, second);
+
+    public void SetBrackets(Texture? left = null, Texture? right = null, Texture? down = null, Texture? up = null) 
+        => _render.SetBrackets(left, right, down, up);
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize) 
+        => new Vector2(140, 140);
+}
+
+public sealed class SightRender : Control
+{
+    private Texture? _center;
+    private Texture? _bracket1;
+    private Texture? _bracket2;
+    private Texture? _bracket3;
+    private Texture? _bracket4;
+
+    private float _scale = 1f;
+    private float _offset = 0f;
+
+    private Color _main = Color.White;
+    private Color _second = Color.Black;
+    public void UpdateTexture(Texture sight, float scale, float offset, Color main, Color second)
+    {
+        _center = sight;
+        _scale = scale;
+        _offset = offset;
+        _main = main;
+        _second = second;
+        UpdateDraw();
+    }
+
+    public void SetBrackets(Texture? left = null, Texture? right = null, Texture? down = null, Texture? up = null)
+    {
+        _bracket1 = left;
+        _bracket2 = right;
+        _bracket3 = down;
+        _bracket4 = up;
+        UpdateDraw();
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        if (_center == null)
+            return;
+
+        var centerPos = Size / 2f;
+
+        DrawPart(handle, _center, centerPos, _scale, _main, _second);
+
+        if (_bracket1 == null || _bracket2 == null)
+            return;
+
+        var bracketSize1 = _bracket1.Size * _scale;
+        var bracketSize2 = _bracket2.Size * _scale;
+
+        var leftPos = centerPos + new Vector2(-_offset - bracketSize1.X * 0.5f, 0f);
+        var rightPos = centerPos + new Vector2(_offset + bracketSize2.X * 0.5f, 0f);
+
+        DrawPart(handle, _bracket1, leftPos, _scale, _main, _second);
+        DrawPart(handle, _bracket2, rightPos, _scale, _main, _second);
+
+        if (_bracket3 != null)
+        {
+            var downPos = centerPos + new Vector2(0f, _offset + bracketSize1.Y * 0.5f);
+            DrawPart(handle, _bracket3, downPos, _scale, _main, _second);
+        }
+
+        if (_bracket4 != null)
+        {
+            var upPos = centerPos + new Vector2(0f, -_offset - bracketSize2.Y * 0.5f);
+            DrawPart(handle, _bracket4, upPos, _scale, _main, _second);
+        }
+    }
+
+    private static void DrawPart(DrawingHandleScreen screen, Texture texture, Vector2 pos, float scale, Color main, Color stroke)
+    {
+        var size = texture.Size * scale;
+
+        screen.DrawTextureRect(texture,
+            UIBox2.FromDimensions(pos - size * 0.5f, size), stroke);
+
+        screen.DrawTextureRect(texture,
+            UIBox2.FromDimensions(pos - size * 0.5f - new Vector2(3f, 3f),
+            size + new Vector2(7f, 7f)), main);
+    }
+}
\ No newline at end of file
diff --git a/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml b/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml
new file mode 100644
index 000000000000..60787f52ad3e
--- /dev/null
+++ b/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml
@@ -0,0 +1,79 @@
+<tabs:UITab
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:sui="clr-namespace:Content.Client._Starlight.Options.UI"
+    xmlns:tabs="clr-namespace:Content.Client._Starlight.Options.UI.Tabs"
+    xmlns:ui="clr-namespace:Content.Client.Options.UI">
+    <BoxContainer Orientation="Vertical">
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer
+                Margin="8,8,8,8"
+                Orientation="Vertical"
+                VerticalExpand="True">
+
+                <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-ui-style'}" />
+                <ui:OptionDropDown Name="DropDownHudTheme" Title="{Loc 'ui-options-hud-theme'}" />
+                <ui:OptionDropDown Name="DropDownHudLayout" Title="{Loc 'ui-options-hud-layout'}" />
+                <ui:OptionSlider Name="SeparatedChatWidthSlider" Title="{Loc 'ui-options-chat-width'}" />
+
+                <PanelContainer Margin="0,8,0,8">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat
+                            BackgroundColor="#353540"
+                            BorderColor="#2E2E35"
+                            BorderThickness="1" />
+                    </PanelContainer.PanelOverride>
+
+                    <BoxContainer Margin="6" Orientation="Vertical">
+                        <Label StyleClasses="LabelKeyText" Text="{Loc 'ui-options-ui-ranged-sight'}" />
+                        <PanelContainer Margin="0,6,0,6">
+                            <PanelContainer.PanelOverride>
+                                <gfx:StyleBoxFlat
+                                    BackgroundColor="#24242b"
+                                    BorderColor="#2E2E35"
+                                    BorderThickness="1" />
+                            </PanelContainer.PanelOverride>
+
+                            <BoxContainer
+                                Margin="6"
+                                HorizontalAlignment="Center"
+                                Orientation="Horizontal">
+                                <BoxContainer HorizontalAlignment="Center" Orientation="Vertical">
+                                    <Label
+                                        HorizontalAlignment="Center"
+                                        StyleClasses="LabelSecondaryText"
+                                        Text="{Loc 'ui-options-ranged-sight'}" />
+                                    <sui:OptionsSightPreview Name="RangedSightPreview" Access="Public" />
+                                </BoxContainer>
+
+                                <Control MinSize="12 1" />
+
+                                <BoxContainer HorizontalAlignment="Center" Orientation="Vertical">
+                                    <Label
+                                        HorizontalAlignment="Center"
+                                        StyleClasses="LabelSecondaryText"
+                                        Text="{Loc 'ui-options-melee-sight'}" />
+                                    <sui:OptionsSightPreview Name="MeleeSightPreview" Access="Public" />
+                                </BoxContainer>
+                            </BoxContainer>
+                        </PanelContainer>
+
+                        <Label Text="{Loc 'ui-options-ui-sight-hash'}" />
+                        <LineEdit Name="SightsOptionsHash" />
+
+                        <ui:OptionDropDown Name="DropDownRangedSight" Title="{Loc 'ui-options-ranged-sight'}" />
+                        <ui:OptionDropDown Name="DropDownMeleeSight" Title="{Loc 'ui-options-melee-sight'}" />
+                        <ui:OptionSlider Name="RangedSightScaleSlider" Title="{Loc 'ui-options-ranged-sight-scale'}" />
+                        <ui:OptionSlider Name="RangedSightOffsetSlider" Title="{Loc 'ui-options-ranged-sight-offset'}" />
+                        <CheckBox Name="SightRotationCheckBox" Text="{Loc 'ui-options-sight-rotation'}" />
+
+                        <ui:OptionColorSlider Name="SightMainColorSlider" Title="{Loc 'ui-options-sight-main-color'}" />
+                        <ui:OptionColorSlider Name="SightSecondColorSlider" Title="{Loc 'ui-options-sight-second-color'}" />
+                    </BoxContainer>
+                </PanelContainer>
+            </BoxContainer>
+        </ScrollContainer>
+        <ui:OptionsTabControlRow Name="Control" Access="Public" />
+    </BoxContainer>
+</tabs:UITab>
diff --git a/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml.cs b/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml.cs
new file mode 100644
index 000000000000..6af6cfa2aabe
--- /dev/null
+++ b/Content.Client/_Starlight/Options/UI/Tabs/UITab.xaml.cs
@@ -0,0 +1,194 @@
+using System.Linq;
+using Content.Client.Options.UI;
+using Content.Client.UserInterface.Screens;
+using Content.Shared._Starlight.CombatMode;
+using Content.Shared.CCVar;
+using Content.Shared.HUD;
+using Content.Shared.Starlight.CCVar;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.Graphics.RSI;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Starlight.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class UITab : Control
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IEntitySystemManager _entSysMan = default!;
+
+    public UITab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
+        themes.Sort();
+        var themeEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var gear in themes)
+        {
+            themeEntries.Add(new OptionDropDownCVar<string>.ValueOption(gear.ID, Loc.GetString(gear.Name)));
+        }
+
+        var layoutEntries = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var layout in Enum.GetValues(typeof(ScreenType)))
+        {
+            layoutEntries.Add(new OptionDropDownCVar<string>.ValueOption(layout.ToString()!, Loc.GetString($"ui-options-hud-layout-{layout.ToString()!.ToLower()}")));
+        }
+
+        var rangedSights = new List<OptionDropDownCVar<string>.ValueOption>();
+        var meleeSights = new List<OptionDropDownCVar<string>.ValueOption>();
+        foreach (var sight in _prototypeManager.EnumeratePrototypes<SightPrototype>())
+        {
+            var option = new OptionDropDownCVar<string>.ValueOption(sight.ID, Loc.GetString(sight.Name));
+            if (sight.Bolt)
+                continue;
+            switch (sight.SightType)
+            {
+                case SightType.Ranged:
+                    rangedSights.Add(option);
+                    break;
+                case SightType.Melee:
+                    meleeSights.Add(option);
+                    break;
+                case SightType.Universal:
+                    meleeSights.Add(option);
+                    rangedSights.Add(option);
+                    break;
+            }
+        }
+
+        SightsOptionsHash.OnTextChanged += OnTextChanged;
+        UpdateSightsOptionsHash();
+        _cfg.OnValueChanged(StarlightCCVars.RangedSight, _ => UpdateSightsOptionsHash(), true);
+        _cfg.OnValueChanged(StarlightCCVars.MeleeSight, _ => UpdateSightsOptionsHash(), true);
+        _cfg.OnValueChanged(StarlightCCVars.RangedSightScale, _ => UpdateSightsOptionsHash(), true);
+        _cfg.OnValueChanged(StarlightCCVars.RangedSightOffset, _ => UpdateSightsOptionsHash(), true);
+        _cfg.OnValueChanged(StarlightCCVars.SightMainColor, _ => UpdateSightsOptionsHash(), true);
+        _cfg.OnValueChanged(StarlightCCVars.SightSecondColor, _ => UpdateSightsOptionsHash(), true);
+
+        Control.AddOptionDropDown(CVars.InterfaceTheme, DropDownHudTheme, themeEntries);
+        Control.AddOptionDropDown(CCVars.UILayout, DropDownHudLayout, layoutEntries);
+        Control.AddOptionSlider(StarlightCCVars.ChatSeparatedMinWidth, SeparatedChatWidthSlider, 300, 580);
+        Control.AddOptionDropDown(StarlightCCVars.RangedSight, DropDownRangedSight, rangedSights);
+        Control.AddOptionDropDown(StarlightCCVars.MeleeSight, DropDownMeleeSight, meleeSights);
+        Control.AddOptionSlider(StarlightCCVars.RangedSightScale, RangedSightScaleSlider, 10, 100);
+        Control.AddOptionSlider(StarlightCCVars.RangedSightOffset, RangedSightOffsetSlider, 0, 100);
+        Control.AddOptionCheckBox(StarlightCCVars.SightRotation, SightRotationCheckBox);
+        Control.AddOptionColorSlider(StarlightCCVars.SightMainColor, SightMainColorSlider);
+        Control.AddOptionColorSlider(StarlightCCVars.SightSecondColor, SightSecondColorSlider);
+    }
+
+    private void UpdateSightsOptionsHash()
+    {
+        var ranged = _cfg.GetCVar(StarlightCCVars.RangedSight);
+        var melee = _cfg.GetCVar(StarlightCCVars.MeleeSight);
+        var scale = _cfg.GetCVar(StarlightCCVars.RangedSightScale);
+        var offset = _cfg.GetCVar(StarlightCCVars.RangedSightOffset);
+        var rotation = _cfg.GetCVar(StarlightCCVars.SightRotation);
+        var main = _cfg.GetCVar(StarlightCCVars.SightMainColor);
+        var second = _cfg.GetCVar(StarlightCCVars.SightSecondColor);
+        var raw = $"{ranged}\u001F{melee}\u001F{scale}\u001F{offset}\u001F{rotation}\u001F{main}\u001F{second}";
+        var bytes = System.Text.Encoding.UTF8.GetBytes(raw);
+        var packed = Convert.ToBase64String(bytes);
+        SightsOptionsHash.Text = packed;
+        SightsOptionsHash.UpdateDraw();
+        if (!_entSysMan.TryGetEntitySystem(out SpriteSystem? _sprite))
+            return;
+        if (_prototypeManager.TryIndex(ranged, out SightPrototype? rangedProto) && rangedProto.SightType is (SightType.Ranged or SightType.Universal))
+        {
+            var rsi = _sprite.RsiStateLike(rangedProto.Sprite);
+            if (rsi.IsAnimated && rsi.AnimationFrameCount >= 3)
+            {
+                var bracket1 = rsi.GetFrame(RsiDirection.South, 0); // Left
+                var sight = rsi.GetFrame(RsiDirection.South, 1); // Center
+                var bracket2 = rsi.GetFrame(RsiDirection.South, 2); // Right
+                Texture? bracket3 = null; // Down
+                Texture? bracket4 = null; // Up
+                if (rsi.AnimationFrameCount >= 4)
+                    bracket3 = rsi.GetFrame(RsiDirection.South, 3);
+                if (rsi.AnimationFrameCount >= 5)
+                    bracket4 = rsi.GetFrame(RsiDirection.South, 4);
+                RangedSightPreview.UpdateTexture(sight, scale / 100f, offset / 100f, Color.FromHex(main), Color.FromHex(second));
+                RangedSightPreview.SetBrackets(bracket1, bracket2, bracket3, bracket4);
+            }
+            else
+            {
+                RangedSightPreview.UpdateTexture(_sprite.Frame0(rangedProto.Sprite), scale / 100f, offset / 100f, Color.FromHex(main), Color.FromHex(second));
+                RangedSightPreview.SetBrackets();
+            }
+        }
+
+        if (_prototypeManager.TryIndex(melee, out SightPrototype? meleeProto) && meleeProto.SightType is (SightType.Melee or SightType.Universal))
+        {
+            var rsi = _sprite.RsiStateLike(meleeProto.Sprite);
+            if (rsi.IsAnimated && rsi.AnimationFrameCount >= 3)
+            {
+                var bracket1 = rsi.GetFrame(RsiDirection.South, 0); // Left
+                var sight = rsi.GetFrame(RsiDirection.South, 1); // Center
+                var bracket2 = rsi.GetFrame(RsiDirection.South, 2); // Right
+                Texture? bracket3 = null; // Down
+                Texture? bracket4 = null; // Up
+                if (rsi.AnimationFrameCount >= 4)
+                    bracket3 = rsi.GetFrame(RsiDirection.South, 3);
+                if (rsi.AnimationFrameCount >= 5)
+                    bracket4 = rsi.GetFrame(RsiDirection.South, 4);
+                MeleeSightPreview.UpdateTexture(sight, scale / 100f, offset / 100f, Color.FromHex(main), Color.FromHex(second));
+                MeleeSightPreview.SetBrackets(bracket1, bracket2, bracket3, bracket4);
+            }
+            else
+            {
+                MeleeSightPreview.UpdateTexture(_sprite.Frame0(meleeProto.Sprite), scale / 100f, offset / 100f, Color.FromHex(main), Color.FromHex(second));
+                MeleeSightPreview.SetBrackets();
+            }
+        }
+    }
+
+    private void OnTextChanged(LineEdit.LineEditEventArgs args)
+    {
+        if (args.Text.ToString() is not string packed)
+            return;
+        byte[] bytes = [];
+        try
+        {
+            bytes = Convert.FromBase64String(packed);
+        }
+        catch
+        {
+            return;
+        }
+        var raw = System.Text.Encoding.UTF8.GetString(bytes);
+        var parts = raw.Split('\u001F');
+
+        if (parts.Length != 7)
+            return;
+
+        if (_prototypeManager.TryIndex(parts[0], out SightPrototype? ranged) && ranged.SightType is (SightType.Ranged or SightType.Universal))
+            _cfg.SetCVar(StarlightCCVars.RangedSight, parts[0], true);
+
+        if (_prototypeManager.TryIndex(parts[1], out SightPrototype? melee) && melee.SightType is (SightType.Melee or SightType.Universal))
+            _cfg.SetCVar(StarlightCCVars.MeleeSight, parts[1], true);
+
+        if (int.TryParse(parts[2], out var scale))
+            _cfg.SetCVar(StarlightCCVars.RangedSightScale, scale, true);
+        if (int.TryParse(parts[3], out var offset))
+            _cfg.SetCVar(StarlightCCVars.RangedSightOffset, offset, true);
+
+        if (bool.TryParse(parts[4], out var rotation))
+            _cfg.SetCVar(StarlightCCVars.SightRotation, rotation, true);
+
+        if (Color.TryFromHex(parts[5]) != null)
+            _cfg.SetCVar(StarlightCCVars.SightMainColor, parts[4], true);
+
+        if (Color.TryFromHex(parts[6]) != null)
+            _cfg.SetCVar(StarlightCCVars.SightSecondColor, parts[5], true);
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 676f6386d0fd..2000117aead8 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -115,7 +115,8 @@ public override void Shoot(Entity<GunComponent> gun, List<(EntityUid? Entity, IS
         var toMap = TransformSystem.ToMapCoordinates(toCoordinates).Position;
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+        var angle = GetRecoilAngle(gun, mapDirection.ToAngle()); // Starlight-edit
+        gun.Comp.LastFire = gun.Comp.NextFire; // Stalright-edit
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out _)
@@ -361,20 +362,9 @@ private Angle[] LinearSpreadWithRandom(Angle start, Angle end, int intervals, fl
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
-    {
-        var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
-        var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
-        component.CurrentAngle = new Angle(newTheta);
-        component.LastFire = component.NextFire;
-
-        // Convert it so angle can go either side.
-        var random = Random.NextFloat(-0.5f, 0.5f);
-        var spread = component.CurrentAngle.Theta * random;
-        var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
-        DebugTools.Assert(spread <= component.MaxAngleModified.Theta);
-        return angle;
-    }
+    // Starlight-start: Fully rework recoil
+    //private Angle GetRecoilAngle(TimeSpan curTime, Entity<GunComponent> gun, Angle direction)
+    // Starlight-end
 
     protected override void Popup(string message, EntityUid? uid, EntityUid? user) { }
 
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 6f2faf6e2188..d81b774d98ee 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -270,6 +270,14 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public Vector2 DefaultDirection = new Vector2(0, -1);
+
+    #region Starlight
+    [DataField]
+    public float SprintSpreadModifier = 1f;
+
+    [DataField]
+    public float WalkSpreadModifier = 0.5f;
+    #endregion
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
index bd2e9d4dd1e5..7e9386ba7e48 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
@@ -36,4 +36,18 @@ public sealed partial class GunWieldBonusComponent : Component
 
     [DataField]
     public LocId? WieldBonusExamineMessage = "gunwieldbonus-component-examine";
+
+    #region Starlight
+    [DataField, AutoNetworkedField]
+    public float MinAngleDivider = 1f;
+
+    [DataField, AutoNetworkedField]
+    public float MaxAngleDivider = 1f;
+
+    [DataField, AutoNetworkedField]
+    public float AngleDecayDivider = 1f;
+
+    [DataField, AutoNetworkedField]
+    public float AngleIncreaseDivider = 1f;
+    #endregion
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 957abb4ab903..6427f5695141 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -43,6 +43,7 @@
 using Content.Shared.Mech.Components;
 using Content.Shared.Starlight.Utility;
 using Content.Shared.Weapons.Hitscan.Events;
+using Content.Shared.Movement.Components;
 using Content.Shared._Starlight.Camera;
 #endregion Starlight
 
@@ -576,6 +577,43 @@ protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge
     }
 
     #region Starlight
+
+    public Angle GetCurrentAngle(Entity<GunComponent?> gun, TimeSpan? curTime = null)
+    {
+        if (!Resolve(gun, ref gun.Comp))
+            return new Angle(0);
+        curTime ??= Timing.CurTime;
+        var timeSinceLastFire = (curTime - gun.Comp.LastFire).Value.TotalSeconds;
+        var newTheta = MathHelper.Clamp(gun.Comp.CurrentAngle.Theta + gun.Comp.AngleIncreaseModified.Theta - gun.Comp.AngleDecayModified.Theta * timeSinceLastFire, gun.Comp.MinAngleModified.Theta, gun.Comp.MaxAngleModified.Theta);
+        gun.Comp.CurrentAngle = new Angle(newTheta);
+        return gun.Comp.CurrentAngle;
+    }
+
+    public Angle GetRecoilAngle(Entity<GunComponent> gun, Angle direction, TimeSpan? curTime = null)
+    {
+        GetCurrentAngle(gun.AsNullable(), curTime);
+        var spreadModifier = 1f;
+
+        var xform = Transform(gun);
+        if (TryComp<InputMoverComponent>(xform.ParentUid, out var mover) && mover.CanMove && mover.HasDirectionalMovement)
+        {
+            if (mover.Sprinting)
+                spreadModifier += gun.Comp.SprintSpreadModifier;
+            else
+                spreadModifier += gun.Comp.WalkSpreadModifier;
+        }
+
+        // Convert it so angle can go either side.
+        var random = Random.NextFloat(-0.5f, 0.5f);
+
+        var finalSpread = gun.Comp.CurrentAngle.Theta * spreadModifier;
+        var spread = finalSpread * random;
+
+        var angle = new Angle(direction.Theta + gun.Comp.CurrentAngle.Theta * random);
+        DebugTools.Assert(spread <= gun.Comp.MaxAngleModified.Theta);
+        return angle;
+    }
+
     public bool IsChamberClosed(EntityUid gunEntity)
         => Appearance.TryGetData(gunEntity, AmmoVisuals.BoltClosed, out bool boltClosed) && boltClosed;
     #endregion
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index c99941e332d3..b7a27ccd02f2 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -124,10 +124,16 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref Gun
         if (TryComp(bonus, out WieldableComponent? wield) &&
             wield.Wielded)
         {
+            // Starlight-start: Add support for multiplicative bonuses
             args.MinAngle += bonus.Comp.MinAngle;
+            args.MinAngle /= bonus.Comp.MinAngleDivider;
             args.MaxAngle += bonus.Comp.MaxAngle;
+            args.MaxAngle /= bonus.Comp.MaxAngleDivider;
             args.AngleDecay += bonus.Comp.AngleDecay;
+            args.AngleDecay /= bonus.Comp.AngleDecayDivider;
             args.AngleIncrease += bonus.Comp.AngleIncrease;
+            args.AngleIncrease /= bonus.Comp.AngleIncreaseDivider;
+            // Starlight-end
         }
     }
 
diff --git a/Content.Shared/_Starlight/CCVar/StarlightCCVars.Graphics.cs b/Content.Shared/_Starlight/CCVar/StarlightCCVars.Graphics.cs
index 062dd4ee1c3e..5eb24916c86a 100644
--- a/Content.Shared/_Starlight/CCVar/StarlightCCVars.Graphics.cs
+++ b/Content.Shared/_Starlight/CCVar/StarlightCCVars.Graphics.cs
@@ -3,6 +3,12 @@
 namespace Content.Shared.Starlight.CCVar;
 public sealed partial class StarlightCCVars
 {
+    public static readonly CVarDef<bool> HolesEnabled =
+        CVarDef.Create("opt.holes_enabled", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
     public static readonly CVarDef<bool> TracesEnabled =
         CVarDef.Create("opt.traces_enabled", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> SparksEnabled =
+        CVarDef.Create("opt.sparks_enabled", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/_Starlight/CCVar/StarlightCCVars.Interface.cs b/Content.Shared/_Starlight/CCVar/StarlightCCVars.Interface.cs
deleted file mode 100644
index b0667a6a10da..000000000000
--- a/Content.Shared/_Starlight/CCVar/StarlightCCVars.Interface.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Configuration;
-
-namespace Content.Shared.Starlight.CCVar;
-
-public sealed partial class StarlightCCVars
-{
-    /// <summary>
-    /// A newline-separated list of saved labels for the hand labeler tool
-    /// </summary>
-    public static readonly CVarDef<string> HandLabelerSavedLabels =
-        CVarDef.Create("interface.hand_labeler_saved_labels", "", CVar.CLIENTONLY | CVar.ARCHIVE);
-
-}
diff --git a/Content.Shared/_Starlight/CCVar/StarlightCCVars.UI.cs b/Content.Shared/_Starlight/CCVar/StarlightCCVars.UI.cs
index 5f4c5739abe2..4416707d2d03 100644
--- a/Content.Shared/_Starlight/CCVar/StarlightCCVars.UI.cs
+++ b/Content.Shared/_Starlight/CCVar/StarlightCCVars.UI.cs
@@ -8,4 +8,31 @@ public sealed partial class StarlightCCVars
     /// </summary>
     public static readonly CVarDef<int> ChatSeparatedMinWidth =
         CVarDef.Create("ui.seperated_chat_min_width", 300, CVar.CLIENT | CVar.ARCHIVE);
+
+    /// <summary>
+    /// A newline-separated list of saved labels for the hand labeler tool
+    /// </summary>
+    public static readonly CVarDef<string> HandLabelerSavedLabels =
+        CVarDef.Create("ui.hand_labeler_saved_labels", "", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> RangedSight =
+        CVarDef.Create("ui.ranged_sight", "GunSight", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> RangedSightScale =
+        CVarDef.Create("ui.ranged_sight_scale", 60, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<int> RangedSightOffset =
+        CVarDef.Create("ui.ranged_sight_offset", 50, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> SightMainColor =
+        CVarDef.Create("ui.sight_main_color", Color.White.WithAlpha(0.3f).ToHex(), CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> SightSecondColor =
+        CVarDef.Create("ui.sight_second_color", Color.Black.WithAlpha(0.5f).ToHex(), CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> MeleeSight =
+        CVarDef.Create("ui.melee_sight", "MeleeSight", CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<bool> SightRotation =
+        CVarDef.Create("ui.sight_rotation", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/_Starlight/CombatMode/SightPrototype.cs b/Content.Shared/_Starlight/CombatMode/SightPrototype.cs
new file mode 100644
index 000000000000..b763d85d0cdc
--- /dev/null
+++ b/Content.Shared/_Starlight/CombatMode/SightPrototype.cs
@@ -0,0 +1,45 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._Starlight.CombatMode;
+
+[Prototype("sight")]
+public sealed partial class SightPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = string.Empty;
+
+    [DataField(required: true)]
+    public string Name { get; private set; } = string.Empty;
+
+    [DataField]
+    public SightType SightType = SightType.Melee;
+
+    [DataField]
+    public string? BoltVariant = null;
+
+    [DataField]
+    public bool Bolt = false;
+
+    [DataField(required: true)]
+    public SpriteSpecifier Sprite = SpriteSpecifier.Invalid;
+
+    [DataField]
+    public bool ShowCursor = true;
+
+    [DataField]
+    public Color MainColor { private set; get; } = Color.White.WithAlpha(0.3f);
+
+    [DataField]
+    public Color StrokeColor { private set; get; } = Color.Black.WithAlpha(0.5f);
+
+    [DataField]
+    public float Scale = 0.6f;
+}
+
+public enum SightType : int
+{
+    Ranged,
+    Melee,
+    Universal,
+}
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_Starlight/escape-menu/ui/options-menu.ftl
index 9e09aa1d2fa4..37540f548c76 100644
--- a/Resources/Locale/en-US/_Starlight/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/_Starlight/escape-menu/ui/options-menu.ftl
@@ -2,6 +2,20 @@ ui-options-function-open-m-help = Open mentor help
 ui-escape-connect-discord = Link Discord
 server-info-connect-discord-button = Link Discord
 
+## Graphics
+
+ui-options-trace = Display the bullet's trace
+ui-options-trace-tooltip = If you're lagging while shooting, uncheck this box,
+                           and the hitscan won't display the texture of the smoke behind the flying bullet.
+
+ui-options-holes = Display the bullet's holes
+ui-options-holes-tooltip = If you're lagging while shooting, uncheck this box,
+                           and the hitscan won't display the texture of the bullet holes.
+
+ui-options-sparks = Display sparks
+ui-options-sparks-tooltip = If you're lagging while shooting, uncheck this box,
+                           and the hitscan won't display sparks when the bullet hits a surface.
+
 ## Accessibility
 
 ui-options-arachnophobia = Arachnophobia Mode
diff --git a/Resources/Locale/en-US/_Starlight/overlay/sights_melee.ftl b/Resources/Locale/en-US/_Starlight/overlay/sights_melee.ftl
new file mode 100644
index 000000000000..b00ecd1b6d2b
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/overlay/sights_melee.ftl
@@ -0,0 +1,2 @@
+overlay-melee-sight-arrows = Arrows
+overlay-melee-sight-dot-arrows = [Dot] Arrows
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/overlay/sights_ranged.ftl b/Resources/Locale/en-US/_Starlight/overlay/sights_ranged.ftl
new file mode 100644
index 000000000000..d286b9004119
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/overlay/sights_ranged.ftl
@@ -0,0 +1,8 @@
+overlay-ranged-sight-default = Default
+overlay-ranged-sight-dot-outer-double-arrows = [Dot, Outer] Arrows double
+overlay-ranged-sight-basic = Basic
+overlay-ranged-sight-dot-basic = [Dot] Basic
+overlay-ranged-sight-dot-cross = [Dot] Cross
+overlay-ranged-sight-dot-double = [Dot] Double
+overlay-ranged-sight-triple = Triple
+overlay-ranged-sight-dot-triple = [Dot] Triple
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/overlay/sights_universal.ftl b/Resources/Locale/en-US/_Starlight/overlay/sights_universal.ftl
new file mode 100644
index 000000000000..fd3f8126de70
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/overlay/sights_universal.ftl
@@ -0,0 +1,6 @@
+overlay-universal-sight-melee = Melee Default
+overlay-universal-sight-dot-outer-arrows = [Dot, Outer] Arrows
+overlay-universal-sight-dot-brackets = [Dot] Bracket
+overlay-universal-sight-small-cross = Cross Small
+overlay-universal-sight-small-cross-two = Cross Small 2
+overlay-universal-sight-dot = Dot
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/ui-options/ui-options-tts.ftl b/Resources/Locale/en-US/_Starlight/ui-options/ui-options-tts.ftl
deleted file mode 100644
index 12d449dfad1f..000000000000
--- a/Resources/Locale/en-US/_Starlight/ui-options/ui-options-tts.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-ui-options-tts-label = Text-To-Speech
-ui-options-tts-volume = TTS Volume:
-ui-options-tts-chime-volume = Chime Volume:
-credits-window-tts-title = TTS (Text-To-Speech) Feature
-
-ui-options-tts-radio-volume = Radio Volume:
-ui-options-tts-announce-volume = Announcement Volume:
-
-ui-options-tts-enabled = Text-To-Speech Enabled
-ui-options-tts-radio-queue-enabled = Queue Radio TTS
-ui-options-radio-chime-mute = Mute Radio Chimes
-
-tts-examinable-verb-text = Voice
-tts-examinable-verb-message = Examine the voice.
-tts-examine = {SUBJECT($ent)} sounds like [color=Pink]{$voice}[/color].
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 8664c7bc5f48..6eb6cd550c15 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -95,9 +95,6 @@ ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport
 ui-options-filter-label = Scaling filter:
 ui-options-filter-nearest = Nearest (no smoothing)
 ui-options-filter-bilinear = Bilinear (smoothed)
-ui-options-trace = Display the bullet's trace
-ui-options-trace-tooltip = If you're lagging while shooting, uncheck this box,
-                           and the hitscan won't display the texture of the smoke behind the flying bullet.
 ui-options-vp-vertical-fit = Vertical viewport fitting
 ui-options-vp-vertical-fit-tooltip = When enabled, the main viewport will ignore the horizontal axis entirely when
                                      fitting to your screen. If your screen is smaller than the viewport, then this
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index e1ca5412889b..f0c8b814a4e1 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -430,7 +430,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingNeckCloakHosElite # Starlight
-    - id: WeaponEnergySMG # Starlight
+    - id: WeaponSubMachineGunEnergy # Starlight
     # - id: WeaponEnergyMagnum # Starlight - Removed, given to det
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index c54fb6461b7e..ee5a3b9a2888 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -395,7 +395,7 @@
     - id: BoxFiringPinLaser # Starlight, firing pins
     - id: WeaponLaserCarbine
       amount: 3
-    - id: WeaponLr30
+    - id: WeaponRifleLr30
       amount: 1
     - id: MagazineBatteryLr30
       amount: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
index 690658d0c70f..352478c582bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
@@ -6,8 +6,11 @@
   - type: Wieldable
     unwieldOnUse: false
   - type: GunWieldBonus
-    minAngle: -20
-    maxAngle: -30
+    maxAngle: 0
+    minAngle: 0
+    angleIncreaseDivider: 2
+    minAngleDivider: 2
+    maxAngleDivider: 2
   - type: Gun
-    minAngle: 21
-    maxAngle: 32   
+    minAngle: 20
+    maxAngle: 30
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 2fd53012534b..78fb66143001 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BasePistol
-  parent: BaseItem
+  parent: [ BaseItem, BaseGunWieldable ] # Starlight-edit
   id: BaseWeaponPistol
   description: A rooty tooty point and shooty.
   abstract: true
@@ -34,6 +34,12 @@
     - suitStorage
     - Belt
   - type: Gun
+    # Starlight-start
+    minAngle: 5
+    maxAngle: 20
+    angleDecay: 22.5
+    angleIncrease: 15
+    # Starlight-end
     fireRate: 6
     selectedMode: SemiAuto
     availableModes:
@@ -77,6 +83,10 @@
   - type: StaticPrice
     price: 500
   # starlight start
+  - type: GunWieldBonus
+    angleIncreaseDivider: 1.5
+    minAngleDivider: 1.5
+    maxAngleDivider: 1.5
   - type: ContainerFill
     containers:
       firing_pin:
@@ -249,10 +259,12 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
   - type: Gun
-    minAngle: 1
-    maxAngle: 20
-    angleIncrease: 8
-    angleDecay: 9
+    # Starlight-start
+    minAngle: 10
+    maxAngle: 30
+    angleIncrease: 20
+    angleDecay: 30
+    # Starlight-end
     fireRate: 4
     availableModes:
     - SemiAuto
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 9aa2785bc114..daa2a5be7a51 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -123,6 +123,12 @@
     impactFlash:
       sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
       state: impact_xray
+  # Starlight-start
+  - type: HitscanPierce
+    chance: 1
+    pierceLevel: Rock
+    deviation: 0
+  # Starlight-end
 
 - type: entity
   parent: BasicHitscan
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 8ba20091ac53..bbcf25f64d92 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseWeaponRevolver
-  parent: BaseItem
+  parent: [ BaseItem, BaseGunWieldable ] # Starlight-edit
   id: BaseWeaponRevolver
   description: A rooty tooty point and shooty.
   abstract: true
@@ -24,6 +24,12 @@
     - Belt
   - type: AmmoCounter
   - type: Gun
+    # Starlight-start
+    minAngle: 5
+    maxAngle: 20
+    angleDecay: 22.5
+    angleIncrease: 15
+    # Starlight-end
     selectedMode: SemiAuto
     fireRate: 1.5
     availableModes:
@@ -52,6 +58,12 @@
     dualWieldInaccuracyPenalty: 27
   - type: StaticPrice
     price: 500
+  # Starlight-start
+  - type: GunWieldBonus
+    angleIncreaseDivider: 1.5
+    minAngleDivider: 1.5
+    maxAngleDivider: 1.5
+  # Starlight-end
 
 - type: entity
   name: Deckard
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index cd53d366eb8b..a73e24c4c67c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -77,7 +77,7 @@
 
 - type: entity
   name: Atreides
-  parent: [BaseWeaponSubMachineGun, BaseMajorContraband]
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseMajorContraband]
   id: WeaponSubMachineGunAtreides
   description: A rare machine pistol hailing from the Corporate Wars. Its extremely high fire rate and compact profile make it useful in close quarters combat. Despite its age, it is in remarkably good condition. Feeds from .35 SMG magazines.
   components:
@@ -249,7 +249,7 @@
 
 - type: entity
   name: WT550
-  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband] # Starlight
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseSecurityContraband] # Starlight
   id: WeaponSubMachineGunWt550
   description: A truly unique firearm, the WT550 was designed by Nanotrasen's Small Arms Division as a compact submachine gun fully controllable with one hand. It contains an exotic internal recoil buffer and feeds from special top-mounted .35 magazines.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index f0e6dc3afa63..2fc4d99d8f16 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -73,7 +73,14 @@
   id: WeaponSniperMosin
   description: A weapon of the masses, a true relic. The Kardashev-Mosin has served in nearly every armed conflict since its creation 670 years ago. The bolt-action design of the rifle remains virtually identical to its original design, whether used for hunting, sniping, or endless trench warfare. Uses .45 magnum ammo.
   components:
-  - type: KnockbackByUserTag # Starlight
+  # Starlight-start
+  - type: GunWieldBonus
+    maxAngle: -10
+    minAngle: -10
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 2
+  - type: KnockbackByUserTag
     doestContain:
       Resomi:
         knockback: 2
@@ -81,6 +88,7 @@
         knockback: 1 # half of what resomi take
       Felionoid:
         knockback: 1 # half of what resomi take
+  # Starlight-end
   - type: BallisticAmmoProvider # Starlight
     capacity: 10
     proto: CartridgeMagnumSP
@@ -149,6 +157,11 @@
   id: WeaponSniperHristov
   description: For when you absolutely, positively need to make someone regret their life choices from a safe distance. Uses .60 anti-materiel ammo.
   components:
+  # Starlight-start
+  - type: GunWieldBonus
+    maxAngle: -10
+    minAngle: -10
+  # Starlight-end
   - type: Item
     size: Huge
     shape:
@@ -157,7 +170,7 @@
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi
-  - type: GunRequiresWield
+  #- type: GunRequiresWield Starlight-edit: Remove requirement
   - type: Gun
     pump: true
     fireRate: 0.5
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index d106f54aeb3f..41781a877f5d 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -241,6 +241,10 @@
   - type: IconSmooth
     key: walls
     base: meat
+  # Starlight-start
+  - type: Pierceable
+    level: Flesh
+  # Starlight-end
 
 - type: entity
   parent: BaseWall
@@ -1363,6 +1367,10 @@
   - type: IconSmooth
     key: woods
     base: wood
+  # Starlight-start
+  - type: Pierceable
+    level: Wood
+  # Starlight-end
 
 - type: entity
   parent: BaseWall
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index befd79d768ff..c0b83e9edd8c 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -4,8 +4,10 @@
   placement:
     mode: SnapgridCenter
   components:
+  # Starlight-start
   - type: Pierceable
     level: Metal
+  # Starlight-end
   - type: Transform
     anchored: true
   - type: Clickable
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
index ce97cbb3f922..c7a503ab5620 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@@ -46,7 +46,7 @@
 #    - WeaponShotgunDoubleBarreled Starlight: Replaced with starlight weaponry
 #    - BoxShotgunIncendiary
     # Starlight-start: Starlight incendiary weaponry
-    - WeaponIK60
+    - WeaponRifleIK60
     - MagazineBatteryLr30
     - MagazineBatteryLr30
     - MagazineBatteryLr30
diff --git a/Resources/Prototypes/_Starlight/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Starlight/Catalog/Fills/Crates/armory.yml
index e7eabc5def72..8dd86d1124c0 100644
--- a/Resources/Prototypes/_Starlight/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/_Starlight/Catalog/Fills/Crates/armory.yml
@@ -10,7 +10,7 @@
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponLr30
+        - id: WeaponRifleLr30
           amount: 2
         - id: MagazineBatteryLr30
           amount: 2
diff --git a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml
index f53cd164f190..a57c7edf7142 100644
--- a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml
@@ -9,7 +9,7 @@
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponEnergySniper
+        - id: WeaponSniperEnergy
           amount: 2
 
 - type: entity
diff --git a/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/salvage.yml
index b5af3b290588..4464c5bcb6d6 100644
--- a/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/salvage.yml
@@ -227,8 +227,8 @@
   - !type:BuyerAccessCondition
 
 - type: listing
-  id: VendorSalvageWeaponLr30
-  productEntity: WeaponLr30
+  id: VendorSalvageWeaponRifleLr30
+  productEntity: WeaponRifleLr30
   cost:
     SalvageTicket: 300
   categories:
diff --git a/Resources/Prototypes/_Starlight/Entities/Effects/weapon.yml b/Resources/Prototypes/_Starlight/Entities/Effects/weapon.yml
new file mode 100644
index 000000000000..ccbd534c3247
--- /dev/null
+++ b/Resources/Prototypes/_Starlight/Entities/Effects/weapon.yml
@@ -0,0 +1,55 @@
+- type: entity
+  id: ImpactEffect
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TimedDespawn
+    lifetime: 0.6
+  - type: Sprite
+    drawdepth: Effects
+    layers:
+    - map: ["unshaded"]
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: AnimationPlayer
+  
+- type: displacementEffect
+  id: ImpactDisplacement
+  displacement:
+    sizeMaps:
+      32:
+        sprite: _Starlight/Effects/impact.rsi
+        state: impact
+  
+- type: entity
+  id: BulletHoleEffect
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TimedDespawn
+    lifetime: 10
+  - type: Sprite
+    drawdepth: Effects
+    sprite: _Starlight/Effects/bullet_hole.rsi
+    state: bullet_hole
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: AnimationPlayer
+  
+- type: entity
+  id: ImpactSparksEffect
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TimedDespawn
+    lifetime: 0.4
+  - type: Sprite
+    drawdepth: Effects
+    sprite: _Starlight/Effects/impact_sparks.rsi
+    state: effect
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: AnimationPlayer
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index b767f23722a9..a49b4709d78d 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -329,12 +329,12 @@
     autoRechargePauseTime: 44
 
 - type: entity
-  parent: [ BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband ]
-  id: WeaponIonRifle
-  name: ion rifle
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband, BaseCentcommContraband ]
+  id: WeaponIonCarbine
+  name: ion carbine
   components:
   - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Battery/ion_rifle.rsi
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/ion_carbine.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -342,13 +342,9 @@
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Item
-    size: Ginormous
-  - type: Clothing
-    quickEquip: false
-    slots:
-    - Back
-  - type: Gun
-    fireRate: 0.6
+    size: Normal
+    shape:
+    - 0, 0, 3, 1
   - type: BatterySelfRecharger
     autoRechargeRate: 40 #100sec+60Sec Pause
     autoRechargePauseTime: 60
@@ -361,19 +357,17 @@
     zeroVisible: true
   - type: Appearance
   - type: EmpImmune
-  - type: GunRequiresWield
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 8
-    pvsIncrease: 0.3
+  - type: GunWieldBonus
+    maxAngle: -10
+    minAngle: -10
 
 - type: entity
-  parent: [BaseWeaponBattery, BaseSecurityContraband ]
-  id: WeaponIonCarbine
-  name: ion carbine
+  parent: WeaponIonCarbine
+  id: WeaponIonRifle
+  name: ion rifle
   components:
   - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Battery/ion_carbine.rsi
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/ion_rifle.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -381,23 +375,21 @@
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Item
-    size: Normal
-    shape:
-    - 0, 0, 3, 1
-  - type: Gun
-    fireRate: 0.6
-  - type: BatterySelfRecharger
-    autoRechargeRate: 40 #100sec+60Sec Pause
-    autoRechargePauseTime: 60
-  - type: BatteryAmmoProvider
-    proto: EmpPulse
-    fireCost: 250
+    size: Ginormous
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - Back
   - type: MagazineVisuals
     magState: mag
     steps: 5
     zeroVisible: true
   - type: Appearance
   - type: EmpImmune
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 8
+    pvsIncrease: 0.3
 
 - type: entity
   name: immolator laser gun
@@ -551,7 +543,7 @@
 - type: entity
   name: PDW-9 taser pistol
   parent: [ BaseWeaponBatterySmall, BaseSecurityContraband ]
-  id: WeaponPDW9
+  id: WeaponPistolPDW9
   description: A compact pulse core in a classic Nanotrasen officer pistol design. It's not the size of the gun, it's the size of the hole it puts in people.
   components:
   - type: Appearance
@@ -628,7 +620,7 @@
 
 - type: entity
   parent: [ BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband ]
-  id: WeaponEnergySniper
+  id: WeaponSniperEnergy
   name: LWAP
   components:
   - type: Sprite
@@ -646,16 +638,20 @@
     slots:
     - Back
   - type: Gun
+    minAngle: 30
+    maxAngle: 50
     fireRate: 0.5
   - type: BatteryAmmoProvider
     proto: SniperBolt
     fireCost: 100
+  - type: GunWieldBonus
+    maxAngle: -30
+    minAngle: -20
   - type: MagazineVisuals
     magState: mag
     steps: 5
     zeroVisible: true
   - type: Appearance
-  - type: GunRequiresWield
   - type: CursorOffsetRequiresWield
   - type: EyeCursorOffset
     maxOffset: 5
@@ -866,8 +862,8 @@
 
 - type: entity
   name: proto-5x energy gun
-  parent: [BaseWeaponBattery, BaseGrandTheftContraband]
-  id: WeaponEnergySMG
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
+  id: WeaponSubMachineGunEnergy
   description: A one-of-a-kind prototype energy sub-machine gun. It offers high energy firepower and a powerful self recharge.
   components:
   - type: CanDualWield
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index 19ab61f55f09..d7075d852aea 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -17,16 +17,15 @@
     slots:
     - Back
     - suitStorage
-  - type: GunRequiresWield
   - type: MagazineVisuals
     magState: mag
     steps: 4
     zeroVisible: true
   - type: Gun
-    minAngle: 20
+    minAngle: 25
     maxAngle: 35
-    angleIncrease: 2
-    angleDecay: 10
+    angleIncrease: 4
+    angleDecay: 16
     fireRate: 6  
   - type: Appearance
   - type: RestrictByEquippedTag
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 2daef4c68206..3f27230e0fbc 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -174,31 +174,37 @@
   parent: [WeaponPistolDP, BaseBlueShieldContraband, BaseGrandTheftContraband]
   id: WeaponPistolSP8T
   components:
-    - type: Gun
-      soundGunshot:
-        path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8t.ogg
-    - type: Sprite
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8t.rsi
-    - type: ChamberMagazineAmmoProvider
-      availablePrefixes:
-        - ""
-        - dust
-    - type: StealTarget
-      stealGroup: BSOWeapon
-      
+  - type: Gun
+    maxAngle: 15
+    angleIncrease: 10
+    angleDecay: 20
+    soundGunshot:
+      path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8t.ogg
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8t.rsi
+  - type: ChamberMagazineAmmoProvider
+    availablePrefixes:
+    - ""
+    - dust
+  - type: StealTarget
+    stealGroup: BSOWeapon
+
 - type: entity
   name: sp-8ar
   parent: [WeaponPistolDP, BaseSecurityContraband]
   id: WeaponPistolSP8AR
   components:
-    - type: Gun
-      soundGunshot:
-        path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8ar.ogg
-    - type: Sprite
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8ar.rsi
-    - type: ChamberMagazineAmmoProvider
-      availablePrefixes:
-        - ""
+  - type: Gun
+    maxAngle: 15
+    angleIncrease: 10
+    angleDecay: 20
+    soundGunshot:
+      path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8ar.ogg
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8ar.rsi
+  - type: ChamberMagazineAmmoProvider
+    availablePrefixes:
+    - ""
 
 - type: entity
   name: stechkin pistol
@@ -279,18 +285,18 @@
   id: WeaponPistolDeagle
   description: A high-caliber handgun designed for putting down large game.
   components:
-    - type: Sprite
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/deagle.rsi
-    - type: Clothing
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/deagle.rsi
-    - type: Gun
-      minAngle: 1
-      maxAngle: 15
-      angleIncrease: 6
-      angleDecay: 7
-      fireRate: 5
-      soundGunshot:
-        path: /Audio/_Starlight/Weapons/Guns/Gunshots/deagle.ogg
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/deagle.rsi
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/deagle.rsi
+  - type: Gun
+    minAngle: 10
+    maxAngle: 30
+    angleIncrease: 20
+    angleDecay: 30
+    fireRate: 5
+    soundGunshot:
+      path: /Audio/_Starlight/Weapons/Guns/Gunshots/deagle.ogg
 
 - type: entity
   name: m1911
@@ -298,68 +304,18 @@
   id: WeaponPistolM1911
   description: A classic .45 handgun with a small magazine capacity.
   components:
-    - type: Sprite
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/m1911.rsi
-    - type: Clothing
-      sprite: _Starlight/Objects/Weapons/Guns/Pistols/m1911.rsi
-    - type: Gun
-      minAngle: 1
-      maxAngle: 20
-      angleIncrease: 8
-      angleDecay: 7
-      fireRate: 7
-      soundGunshot:
-        path: /Audio/_Starlight/Weapons/Guns/Gunshots/colt.ogg
-
-# Doesn't work and idk why
-
-#- type: entity
-#name: mk 64
-#parent: [BaseWeaponPistol, BaseSecurityContraband]
-#id: WeaponMachinePistolMk64
-#description: Designed by Nanotrasen’s Small Arms Division, the Mk64 is an unconventional full-auto machine pistol with questionable accuracy, though it can be fired one-handed. Feeds from .35 machine pistol magazines.
-#components:
-#- type: Sprite
-#sprite: _Starlight/Objects/Weapons/Guns/Pistols/mk64.rsi
-#layers:
-#- state: base
-#map: ["enum.GunVisualLayers.Base"]
-#- state: mag-0
-#map: ["enum.GunVisualLayers.Mag"]
-#- type: Clothing
-#sprite: _Starlight/Objects/Weapons/Guns/Pistols/mk64.rsi
-#- type: Gun
-#fireRate: 6
-#availableModes:
-#- FullAuto
-#soundGunshot:
-#path: _Starlight/Audio/Weapons/Guns/Gunshots/uzi.ogg
-#- type: ChamberMagazineAmmoProvider
-#soundRack:
-#path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg
-#- type: ItemSlots
-#slots:
-#gun_magazine:
-#name: Magazine
-#startingItem: MagazinePistolHighCapacitySP
-#insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
-#ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
-#priority: 2
-#whitelist:
-#tags:
-#- MagazinePistolHighCapacity
-#whitelistFailPopup: gun-magazine-whitelist-fail
-#gun_chamber:
-#name: Chamber
-#startingItem: CartridgePistolSP
-#priority: 1
-#whitelist:
-#tags:
-#- CartridgePistol
-#- type: ContainerContainer
-#containers:
-#gun_magazine: !type:ContainerSlot
-#gun_chamber: !type:ContainerSlot
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/m1911.rsi
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Pistols/m1911.rsi
+  - type: Gun
+    minAngle: 10
+    maxAngle: 30
+    angleIncrease: 20
+    angleDecay: 30
+    fireRate: 7
+    soundGunshot:
+      path: /Audio/_Starlight/Weapons/Guns/Gunshots/colt.ogg
 
 - type: entity
   name: makeshift pistol
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml
deleted file mode 100644
index b48b47f23f8d..000000000000
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: entity
-  id: ImpactEffect
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: TimedDespawn
-    lifetime: 0.6
-  - type: Sprite
-    drawdepth: Effects
-    layers:
-    - map: ["unshaded"]
-      #shader: unshaded
-  - type: EffectVisuals
-  - type: Tag
-    tags:
-      - HideContextMenu
-  - type: AnimationPlayer
-
-- type: displacementEffect
-  id: displacementEffect
-  displacement:
-    sizeMaps:
-      32:
-        sprite: _Starlight/Effects/impact.rsi
-        state: impact
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index c0dd4636cf54..1661ccad6643 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1263,6 +1263,22 @@
         sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
         state: heavylaser
 
+- type: entity
+  id: EnergyTraceNoBeam
+  parent: BasicHitscanNoBeam
+  categories: [ HideSpawnMenu ]
+  abstract: true
+  components:
+  - type: HitscanBasicRaycast
+    collisionMask: BulletImpassable
+  - type: HitscanReflect
+    reflectiveType: Energy
+  - type: HitscanBasicVisuals
+    bullet:
+      sprite:
+        sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+        state: heavylaser
+
 - type: entity
   parent: BasicHitscan
   id: LaserTrace
@@ -1419,7 +1435,7 @@
 - type: entity
   id: AdvancedTaserBolt
   name: taser bolt
-  parent: EnergyTrace
+  parent: EnergyTraceNoBeam
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -1442,7 +1458,7 @@
 - type: entity
   id: EmpPulse
   name: EMP impulse
-  parent: EnergyTrace
+  parent: EnergyTraceNoBeam
   components:
   - type: HitscanEmpEffect
     emp:
@@ -1458,7 +1474,7 @@
 - type: entity
   id: DecloneBolt
   name: declone bolt
-  parent: EnergyTrace
+  parent: EnergyTraceNoBeam
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
@@ -1475,17 +1491,17 @@
 - type: entity
   id: SniperBolt
   name: sniper bolt
-  parent: EnergyTrace
+  parent: EnergyTraceNoBeam
   categories: [ HideSpawnMenu ]
   components:
   - type: HitscanBasicDamage
     damage:
       types:
-        Heat: 60
+        Heat: 80
   - type: HitscanCrawlerTargetEffects
     knockdownDuration: 3
   - type: HitscanStaminaDamage
-    staminaDamage: 40
+    staminaDamage: 50
   - type: HitscanBasicVisuals
     bullet:
       sprite:
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index a2b319d574c1..ec933ac77f80 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -26,7 +26,7 @@
 - type: entity
   name: lr-30
   parent: [BaseItem, BaseGunWieldable, BaseSecuritySalvageContraband]
-  id: WeaponLr30
+  id: WeaponRifleLr30
   description: Energy carbine with lethal mode.
   components:
   - type: Sprite
@@ -78,7 +78,7 @@
 - type: entity
   name: IK-60 laser carbine
   parent: [BaseItem, BaseGunWieldable, BaseSecurityContraband]
-  id: WeaponIK60
+  id: WeaponRifleIK60
   description: A short, compact rifle-like carbine that relies more on battery-powered ammunition rather than a built-in battery. Used by the Nanotrasen Space Force in combat operations.
   components:
   - type: Sprite
@@ -282,6 +282,9 @@
   id: WeaponRifleL10
   description: "A scoped marksman rifle for medium range engagements, built on the Lecter platform.\nChambered in .45 magnum."
   components:
+  - type: GunWieldBonus
+    maxAngle: -10
+    minAngle: -10
   - type: Sprite
     sprite: _Starlight/Objects/Weapons/Guns/Rifles/L10.rsi
     layers:
@@ -293,12 +296,12 @@
     sprite: _Starlight/Objects/Weapons/Guns/Rifles/L10.rsi
   - type: Gun
     fireRate: 2
+    angleIncrease: 2
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
-  - type: GunRequiresWield
   - type: SpeedModifiedOnWield
     walkModifier: 0.9
     sprintModifier: 0.9
@@ -446,8 +449,6 @@
     - type: Wieldable
       unwieldOnUse: false
     - type: GunWieldBonus
-      minAngle: -13
-      maxAngle: -10
     - type: Gun
       minAngle: 21
       maxAngle: 32
@@ -489,57 +490,3 @@
     - type: EyeCursorOffset
       maxOffset: 0.5
       pvsIncrease: 1.4
-
-# Starlight start
-- type: entity
-  name: SPC-Lionhunter
-  parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband ]
-  id: WeaponRifleLionhunter
-  description: A one of a kind bolt-action rifle fitted with an integrated scope. Chambered for a proprietary .48 round developed by parties unknown. Built to drop targets at range with authority. Each shot demands a deliberate recycle of the action.
-  components:
-  - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_icons.rsi
-    layers:
-    - state: base
-      map: [ "enum.GunVisualLayers.Base" ]
-  - type: Item
-    size: Huge
-    shape:
-    - 0,0,3,2
-    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_inhands.rsi
-  - type: Clothing
-    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_inhands.rsi
-    quickEquip: false
-    slots:
-    - Back
-    - suitStorage
-  - type: Gun
-    fireRate: 1
-    pump: true
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-      - Cartridge48Rifle
-    capacity: 10
-    proto: Cartridge48Rifle
-    soundRack:
-      path: /Audio/_Starlight/Weapons/Guns/Cock/cycle_bolt.ogg
-      params:
-        variation: 0.1
-  - type: GunRequiresWield
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 5.4
-    pvsIncrease: 0.54
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-      firing_pin: !type:Container
-  - type: Appearance
-# Starlight end
\ No newline at end of file
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 0bf8b2471577..135dfc279594 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -26,7 +26,7 @@
             
 - type: entity
   name: SP-91-RC
-  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband]
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponSubMachineGunSP91RC
   description: Compact submachine gun designed for riot control.
   components:
@@ -37,11 +37,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Wieldable
-    unwieldOnUse: false
-  - type: GunWieldBonus
-    minAngle: -19
-    maxAngle: -16
   - type: Gun
     fireRate: 13
     selectedMode: Burst
@@ -60,7 +55,7 @@
     
 - type: entity
   name: Type U3 Uzi
-  parent: [BaseWeaponSubMachineGun, BaseMajorContraband]
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseMajorContraband]
   id: WeaponSubMachineGunUzi
   description: Lightweight submachine gun with a 32-round magazine that has single or 4 round firing modes.
   components:
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 9bf156f5983b..7ce617730438 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -287,7 +287,6 @@
     sprite: _Starlight/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi
   - type: Clothing
     sprite: _Starlight/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi
-  - type: GunRequiresWield
   - type: BallisticAmmoProvider
     capacity: 2
     proto: null
diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 99c7dceb0f63..9129a71a9868 100644
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -143,4 +143,58 @@
       - CartridgeMagnum
       - CartridgeMagnumImprovised
   - type: WeaponDismantleOnShoot
-    dismantleChance: 0
\ No newline at end of file
+    dismantleChance: 0
+
+- type: entity
+  name: SPC-Lionhunter
+  parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband ]
+  id: WeaponSniperLionhunter
+  description: A one of a kind bolt-action rifle fitted with an integrated scope. Chambered for a proprietary .48 round developed by parties unknown. Built to drop targets at range with authority. Each shot demands a deliberate recycle of the action.
+  components:
+  - type: GunWieldBonus
+    maxAngle: -10
+    minAngle: -10
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_icons.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+  - type: Item
+    size: Huge
+    shape:
+    - 0,0,3,2
+    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_inhands.rsi
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Rifles/lionhunter_inhands.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    fireRate: 1
+    pump: true
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - Cartridge48Rifle
+    capacity: 10
+    proto: Cartridge48Rifle
+    soundRack:
+      path: /Audio/_Starlight/Weapons/Guns/Cock/cycle_bolt.ogg
+      params:
+        variation: 0.1
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 5.4
+    pvsIncrease: 0.54
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+      firing_pin: !type:Container
+  - type: Appearance
\ No newline at end of file
diff --git a/Resources/Prototypes/_Starlight/Overlay/sights_melee.yml b/Resources/Prototypes/_Starlight/Overlay/sights_melee.yml
new file mode 100644
index 000000000000..089ae93cfdd2
--- /dev/null
+++ b/Resources/Prototypes/_Starlight/Overlay/sights_melee.yml
@@ -0,0 +1,17 @@
+- type: sight
+  id: ArrowsSight
+  name: overlay-melee-sight-arrows
+  sightType: Melee
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: arrows
+
+- type: sight
+  id: ArrowsDotSight
+  name: overlay-melee-sight-dot-arrows
+  sightType: Melee
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: arrows_dot
\ No newline at end of file
diff --git a/Resources/Prototypes/_Starlight/Overlay/sights_ranged.yml b/Resources/Prototypes/_Starlight/Overlay/sights_ranged.yml
new file mode 100644
index 000000000000..b46715a3c3ec
--- /dev/null
+++ b/Resources/Prototypes/_Starlight/Overlay/sights_ranged.yml
@@ -0,0 +1,82 @@
+- type: sight
+  id: GunSight
+  name: overlay-ranged-sight-default
+  sightType: Ranged
+  boltVariant: GunSightBolt
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers_big.rsi
+    state: gun_sight
+
+- type: sight
+  id: GunSightBolt
+  name: overlay-ranged-sight-default
+  sightType: Ranged
+  bolt: true
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers_big.rsi
+    state: gun_bolt_sight
+
+- type: sight
+  id: ArrowsOuterDoubleSight
+  name: overlay-ranged-sight-dot-outer-double-arrows
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: arrows_outer_double
+
+- type: sight
+  id: BasicSight
+  name: overlay-ranged-sight-dot-basic
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: basic
+
+- type: sight
+  id: BasicDotSight
+  name: overlay-ranged-sight-dot-basic
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: basic_dot
+
+- type: sight
+  id: CrossDotSight
+  name: overlay-ranged-sight-dot-cross
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: cross_dot
+
+- type: sight
+  id: DoubleSight
+  name: overlay-ranged-sight-dot-double
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: double_dot
+
+- type: sight
+  id: TripleSight
+  name: overlay-ranged-sight-triple
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: triple
+
+- type: sight
+  id: TripleDotSight
+  name: overlay-ranged-sight-dot-triple
+  sightType: Ranged
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: triple_dot
\ No newline at end of file
diff --git a/Resources/Prototypes/_Starlight/Overlay/sights_universal.yml b/Resources/Prototypes/_Starlight/Overlay/sights_universal.yml
new file mode 100644
index 000000000000..6d318ca78e20
--- /dev/null
+++ b/Resources/Prototypes/_Starlight/Overlay/sights_universal.yml
@@ -0,0 +1,53 @@
+- type: sight
+  id: MeleeSight
+  name: overlay-universal-sight-melee
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: melee_sight
+
+- type: sight
+  id: ArrowsOuterSight
+  name: overlay-universal-sight-dot-outer-arrows
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: arrows_outer
+
+- type: sight
+  id: BracketsSight
+  name: overlay-universal-sight-dot-brackets
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: brackets
+
+- type: sight
+  id: CrossSmallSight
+  name: overlay-universal-sight-small-cross
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: cross_small
+
+- type: sight
+  id: CrossSmallTwoSight
+  name: overlay-universal-sight-small-cross-two
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: cross_small2
+
+- type: sight
+  id: DotSight
+  name: overlay-universal-sight-dot
+  sightType: Universal
+  showCursor: false
+  sprite:
+    sprite: _Starlight/Interface/Misc/crosshair_pointers.rsi
+    state: dot
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/StarlightSOP/SecuritySOP/HeadOfSecurity.xml b/Resources/ServerInfo/Guidebook/StarlightSOP/SecuritySOP/HeadOfSecurity.xml
index 5046412fde82..230ae4b058d4 100644
--- a/Resources/ServerInfo/Guidebook/StarlightSOP/SecuritySOP/HeadOfSecurity.xml
+++ b/Resources/ServerInfo/Guidebook/StarlightSOP/SecuritySOP/HeadOfSecurity.xml
@@ -7,7 +7,7 @@
 <Box>
 	<GuideEntityEmbed Entity="WeaponSubMachineGunWt550"/>
 	or
-	<GuideEntityEmbed Entity="WeaponEnergySMG"/>
+	<GuideEntityEmbed Entity="WeaponSubMachineGunEnergy"/>
 </Box>
 <Box>
 	<GuideEntityEmbed Entity="Stunbaton"/>
diff --git a/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/melee_sight.png b/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/melee_sight.png
deleted file mode 100644
index 8ab45b0b8b0acc3c49a97ab648184afbbe80663d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16635
zcmeI4NoW*76oz{=CNUUMLBxO%a6<$Sf}kg(nGgq;L{XwB5|@|+F>d3E7rluWQBhAW
zhzOz{#FL-_K|xUTD7al*P;ifkAQ``>*3fCXdM4B3bk}sh@K05}uI2szbXQj|lf$h`
znrmz7YAnmDO)W?+BW(~=SMqted;1HL%JmDIlU7Fl&fU6n9MAA=3s&v4tQivpiM<!+
z?#5Y_PAzV#dRsB3cG9@(Z(0uE8lP@jnQq*=WlKj-+G^a<u`b=Qv3^f?x~sl9wYatI
z;K*^7Rd1z|^Oo;TBpMoedubC}U<zb1ne&3c0tj+oh@S$=P6ZiD$;XDZoqV)J(2$RY
z2sy}?w+MNXFHaFX$oI2N;AZ79F~ZDk!c&BQkol<!E~(ifKxnHADdp-T^9p<hlGmA;
zBEY5^Jl3!}f`1xV4{n2p-~!Ou=8~VQ{SF9|vEZ8vqaIz~)a`MpFRl|{sIFZo{RBKk
zB6paUydpt;HxX{&H%@@HgC*}Ff*eY6xoCzFYy#Z036S%fcQT``eNX76oN(3&ZJA(4
zfj2;G(Bu^{X$#JR(aL8;O2C!i5h$3vB1#{_Ro<x7*uafaISw{fAXcDc3NWcvfDs_O
zA|pQp1a^LA>|uTdsK}=S23kbD)nGRGPWcMyN3a}R0zqA|brZ`R#=i>cz$DNIUV}%8
zMB*N)KVtx|>v`Yjd4JJa7V+6vj1&i$zb}TaLQP(YN1VkM!4&fUMFi8x7gYpP$rnY0
z9OUn)LBgKGV?WTD`@~3XuL)0XT<!}yaTOo2&IBKT&axs5kw(;#C$wFv16!IQ{{?&i
za&9%k;8T;i_3Ger^)5gr^Nzqj0pa7cu7CWkKVmqyI?A%@`vqP){9!KsBsd{1X?}(x
zUWda+wolHlr{HV#_xG<L-uFOf*~4K#wAA(zLEca?!r*aN$6PpilE@)K;LBjo;Mqw0
z{#S^micl2tN@3GPAYQpCt26K2UXgaD^yW1ugzj+AurG|f62lY`h*KWSI?W$>n+Qjp
zJ=@BG?Fqz?UB{5G0w=+ye`r?m7bT_BHQ*_5d-~g0ltFxULTp(<^6hF+_x2b-9#+b2
zsHvbDJOOXH4fT~Ywpf8!fmnf9fmi{D0-QOfJ6xeE4*I-VK=dt$5ZGd=fOw1B1oFp#
zSTsd|_^v<n|9(VI1bDaF1dwdBM1XLoLx5<B09$!S*v*p8*@j9Jz${?qTVhT^Qie<$
zaI<GP=K*=avfWWZ-a#lIgPiWplJ3V7?WJO0igkd+<#IQKPP>qj%W=0$@*ggB&3Ae1
z3HBqPIJdFFDpw8>%A36UQZyn&gS<wBXpy&x5ZxbAD-jA#H%wgGM&pI@e*p^aWMIRK
W6CT`esp~u=-c-|)<hA+jhkgSURR0SA

diff --git a/Resources/Textures/_Starlight/Effects/bullet_hole.rsi/bullet_hole.png b/Resources/Textures/_Starlight/Effects/bullet_hole.rsi/bullet_hole.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a20bdc3c870b64ea40270347df35c221415a894
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzQ%@Jikcif|XB>GM3^^DaFWEC0
zG}PyFyy$#Tm}&I+elG(<Tv+J#-S3|jniZxUJCh^EaNxh4T|VnRN7KwrKm!;&UHx3v
IIVCg!06?N5g8%>k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Effects/bullet_hole.rsi/meta.json b/Resources/Textures/_Starlight/Effects/bullet_hole.rsi/meta.json
new file mode 100644
index 000000000000..5f23cf4fbbb0
--- /dev/null
+++ b/Resources/Textures/_Starlight/Effects/bullet_hole.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "by Rinary for Starlight",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"load": {
+		"srgb": false
+	},
+	"states": [
+		{
+			"name": "bullet_hole"
+		}
+	]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Starlight/Effects/impact_sparks.rsi/effect.png b/Resources/Textures/_Starlight/Effects/impact_sparks.rsi/effect.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f3f2409aa887359adbf99676b47e3b0011e667
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!scD`rjv*Cu-d;b*+hV}Oa^Q>0
z|E)_zKHI!hQJ8;Yno%&r?9J1IC76LKf#BX5%cOIHGb=;WJ9fwwZ%UhB`FdOXigWcs
zg}JuZuYV4HeyNmG{dTOwkB|HX8~#5n-^r2oH26jCMM>2a=klK~k>6W%@>Zo_^vu$e
zcB{Mt=FU&u8slEa8!~-?)qJ*9_ia>dVoDhq85lC&vN^vgV&8J*Auq^QPgg&ebxsLQ
E0CBTX!~g&Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Effects/impact_sparks.rsi/meta.json b/Resources/Textures/_Starlight/Effects/impact_sparks.rsi/meta.json
new file mode 100644
index 000000000000..cd9d49007d35
--- /dev/null
+++ b/Resources/Textures/_Starlight/Effects/impact_sparks.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Made by Rinary for Starlight",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "effect",
+			"delays": [
+				[
+					0.1,
+					0.1,
+					0.1,
+					0.1
+				]
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..b49a6a2c5bb71df7eccefee5107df8b6bd1953a9
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDVB6cUq=RpjeRx011AIdJOMr-
zuK&RR$OF=>3@L{|>PmwAg6GFG{Fez5%mDI>JzX3_JUZWAapY=n;Bmfq?au#m>t?eF
z8twAheyYCd^2*nbS28d%{oyV7?V822fHC^PF$S(}7Z}otZML;ueLg>jYxjP?iK-p{
zn66l_cdwN_x@Mn92LGOYLKQ$lpo0I+>SpPZ4E`A3uRGYEt2;C>*fW?r9T)$|ETwe|
PXg!0ctDnm{r-UW|p!QU!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..775351cd74b7cae7bd5ba22ac656e13cfb59cbaa
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDVB6cUq=RpjeRx011AIdasfUe
zuK!WNzkmNA0zi2nLq^{92av^8666<r-hTc2{QL9c8UA0m@0<e^ZS{0<4DslEd&Qft
z!GOc{V%^gG|I%eyjngC+F}G%(wN(?lTu~9kz{v8!%;AatreiDu55y{xnfP|FG8O1B
z?pOHrM>*O_Pxbz*?&uT_&Kq~Em+CXToq4)s!FvC#+mjnE%CEh)%`%K-8@t<m8O;y2
xAHIq<zHi*DFP+1Gr}pBHTlY;G82)k2iTxbE`IXN50HA{yJYD@<);T3K0RY1Dbh-cl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer.png
new file mode 100644
index 0000000000000000000000000000000000000000..4800f7f0fc3131b59047fa2914fabdb40a3be263
GIT binary patch
literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQVTp?978f1-(ES$+hQQ#e6i!y
zi<V25xaL;sD=ggEsIblK|J@w|=Oa9`fod5T9;kWFUUGJB@{|>o{RYc>0_3}9ZEu;l
zB#+mmVM$!tw<!jXKly(X5}Fo&Zu-L-e@@QR`HZYvrh7%m&DlNe{ojN3|6J$pefLcI
zo4LUQwj1$HEkZGGPVZ-#xvpi#(|D$@GYptr&Q-UZ;xImt^O*@`--mhfOcj%|?nHic
P25~)I{an^LB{Ts5B>`C#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer_double.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/arrows_outer_double.png
new file mode 100644
index 0000000000000000000000000000000000000000..c54780ce2f00a85fa3b721207306e07d64672e96
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDVB6cUq=RpjeRx011AIdJOMr-
zuK&RR$OF=>3@L{|>PmwAg6GFG{Fez5%mDH`JzX3_JUZV_G2}a-z~Q>^&i`|=Qlde2
zjWfzJ5)%XN1sh!YSP;M+b)jiH>lw3frYlm6-5buS+O1IC?e6h3XhO`BiLwX9<fX(k
zkMl2kEUl(>vVYlQDUFz~5)1#<9ouS~sqyLSgyJ@(`!<(#nP)BB`SC@;jZA?R*P7hg
ooBfiT<9~0xzlBxz$MOd(2cL-F42nNx33L>Lr>mdKI;Vst0MDLbsQ>@~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a57ed3a8121205219115d2c190d720701ba184
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^3xHUGgBeIJTG)IXNU@|l`Z_W&Z0xJ~9XJ`tXAAHN
zaRt)<|NmclbN*c*i>V~YFPPzf^hBktK%Skai(^Pc>)UgNTnq|4ERLW5``?b%Y<Emq
z#{000hruc|_4{j<Wh~3=_|_c#`RUsK<Bh%`F3Ylc{45n`StPO<8sAJ{UIH|U!PC{x
JWt~$(69DPYH#z_S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic_dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/basic_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..d14a28545bb78078c06fdfd2ab813b55549155db
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^3xHUGgBeIJTG)IXNU@|l`Z_W&Z0xJ~9XJ`tXAAHN
zaRt)<|NmclbN*c*i>V~YFPPzf^hBktK%Skai(^Pc>)UgVTnq|4M-IIEZ~yl0Y!>gS
zXSSAjPE}bMeCXYENe@YnTA3MVUo!lyx8Km&I0Xo={BZD`mB#3(&CtrFcr+Ji5`(9!
KpUXO@geCx|zd9!X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/brackets.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/brackets.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1c5dacc76d7930ef1e4310ccdc15871b2f864b4
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDVB6cUq=RpjeRx011AIdJOMr-
zuK&RR$OF=>3@L{|>PmwAg6GFG{Fez5%mDJcJzX3_JUZV_-6+&xz~S8d=fC~#7Yq-h
za=+YKc;?~Wg?k$wKR+n8M%^H|V9#9EXL=G{xdBcFA-5m2@bBlI!^^1l$=i9s%0IU+
zh;;lHi)}oXek`l$d#CP?s0;IdGOb*@ep@D&N%Pj#i?R+g)}^#HWURPlQ7ZkVdP3)%
ri|-g2H5cDyex|v@{gmzuJqt#6Es0z{rD|)Svlu*G{an^LB{Ts5UD#xn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..c183db78456a459abd0f4c6c7a2b22b2ba18823c
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qPj0(?ST
z|NZ;-9~%J51BG|5PrL+Vag_x51>d({fBt=b{CtN07bE9S0*cP^ba4!^=-oRxkgq|3
z$9c6<&iDNr1SNb{{FAuL|86Viku3rfC0hNS33RTy5@>O5vXz#*UFTtoNkQ&cO&wP(
ze)(K^a_#PyJlmGO7VTY_*L+X%l-bMP#=lDT|D~su#>(-|e)TP*;g!d_*K&vcy_<Mn
zGGd+fX|`$E$uEA&em!*Iv-Qh;;^s3;_AZ$DWp4r$E9@$~lM>Y<zx#mv<6NWur9f9Q
Nc)I$ztaD0e0svB<iTwZo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..24d8fb6a492a59be0f9f0d7427097135e605e730
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qOM0(?ST
z|APUL2c%gUQVxOCl?3?(&yQ#LFB2q~0pz=Tx;Tbd^u9f3$Okg;z_fq=&$G=iX_~E9
z)*QpN!TG~MVTFr5LCh|z7z0>TJvOdccJlY%el7$54J`Ni-<{mi&-UiiK~n>U<q{l%
UpA|hAfkrZTy85}Sb4q9e081o4Jpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small2.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/cross_small2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a85e294b20056b1086aa518f0dbba77de7c78773
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qO&1AIbU
z|NsC04-9||H~>ll+1DG_-vzQbOM?7@=ilG|{=7av!+%?W9wVS&hNp{Th(+()es8`8
z1s<1)bu)g?zY);0aI4GR%V%|-sm=|*b$TlAANDOTMEo5j*OaR`upU^&vtU_6fO?hx
zq<jOVFZYrJ)_rgITQ1zJ)-S&28cPS0powSB@u1D`cPm}BN$EPHw41kv#c#<B=|VRP
RZA+k?44$rjF6*2UngG2aV^#nF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcb0bd9c8541d64eebdeb91d970276019af9a7aa
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qNN0(?ST
z|AWE5fBzs1APJNKlJY`sUO*N{NswQ#eg6IR@6R**-^cbW9w=tu>Eak-(VLv0%pl<=
z$`i@TbLPwor4=z@Wo2P|xMtkAIrD>7LP}!dk~0$*bFpn^Vz96gzkTTL;a5Pt44$rj
JF6*2UngG{7L=^x4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/double_dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/double_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a6ba3190253cbbfe953a5af71cf813a915576cd
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDVB6cUq=RpjeRx011AId5&=FT
zuK$t1zkmOLJfIAa%t;S=0c3HM1o;KOx6faH|2)J0Lj6e!Krt6j7sn8f&bMa|@&YYz
zzNnP&{r(Ns4+}WefAzOKOEhO^WMbivVA-&u%DjB_yYGLMC!}m+a&*()(D0S@i>gBd
d1EX>SbB}^Y_0yx~yMX2~c)I$ztaD0e0sv0fO$7h|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/melee_sight.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/melee_sight.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff4bd1c042620324e179d3ddac0c624618c8579
GIT binary patch
literal 621
zcmV-z0+RiSP)<h;3K|Lk000e1NJLTq005u>001Be1^@s6m49>f0006sNkl<Zc%1E=
zu}<VL6h-gTtdORho`QBuer3O6VWcVe4Wum)i0#mbek*!D0XkX=`YGwS+gRGsYLYn4
zvz=t_k<vMK93REW^K$?pgqR{Ew<Nc<uR|OmB=7l;``Xtdj)?!{lZ2ui4f2(dkmMp9
zCnPOvV-td;g?q9fxu|_Tx#*BDNy2D}NUi~V2XF@96u=I^4>Q{(^=2lJTmkq4U<Kd<
zz&n69GrOyOZJq?NenuAmZDtp)jW^i-KyvBU(8M6Q4ELb?bX1U*@&5`(zW#SSb~i4K
zOc;_Iujy!vbd3LXIP&yg^2IS%3A^OmE9Wnv<m<=WBqX_xk#Dd3V@vsU-^L|h0&|j(
z<Za*aZ|VPSpN1vh0Oleg$)}X@Z|MJ1Y@==RJ$iKP80eUeCLtlo*VKp40SRAYPKtWr
z6mewzIxGOm=M?$&&fk~txvTKD;YNK)zI1|wO>wf$EE10xYib=NS0Tok{Mr>Hd<en%
zgM3S^T;wGT+AoqXW_FWU#|FST$*aCAR%W&%d1+>!DQ$;3Zb&Yp>d+MI%aAEJtS!4v
zfs<IfmxMkHeg6xI4Xz&nBu@r+tON?f48tP~6S8Vt!yuE&(vgH|c*OvNfUbeyNeKu^
z*c<Nvbk(J>u^<WK$hG=WH5p(mNWyk<FTGVwhZ+k?NIgucgw(1Dp_x%i{y<8l<X26J
z9}C))beK|`l5%Vc5~3GXw?zs8Z44J<K)=Qi)zQy^gc!(Qrw-FgkgcmO00000NkvXX
Hu0mjfVPYNA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/meta.json b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/meta.json
new file mode 100644
index 000000000000..cc7e7d1ef031
--- /dev/null
+++ b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/meta.json
@@ -0,0 +1,143 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Kenney assets, https://kenney-assets.itch.io/crosshair-pack",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "arrows",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "arrows_dot",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "arrows_outer",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "arrows_outer_double",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "basic",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "basic_dot",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "brackets",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cross_dot"
+    },
+    {
+      "name": "cross_small"
+    },
+    {
+      "name": "cross_small2"
+    },
+    {
+      "name": "dot"
+    },
+    {
+      "name": "double_dot",
+      "delays": [
+        [
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "triple",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "triple_dot",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "melee_sight",
+      "license": "CC-BY-SA-3.0",
+      "copyright": "https://github.com/Arteben",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d4e0dce1d42129a019dd6bf874517491aeff629
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!DVB6cUq=RpjeRx011AIdg`O^s
zAr*7p-Z;(GpdjKJnE&Pf{+!DkN<s^dM`nvz?6`RB$Tgs{29d8{7<yjr{r<N&l(+VD
z>MfU=NeqWL73P45J5^gBRNUH={iWoWSbcrHwSxs?i?G9v@c;8Io~upJWD)RVcnBgu
ZK+$Y(kAPz2^UlX0o~Nsy%Q~loCIB>zLE!)Z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple_dot.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers.rsi/triple_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b143d19a9d1accb78a542050f2824b500d868f2
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!DVB6cUq=RpjeRx011AIdn><|{
zLn`LHy?&ANkby|+!{Q^1GOp?cs_rkn{1z-OX@2Z2?=t1mg``t|_b-p(c(TlPf(sK+
z8v{e=kNdm}d?)R>zHRour-@tpHh8lvuwV+1Vbthj5GkKC`$OgJm{niPtkh42Udq*C
zzx}=U+RLK<*)wz3UFV<hMDeA~RR7!4fnufqx6W_$^t*p7B5gb423rp))!xezyu0k?
ue~A96%<x));izE4BMyf`7O<@h3p&I*EcG3HuRN9k33$5txvX<aXaWEkt73To

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/gun_bolt_sight.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/gun_bolt_sight.png
similarity index 100%
rename from Resources/Textures/Interface/Misc/crosshair_pointers.rsi/gun_bolt_sight.png
rename to Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/gun_bolt_sight.png
diff --git a/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/gun_sight.png b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/gun_sight.png
similarity index 100%
rename from Resources/Textures/Interface/Misc/crosshair_pointers.rsi/gun_sight.png
rename to Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/gun_sight.png
diff --git a/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/meta.json b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/meta.json
similarity index 85%
rename from Resources/Textures/Interface/Misc/crosshair_pointers.rsi/meta.json
rename to Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/meta.json
index 25fd92795ebd..d1e0513ac9f8 100644
--- a/Resources/Textures/Interface/Misc/crosshair_pointers.rsi/meta.json
+++ b/Resources/Textures/_Starlight/Interface/Misc/crosshair_pointers_big.rsi/meta.json
@@ -12,9 +12,6 @@
     },
     {
       "name": "gun_bolt_sight"
-    },
-    {
-      "name": "melee_sight"
     }
   ]
 }
diff --git a/Resources/_Starlight/migration.yml b/Resources/_Starlight/migration.yml
index 27e1ecb1f24a..14c056b9fc19 100644
--- a/Resources/_Starlight/migration.yml
+++ b/Resources/_Starlight/migration.yml
@@ -57,6 +57,13 @@ CrateStarterXenobiology: null
 #2026-02-15
 ClothingOuterArmorSovietFlak: ClothingOuterArmorSovietPlate
 
+#2026-02-28
+WeaponLr30: WeaponRifleLr30
+WeaponEnergySMG: WeaponSubMachineGunEnergy
+WeaponIK60: WeaponRifleIK60
+WeaponPDW9: WeaponPistolPDW9
+WeaponEnergySniper: WeaponSniperEnergy
+
 #2026-03-06
 LockerBSOFilled: LockerBlueshieldFilled
 
diff --git a/git b/git
deleted file mode 100644
index e69de29bb2d1..000000000000