diff --git a/Content.Client/Audio/Jukebox/JukeboxEntry.xaml b/Content.Client/Audio/Jukebox/JukeboxEntry.xaml
index 1064156fcb..143fc44d20 100644
--- a/Content.Client/Audio/Jukebox/JukeboxEntry.xaml
+++ b/Content.Client/Audio/Jukebox/JukeboxEntry.xaml
@@ -1,7 +1,6 @@
 <BoxContainer xmlns="https://spacestation14.io"
               Orientation="Horizontal"
-              HorizontalExpand="True"
->
+              HorizontalExpand="True">
     <Label Name="SongName" HorizontalAlignment="Left" HorizontalExpand="True"/>
     <Button Name="PlayButton" StyleClasses="OpenRight" Text="{Loc 'jukebox-menu-buttonplay'}" />
     <Button Name="StopButton" StyleClasses="OpenLeft" Text="{Loc 'jukebox-menu-buttonstop'}" />
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 328c3e6e06..6478973a22 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -1,7 +1,6 @@
 using Content.Client._White.Chat;
 using Content.Client._White.JoinQueue;
 using Content.Client._White.Jukebox;
-using Content.Client._White.Overlays;
 using Content.Client._White.Reputation;
 using Content.Client._White.Sponsors;
 using Content.Client._White.Stalin;
@@ -10,7 +9,6 @@ using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Eui;
-using Content.Client.Flash;
 using Content.Client.Fullscreen;
 using Content.Client.GhostKick;
 using Content.Client.Guidebook;
@@ -26,6 +24,7 @@ using Content.Client.Radiation.Overlays;
 using Content.Client.Replay;
 using Content.Client.Screenshot;
 using Content.Client.Singularity;
+using Content.Client._White.Explosion;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
@@ -179,6 +178,7 @@ namespace Content.Client.Entry
             _parallaxManager.LoadDefaultParallax();
 
             _overlayManager.AddOverlay(new SingularityOverlay());
+            _overlayManager.AddOverlay(new ExplosionShockWaveOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             // _overlayManager.AddOverlay(new GrainOverlay());
             // _overlayManager.AddOverlay(new AtmOverlay());
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index a363a1f937..0432592748 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -244,7 +244,7 @@ namespace Content.Client.Lobby
                 _lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
             }
 
-            _lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] White Dream [/font]");
+            _lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Giedi Prime [/font]");
             _lobby!.ChangelogLabel.SetMarkup("Список изменений:");
         }
 
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index 843a3f084a..11d35edd6a 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -41,6 +41,7 @@
             <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
             <CheckBox Name="LogInChatCheckBox" Text="Логировать действия в чат" />
             <CheckBox Name="ShowTrailsCheckBox" Text="Отображать трейлы от пуль" />
+            <CheckBox Name="EnableLightsGlowingBox" Text="Включить свечение от ламп" />
         </BoxContainer>
         <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <Button Name="ApplyButton"
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 220b10d68b..06451d93e2 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -73,8 +73,9 @@ namespace Content.Client.Options.UI.Tabs
             ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
             ParallaxLowQualityCheckBox.OnToggled += OnCheckBoxToggled;
             FpsCounterCheckBox.OnToggled += OnCheckBoxToggled;
-            LogInChatCheckBox.OnToggled += OnCheckBoxToggled;
-            ShowTrailsCheckBox.OnToggled += OnCheckBoxToggled;
+            LogInChatCheckBox.OnToggled += OnCheckBoxToggled; // WD
+            ShowTrailsCheckBox.OnToggled += OnCheckBoxToggled; // WD
+            EnableLightsGlowingBox.OnToggled += OnCheckBoxToggled; // WD
             ApplyButton.OnPressed += OnApplyButtonPressed;
             VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync);
             FullscreenCheckBox.Pressed = ConfigIsFullscreen;
@@ -86,8 +87,9 @@ namespace Content.Client.Options.UI.Tabs
             ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender);
             ParallaxLowQualityCheckBox.Pressed = _cfg.GetCVar(CCVars.ParallaxLowQuality);
             FpsCounterCheckBox.Pressed = _cfg.GetCVar(CCVars.HudFpsCounterVisible);
-            LogInChatCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.LogChatActions);
-            ShowTrailsCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.ShowTrails);
+            LogInChatCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.LogChatActions); // WD
+            ShowTrailsCheckBox.Pressed = _cfg.GetCVar(WhiteCVars.ShowTrails); // WD
+            EnableLightsGlowingBox.Pressed = _cfg.GetCVar(WhiteCVars.EnableLightsGlowing); // WD
             ViewportWidthSlider.Value = _cfg.GetCVar(CCVars.ViewportWidth);
 
             _cfg.OnValueChanged(CCVars.ViewportMinimumWidth, _ => UpdateViewportWidthRange());
@@ -120,8 +122,9 @@ namespace Content.Client.Options.UI.Tabs
             _cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox.Pressed);
             _cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed);
-            _cfg.SetCVar(WhiteCVars.LogChatActions, LogInChatCheckBox.Pressed);
-            _cfg.SetCVar(WhiteCVars.ShowTrails, ShowTrailsCheckBox.Pressed);
+            _cfg.SetCVar(WhiteCVars.LogChatActions, LogInChatCheckBox.Pressed); // WD
+            _cfg.SetCVar(WhiteCVars.ShowTrails, ShowTrailsCheckBox.Pressed); // WD
+            _cfg.SetCVar(WhiteCVars.EnableLightsGlowing, EnableLightsGlowingBox.Pressed); // WD
             _cfg.SetCVar(CCVars.ViewportWidth, (int) ViewportWidthSlider.Value);
 
             _cfg.SaveToFile();
@@ -151,8 +154,9 @@ namespace Content.Client.Options.UI.Tabs
             var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender);
             var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality);
             var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible);
-            var isLogInChatSame = LogInChatCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.LogChatActions);
-            var isShowTrailsSame = ShowTrailsCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.ShowTrails);
+            var isLogInChatSame = LogInChatCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.LogChatActions); // WD
+            var isShowTrailsSame = ShowTrailsCheckBox.Pressed == _cfg.GetCVar(WhiteCVars.ShowTrails); // WD
+            var isEnableLightsGlowing = EnableLightsGlowingBox.Pressed == _cfg.GetCVar(WhiteCVars.EnableLightsGlowing); // WD
             var isWidthSame = (int) ViewportWidthSlider.Value == _cfg.GetCVar(CCVars.ViewportWidth);
 
             ApplyButton.Disabled = isVSyncSame &&
@@ -167,7 +171,8 @@ namespace Content.Client.Options.UI.Tabs
                                    isFpsCounterVisibleSame &&
                                    isWidthSame &&
                                    isLogInChatSame &&
-                                   isShowTrailsSame;
+                                   isShowTrailsSame &&
+                                   isEnableLightsGlowing;
         }
 
         private bool ConfigIsFullscreen =>
diff --git a/Content.Client/_White/Explosion/RMCExplosionShockWaveOverlay.cs b/Content.Client/_White/Explosion/RMCExplosionShockWaveOverlay.cs
new file mode 100644
index 0000000000..aa8efedc31
--- /dev/null
+++ b/Content.Client/_White/Explosion/RMCExplosionShockWaveOverlay.cs
@@ -0,0 +1,90 @@
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+using Content.Shared._White.Explosion;
+
+namespace Content.Client._White.Explosion;
+
+public sealed class ExplosionShockWaveOverlay : Overlay, IEntityEventSubscriber
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private SharedTransformSystem? _xformSystem;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override bool RequestScreenTexture => true;
+
+    private readonly ShaderInstance _shader;
+
+    /// <summary>
+    ///     Maximum number of distortions that can be shown on screen at a time.
+    /// </summary>
+    public const int MaxCount = 30;
+
+    public ExplosionShockWaveOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _shader = _prototypeManager.Index<ShaderPrototype>("ShockWave").Instance().Duplicate();
+    }
+
+    private readonly Vector2[] _positions = new Vector2[MaxCount];
+    private readonly float[] _falloffPower = new float[MaxCount];
+    private readonly float[] _sharpness = new float[MaxCount];
+    private readonly float[] _width = new float[MaxCount];
+    private int _count;
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (args.Viewport.Eye == null || _xformSystem is null && !_entMan.TrySystem(out _xformSystem))
+            return false;
+
+        var query = _entMan.EntityQueryEnumerator<ExplosionShockWaveComponent, TransformComponent>();
+
+        _count = 0;
+
+        while (query.MoveNext(out var uid, out var distortion, out var xform))
+        {
+            if (xform.MapID != args.MapId)
+                continue;
+
+            var mapPos = _xformSystem.GetWorldPosition(uid);
+
+            var tempCoords = args.Viewport.WorldToLocal(mapPos);
+
+            // normalized coords, 0 - 1 plane. This is pure hell, we subtract 1 because fragment calculates from the bottom and local goes from the top of the viewport
+            tempCoords.Y = 1 - (tempCoords.Y / args.Viewport.Size.Y);
+            tempCoords.X /= args.Viewport.Size.X;
+
+            _positions[_count] = tempCoords;
+            _falloffPower[_count] = distortion.FalloffPower;
+            _sharpness[_count] = distortion.Sharpness;
+            _width[_count] = distortion.Width;
+            _count++;
+
+            if (_count == MaxCount)
+                break;
+        }
+
+        return _count > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null || args.Viewport.Eye == null)
+            return;
+
+        _shader?.SetParameter("renderScale", args.Viewport.RenderScale * args.Viewport.Eye.Scale);
+        _shader?.SetParameter("count", _count);
+        _shader?.SetParameter("position", _positions);
+        _shader?.SetParameter("falloffPower", _falloffPower);
+        _shader?.SetParameter("sharpness", _sharpness);
+        _shader?.SetParameter("width", _width);
+        _shader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+        var worldHandle = args.WorldHandle;
+        worldHandle.UseShader(_shader);
+        worldHandle.DrawRect(args.WorldAABB, Color.White);
+        worldHandle.UseShader(null);
+    }
+}
diff --git a/Content.Client/_White/Lighting/Shaders/LightingOverlay.cs b/Content.Client/_White/Lighting/Shaders/LightingOverlay.cs
new file mode 100644
index 0000000000..75acca625f
--- /dev/null
+++ b/Content.Client/_White/Lighting/Shaders/LightingOverlay.cs
@@ -0,0 +1,92 @@
+using System.Numerics;
+using Content.Shared._White;
+using Content.Shared._White.Lighting.Shaders;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
+
+namespace Content.Client._White.Lighting.Shaders;
+
+public sealed class LightingOverlay : Overlay
+{
+    private readonly IPrototypeManager _prototypeManager;
+    private readonly EntityManager _entityManager;
+    private readonly SpriteSystem _spriteSystem;
+    private readonly TransformSystem _transformSystem;
+    private readonly IConfigurationManager _cfg;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
+    public override bool RequestScreenTexture => true;
+
+    private readonly ShaderInstance _shader;
+    private bool _enableGlowing;
+
+    public LightingOverlay(EntityManager entityManager, IPrototypeManager prototypeManager)
+    {
+        _entityManager = entityManager;
+        _spriteSystem = entityManager.EntitySysManager.GetEntitySystem<SpriteSystem>();
+        _prototypeManager = prototypeManager;
+        _transformSystem = entityManager.EntitySysManager.GetEntitySystem<TransformSystem>();
+        _cfg = IoCManager.Resolve<IConfigurationManager>();
+        _cfg.OnValueChanged(WhiteCVars.EnableLightsGlowing, val => _enableGlowing = val, true);
+
+        IoCManager.InjectDependencies(this);
+
+        _shader = _prototypeManager.Index<ShaderPrototype>("LightingOverlay").InstanceUnique();
+        ZIndex = (int) DrawDepth.Overdoors;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (!_enableGlowing)
+            return;
+
+        if (ScreenTexture == null)
+            return;
+
+        var xformCompQuery = _entityManager.GetEntityQuery<TransformComponent>();
+
+        var handle = args.WorldHandle;
+        var bounds = args.WorldAABB.Enlarged(5f);
+
+        _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+        var query = _entityManager.AllEntityQueryEnumerator<LightingOverlayComponent, PointLightComponent, TransformComponent>();
+        while (query.MoveNext(out _, out var component, out var pointLight, out var xform))
+        {
+            if (xform.MapID != args.MapId)
+                continue;
+
+            if (!component.Enabled ?? !pointLight.Enabled)
+                continue;
+
+            var worldPos = _transformSystem.GetWorldPosition(xform, xformCompQuery);
+
+            if (!bounds.Contains(worldPos))
+                continue;
+
+            var color = component.Color ?? pointLight.Color;
+
+            var (_, _, worldMatrix) = xform.GetWorldPositionRotationMatrix(xformCompQuery);
+            handle.SetTransform(worldMatrix);
+
+            var mask = _spriteSystem.Frame0(component.Sprite); // mask
+
+            var xOffset = component.Offsetx - (mask.Width / 2) / EyeManager.PixelsPerMeter;
+            var yOffset = component.Offsety - (mask.Height / 2) / EyeManager.PixelsPerMeter;
+
+            var textureVector = new Vector2(xOffset, yOffset);
+
+            handle.DrawTexture(mask, textureVector, color);
+
+            handle.UseShader(_shader);
+        }
+
+        handle.UseShader(null);
+        handle.SetTransform(Matrix3.Identity);
+    }
+}
diff --git a/Content.Client/_White/Lighting/Shaders/LightingOverlaySystem.cs b/Content.Client/_White/Lighting/Shaders/LightingOverlaySystem.cs
new file mode 100644
index 0000000000..c64cbedd1e
--- /dev/null
+++ b/Content.Client/_White/Lighting/Shaders/LightingOverlaySystem.cs
@@ -0,0 +1,25 @@
+using Robust.Client.Graphics;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._White.Lighting.Shaders;
+
+public sealed class LightingOverlaySystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    private LightingOverlay _lightingOverlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _lightingOverlay = new LightingOverlay(EntityManager, _prototypeManager);
+        _overlayManager.AddOverlay(_lightingOverlay);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayManager.RemoveOverlay(_lightingOverlay);
+    }
+}
diff --git a/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs b/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs
index 109276264d..ca1266c842 100644
--- a/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs
+++ b/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs
@@ -8,7 +8,7 @@ namespace Content.Client._White.WeaponsModules;
 
 public sealed partial class WeaponModulesVisuals : VisualizerSystem<WeaponModulesComponent>
 {
-    [Dependency] private readonly PointLightSystem _lightSystem = default!;
+[Dependency] private readonly PointLightSystem _lightSystem = default!;
     protected override void OnAppearanceChange(EntityUid uid, WeaponModulesComponent component, ref AppearanceChangeEvent args)
     {
         base.OnAppearanceChange(uid, component, ref args);
@@ -16,34 +16,57 @@ public sealed partial class WeaponModulesVisuals : VisualizerSystem<WeaponModule
         if(args.Sprite == null)
             return;
 
-        args.Sprite.LayerSetVisible(ModuleVisualState.HandGuardModule, false);
-        args.Sprite.LayerSetVisible(ModuleVisualState.BarrelModule, false);
-        args.Sprite.LayerSetVisible(ModuleVisualState.AimModule, false);
-
-        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.HandGuardModule, out var handguardModule, args.Component) && handguardModule.Length != 0 && handguardModule != "none")
+        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.BarrelModule, out var barrelModule, args.Component))
         {
-            args.Sprite.LayerSetState(ModuleVisualState.HandGuardModule, handguardModule);
-            args.Sprite.LayerSetVisible(ModuleVisualState.HandGuardModule, true);
+            if (barrelModule.Length != 0 && barrelModule != "none")
+            {
+                args.Sprite.LayerSetState(ModuleVisualState.BarrelModule, barrelModule);
+                args.Sprite.LayerSetVisible(ModuleVisualState.BarrelModule, true);
+            }
+            else
+                args.Sprite.LayerSetVisible(ModuleVisualState.BarrelModule, false);
         }
 
-        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.BarrelModule, out var barrelModule, args.Component) && barrelModule.Length != 0 && barrelModule != "none")
+        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.HandGuardModule, out var handguardModule, args.Component))
         {
-            args.Sprite.LayerSetState(ModuleVisualState.BarrelModule, barrelModule);
-            args.Sprite.LayerSetVisible(ModuleVisualState.BarrelModule, true);
+            if (handguardModule.Length != 0 && handguardModule != "none")
+            {
+                args.Sprite.LayerSetState(ModuleVisualState.HandGuardModule, handguardModule);
+                args.Sprite.LayerSetVisible(ModuleVisualState.HandGuardModule, true);
+            }
+            else
+                args.Sprite.LayerSetVisible(ModuleVisualState.HandGuardModule, false);
         }
 
-        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.AimModule, out var aimModule, args.Component) && aimModule.Length != 0 && aimModule != "none")
+        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.AimModule, out var aimModule, args.Component))
         {
-            args.Sprite.LayerSetState(ModuleVisualState.AimModule, aimModule);
-            args.Sprite.LayerSetVisible(ModuleVisualState.AimModule, true);
+            if (aimModule.Length != 0 && aimModule != "none")
+            {
+                args.Sprite.LayerSetState(ModuleVisualState.AimModule, aimModule);
+                args.Sprite.LayerSetVisible(ModuleVisualState.AimModule, true);
+            }
+            else
+                args.Sprite.LayerSetVisible(ModuleVisualState.AimModule, false);
         }
 
-        if (AppearanceSystem.TryGetData(uid, Modules.Light, out var data, args.Component))
+        if (AppearanceSystem.TryGetData<string>(uid, ModuleVisualState.ShutterModule, out var shutterModule, args.Component))
+        {
+            if (shutterModule.Length != 0 && shutterModule != "none")
+            {
+                args.Sprite.LayerSetState(ModuleVisualState.ShutterModule, shutterModule);
+                args.Sprite.LayerSetVisible(ModuleVisualState.ShutterModule, true);
+            }
+            else
+                args.Sprite.LayerSetVisible(ModuleVisualState.ShutterModule, false);
+        }
+
+        if (AppearanceSystem.TryGetData(uid, Modules.Light, out _, args.Component))
         {
             if (TryComp<PointLightComponent>(uid, out var pointLightComponent))
             {
                 if(!pointLightComponent.Enabled)
                     return;
+
                 _lightSystem.SetMask("/Textures/White/Effects/LightMasks/lightModule.png", pointLightComponent!);
             }
         }
diff --git a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
index 78e41c59ae..68cdbce037 100644
--- a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
@@ -1,14 +1,14 @@
+using System.Numerics;
 using Content.Server.Explosion.Components;
+using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Flash.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Throwing;
-using Robust.Shared.Containers;
-using Robust.Shared.Random;
-using Content.Server.Weapons.Ranged.Systems;
-using System.Numerics;
-using Content.Shared.Explosion.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
+using Robust.Shared.Containers;
+using Robust.Shared.Random;
 
 namespace Content.Server.Explosion.EntitySystems;
 
@@ -114,6 +114,7 @@ public sealed class ClusterGrenadeSystem : EntitySystem
                         RaiseLocalEvent(uid, ref ev);
                     }
                 }
+
                 // delete the empty shell of the clusterbomb
                 Del(uid);
             }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 1b34a07a8e..dddc1a53f1 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -7,6 +7,7 @@ using Content.Server.Explosion.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NPC.Pathfinding;
 using Content.Server.Station.Systems;
+using Content.Shared._White.Explosion;
 using Content.Shared.Audio;
 using Content.Shared.Armor;
 using Content.Shared.Camera;
@@ -176,6 +177,11 @@ public sealed partial class ExplosionSystem
             totalIntensity ??= RadiusToIntensity((float) radius, explosive.IntensitySlope, explosive.MaxIntensity);
         totalIntensity ??= explosive.TotalIntensity;
 
+        // WD edit start
+        var ev = new ExplosiveTriggeredEvent();
+        RaiseLocalEvent(uid, ref ev);
+        // WD edit end
+
         QueueExplosion(uid,
             explosive.ExplosionType,
             (float) totalIntensity,
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 15abb06427..3347295cbb 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -23,6 +23,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Content.Server._White.PandaSocket.Main;
+using Content.Server._White.RandomArtifacts;
 using Content.Server._White.RealRoundEnded;
 using Content.Server._White.Reputation;
 using Content.Server._White.Stalin;
@@ -288,6 +289,8 @@ namespace Content.Server.GameTicking
             // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards...
             _mapManager.DoMapInitialize(DefaultMap);
 
+            RaiseLocalEvent(new RandomArtifactsSystem.MainMapInitEvent()); // Please no more organs-artifacts in players
+
             SpawnPlayers(readyPlayers, readyPlayerProfiles, force);
 
             _roundStartDateTime = DateTime.UtcNow;
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
index 06f1b6b154..a739d6bfad 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
@@ -51,7 +51,7 @@ public sealed partial class ParticleAcceleratorSystem
                 ParticleAcceleratorPowerState.Level2 => 3,
                 ParticleAcceleratorPowerState.Level3 => 10,
                 _ => 0,
-            } * 10;
+            } * 3.3f;
         }
 
         if (TryComp<ParticleProjectileComponent>(emitted, out var particle))
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index cbe05d1a77..9f87e79505 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -69,16 +69,18 @@ public sealed class ProjectileSystem : SharedProjectileSystem
         var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage * DamageModifier, component.IgnoreResistances, origin: component.Shooter);
         var deleted = Deleted(target);
 
-        if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
+        if (modifiedDamage is not null && (EntityManager.EntityExists(component.Shooter) || EntityManager.EntityExists(component.Weapon)))
         {
             if (modifiedDamage.Any() && !deleted)
             {
                 _color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
             }
 
+            var shooterOrWeapon = EntityManager.EntityExists(component.Shooter) ? component.Shooter!.Value : component.Weapon!.Value;
+
             _adminLogger.Add(LogType.BulletHit,
                 HasComp<ActorComponent>(target) ? LogImpact.Extreme : LogImpact.High,
-                $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
+                $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(shooterOrWeapon):source} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
         }
 
         if (!deleted)
diff --git a/Content.Server/Singularity/Components/GravityWellComponent.cs b/Content.Server/Singularity/Components/GravityWellComponent.cs
index 58a314fa8b..98c7982f79 100644
--- a/Content.Server/Singularity/Components/GravityWellComponent.cs
+++ b/Content.Server/Singularity/Components/GravityWellComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Singularity.Components;
 using Content.Server.Singularity.EntitySystems;
 
 namespace Content.Server.Singularity.Components;
@@ -13,7 +12,7 @@ public sealed partial class GravityWellComponent : Component
     /// <summary>
     /// The maximum range at which the gravity well can push/pull entities.
     /// </summary>
-    [DataField("maxRange")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public float MaxRange;
 
@@ -21,27 +20,27 @@ public sealed partial class GravityWellComponent : Component
     /// The minimum range at which the gravity well can push/pull entities.
     /// This is effectively hardfloored at <see cref="GravityWellSystem.MinGravPulseRange"/>.
     /// </summary>
-    [DataField("minRange")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MinRange = 0f;
+    public float MinRange;
 
     /// <summary>
     /// The acceleration entities will experience towards the gravity well at a distance of 1m.
     /// Negative values accelerate entities away from the gravity well.
     /// Actual acceleration scales with the inverse of the distance to the singularity.
     /// </summary>
-    [DataField("baseRadialAcceleration")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float BaseRadialAcceleration = 0.0f;
+    public float BaseRadialAcceleration;
 
     /// <summary>
     /// The acceleration entities will experience tangent to the gravity well at a distance of 1m.
     /// Positive tangential acceleration is counter-clockwise.
     /// Actual acceleration scales with the inverse of the distance to the singularity.
     /// </summary>
-    [DataField("baseTangentialAcceleration")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float BaseTangentialAcceleration = 0.0f;
+    public float BaseTangentialAcceleration;
 
     #region Update Timing
 
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index d66d78abfd..b31464eee9 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server._White.Other;
 using Content.Server.Atmos.Components;
 using Content.Server.Singularity.Components;
 using Content.Server.Stunnable;
 using Content.Shared.Ghost;
+using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -37,6 +39,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<GravityWellComponent, ComponentStartup>(OnGravityWellStartup);
 
         var vvHandle = _vvManager.GetTypeHandler<GravityWellComponent>();
@@ -47,6 +50,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     {
         var vvHandle = _vvManager.GetTypeHandler<GravityWellComponent>();
         vvHandle.RemovePath(nameof(GravityWellComponent.TargetPulsePeriod));
+
         base.Shutdown();
     }
 
@@ -57,7 +61,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="frameTime">The time elapsed since the last set of updates.</param>
     public override void Update(float frameTime)
     {
-        if(!_timing.IsFirstTimePredicted)
+        if (!_timing.IsFirstTimePredicted)
             return;
 
         var query = EntityQueryEnumerator<GravityWellComponent, TransformComponent>();
@@ -91,15 +95,16 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="xform">The transform of the gravity well to make pulse.</param>
     private void Update(EntityUid uid, TimeSpan frameTime, GravityWellComponent? gravWell = null, TransformComponent? xform = null)
     {
-        if(!Resolve(uid, ref gravWell))
+        if (!Resolve(uid, ref gravWell))
             return;
 
         gravWell.LastPulseTime = _timing.CurTime;
         gravWell.NextPulseTime = gravWell.LastPulseTime + gravWell.TargetPulsePeriod;
+
         if (gravWell.MaxRange < 0.0f || !Resolve(uid, ref xform))
             return;
 
-        var scale = (float)frameTime.TotalSeconds;
+        var scale = (float) frameTime.TotalSeconds;
         GravPulse(uid, gravWell.MaxRange, gravWell.MinRange, gravWell.BaseRadialAcceleration * scale, gravWell.BaseTangentialAcceleration * scale, xform);
     }
 
@@ -113,10 +118,10 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     private bool CanGravPulseAffect(EntityUid entity)
     {
         return !(
-            EntityManager.HasComponent<GhostComponent>(entity) ||
-            EntityManager.HasComponent<MapGridComponent>(entity) ||
-            EntityManager.HasComponent<MapComponent>(entity) ||
-            EntityManager.HasComponent<GravityWellComponent>(entity)
+            HasComp<GhostComponent>(entity) ||
+            HasComp<MapGridComponent>(entity) ||
+            HasComp<MapComponent>(entity) ||
+            HasComp<GravityWellComponent>(entity)
         );
     }
 
@@ -184,33 +189,47 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
 
         var epicenter = mapPos.Position;
         var minRange2 = MathF.Max(minRange * minRange, MinGravPulseRange); // Cache square value for speed. Also apply a sane minimum value to the minimum value so that div/0s don't happen.
-        var bodyQuery = GetEntityQuery<PhysicsComponent>();
-        var xformQuery = GetEntityQuery<TransformComponent>();
 
         foreach(var entity in _lookup.GetEntitiesInRange(mapPos.MapId, epicenter, maxRange, flags: LookupFlags.Dynamic | LookupFlags.Sundries))
         {
+            if (!entity.Valid)
+                continue;
+
             if (ignore?.Contains(entity) is true)
                 continue;
 
-            if (!bodyQuery.TryGetComponent(entity, out var physics)
-                || physics.BodyType == BodyType.Static)
-            {
-                continue;
-            }
-
-            if (TryComp<MovedByPressureComponent>(entity, out var movedPressure) && !movedPressure.Enabled) //Ignore magboots users
+            // WD added start
+            if (!TryComp<PhysicsComponent>(entity, out var physics)) // WD edit
                 continue;
 
-            if(!CanGravPulseAffect(entity))
+            if (!TryComp(entity, out TransformComponent? xform))
                 continue;
 
-            var displacement = epicenter - _transform.GetWorldPosition(entity, xformQuery);
+            if (HasComp<ContainmentFieldGeneratorComponent>(entity))
+                continue;
+
+            if (xform.Anchored && HasComp<RadiationCollectorComponent>(entity))
+                continue;
+            // WD added end
+
+            if (TryComp<MovedByPressureComponent>(entity, out var movedPressure) && !movedPressure.Enabled) // Ignore magboots users
+                continue;
+
+            if (!CanGravPulseAffect(entity))
+                continue;
+
+            if (xform.Anchored) // WD added
+                _transform.Unanchor(entity, xform);
+
+            var displacement = epicenter - _transform.GetWorldPosition(entity);
             var distance2 = displacement.LengthSquared();
+
             if (distance2 < minRange2)
                 continue;
 
             var scaling = (1f / distance2) * physics.Mass; // TODO: Variable falloff gradiants.
             _physics.ApplyLinearImpulse(entity, (displacement * baseMatrixDeltaV) * scaling, body: physics);
+
             if (stunTime > 0f)
                 _stun.TryParalyze(entity, TimeSpan.FromSeconds(stunTime), true);
         }
@@ -244,7 +263,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="gravWell">The state of the gravity well to set the pulse period for.</param>
     public void SetPulsePeriod(EntityUid uid, TimeSpan value, GravityWellComponent? gravWell = null)
     {
-        if(!Resolve(uid, ref gravWell))
+        if (!Resolve(uid, ref gravWell))
             return;
 
         if (MathHelper.CloseTo(gravWell.TargetPulsePeriod.TotalSeconds, value.TotalSeconds))
@@ -254,6 +273,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
         gravWell.NextPulseTime = gravWell.LastPulseTime + gravWell.TargetPulsePeriod;
 
         var curTime = _timing.CurTime;
+
         if (gravWell.NextPulseTime <= curTime)
             Update(uid, curTime - gravWell.LastPulseTime, gravWell);
     }
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index de7df32374..7a962a33cf 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -122,11 +122,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="singularity">The state of the singularity to set the energy of.</param>
     public void SetEnergy(EntityUid uid, float value, SingularityComponent? singularity = null)
     {
-        if(!Resolve(uid, ref singularity))
-            return;
-
-        var oldValue = singularity.Energy;
-        if (oldValue == value)
+        if (!Resolve(uid, ref singularity))
             return;
 
         singularity.Energy = value;
@@ -154,13 +150,14 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="singularity">The state of the singularity to adjust the energy of.</param>
     public void AdjustEnergy(EntityUid uid, float delta, float min = float.MinValue, float max = float.MaxValue, bool snapMin = true, bool snapMax = true, SingularityComponent? singularity = null)
     {
-        if(!Resolve(uid, ref singularity))
+        if (!Resolve(uid, ref singularity))
             return;
 
         var newValue = singularity.Energy + delta;
-        if((!snapMin && newValue < min)
-        || (!snapMax && newValue > max))
+
+        if ((!snapMin && newValue < min) || (!snapMax && newValue > max))
             return;
+
         SetEnergy(uid, MathHelper.Clamp(newValue, min, max), singularity);
     }
 
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index 301f91622d..22543f9c3c 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -69,7 +69,7 @@ namespace Content.Server.Tabletop
             session.Entities.TryGetValue(entity, out var result);
             session.Entities.Remove(result);
 
-            tabletop.HologramsSpawned--; // White Dream fix
+            tabletop.HologramsSpawned--; // Giedi Prime fix
 
             QueueDel(result);
         }
@@ -102,7 +102,7 @@ namespace Content.Server.Tabletop
 
             component.HologramsSpawned++;
             // Skye hotfix end
-            
+
             var meta = MetaData(handEnt);
             var protoId = meta.EntityPrototype?.ID;
 
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs
index 4afd8af21c..9427b576bc 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs
@@ -25,13 +25,13 @@ public sealed partial class ArtifactComponent : Component
     /// Minimum number of nodes to generate, inclusive
     /// </summary>
     [DataField("nodesMin")]
-    public int NodesMin = 3;
+    public int NodesMin = 2;
 
     /// <summary>
     /// Maximum number of nodes to generate, exclusive
     /// </summary>
     [DataField("nodesMax")]
-    public int NodesMax = 9;
+    public int NodesMax = 10;
     #endregion
 
     /// <summary>
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Commands.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Commands.cs
index d840a1f209..f9583405e7 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Commands.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Commands.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Text;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
@@ -17,6 +18,10 @@ public partial class ArtifactSystem
 
         _conHost.RegisterCommand("getartifactmaxvalue", "Reports the maximum research point value for a given artifact", "forceartifacteffect <uid>",
             GetArtifactMaxValue);
+
+        // WD added
+        _conHost.RegisterCommand("listartifacts", "List all artifact ids and names", "forceartifacteffect",
+            ListArtifacts);
     }
 
     [AdminCommand(AdminFlags.Fun)]
@@ -68,4 +73,25 @@ public partial class ArtifactSystem
         var pointSum = GetResearchPointValue(uid.Value, artifact, true);
         shell.WriteLine($"Max point value for {ToPrettyString(uid.Value)} with {artifact.NodeTree.Count} nodes: {pointSum}");
     }
+
+
+    // WD added - start
+    [AdminCommand(AdminFlags.Admin)]
+    private void ListArtifacts(IConsoleShell shell, string argstr, string[] args)
+    {
+        var items = EntityQuery<ArtifactComponent>();
+
+        var msg = new StringBuilder();
+
+        foreach (var artifact in items)
+        {
+            var entity = artifact.Owner;
+            var effects = string.Join(", ", artifact.NodeTree.ToArray().Select(x => x.Effect));
+
+            msg.AppendFormat("{0}: {1}, {2}\n\n", Name(entity), effects, entity);
+        }
+
+        shell.WriteLine(msg.ToString());
+    }
+    // WD added - end
 }
diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs
index 7948b80e98..1dccd6807e 100644
--- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs
+++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs
@@ -23,6 +23,7 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
     {
         base.Started(uid, component, gameRule, args);
         var query = EntityQueryEnumerator<MindContainerComponent>();
+
         while (query.MoveNext(out var ent, out _))
         {
             ApplyRandomAccent(ent);
@@ -48,6 +49,8 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
 
     #region Helpers
 
+
+    // TODO: Move this to prototypes.
     private enum AccentType
     {
         Stuttering,
@@ -56,19 +59,23 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
         Scrambled,
         Pirate,
         Russian,
-        Anime,
+        OwO,
         Lizard,
         Backwards,
         Bark,
         Anxiety,
-        Moth
+        Moth,
+        French,
+        Gnome,
     }
 
     private void ApplyRandomAccent(EntityUid uid)
     {
         var allAccents = Enum.GetValues(typeof(AccentType)).Cast<AccentType>().ToList();
+
         var randomIndex = _random.Next(allAccents.Count);
         var selectedAccent = allAccents[randomIndex];
+
         ApplyAccent(uid, selectedAccent);
     }
 
@@ -94,15 +101,17 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
             case AccentType.Russian:
                 EntityManager.EnsureComponent<RussianAccentComponent>(uid);
                 break;
-            case AccentType.Anime:
+            case AccentType.OwO:
                 EntityManager.EnsureComponent<OwOAccentComponent>(uid);
                 break;
             case AccentType.Lizard:
                 EntityManager.EnsureComponent<LizardAccentComponent>(uid);
                 break;
+            /* Not funny
             case AccentType.Backwards:
                 EntityManager.EnsureComponent<BackwardsAccentComponent>(uid);
                 break;
+            */
             case AccentType.Bark:
                 EntityManager.EnsureComponent<BarkAccentComponent>(uid);
                 break;
@@ -116,6 +125,12 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
             case AccentType.Moth:
                 EntityManager.EnsureComponent<MothAccentComponent>(uid);
                 break;
+            case AccentType.French:
+                EntityManager.EnsureComponent<FrenchAccentComponent>(uid);
+                break;
+            case AccentType.Gnome:
+                EntityManager.EnsureComponent<GnomeAccentComponent>(uid);
+                break;
         }
     }
 
diff --git a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
index 6d44d052d1..b99c19b88b 100644
--- a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
+++ b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
@@ -32,11 +32,10 @@ public sealed class MessagesCartridgeSystem : EntitySystem
         SubscribeLocalEvent<MessagesCartridgeComponent, CartridgeActivatedEvent>(OnCartActivation);
         SubscribeLocalEvent<MessagesCartridgeComponent, CartridgeDeactivatedEvent>(OnCartDeactivation);
         SubscribeLocalEvent<MessagesCartridgeComponent, CartridgeAddedEvent>(OnCartInsertion);
-        SubscribeLocalEvent<MessagesCartridgeComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<MessagesCartridgeComponent, ComponentRemove>(OnRemove);
     }
 
-    private void OnInit(EntityUid uid, MessagesCartridgeComponent component, ComponentInit args)
+    public void Send(EntityUid uid, MessagesCartridgeComponent component)
     {
         var stationId = _stationSystem.GetOwningStation(uid);
         if (!stationId.HasValue ||
diff --git a/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs b/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs
index bfe87d1bc8..94e0e72ebe 100644
--- a/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs
+++ b/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs
@@ -1,7 +1,5 @@
-using Content.Server.Ghost.Components;
 using Content.Shared.Ghost;
 using Content.Shared._White.CustomGhostSystem;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -19,12 +17,13 @@ public sealed class CustomGhostSpriteSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<GhostComponent, PlayerAttachedEvent>(OnShit);
     }
 
     private void OnShit(EntityUid uid, GhostComponent component, PlayerAttachedEvent args)
     {
-        if(!_playerManager.TryGetSessionByEntity(uid, out var session))
+        if (!_playerManager.TryGetSessionByEntity(uid, out var session))
             return;
 
         TrySetCustomSprite(uid, session.Name);
@@ -37,32 +36,22 @@ public sealed class CustomGhostSpriteSystem : EntitySystem
 
         foreach (var customGhostPrototype in prototypes)
         {
-            if (string.Equals(customGhostPrototype.Ckey, ckey, StringComparison.CurrentCultureIgnoreCase))
-            {
-                _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.Sprite, customGhostPrototype.CustomSpritePath.ToString());
-                _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.SizeOverride, customGhostPrototype.SizeOverride);
+            if (!string.Equals(customGhostPrototype.Ckey, ckey, StringComparison.CurrentCultureIgnoreCase))
+                continue;
 
-                if(customGhostPrototype.AlphaOverride > 0)
-                {
-                    _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.AlphaOverride, customGhostPrototype.AlphaOverride);
-                }
+            _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.Sprite, customGhostPrototype.CustomSpritePath.ToString());
+            _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.SizeOverride, customGhostPrototype.SizeOverride);
 
-                if (customGhostPrototype.GhostName != string.Empty)
-                {
-                    _metaData.SetEntityName(ghostUid, customGhostPrototype.GhostName);
-                }
+            if (customGhostPrototype.AlphaOverride > 0)
+                _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.AlphaOverride, customGhostPrototype.AlphaOverride);
 
-                if (customGhostPrototype.GhostDescription != string.Empty)
-                {
-                    _metaData.SetEntityDescription(ghostUid, customGhostPrototype.GhostDescription);
-                }
+            if (customGhostPrototype.GhostName != string.Empty)
+                _metaData.SetEntityName(ghostUid, customGhostPrototype.GhostName ?? "null");
 
+            if (customGhostPrototype.GhostDescription != string.Empty)
+                _metaData.SetEntityDescription(ghostUid, customGhostPrototype.GhostDescription);
 
-
-
-                return;
-            }
-
+            return;
         }
     }
 }
diff --git a/Content.Server/_White/RandomArtifacts/RandomArtifactsSystem.cs b/Content.Server/_White/RandomArtifacts/RandomArtifactsSystem.cs
new file mode 100644
index 0000000000..1ef1ac8f11
--- /dev/null
+++ b/Content.Server/_White/RandomArtifacts/RandomArtifactsSystem.cs
@@ -0,0 +1,94 @@
+using System.Linq;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
+using Content.Shared._White;
+using Content.Shared.Item;
+using Robust.Shared.Configuration;
+using Robust.Shared.Random;
+
+namespace Content.Server._White.RandomArtifacts;
+
+public sealed class RandomArtifactsSystem : EntitySystem
+{
+    [Dependency] private readonly ArtifactSystem _artifactsSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    private float _itemToArtifactRatio; // from 0 to 100. In % percents. Default is 0.7%
+    private bool _artifactsEnabled;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _configurationManager.OnValueChanged(WhiteCVars.EnableRandomArtifacts, b => OnCvarChanged(b), true);
+        _configurationManager.OnValueChanged(WhiteCVars.ItemToArtifactRatio, r => _itemToArtifactRatio = r, true);
+
+        SubscribeLocalEvent<MainMapInitEvent>(OnRoundStart);
+    }
+
+    private void OnRoundStart(MainMapInitEvent ev)
+    {
+        if (!_artifactsEnabled)
+            return;
+
+        // Removing old artifact-items and replace it with new funny stealthy items
+        foreach (var oldArtifact in EntityQuery<ArtifactComponent>())
+        {
+            QueueDel(oldArtifact.Owner);
+        }
+
+        var items = EntityQuery<ItemComponent>().ToList();
+        _random.Shuffle(items);
+
+        var selectedItems = GetPercentageOfHashSet(items, _itemToArtifactRatio);
+
+        foreach (var item in selectedItems)
+        {
+            var entity = item.Owner;
+            var xform = Transform(entity);
+
+            var station = _station.GetStationInMap(xform.MapID);
+
+            if (!HasComp<StationDataComponent>(station))
+                continue;
+
+            var artifactComponent = EnsureComp<ArtifactComponent>(entity);
+            _artifactsSystem.RandomizeArtifact(entity, artifactComponent);
+        }
+    }
+
+    private HashSet<ItemComponent> GetPercentageOfHashSet(List<ItemComponent> sourceList, float percentage)
+    {
+        var countToAdd = (int) Math.Round((double) sourceList.Count * percentage / 100);
+
+        return sourceList.Where(x => !Transform(x.Owner).Anchored).Take(countToAdd).ToHashSet();
+    }
+
+    private void OnCvarChanged(bool enabled)
+    {
+        if (_artifactsEnabled != enabled && !enabled)
+        {
+            var items = EntityQuery<ItemComponent, ArtifactComponent>();
+
+            foreach (var (_, artifact) in items)
+            {
+                RemComp<ArtifactComponent>(artifact.Owner);
+            }
+        }
+
+        _artifactsEnabled = enabled;
+    }
+
+    public sealed class MainMapInitEvent : EntityEventArgs { }
+
+}
+
+/*
+    Number of items on maps
+    DEV - 1527
+    WhiteBox - 13692
+    WonderBox - 15306
+*/
diff --git a/Content.Shared/Chat/Prototypes/EmotePrototype.cs b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
index f19c7d26cd..bf4d5f61ec 100644
--- a/Content.Shared/Chat/Prototypes/EmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
@@ -35,7 +35,7 @@ public sealed partial class EmotePrototype : IPrototype
     [DataField("chatTriggers")]
     public HashSet<string>? ChatTriggers = new();
 
-    /// <summary> White Dream EDIT Start
+    /// <summary> Giedi Prime EDIT Start
     ///     Текст для кнопки в эмоут меню.
     ///     Бля ну или как это описать, вы поняли короче. ¯\_(ツ)_/¯
     /// </summary>
@@ -44,7 +44,7 @@ public sealed partial class EmotePrototype : IPrototype
 
     [DataField("allowMenu")]
     public bool AllowToEmotionsMenu { get; } = false;
-    // White Dream EDIT end
+    // Giedi Prime EDIT end
 }
 
 /// <summary>
diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index f7b1f3648a..81ba685a29 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -75,7 +75,7 @@ namespace Content.Shared.DrawDepth
         Items = DrawDepthTag.Default + 3,
 
         Mobs = DrawDepthTag.Default + 4,
-		
+
         OverMobs = DrawDepthTag.Default + 5,
 
         Doors = DrawDepthTag.Default + 6,
@@ -93,14 +93,14 @@ namespace Content.Shared.DrawDepth
         /// <summary>
         ///     Explosions, fire, melee swings. Whatever.
         /// </summary>
-        Effects = DrawDepthTag.Default + 9,
+        Effects = DrawDepthTag.Default + 10,
 
-        Ghosts = DrawDepthTag.Default + 10,
+        Ghosts = DrawDepthTag.Default + 11,
 
         /// <summary>
         ///    Use this selectively if it absolutely needs to be drawn above (almost) everything else. Examples include
         ///    the pointing arrow, the drag & drop ghost-entity, and some debug tools.
         /// </summary>
-        Overlays = DrawDepthTag.Default + 11,
+        Overlays = DrawDepthTag.Default + 12,
     }
 }
diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
index a35dfe0a28..2e596382ae 100644
--- a/Content.Shared/MouseRotator/MouseRotatorComponent.cs
+++ b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
@@ -1,5 +1,4 @@
-using System.Numerics;
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MouseRotator;
@@ -15,7 +14,7 @@ public sealed partial class MouseRotatorComponent : Component
     ///     How much the desired angle needs to change before a predictive event is sent
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Angle AngleTolerance = Angle.FromDegrees(20.0);
+    public Angle AngleTolerance = Angle.FromDegrees(6.0); // WD edit
 
     /// <summary>
     ///     The angle that will be lerped to
@@ -38,7 +37,7 @@ public sealed partial class MouseRotatorComponent : Component
     ///     like turrets or ship guns, which have finer range of movement.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public bool Simple4DirMode = true;
+    public bool Simple4DirMode = false; // WD edit
 }
 
 /// <summary>
diff --git a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
index e6ca452da5..ccee6e59c2 100644
--- a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
+++ b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
@@ -27,7 +27,7 @@ public sealed partial class EmbeddableProjectileComponent : Component
     /// How long it takes to remove the embedded object.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
-    public float? RemovalTime = 3f;
+    public float? RemovalTime = 1f;
 
     /// <summary>
     ///     Whether this entity will embed when thrown, or only when shot as a projectile.
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 5fe5c7b208..ff051d24e5 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -203,9 +203,9 @@ public abstract partial class SharedProjectileSystem : EntitySystem
         }
     }
 
-    public void SetShooter(EntityUid id, ProjectileComponent component, EntityUid shooterId)
+    public void SetShooter(EntityUid id, ProjectileComponent component, EntityUid? shooterId = null)
     {
-        if (component.Shooter == shooterId)
+        if (component.Shooter == shooterId || shooterId == null)
             return;
 
         component.Shooter = shooterId;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 878b6cbc3a..0502077356 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -423,7 +423,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         Physics.SetLinearVelocity(uid, finalLinear, body: physics);
 
         var projectile = EnsureComp<ProjectileComponent>(uid);
-        Projectiles.SetShooter(uid, projectile, user ?? gunUid);
+        Projectiles.SetShooter(uid, projectile, user);
         projectile.Weapon = gunUid;
 
         TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle());
diff --git a/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs b/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs
index 454fce7ffe..7bc492a925 100644
--- a/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs
+++ b/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs
@@ -25,7 +25,7 @@ public sealed class CustomGhostPrototype : IPrototype
     public float AlphaOverride { get; } = -1;
 
     [DataField("ghostName")]
-    public string GhostName = string.Empty;
+    public string? GhostName = string.Empty;
 
     [DataField("ghostDescription")]
     public string GhostDescription = string.Empty;
diff --git a/Content.Shared/_White/Explosion/CMExplosionEffectComponent.cs b/Content.Shared/_White/Explosion/CMExplosionEffectComponent.cs
new file mode 100644
index 0000000000..311384782c
--- /dev/null
+++ b/Content.Shared/_White/Explosion/CMExplosionEffectComponent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Explosion;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedExplosionSystem))]
+public sealed partial class ExplosionEffectComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public EntProtoId Explosion = "ExplosionEffectGrenade";
+
+    [DataField, AutoNetworkedField]
+    public EntProtoId ShockWave = "ExplosionEffectGrenadeShockWave";
+
+    [DataField, AutoNetworkedField]
+    public List<EntProtoId> ShrapnelEffects = new() { "ExplosionEffectShrapnel1", "ExplosionEffectShrapnel2" };
+
+    [DataField, AutoNetworkedField]
+    public int MinShrapnel = 5;
+
+    [DataField, AutoNetworkedField]
+    public int MaxShrapnel = 9;
+
+    [DataField, AutoNetworkedField]
+    public float ShrapnelSpeed = 5;
+}
diff --git a/Content.Shared/_White/Explosion/ExplosiveTriggeredEvent.cs b/Content.Shared/_White/Explosion/ExplosiveTriggeredEvent.cs
new file mode 100644
index 0000000000..a42cbb7bc9
--- /dev/null
+++ b/Content.Shared/_White/Explosion/ExplosiveTriggeredEvent.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared._White.Explosion;
+
+[ByRefEvent]
+public readonly record struct ExplosiveTriggeredEvent;
diff --git a/Content.Shared/_White/Explosion/RMCExplosionShockWaveComponent.cs b/Content.Shared/_White/Explosion/RMCExplosionShockWaveComponent.cs
new file mode 100644
index 0000000000..44d14e65fa
--- /dev/null
+++ b/Content.Shared/_White/Explosion/RMCExplosionShockWaveComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Explosion
+{
+    [RegisterComponent, NetworkedComponent]
+    [AutoGenerateComponentState]
+    [Access(typeof(SharedExplosionSystem))]
+    public sealed partial class ExplosionShockWaveComponent : Component
+    {
+        /// <summary>
+        ///     The rate at which the wave fades, lower values means it's active for longer.
+        /// </summary>
+        [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+        public float FalloffPower = 40f;
+
+        /// <summary>
+        ///     How sharp the wave distortion is. Higher values make the wave more pronounced.
+        /// </summary>
+        [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+        public float Sharpness = 10.0f;
+
+        /// <summary>
+        ///     Width of the wave.
+        /// </summary>
+        [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+        public float Width = 0.8f;
+    }
+}
diff --git a/Content.Shared/_White/Explosion/SharedCMExplosionSystem.cs b/Content.Shared/_White/Explosion/SharedCMExplosionSystem.cs
new file mode 100644
index 0000000000..9cb343aba7
--- /dev/null
+++ b/Content.Shared/_White/Explosion/SharedCMExplosionSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Throwing;
+using Robust.Shared.Random;
+
+namespace Content.Shared._White.Explosion;
+
+public sealed class SharedExplosionSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ExplosionEffectComponent, ExplosiveTriggeredEvent>(OnExplosionEffectTriggered);
+    }
+
+    private void OnExplosionEffectTriggered(EntityUid uid, ExplosionEffectComponent component, ref ExplosiveTriggeredEvent args)
+    {
+        SpawnNextToOrDrop(component.ShockWave, uid);
+        SpawnNextToOrDrop(component.Explosion, uid);
+
+        if (component.MaxShrapnel <= 0)
+            return;
+
+        foreach (var effect in component.ShrapnelEffects)
+        {
+            var shrapnelCount = _random.Next(component.MinShrapnel, component.MaxShrapnel);
+            for (var i = 0; i < shrapnelCount; i++)
+            {
+                var angle = _random.NextAngle();
+                var direction = angle.ToVec().Normalized() * 10;
+                var shrapnel = SpawnNextToOrDrop(effect, uid);
+                _throwing.TryThrow(shrapnel, direction, component.ShrapnelSpeed / 10);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/_White/Lighting/Shaders/LightingOverlayComponent.cs b/Content.Shared/_White/Lighting/Shaders/LightingOverlayComponent.cs
new file mode 100644
index 0000000000..692e56a61d
--- /dev/null
+++ b/Content.Shared/_White/Lighting/Shaders/LightingOverlayComponent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+using static Robust.Shared.Utility.SpriteSpecifier;
+
+namespace Content.Shared._White.Lighting.Shaders;
+
+/// <summary>
+/// This is used for LightOverlay
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class LightingOverlayComponent : Component
+{
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool? Enabled;
+
+    [DataField]
+    public SpriteSpecifier Sprite = new Texture(new ResPath("Effects/LightMasks/lightmask_lamp.png"));
+
+    [DataField]
+    public float Offsetx = -0.5f;
+
+    [DataField]
+    public float Offsety = 0.5f;
+
+    [DataField]
+    public Color? Color;
+}
diff --git a/Content.Shared/_White/WhiteCVars.cs b/Content.Shared/_White/WhiteCVars.cs
index 847e8681d0..6a3a6a2809 100644
--- a/Content.Shared/_White/WhiteCVars.cs
+++ b/Content.Shared/_White/WhiteCVars.cs
@@ -20,6 +20,13 @@ public sealed class WhiteCVars
         CVarDef.Create("white.show_trails", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 
     /*
+    * Bullet trails
+    */
+
+        public static readonly CVarDef<bool> EnableLightsGlowing =
+            CVarDef.Create("white.enable_lights_glowing", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /*
  * Offer Indicator
      */
 
@@ -102,7 +109,7 @@ public sealed class WhiteCVars
         */
 
     /// <summary>
-    /// URL of the TTS server API.
+    /// Is TTS enabled
     /// </summary>
     public static readonly CVarDef<bool> TtsEnabled =
         CVarDef.Create("tts.enabled", true, CVar.SERVERONLY);
@@ -125,11 +132,9 @@ public sealed class WhiteCVars
     public static readonly CVarDef<int> TtsMaxCacheSize =
         CVarDef.Create("tts.max_cash_size", 200, CVar.SERVERONLY | CVar.ARCHIVE);
 
-
-
     /*
- * Stalin
-     */
+    * Stalin
+    */
 
     public static readonly CVarDef<string> StalinSalt =
         CVarDef.Create("stalin.salt", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL | CVar.ARCHIVE);
@@ -142,7 +147,6 @@ public sealed class WhiteCVars
     public static readonly CVarDef<float> StalinDiscordMinimumAge =
         CVarDef.Create("stalin.minimal_discord_age_minutes", 604800.0f, CVar.SERVERONLY | CVar.ARCHIVE);
 
-
     /*
    * NonPeaceful Round End
      */
@@ -405,4 +409,14 @@ public sealed class WhiteCVars
 
     public static readonly CVarDef<string> TimeTrackerApiKey =
         CVarDef.Create("white.time_tracker_key", "", CVar.SERVERONLY | CVar.CONFIDENTIAL | CVar.ARCHIVE);
+
+    /*
+     * Random Artifacts
+     */
+
+    public static readonly CVarDef<bool> EnableRandomArtifacts =
+        CVarDef.Create("white.random_artifacts_enabled", true, CVar.SERVERONLY);
+
+    public static readonly CVarDef<float> ItemToArtifactRatio =
+        CVarDef.Create("white.random_artifacts_ratio", 0.4f, CVar.SERVERONLY);
 }
diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index 59bf4c297a..04e183f0f6 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,144 +1,4 @@
 Entries:
-- author: rhailrake
-  changes:
-  - message: Added separate fork changelog
-    type: Add
-  id: 1
-  time: '2022-12-09T02:00:00.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\
-      \ \u0441 \u0447\u0430\u0442\u043E\u043C."
-    type: Add
-  id: 2
-  time: '2022-12-08T15:13:06.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: smooth fix
-    type: Tweak
-  id: 3
-  time: '2022-12-07T18:04:46.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: White changelog
-    type: Add
-  id: 4
-  time: '2022-12-09T12:26:07.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u041E\u0447\u0435\u0440\u0435\u0434\u043D\u043E\u0439 \u0444\u0438\u043A\
-      \u0441 \u0447\u0430\u0442\u0430!"
-    type: Add
-  id: 5
-  time: '2022-12-08T15:37:05.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0446\u0432\u0435\
-      \u0442\u043D\u044B\u0435 \u0438\u043C\u0435\u043D\u0430 \u0432 \u0447\u0430\u0442\
-      ."
-    type: Add
-  id: 6
-  time: '2022-12-08T08:52:44.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: "\u041D\u043E\u0432\u044B\u0435 \u0430\u0438\u0440\u043B\u043E\u043A\u0438\
-      ."
-    type: Add
-  id: 7
-  time: '2022-12-07T19:51:58.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: Russian decals for crayons.
-    type: Add
-  - message: Translate for upstream.
-    type: Add
-  id: 8
-  time: '2022-12-09T10:55:30.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: Russian anounce sounds.
-    type: Add
-  - message: unrobust AFKSystem.
-    type: Remove
-  id: 9
-  time: '2022-12-07T15:47:10.0000000+00:00'
-- author: rhailrake
-  changes:
-  - message: HudOverlays.
-    type: Add
-  - message: Shaders.
-    type: Add
-  - message: And more.
-    type: Add
-  id: 10
-  time: '2022-12-14T19:02:50.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\
-      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A\u0438\u043A\u0430\u0442\
-      \u044C \u0438\u0433\u0440\u043E\u043A\u043E\u0432 \u043F\u043E\u0441\u043B\u0435\
-      \ \u0431\u0430\u043D\u0430."
-    type: Add
-  id: 11
-  time: '2022-12-15T04:43:41.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D Force Say."
-    type: Add
-  id: 12
-  time: '2022-12-15T08:55:36.0000000+00:00'
-- author: ILLUZORR
-  changes:
-  - message: "\u0412\u0435\u0441, \u043D\u0430\u0432\u0435\u0440\u043D\u043E\u0435\
-      , \u0432\u0441\u0435\u0445 \u0441\u043F\u0435\u0446. \u043A\u043E\u0441\u0442\
-      \u044E\u043C\u043E\u0432, \u043F\u043E \u0442\u0438\u043F\u0443 \u043F\u043E\
-      \u0436\u0430\u0440\u043D\u043E\u0433\u043E, \u043F\u0430\u043D\u0446\u0438\u0440\
-      \u044F \u0438 \u0442.\u0434 \u0442\u0435\u043F\u0435\u0440\u044C 35. (\u0411\
-      \u044B\u043B \u0445\u0443\u0439 \u043F\u043E\u0439\u043C\u0438 \u0441\u043A\u043E\
-      \u043B\u044C\u043A\u043E.)"
-    type: Fix
-  - message: "\u0412\u0435\u0441, \u0432\u0440\u043E\u0434\u0435 \u043A\u0430\u043A\
-      \ \u0432\u0441\u0435\u0445 EVA \u043A\u043E\u0441\u0442\u044E\u043C\u043E\u0432\
-      \ \u0442\u0435\u043F\u0435\u0440\u044C 40. (\u0411\u044B\u043B 80.)"
-    type: Fix
-  - message: "\u0412\u0435\u0441 \u043F\u043E\u0447\u0442\u0438 \u0432\u0441\u0435\
-      \u0445 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0442\u0435\
-      \u043F\u0435\u0440\u044C 45. (\u0411\u044B\u043B 121.)"
-    type: Fix
-  id: 13
-  time: '2022-12-15T09:32:23.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u043E\u043D\
-      \ \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u043A\u043B\u043E\u043D\u0438\
-      \u0440\u043E\u0432\u0430\u043D\u0438\u044F."
-    type: Add
-  id: 14
-  time: '2022-12-16T09:09:09.0000000+00:00'
-- author: Valtosin
-  changes:
-  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0435\
-      \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0435 \u043E\u0442\u043E\
-      \u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0441\u043F\u0440\u0430\u0439\
-      \u0442\u043E\u0432 \u043E\u043A\u043E\u043D \u0438 \u0441\u0442\u0435\u043D."
-    type: Fix
-  id: 15
-  time: '2022-12-16T13:38:00.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\
-      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0434\u0435\u043B\u0430\u0442\
-      \u044C \u043D\u0435\u0441\u043C\u0435\u0448\u043D\u043E\u0435!"
-    type: Add
-  id: 16
-  time: '2022-12-27T19:53:31.0000000+00:00'
-- author: RavMorgan
-  changes:
-  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\
-      \u0435!"
-    type: Remove
-  id: 17
-  time: '2022-12-27T23:44:42.0000000+00:00'
 - author: RavMorgan
   changes:
   - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043C\
@@ -8290,3 +8150,409 @@
   id: 498
   time: '2024-08-16T20:46:26.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/629
+- author: ua_No_Name48237
+  changes:
+  - message: "\u0424\u0438\u043A\u0441 \u0442\u0440\u0435\u043A\u0438\u043D\u0433\u0430\
+      \ \u043F\u043B\u0435\u0439\u0442\u0430\u043C \u0432\u0440\u0435\u043C\u0435\u043D\
+      \u0438 \u0431\u0440\u0438\u0433\u043C\u0435\u0434\u0438\u043A\u0430."
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0434\u0443\
+      \u0431\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0441\u0443\u043C\
+      \u043A\u0438 \u0431\u0440\u0438\u0433\u043C\u0435\u0434\u0438\u043A\u0430 \u0432\
+      \ \u0435\u0433\u043E \u043B\u043E\u0434\u0430\u0443\u0442\u0435."
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
+      \u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u0437\u0430\u0440\u043F\u043B\
+      \u0430\u0442\u044B \u0443 \u0431\u0440\u0438\u0433\u043C\u0435\u0434\u0438\u043A\
+      \u0430"
+    type: Fix
+  id: 499
+  time: '2024-08-17T12:48:05.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/631
+- author: ThereDrD0
+  changes:
+  - message: "\u0412\u0437\u0440\u044B\u0432\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0438\u043C\u0435\u044E\u0442 \u0432\u0438\u0437\u0443\u0430\u043B\u0438\u0437\
+      \u0430\u0446\u0438\u044E \u0443\u0434\u0430\u0440\u043D\u043E\u0439 \u0432\u043E\
+      \u043B\u043D\u044B"
+    type: Add
+  - message: "\u041D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0432\u0437\u0440\
+      \u044B\u0432\u044B \u0438\u043C\u0435\u044E\u0442 \u0432\u0438\u0437\u0443\u0430\
+      \u043B\u0438\u0437\u0430\u0446\u0438\u044E \u0448\u0440\u0430\u043F\u043D\u0435\
+      \u043B\u0438"
+    type: Add
+  - message: "\u041E\u0441\u043A\u043E\u043B\u043E\u0447\u043D\u0430\u044F \u0433\u0440\
+      \u0430\u043D\u0430\u0442\u0430 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\
+      \ \u043F\u0438\u0449\u0438\u0442"
+    type: Remove
+  id: 500
+  time: '2024-08-17T20:59:11.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/633
+- author: ThereDrD0
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D Giedi Prime"
+    type: Add
+  - message: "\u0423\u0431\u0440\u0430\u043D White Dream"
+    type: Remove
+  id: 501
+  time: '2024-08-19T00:27:31.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/635
+- author: ThereDrD0
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u044B\
+      \ \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043D\u044B\u0435 \u043C\u043E\u0434\
+      \u0443\u043B\u0438 \u043A\u0438\u0431\u043E\u0440\u0433\u043E\u0432. \u041C\u043E\
+      \u0434\u0443\u043B\u044C \u0420\u0426\u0414 \u0443\u0434\u0430\u043B\u0435\u043D\
+      \ \u0438 \u0437\u0430\u043C\u0435\u043D\u0435\u043D \u043D\u0430 \u0430\u0442\
+      \u043C\u043E\u0441\u0444\u0435\u0440\u043D\u044B\u0439 \u043C\u043E\u0434\u0443\
+      \u043B\u044C \u0441 \u0420\u041F\u0414 \u0438 \u0433\u043E\u043B\u043E\u043F\
+      \u0440\u043E\u0435\u043A\u0442\u043E\u0440\u0430\u043C\u0438. \u0420\u0426\u0414\
+      \ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u043C\u043E\u0434\
+      \u0443\u043B\u044C \u0441\u0442\u0440\u043E\u0438\u0442\u0435\u043B\u044C\u0441\
+      \u0442\u0432\u0430"
+    type: Add
+  - message: "\u041C\u0435\u0434\u0438\u0446\u0438\u043D\u0441\u043A\u0438\u0439 \u043C\
+      \u043E\u0434\u0443\u043B\u044C \u043B\u0435\u0447\u0435\u043D\u0438\u044F \u043F\
+      \u043E\u043B\u0443\u0447\u0438\u043B \u0441\u0430\u043C\u043E\u0437\u0430\u0440\
+      \u044F\u0436\u0430\u044E\u0449\u0438\u0439\u0441\u044F \u0433\u0438\u043F\u043E\
+      \u0441\u043F\u0440\u0435\u0439, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C\
+      \ \u043D\u0430\u0445\u043E\u0434\u044F\u0442\u0441\u044F \u0431\u0430\u0437\u043E\
+      \u0432\u044B\u0435 \u043B\u0435\u043A\u0430\u0440\u0441\u0442\u0432\u0430. \u0412\
+      \ \u043F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u043E\u043C \u043C\u043E\
+      \u0434\u0443\u043B\u0435 \u043B\u0435\u0447\u0435\u043D\u0438\u044F \u043D\u0430\
+      \u0445\u043E\u0434\u0438\u0442\u0441\u044F \u043F\u0440\u043E\u0434\u0432\u0438\
+      \u043D\u0443\u0442\u044B\u0439 \u0433\u0438\u043F\u043E\u0441\u043F\u0440\u0435\
+      \u0439 \u0441 \u0431\u043E\u043B\u0435\u0435 \u043A\u0440\u0443\u0442\u044B\u043C\
+      \u0438 \u043B\u0435\u043A\u0430\u0440\u0441\u0442\u0432\u0430\u043C\u0438"
+    type: Add
+  - message: "\u041C\u043E\u0434\u0443\u043B\u044C \u0443\u0431\u043E\u0440\u043A\u0438\
+      \ \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u0441\u0430\u043C\u043E\u043F\u043E\
+      \u043F\u043E\u043B\u043D\u044F\u044E\u0449\u0438\u0439\u0441\u044F \u0441\u043F\
+      \u0440\u0435\u0439 \u0441 \u043A\u043E\u0441\u043C\u043E\u0447\u0438\u0441\u0442\
+      \u043E\u043C, \u0431\u043E\u043B\u0435\u0435 \u0431\u043E\u043B\u044C\u0448\u043E\
+      \u0439 \u043C\u0443\u0441\u043E\u0440\u043D\u044B\u0439 \u043C\u0435\u0448\u043E\
+      \u043A."
+    type: Add
+  - message: "\u041C\u043E\u0434\u0443\u043B\u044C \u043E\u0433\u043D\u0435\u0442\u0443\
+      \u0448\u0438\u0442\u0435\u043B\u044F \u0443\u0434\u0430\u043B\u0435\u043D, \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u043E\u0433\u043D\u0435\u0442\u0443\u0448\u0438\
+      \u0442\u0435\u043B\u044C \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F\
+      \ \u0432 \u043C\u043E\u0434\u0443\u043B\u0435 \u0441 \u0438\u043D\u0441\u0442\
+      \u0440\u0443\u043C\u0435\u043D\u0442\u0430\u043C\u0438."
+    type: Tweak
+  - message: "\u041C\u043E\u0434\u0443\u043B\u044C \u0443\u0431\u043E\u0440\u0449\u0438\
+      \u043A\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u043C\u0435\u0435\u0442\
+      \ \u0431\u043E\u043B\u0435\u0435 \u0431\u043E\u043B\u044C\u0448\u043E\u0439\
+      \ \u043B\u0430\u043C\u043F\u043E\u0437\u0430\u043C\u0435\u043D\u0438\u0442\u0435\
+      \u043B\u044C"
+    type: Tweak
+  id: 502
+  time: '2024-08-19T01:23:54.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/577
+- author: keslik
+  changes:
+  - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0430 \u043F\u0440\u043E\
+      \u0447\u043D\u043E\u0441\u0442\u044C \u0449\u0438\u0442\u043E\u0432 \u0421\u0411"
+    type: Tweak
+  - message: "\u0420\u0435\u0431\u0430\u043B\u0430\u043D\u0441 \u043F\u0440\u043E\u0442\
+      \u0438\u0432\u043E\u0443\u0434\u0430\u0440\u043D\u043E\u0433\u043E \u0441\u043D\
+      \u0430\u0440\u044F\u0436\u0435\u043D\u0438\u044F \u0421\u0411"
+    type: Tweak
+  - message: "\u041A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E \u043E\u0442\u043E\
+      \u0431\u0440\u0430\u0436\u0430\u044E\u0442\u0441\u044F \u0445\u0430\u0440\u0430\
+      \u043A\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043A\u0438 \u043A\u043E\u0441\
+      \u0442\u044E\u043C\u0430 \u0440\u0430\u0434\u0438\u0430\u0446\u0438\u043E\u043D\
+      \u043D\u043E\u0439 \u0437\u0430\u0449\u0438\u0442\u044B"
+    type: Fix
+  id: 503
+  time: '2024-08-19T01:25:10.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/637
+- author: ThereDrD0
+  changes:
+  - message: "\u0421\u0442\u0430\u043B\u0438\u043D \u0432\u044B\u043A\u043B\u044E\u0447\
+      \u0435\u043D \u0438\u0437-\u0437\u0430 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\
+      \u0436\u043D\u043E\u0441\u0442\u0438 \u043F\u0440\u0438\u0432\u044F\u0437\u0430\
+      \u0442\u044C \u0434\u0438\u0441\u043A\u043E\u0440\u0434 \u043A \u0433\u043E\u0441\
+      \u0442\u0435\u0432\u043E\u043C\u0443 \u0430\u043A\u043A\u0430\u0443\u043D\u0442\
+      \u0443"
+    type: Remove
+  id: 504
+  time: '2024-08-19T15:13:22.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/638
+- author: Jabaks
+  changes:
+  - message: "\u041E\u0447\u0435\u0440\u0435\u0434\u044C \u0432 \u043C\u0443\u0437\
+      \u044B\u043A\u0430\u043B\u044C\u043D\u043E\u043C \u0430\u0432\u0442\u043E\u043C\
+      \u0430\u0442\u0435."
+    type: Add
+  - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u043C\u0443\u0437\u044B\u043A\
+      \u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0430\u0432\u0442\u043E\u043C\u0430\
+      \u0442\u0430."
+    type: Add
+  id: 505
+  time: '2024-08-19T18:11:35.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/640
+- author: ThereDrD0
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u043F\u0440\u0430\u0432\
+      \u043B\u0435\u043D\u043D\u044B\u0439 \u0441\u0432\u0435\u0442 \u0441\u0442\u0430\
+      \u043B \u0431\u043E\u043B\u0435\u0435 \u043F\u0440\u044F\u043C\u044B\u043C \u0438\
+      \ \u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u043C"
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430\u043F\u0440\u0430\u0432\
+      \u043B\u0435\u043D\u043D\u044B\u0439 \u0441\u0432\u0435\u0442 \u043A\u0440\u0443\
+      \u0442\u0438\u0442\u0441\u044F \u043D\u0430 360 \u0432\u0441\u043B\u0435\u0434\
+      \ \u0437\u0430 \u043C\u044B\u0448\u043A\u043E\u0439 \u0432 \u043A\u043E\u043C\
+      \u0431\u0430\u0442\u043C\u043E\u0434\u0435"
+    type: Add
+  id: 506
+  time: '2024-08-19T20:14:55.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/641
+- author: ThereDrD0
+  changes:
+  - message: "\u0421\u0438\u043D\u0433\u0443\u043B\u044F\u0440\u043D\u043E\u0441\u0442\
+      \u044C \u0442\u0435\u043F\u0435\u0440\u044C \u0440\u043E\u0431\u0430\u0441\u0442\
+      \u043D\u0430\u044F. \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0430\
+      \ \u043C\u043E\u0436\u0435\u0442 \u0437\u0430\u0441\u0430\u0441\u044B\u0432\u0430\
+      \u0442\u044C \u0441\u0442\u0430\u0442\u0438\u0447\u043D\u044B\u0435 \u043E\u0431\
+      \u044A\u0435\u043A\u0442\u044B, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440\
+      \ \u0441\u0442\u0435\u043D\u044B, \u0434\u0435\u043B\u0430\u0435\u0442 \u044D\
+      \u0442\u043E \u043D\u0435 \u0431\u043E\u043B\u044C\u0448\u0435\u043C \u0440\u0430\
+      \u0434\u0438\u0443\u0441\u0435 \u0438 \u0431\u044B\u0441\u0442\u0440\u0435\u0435\
+      . \u0420\u0430\u0431\u043E\u0442\u0430 \u0432 \u0441\u043E\u0431\u0440\u0430\
+      \u043D\u043D\u043E\u043C \u0432\u0438\u0434\u0435 \u0431\u044B\u043B\u0430 \u043F\
+      \u0440\u043E\u0442\u0435\u0441\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0430\
+      , \u043C\u0438\u043D\u0443\u0442 10 \u043E\u043D\u0430 \u043F\u0440\u043E\u0441\
+      \u0442\u043E\u044F\u043B\u0430 \u0438 \u043D\u0435 \u0440\u0430\u0437\u0432\u0430\
+      \u043B\u0438\u043B\u0430\u0441\u044C."
+    type: Add
+  - message: "\u0420\u043E\u043B\u0438\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0434\u0430\u044E\u0442 \u0431\u043E\u043B\u044C\u0448\u0438\u0439 \u0431\
+      \u0443\u0441\u0442 \u043A \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u0438.\
+      \ \u041D\u043E \u0432\u044B \u0432\u0441\u0435 \u0435\u0449\u0435 \u0431\u0443\
+      \u0434\u0435\u0442\u0435 \u043F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E\
+      \ \u0431\u0438\u0442\u044C\u0441\u044F \u0438 \u043F\u043E\u043B\u0443\u0447\
+      \u0430\u0442\u044C \u0443\u0440\u043E\u043D \u043F\u0440\u0438 \u0440\u0430\u0437\
+      \u0433\u043E\u043D\u0430\u0445 \u0438 \u0441\u0442\u043E\u043B\u043A\u043D\u043E\
+      \u0432\u0435\u043D\u0438\u044F\u0445"
+    type: Tweak
+  - message: "\u041F\u0443\u043B\u0435\u043C\u0435\u0442 \u041B6 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u0441\u0442\u0440\u0435\u043B\u044F\u0435\u0442 \u043D\u0430\
+      \u043C\u043D\u043E\u0433\u043E \u0442\u043E\u0447\u043D\u0435\u0435 \u0432 \u0434\
+      \u0432\u0443\u0445 \u0440\u0443\u043A\u0430\u0445"
+    type: Tweak
+  - message: "\u041A\u043E\u043F\u044C\u0435 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043D\u0430\u043D\u043E\u0441\u0438\u0442 30 \u0443\u0440\u043E\u043D\u0430\
+      \ \u043F\u0440\u0438 \u0431\u0440\u043E\u0441\u043A\u0435"
+    type: Tweak
+  - message: "\u0412\u0441\u0435 \u0432\u0442\u044B\u043A\u0430\u0435\u043C\u044B\u0435\
+      \ \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u044B \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u0432\u044B\u0442\u0430\u0441\u043A\u0438\u0432\u0430\u044E\u0442\u0441\
+      \u044F \u0438\u0437 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0430 \u0437\
+      \u0430 1 \u0441\u0435\u043A\u0443\u043D\u0434\u0443 \u0432\u043C\u0435\u0441\
+      \u0442\u043E 3"
+    type: Tweak
+  - message: "\u0412\u0437\u0440\u044B\u0432\u043D\u044B\u0435 \u043C\u0438\u043D\u044B\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u0443\u0431\u044C\u044E\u0442 \u0432\
+      \u0430\u0441 \u043F\u043E\u0441\u043B\u0435 \u043D\u0430\u0441\u0442\u0443\u043F\
+      \u0430\u043D\u0438\u044F"
+    type: Tweak
+  - message: "\u0420\u0426\u0414 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u043C\
+      \u0435\u0435\u0442 \u0444\u043E\u0440\u043C\u0443 \u043F\u0438\u0441\u0442\u043E\
+      \u043B\u0435\u0442\u0430, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u043D\u0430\
+      \u043F\u043E\u043C\u0438\u043D\u0430\u0435\u0442 \u0435\u0433\u043E \u0441\u043F\
+      \u0440\u0430\u0439\u0442."
+    type: Tweak
+  - message: "\u0421\u0442\u0430\u043D\u0446\u0438\u043E\u043D\u043D\u044B\u0435 \u043C\
+      \u0430\u044F\u0447\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435\
+      \ \u044F\u0432\u043B\u044F\u044E\u0442\u0441\u044F \u0432\u0430\u0440\u043F\
+      -\u043F\u043E\u0438\u043D\u0442\u0430\u043C\u0438 \u043F\u043E \u0441\u0442\u0430\
+      \u0440\u043E\u0439 \u043F\u0440\u043E\u0441\u044C\u0431\u0435 \u043C\u0430\u043F\
+      \u043F\u0435\u0440\u043E\u0432"
+    type: Fix
+  id: 507
+  time: '2024-08-20T01:01:10.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/575
+- author: ThereDrD0
+  changes:
+  - message: "\u041A\u043E\u0434 \u043F\u0440\u0438\u0442\u044F\u0433\u0438\u0432\u0430\
+      \u043D\u0438\u044F \u0441\u0438\u043D\u0433\u0443\u043B\u044F\u0440\u043D\u043E\
+      \u0441\u0442\u044C\u044E \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0432\
+      \ \u0441\u0442\u0430\u043B \u0447\u0443\u0442\u044C \u0431\u043E\u043B\u0435\
+      \u0435 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u043E\u0432\u0430\
+      \u043D\u043D\u044B\u0439"
+    type: Fix
+  id: 508
+  time: '2024-08-20T02:37:32.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/642
+- author: ThereDrD0
+  changes:
+  - message: "\u041C\u0435\u0442\u0435\u043E\u0440\u0438\u0442\u044B \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u044D\u0444\u0444\u0435\u043A\
+      \u0442 \u0432\u0437\u0440\u044B\u0432\u043D\u043E\u0439 \u0432\u043E\u043B\u043D\
+      \u044B \u043F\u0440\u0438 \u0432\u0437\u0440\u044B\u0432\u0435"
+    type: Add
+  id: 509
+  time: '2024-08-20T04:07:48.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/646
+- author: ThereDrD0
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0443\u0441\u0442\
+      \u043E\u0439 \u043A\u0430\u0440\u0442\u0440\u0438\u0434\u0436 \u0432 \u043C\u0435\
+      \u0434\u0438\u0446\u0438\u043D\u0441\u043A\u0438\u0439 \u0442\u0435\u0445\u0444\
+      \u0430\u0431"
+    type: Add
+  - message: "\u041C\u0430\u0437\u044C \u0442\u0435\u043F\u0435\u0440\u044C \u043B\
+      \u0435\u0447\u0438\u0442 10 \u043E\u0436\u043E\u0433\u043E\u0432 \u0432\u043C\
+      \u0435\u0441\u0442\u043E 5"
+    type: Tweak
+  - message: "\u0420\u0435\u0433\u0435\u043D\u0435\u0440\u0430\u0442\u0438\u0432\u043D\
+      \u0430\u044F \u0441\u0435\u0442\u043A\u0430 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043B\u0435\u0447\u0438\u0442 20 \u043E\u0436\u043E\u0433\u043E\u0432 \u0432\
+      \u043C\u0435\u0441\u0442\u043E 10"
+    type: Tweak
+  - message: "\u0411\u0438\u043D\u0442\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043F\u0440\u0438\u043C\u0435\u043D\u044F\u044E\u0442\u0441\u044F \u0431\u044B\
+      \u0441\u0442\u0440\u0435\u0435 \u0438 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\
+      \u0435 \u043B\u0435\u0447\u0430\u0442 10 \u043F\u0440\u043E\u043D\u0438\u043A\
+      \u0430\u044E\u0449\u0435\u0433\u043E \u0443\u0440\u043E\u043D\u0430 \u0438 5\
+      \ \u043F\u043E\u0440\u0435\u0437\u043E\u0432"
+    type: Tweak
+  - message: "\u0416\u0433\u0443\u0442 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\
+      \u0437\u0431\u0430\u0432\u0438\u0442 \u043A\u043E\u0441\u043C\u043E\u043D\u0430\
+      \u0432\u0442\u0430 \u043E\u0442 \u043B\u044E\u0431\u043E\u0433\u043E \u043A\u0440\
+      \u043E\u0432\u043E\u0442\u0435\u0447\u0435\u043D\u0438\u044F \u0437\u0430 \u043E\
+      \u0434\u043D\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\
+      \u043D\u0438\u0435"
+    type: Tweak
+  - message: "\u0423\u0431\u0440\u0430\u043D \u043A\u0440\u0430\u0444\u0442 \u043F\
+      \u043B\u0430\u0441\u0442\u044B\u0440\u0435\u0439 \u0438 \u043C\u0430\u0437\u0435\
+      \u0439, \u0441\u0445\u043E\u0434\u0438\u0442\u0435 \u0432 \u043A\u0430\u0440\
+      \u0433\u043E \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\
+      \u0439\u0442\u0435 \u0445\u0438\u043C\u0438\u043A\u0430\u0442\u044B"
+    type: Remove
+  id: 510
+  time: '2024-08-20T04:06:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/645
+- author: ThereDrD0
+  changes:
+  - message: "\u041E\u0442\u043A\u0430\u0442 \u0440\u043E\u0431\u0430\u0441\u0442\u043D\
+      \u043E\u0439 \u0441\u0438\u043D\u0433\u0438 \u0434\u043E \u0435\u0435 \u0444\
+      \u0438\u043A\u0441\u0430 \u0438\u0437-\u0437\u0430 \u043F\u0440\u043E\u0431\u043B\
+      \u0435\u043C \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\
+      \u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\u044E"
+    type: Remove
+  id: 511
+  time: '2024-08-20T04:29:10.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/648
+- author: PointPNG
+  changes:
+  - message: "\u0411\u044B\u043B \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\
+      \ \u0441\u0435\u0440\u0432\u0435\u0440 \u041F\u0414\u0410 \u043D\u0430 \u0422\
+      \u0440\u0438\u0443\u043C\u0444, \u0412\u0430\u043D\u0434\u0435\u0440\u0411\u043E\
+      \u043A\u0441 \u0438 \u0412\u0430\u0439\u0442\u0411\u043E\u043A\u0441."
+    type: Add
+  id: 512
+  time: '2024-08-20T04:29:23.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/647
+- author: keslik
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\
+      \u0434\u0438\u043E\u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u0434\
+      \u043B\u044F \u043D\u043E\u0432\u044B\u0445 \u043A\u0440\u0438\u043C\u0438\u043D\
+      \u0430\u043B\u044C\u043D\u044B\u0445 \u0441\u0442\u0430\u0442\u0443\u0441\u043E\
+      \u0432"
+    type: Fix
+  id: 513
+  time: '2024-08-20T22:01:33.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/650
+- author: Valtos
+  changes:
+  - message: "\u041D\u043E\u0432\u044B\u0439 \u043B\u043E\u0433\u043E\u0442\u0438\u043F"
+    type: Add
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u043F\
+      \u0435\u0447\u0430\u0442\u043A\u0430 \u0432 \u043D\u0430\u0437\u0432\u0430\u043D\
+      \u0438\u0438"
+    type: Fix
+  id: 514
+  time: '2024-08-21T13:51:06.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/653
+- author: Spatison
+  changes:
+  - message: "\u0421\u0438\u043D\u0430\u043D\u043E \u0431\u043E\u043B\u044C\u0448\u0435\
+      \ \u043D\u0435 \u0441\u0440\u0435\u0442 \u043E\u0448\u0438\u0431\u043A\u0430\
+      \u043C\u0438"
+    type: Fix
+  id: 515
+  time: '2024-08-21T20:23:23.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/652
+- author: ThereDrD0
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u044B\
+      \ \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B. \u0422\u0435\u043F\
+      \u0435\u0440\u044C \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u0430\u043C\
+      \u0438 \u044F\u0432\u043B\u044F\u044E\u0442\u0441\u044F \u0440\u0430\u043D\u0434\
+      \u043E\u043C\u043D\u044B\u0435 \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u044B\
+      \ \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438 \u0432 \u043D\u0435\
+      \u043A\u043E\u0442\u043E\u0440\u043E\u043C \u043F\u0440\u043E\u0446\u0435\u043D\
+      \u0442\u043E\u043C \u0441\u043E\u043E\u0442\u043D\u043E\u0448\u0435\u043D\u0438\
+      \u0438. \u041A\u0430\u0436\u0434\u044B\u0439 \u043F\u0440\u0435\u0434\u043C\u0435\
+      \u0442 \u0438\u043C\u0435\u0435\u0442 \u0441\u0432\u043E\u0438 \u044D\u0444\u0444\
+      \u0435\u043A\u0442\u044B \u0438 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u044B\
+      . \u0413\u043E\u0442\u043E\u0432\u044C\u0442\u0435\u0441\u044C \u0437\u0432\u043E\
+      \u043D\u0438\u0442\u044C \u0443\u0447\u0435\u043D\u044B\u043C, \u0435\u0441\u043B\
+      \u0438 \u043F\u0443\u043B\u044F \u0432 \u0432\u0430\u0448\u043C \u043F\u0438\
+      \u0441\u0442\u043E\u043B\u0435\u0442\u0430 \u043F\u0440\u0438\u0437\u044B\u0432\
+      \u0430\u0435\u0442 \u043A\u0441\u0435\u043D\u043E\u043C\u043E\u0440\u0444\u043E\
+      \u0432!"
+    type: Add
+  - message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0430 \u0442\u0435\
+      \u043E\u0440\u0435\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0432\u043E\
+      \u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0430\u0440\u0442\u0435\
+      \u0444\u0430\u043A\u0442\u0443 \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C\
+      \ \u044D\u0444\u0444\u0435\u043A\u0442 \u0441\u043F\u0430\u0432\u043D\u0430\
+      \ \u0441\u0438\u043D\u0433\u0438 \u0438 \u0442\u0435\u0441\u043B\u044B"
+    type: Add
+  id: 516
+  time: '2024-08-21T22:07:43.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/654
+- author: ThereDrD0
+  changes:
+  - message: "\u0421\u043B\u043E\u043C\u0430\u043D\u043D\u044B\u0435 \u043B\u0430\u043C\
+      \u043F\u043E\u0447\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435\
+      \ \u0438\u043C\u0435\u044E\u0442 \u0441\u0432\u0435\u0447\u0435\u043D\u0438\u044F"
+    type: Fix
+  - message: "\u041E\u0440\u0433\u0430\u043D\u044B \u0438 \u0440\u0430\u0443\u043D\
+      \u0434\u0441\u0442\u0430\u0440\u0442\u043E\u0432\u044B\u0435 \u043F\u0440\u0435\
+      \u0434\u043C\u0435\u0442\u044B \u043D\u0430 \u0438\u0433\u0440\u043E\u043A\u0430\
+      \u0445 \u0431\u043E\u043B\u044C\u0448\u0435 \u043C\u043E\u0433\u0443\u0442 \u0441\
+      \u0442\u0430\u0442\u044C \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u0430\
+      \u043C\u0438"
+    type: Fix
+  - message: "\u0410\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u043D\u0435 \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\u044F\
+      \u0432\u043B\u044F\u0442\u044C\u0441\u044F \u043D\u0430 \u0441\u0442\u0430\u043D\
+      \u0446\u0438\u0438 \u041E\u0411\u0420, \u0441\u0442\u0430\u043D\u0446\u0438\u0438\
+      \ \u043D\u044E\u043A\u0435\u0440\u043E\u0432 \u0438\u043B\u0438 \u043C\u0430\
+      \u0433\u0430. \u0422\u0435\u043F\u0435\u0440\u044C \u0442\u043E\u043B\u044C\u043A\
+      \u043E \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438"
+    type: Fix
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u043A\u043E\u043B\
+      \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0440\u0435\u0434\u043C\u0435\
+      \u0442\u043E\u0432 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u043E\u0432"
+    type: Tweak
+  - message: "\u0423\u0431\u0440\u0430\u043D \u0430\u043A\u0446\u0435\u043D\u0442\
+      \ \u043F\u0435\u0440\u0435\u0432\u0435\u0440\u043D\u0443\u0442\u043E\u0439 \u0440\
+      \u0435\u0447\u0438 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0440\u0430\
+      \u043D\u0434\u043E\u043C\u043D\u044B\u0445 \u0430\u043A\u0446\u0435\u043D\u0442\
+      \u043E\u0432"
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0433\u043D\u043E\u043C\
+      \u0438\u0439 \u0438 \u0444\u0440\u0430\u043D\u0446\u0443\u0437\u0441\u043A\u0438\
+      \u0439 \u0434\u043B\u044F \u0430\u0441\u043F\u0435\u043A\u0442\u0430 \u043D\u0430\
+      \ \u0440\u0430\u043D\u0434\u043E\u043C\u043D\u044B\u0439 \u0430\u043A\u0446\u0435\
+      \u043D\u0442"
+    type: Add
+  id: 517
+  time: '2024-08-22T22:55:24.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/656
diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
index 95f6a403f8..853eb11e84 100644
--- a/Resources/Locale/en-US/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -12,4 +12,4 @@ changelog-button-new-entries = Changelog (new!)
 
 changelog-tab-title-Changelog = Changelog
 changelog-tab-title-Admin = Admin
-changelog-tab-title-ChangelogWhite = White Dream
+changelog-tab-title-ChangelogWhite = Giedi Prime
diff --git a/Resources/Locale/ru-RU/changelog/changelog-window.ftl b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
index 89664fd594..d2ec20c393 100644
--- a/Resources/Locale/ru-RU/changelog/changelog-window.ftl
+++ b/Resources/Locale/ru-RU/changelog/changelog-window.ftl
@@ -12,4 +12,4 @@ changelog-button-new-entries = Обновления (новые!)
 
 changelog-tab-title-Changelog = Changelog
 changelog-tab-title-Admin = Admin
-changelog-tab-title-ChangelogWhite = White Dream
+changelog-tab-title-ChangelogWhite = Giedi Prime
diff --git a/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl b/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl
index f9b99bdb2f..11d1db0a49 100644
--- a/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/ru-RU/criminal-records/criminal-records.ftl
@@ -48,9 +48,13 @@ criminal-records-console-not-wanted = {$name} больше не в розыск
 criminal-records-console-paroled = {$name} был условно-досрочно освобождён {$officer} на основании {$reason}.
 criminal-records-console-not-parole = {$name} нарушил условия условно-досрочного освобождения.
 criminal-records-console-search = {$name} требуется обыскать по указу {$officer}.
+criminal-records-console-not-search = {$name} больше не требуется обыскать.
 criminal-records-console-monitoring = За {$name} требуется вести наблюдание по причине {$reason}.
+criminal-records-console-not-monitoring = За {$name} можно прекратить слежку.
 criminal-records-console-execute = {$name} требуется ликвидировать по приказу {$officer} по причине {$reason}.
+criminal-records-console-not-execute = Приказ на устранение {$name} отменён {$officer}.
 criminal-records-console-demoted = {$name} должен быть понижен в должности по указу {$officer} по причине {$reason}.
+criminal-records-console-not-demoted = {$name} больше не требуется уволить.
 criminal-records-console-unknown-officer = <неопознанный офицер>
 
 
diff --git a/Resources/Maps/White/Triumph.yml b/Resources/Maps/White/Triumph.yml
index 21d7a77f19..8a42879a54 100644
--- a/Resources/Maps/White/Triumph.yml
+++ b/Resources/Maps/White/Triumph.yml
@@ -42186,20 +42186,6 @@ entities:
     - type: Transform
       pos: -4.581229,89.50693
       parent: 2
-- proto: BorgModuleDiagnosis
-  entities:
-  - uid: 2929
-    components:
-    - type: Transform
-      pos: -3.7428265,89.72663
-      parent: 2
-- proto: BorgModuleFireExtinguisher
-  entities:
-  - uid: 2930
-    components:
-    - type: Transform
-      pos: -5.575923,89.74651
-      parent: 2
 - proto: BorgModuleGardening
   entities:
   - uid: 2931
@@ -132259,8 +132245,6 @@ entities:
     - type: Transform
       pos: 8.5,133.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconAME
   entities:
   - uid: 19950
@@ -132268,8 +132252,6 @@ entities:
     - type: Transform
       pos: -87.5,73.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 19951
@@ -132277,8 +132259,6 @@ entities:
     - type: Transform
       pos: -31.5,61.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconArmory
   entities:
   - uid: 19952
@@ -132286,8 +132266,6 @@ entities:
     - type: Transform
       pos: -35.5,114.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 19953
@@ -132295,8 +132273,6 @@ entities:
     - type: Transform
       pos: 0.5,10.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconArtifactLab
   entities:
   - uid: 19954
@@ -132304,8 +132280,6 @@ entities:
     - type: Transform
       pos: -42.5,76.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconAtmospherics
   entities:
   - uid: 19955
@@ -132313,8 +132287,6 @@ entities:
     - type: Transform
       pos: -67.5,74.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconBar
   entities:
   - uid: 19956
@@ -132322,8 +132294,6 @@ entities:
     - type: Transform
       pos: -30.5,27.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconBotany
   entities:
   - uid: 19957
@@ -132331,8 +132301,6 @@ entities:
     - type: Transform
       pos: -22.5,45.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconBridge
   entities:
   - uid: 19958
@@ -132340,8 +132308,6 @@ entities:
     - type: Transform
       pos: 8.5,106.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconBrig
   entities:
   - uid: 19959
@@ -132349,8 +132315,6 @@ entities:
     - type: Transform
       pos: -56.5,97.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCaptainsQuarters
   entities:
   - uid: 19960
@@ -132358,8 +132322,6 @@ entities:
     - type: Transform
       pos: -11.5,115.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCargoBay
   entities:
   - uid: 19961
@@ -132367,8 +132329,6 @@ entities:
     - type: Transform
       pos: 2.5,37.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCargoReception
   entities:
   - uid: 19962
@@ -132376,8 +132336,6 @@ entities:
     - type: Transform
       pos: -6.5,37.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCERoom
   entities:
   - uid: 19963
@@ -132385,8 +132343,6 @@ entities:
     - type: Transform
       pos: -92.5,73.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconChapel
   entities:
   - uid: 19964
@@ -132394,8 +132350,6 @@ entities:
     - type: Transform
       pos: -35.5,-28.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconChemistry
   entities:
   - uid: 19965
@@ -132403,8 +132357,6 @@ entities:
     - type: Transform
       pos: -10.5,48.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCMORoom
   entities:
   - uid: 19966
@@ -132412,8 +132364,6 @@ entities:
     - type: Transform
       pos: 14.5,50.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCommand
   entities:
   - uid: 19967
@@ -132421,8 +132371,6 @@ entities:
     - type: Transform
       pos: -4.5,105.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCryonics
   entities:
   - uid: 19968
@@ -132430,8 +132378,6 @@ entities:
     - type: Transform
       pos: -0.5,49.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconCryosleep
   entities:
   - uid: 19969
@@ -132439,8 +132385,6 @@ entities:
     - type: Transform
       pos: -35.5,26.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconDetectiveRoom
   entities:
   - uid: 19970
@@ -132448,8 +132392,6 @@ entities:
     - type: Transform
       pos: -23.5,134.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconDisposals
   entities:
   - uid: 19971
@@ -132457,22 +132399,16 @@ entities:
     - type: Transform
       pos: -27.5,126.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 19972
     components:
     - type: Transform
       pos: 4.5,-2.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 19973
     components:
     - type: Transform
       pos: 46.5,107.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconDorms
   entities:
   - uid: 19974
@@ -132480,8 +132416,6 @@ entities:
     - type: Transform
       pos: -27.5,6.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconEngineering
   entities:
   - uid: 19975
@@ -132489,8 +132423,6 @@ entities:
     - type: Transform
       pos: -80.5,56.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconEscapePod
   entities:
   - uid: 19976
@@ -132498,15 +132430,11 @@ entities:
     - type: Transform
       pos: -7.5,0.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 19977
     components:
     - type: Transform
       pos: 14.5,87.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconEvac
   entities:
   - uid: 19978
@@ -132514,8 +132442,6 @@ entities:
     - type: Transform
       pos: -62.5,21.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 19979
@@ -132523,8 +132449,6 @@ entities:
     - type: Transform
       pos: -50.5,84.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconGravGen
   entities:
   - uid: 19980
@@ -132532,8 +132456,6 @@ entities:
     - type: Transform
       pos: -50.5,44.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconHOPOffice
   entities:
   - uid: 19981
@@ -132541,8 +132463,6 @@ entities:
     - type: Transform
       pos: -26.5,95.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconHOSRoom
   entities:
   - uid: 19982
@@ -132550,8 +132470,6 @@ entities:
     - type: Transform
       pos: -56.5,114.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
   - uid: 19983
@@ -132559,8 +132477,6 @@ entities:
     - type: Transform
       pos: -39.5,47.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconKitchen
   entities:
   - uid: 19984
@@ -132568,8 +132484,6 @@ entities:
     - type: Transform
       pos: -22.5,34.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconLawOffice
   entities:
   - uid: 19985
@@ -132577,8 +132491,6 @@ entities:
     - type: Transform
       pos: -87.5,86.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconLibrary
   entities:
   - uid: 19986
@@ -132586,8 +132498,6 @@ entities:
     - type: Transform
       pos: -35.5,-11.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconMedical
   entities:
   - uid: 19987
@@ -132595,8 +132505,6 @@ entities:
     - type: Transform
       pos: -7.5,57.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 19988
@@ -132604,8 +132512,6 @@ entities:
     - type: Transform
       pos: -11.5,70.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconPermaBrig
   entities:
   - uid: 19989
@@ -132613,8 +132519,6 @@ entities:
     - type: Transform
       pos: -36.5,168.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconPowerBank
   entities:
   - uid: 19990
@@ -132622,8 +132526,6 @@ entities:
     - type: Transform
       pos: -99.5,76.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconQMRoom
   entities:
   - uid: 19991
@@ -132631,8 +132533,6 @@ entities:
     - type: Transform
       pos: 4.5,25.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconRDRoom
   entities:
   - uid: 19992
@@ -132640,8 +132540,6 @@ entities:
     - type: Transform
       pos: -31.5,70.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconRND
   entities:
   - uid: 19993
@@ -132649,8 +132547,6 @@ entities:
     - type: Transform
       pos: -24.5,69.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconRobotics
   entities:
   - uid: 19994
@@ -132658,8 +132554,6 @@ entities:
     - type: Transform
       pos: -7.5,86.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSalvage
   entities:
   - uid: 19995
@@ -132667,8 +132561,6 @@ entities:
     - type: Transform
       pos: 51.5,98.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSecurity
   entities:
   - uid: 19996
@@ -132676,8 +132568,6 @@ entities:
     - type: Transform
       pos: -45.5,120.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSecurityCheckpoint
   entities:
   - uid: 19997
@@ -132685,22 +132575,16 @@ entities:
     - type: Transform
       pos: -8.5,18.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 19998
     components:
     - type: Transform
       pos: -52.5,25.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 19999
     components:
     - type: Transform
       pos: -20.5,84.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconServerRoom
   entities:
   - uid: 20000
@@ -132708,8 +132592,6 @@ entities:
     - type: Transform
       pos: -40.5,65.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconService
   entities:
   - uid: 20001
@@ -132717,8 +132599,6 @@ entities:
     - type: Transform
       pos: -15.5,6.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSingularity
   entities:
   - uid: 20002
@@ -132726,8 +132606,6 @@ entities:
     - type: Transform
       pos: -117.5,73.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSolars
   entities:
   - uid: 20003
@@ -132735,29 +132613,21 @@ entities:
     - type: Transform
       pos: -104.5,-51.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 20004
     components:
     - type: Transform
       pos: 88.5,90.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 20005
     components:
     - type: Transform
       pos: -185.5,98.5
       parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 20006
     components:
     - type: Transform
       pos: -37.5,185.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSupply
   entities:
   - uid: 20007
@@ -132765,8 +132635,6 @@ entities:
     - type: Transform
       pos: -5.5,26.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconSurgery
   entities:
   - uid: 20008
@@ -132774,8 +132642,6 @@ entities:
     - type: Transform
       pos: -4.5,80.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconTechVault
   entities:
   - uid: 20009
@@ -132783,8 +132649,6 @@ entities:
     - type: Transform
       pos: -59.5,46.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconTEG
   entities:
   - uid: 20010
@@ -132792,8 +132656,6 @@ entities:
     - type: Transform
       pos: -79.5,74.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconTelecoms
   entities:
   - uid: 20011
@@ -132801,8 +132663,6 @@ entities:
     - type: Transform
       pos: -50.5,46.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconTheater
   entities:
   - uid: 20012
@@ -132810,8 +132670,6 @@ entities:
     - type: Transform
       pos: -48.5,7.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconToolRoom
   entities:
   - uid: 20013
@@ -132819,8 +132677,6 @@ entities:
     - type: Transform
       pos: -2.5,-6.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconVault
   entities:
   - uid: 20014
@@ -132828,8 +132684,6 @@ entities:
     - type: Transform
       pos: 8.5,126.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefaultStationBeaconWardensOffice
   entities:
   - uid: 20015
@@ -132837,8 +132691,6 @@ entities:
     - type: Transform
       pos: -41.5,95.5
       parent: 2
-    missingComponents:
-    - WarpPoint
 - proto: DefibrillatorCabinet
   entities:
   - uid: 20016
@@ -226184,6 +226036,16 @@ entities:
     - type: Transform
       pos: -156.5,74.5
       parent: 2
+- proto: MessagesServer
+  entities:
+  - uid: 2929
+    components:
+    - type: Transform
+      pos: -53.5,41.5
+      parent: 2
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
 - proto: MicrophoneInstrument
   entities:
   - uid: 32906
diff --git a/Resources/Maps/White/Whitebox.yml b/Resources/Maps/White/Whitebox.yml
index 53c7d12983..5c69d6934a 100644
--- a/Resources/Maps/White/Whitebox.yml
+++ b/Resources/Maps/White/Whitebox.yml
@@ -90251,7 +90251,6 @@ entities:
     - type: Transform
       pos: 39.5,-37.5
       parent: 2
-    - type: DeviceNetwork
   - uid: 13105
     components:
     - type: Transform
@@ -118444,7 +118443,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,28.5
       parent: 2
-    - type: DeviceNetwork
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 16718
@@ -132052,6 +132050,16 @@ entities:
     - type: Transform
       pos: 33.5,16.5
       parent: 2
+- proto: MessagesServer
+  entities:
+  - uid: 12470
+    components:
+    - type: Transform
+      pos: -14.5,-51.5
+      parent: 2
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
 - proto: MicroManipulatorStockPart
   entities:
   - uid: 18705
@@ -132185,13 +132193,6 @@ entities:
     - type: Transform
       pos: 52.38254,-44.60257
       parent: 2
-- proto: MonkeyCubeBox
-  entities:
-  - uid: 12452
-    components:
-    - type: Transform
-      pos: 52.38254,-37.594757
-      parent: 2
 - proto: MopBucket
   entities:
   - uid: 18727
@@ -143193,13 +143194,13 @@ entities:
       pos: 4.166244,-61.42392
       parent: 2
     - type: RCDAmmo
-      charges: 45
+      charges: 67
   - uid: 19120
     components:
     - type: Transform
       parent: 18558
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143208,7 +143209,7 @@ entities:
     - type: Transform
       parent: 18558
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143217,7 +143218,7 @@ entities:
     - type: Transform
       parent: 18559
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143226,7 +143227,7 @@ entities:
     - type: Transform
       parent: 18559
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143235,7 +143236,7 @@ entities:
     - type: Transform
       parent: 18560
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143244,7 +143245,7 @@ entities:
     - type: Transform
       parent: 18560
     - type: RCDAmmo
-      charges: 45
+      charges: 67
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143254,14 +143255,14 @@ entities:
       pos: 4.173121,-61.326607
       parent: 2
     - type: RCDAmmo
-      charges: 45
+      charges: 67
   - uid: 24413
     components:
     - type: Transform
       pos: 4.166244,-61.51767
       parent: 2
     - type: RCDAmmo
-      charges: 45
+      charges: 67
 - proto: ReagentContainerFlourSmall
   entities:
   - uid: 20165
@@ -159591,10 +159592,6 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        invalid:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
         11102:
         - Left: Forward
         - Right: Reverse
@@ -159749,6 +159746,11 @@ entities:
       parent: 2
 - proto: VariantCubeBox
   entities:
+  - uid: 12452
+    components:
+    - type: Transform
+      pos: 52.38254,-37.594757
+      parent: 2
   - uid: 18950
     components:
     - type: Transform
diff --git a/Resources/Maps/White/WonderBox.yml b/Resources/Maps/White/WonderBox.yml
index 6eb9c903b0..855a546bbd 100644
--- a/Resources/Maps/White/WonderBox.yml
+++ b/Resources/Maps/White/WonderBox.yml
@@ -123735,6 +123735,16 @@ entities:
     - type: Transform
       pos: 41.44204,-11.98768
       parent: 2
+- proto: MessagesServer
+  entities:
+  - uid: 19230
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
 - proto: MicroManipulatorStockPart
   entities:
   - uid: 16180
@@ -132930,49 +132940,49 @@ entities:
       pos: 6.7808495,-46.50002
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24069
     components:
     - type: Transform
       pos: 6.7808495,-46.030556
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24070
     components:
     - type: Transform
       pos: 6.7808495,-45.564182
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24071
     components:
     - type: Transform
       pos: 6.4999847,-46.441338
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24072
     components:
     - type: Transform
       pos: 6.4999847,-45.968784
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24073
     components:
     - type: Transform
       pos: 6.4999847,-45.502415
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
   - uid: 24203
     components:
     - type: Transform
       pos: 4.636591,-46.013115
       parent: 2
     - type: RCDAmmo
-      charges: 67
+      charges: 100
 - proto: ReagentContainerFlour
   entities:
   - uid: 17280
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 9ea2be60f4..d9c8850e1f 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -28,7 +28,7 @@
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
+  parent: ClothingBackpackBrigmedic
   id: ClothingBackpackBrigmedicFilled
   components:
   - type: StorageFill
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 63ea974c47..cdd1a0b0bf 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -88,7 +88,7 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.95
+        Piercing: 0.9 # WD
 
 #Bombsuit Helmet
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 5eca9c6b41..ae2efa650b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -61,7 +61,7 @@
       coefficients:
         Blunt: 0.4
         Slash: 0.4
-        Piercing: 0.9
+        Piercing: 0.7 # WD
         Heat: 0.9
         Caustic: 0.9
   - type: ExplosionResistance
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 991fa93c5c..50aff47b94 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -105,7 +105,7 @@
     modifiers:
       coefficients:
         Heat: 0.90
-        Radiation: 0.001
+        Radiation: 0.01 # WD
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/rad.rsi
   - type: GroupExamine
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 961e0b01ad..0b92fd70ba 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -250,7 +250,7 @@
     sprintModifier: 0.8
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesBase
   id: ClothingShoesSkates
   name: roller skates
   description: "Get your skates on!"
@@ -266,8 +266,8 @@
   - type: Item
     sprite: Clothing/Shoes/Specific/skates.rsi
   - type: ClothingSpeedModifier
-    walkModifier: 1.1
-    sprintModifier: 1.1
+    walkModifier: 1.3
+    sprintModifier: 1.3
   - type: Skates
   - type: FootstepModifier
     footstepSoundCollection:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 643b5f5d92..d90f278190 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -257,7 +257,8 @@
     footstepSoundCollection:
       collection: FootstepHoverBorg
       params:
-        volume: -6
+        variation: 0.1
+        volume: -13
   - type: InteractionPopup
     interactSuccessString: petting-success-medical-cyborg
     interactFailureString: petting-failure-medical-cyborg
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 4f7a8aa9b0..b822f7b19a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -24,7 +24,7 @@
   - type: NavMapBeacon
     defaultText: station-beacon-general
     color: "#D4D4D496"
-  - type: WarpPoint
+#  - type: WarpPoint WD edit
   - type: SpawnTeleportLocation
   - type: GiftIgnore
   - type: ActivatableUI
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 9a77ebc285..cce1afbff5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -104,4 +104,18 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
-      Glass: 40
\ No newline at end of file
+      Glass: 40
+
+- type: entity
+  name: massive fire extinguisher
+  parent: FireExtinguisher
+  id: FireExtinguisherMassive
+  description: It extinguishes fires.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 300
+        reagents:
+        - ReagentId: Water
+          Quantity: 300
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index e7d5e8a219..3297f61fb1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -70,9 +70,9 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    maxIntensity: 10
+    maxIntensity: 40
     intensitySlope: 3
-    totalIntensity: 120 # about a ~4 tile radius
+    totalIntensity: 70 # about a ~4 tile radius
     canCreateVacuum: false
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 3648e41db6..9c5e6c360f 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -70,6 +70,32 @@
   id: RiotShield
   description: A large tower shield. Good for controlling crowds.
   components:
+    - type: Sprite # WD start
+      state: riot-icon
+    - type: Item
+      heldPrefix: riot
+    - type: Blocking
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.7
+          Slash: 0.7
+          Piercing: 0.5
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.6
+          Slash: 0.6
+          Piercing: 0.4
+        flatReductions:
+          Blunt: 1.5
+          Piercing: 1.5
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 160
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - type: StaticPrice
       price: 90
 
@@ -92,8 +118,16 @@
           Heat: 0.7
         flatReductions:
           Heat: 2
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 120
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - type: Reflect
-      reflectProb: 0.25
+      reflectProb: 0.5
       reflects:
         - Energy
 
@@ -111,14 +145,24 @@
       passiveBlockModifier:
         coefficients:
           Blunt: 0.8
+          Slash: 0.8
           Piercing: 0.8
       activeBlockModifier:
         coefficients:
           Blunt: 0.7
+          Slash: 0.7
           Piercing: 0.7
         flatReductions:
           Blunt: 1.5
           Piercing: 1.5
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 220
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ] # WD end
 
 #Changeling shield
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index e9eb18f926..2b279cb8d9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -27,7 +27,7 @@
   - type: UseDelay
   - type: Spray
     transferAmount: 10
-    sprayVelocity: 2
+    sprayVelocity: 5 # WD
     spraySound:
       path: /Audio/Effects/spray2.ogg
   - type: TrashOnSolutionEmpty
@@ -93,6 +93,20 @@
       - Spray
       - DroneUsable #They don't have any other chem stuff on their whitelist so they can't refill it
 
+- type: entity # WD - for borgs
+  name: space cleaner
+  description: BLAM!-brand non-foaming space cleaner!
+  id: SprayBottleSpaceCleanerSelfRecharging
+  parent: SprayBottle
+  suffix: ""
+  components:
+  - type: SolutionRegeneration
+    solution: spray
+    generated:
+      reagents:
+      - ReagentId: SpaceCleaner
+        Quantity: 3
+
 # Vapor
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index 0be2889d18..1dc0e587a6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -44,6 +44,24 @@
   - type: StorageFillVisualizer
     fillBaseName: blue-icon
 
+- type: entity # WD - for borgs
+  name: trash bag
+  id: TrashBagAdvanced
+  parent: TrashBagBlue
+  components:
+  - type: Storage
+    maxItemSize: Large
+    grid:
+    - 0,0,4,9
+    quickInsert: true
+    areaInsert: true
+    storageOpenSound:
+      collection: trashBagRustle
+    storageInsertSound:
+      collection: trashBagRustle
+  - type: Dumpable
+    multiplier: 1.3
+
 - type: entity
   name: spell of all-consuming cleanliness
   id: BagOfSummoningGarbage
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 11ca70eae2..d6fb4f5cf6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -32,11 +32,8 @@
     damageContainers:
       - Biological
     damage:
-      types:
-        Heat: -5
-        Cold: -5
-        Shock: -5
-        Caustic: -1.5
+      groups:
+        Burn: -10 # WD
     healingBeginSound:
       path: "/Audio/Items/Medical/ointment_begin.ogg"
     healingEndSound:
@@ -83,11 +80,8 @@
     damageContainers:
       - Biological
     damage:
-      types:
-        Heat: -10
-        Cold: -10
-        Shock: -10
-        Caustic: -10
+      groups:
+        Burn: -20 # WD
     healingBeginSound:
       path: "/Audio/Items/Medical/ointment_begin.ogg"
     healingEndSound:
@@ -211,8 +205,8 @@
       - Biological
     damage:
       types:
-        Bloodloss: -0.5 #lowers bloodloss damage
-    ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
+        Bloodloss: -0.5 # WD #lowers bloodloss damage
+    ModifyBloodLevel: 30 #restores about 10% blood per use on standard humanoids.
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
     healingEndSound:
@@ -253,7 +247,7 @@
         types:
           Bloodloss: 2
           Asphyxiation: 2 # Essentially Stopping all blood reaching a part of your body
-      bloodlossModifier: -10
+      bloodlossModifier: -30
       delay: 0.5
       healingBeginSound:
         path: "/Audio/Items/Medical/brutepack_begin.ogg"
@@ -265,7 +259,6 @@
     - type: StackPrice
       price: 10
 
-
 - type: entity
   name: roll of gauze
   description: Some sterile gauze to wrap around bloody stumps.
@@ -288,9 +281,10 @@
       - Biological
     damage:
       types:
-        Slash: -5
-        Piercing: -10
-    bloodlossModifier: -10
+        Slash: -2
+        Piercing: -2
+    bloodlossModifier: -5
+    delay: 0.5
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
     healingEndSound:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index fe4b9cf0ca..8c0282751a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -1,14 +1,9 @@
-- type: entity
+- type: entity # WD
   name: hypospray
   parent: BaseItem
   description: A sterile injector for rapid administration of drugs to patients.
-  id: Hypospray
+  id: BaseHypospray
   components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/hypospray.rsi
-    state: hypo
-  - type: Item
-    sprite: Objects/Specific/Medical/hypospray.rsi
   - type: SolutionContainerManager
     solutions:
       hypospray:
@@ -23,16 +18,28 @@
     delay: 0.5
   - type: StaticPrice
     price: 750
+  - type: ContextMenuInteractionBlocker
+
+- type: entity
+  name: hypospray
+  parent: BaseHypospray # WD
+  description: A sterile injector for rapid administration of drugs to patients.
+  id: Hypospray
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/hypospray.rsi
+    state: hypo
+  - type: Item
+    sprite: Objects/Specific/Medical/hypospray.rsi
   - type: Tag
     tags:
     - HighRiskItem
   - type: StealTarget
     stealGroup: Hypospray
-  - type: ContextMenuInteractionBlocker
 
 - type: entity
   name: gorlex hypospray
-  parent: BaseItem
+  parent: BaseHypospray # WD
   description: Using reverse engineered designs from NT, Cybersun produced these in limited quantities for Gorlex Marauder operatives.
   id: SyndiHypo
   components:
@@ -45,19 +52,10 @@
     solutions:
       hypospray:
         maxVol: 20
-  - type: RefillableSolution
-    solution: hypospray
-  - type: ExaminableSolution
-    solution: hypospray
-  - type: Hypospray
-    onlyAffectsMobs: false
-  - type: UseDelay
-    delay: 0.5
-  - type: ContextMenuInteractionBlocker
 
 - type: entity
   name: borghypo
-  parent: BaseItem
+  parent: BaseHypospray # WD
   description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs.
   id: BorgHypo
   components:
@@ -69,16 +67,54 @@
   - type: SolutionContainerManager
     solutions:
       hypospray:
-        maxVol: 10
-  - type: RefillableSolution
+        maxVol: 15
+  - type: AutoRegenReagent # WD
+    reagents:
+    - Epinephrine
+    - Tricordrazine
+    - Dexalin
+    - Saline
+    - Kelotane
+    interval: 1
     solution: hypospray
-  - type: ExaminableSolution
+
+- type: entity # WD
+  name: borghypo
+  parent: BorgHypo
+  description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs.
+  id: BorgHypoAdvanced
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 25
+  - type: AutoRegenReagent
+    reagents:
+    - Epinephrine
+    - Bicaridine
+    - Dermaline
+    - DexalinPlus
+    - Ultravasculine
+    - Saline
+    interval: 2
+    solution: hypospray
+
+- type: entity # WD
+  name: borghypo
+  parent: BorgHypo
+  description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs.
+  id: BorgHypoParamedic
+  components:
+  - type: AutoRegenReagent
+    reagents:
+    - Epinephrine
+    - Barozine
+    - TranexamicAcid
+    - Inaprovaline
+    - Ethylredoxrazine
+    - Ipecac
+    interval: 2
     solution: hypospray
-  - type: Hypospray
-    onlyAffectsMobs: false
-  - type: UseDelay
-    delay: 0.5
-  - type: ContextMenuInteractionBlocker
 
 - type: entity
   name: experimental hypospray
@@ -87,12 +123,12 @@
   description: The ultimate application of bluespace technology and rapid chemical administration.
   id: AdminHypo
   components:
-    - type: SolutionContainerManager
-      solutions:
-        hypospray:
-          maxVol: 3000
-    - type: UseDelay
-      delay: 0.0
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 3000
+  - type: UseDelay
+    delay: 0.0
 
 - type: entity
   name: chemical medipen
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 3ba14b0e28..1a7bd92c94 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -120,19 +120,6 @@
     - Wirecutter
     - trayScanner
 
-- type: entity
-  id: BorgModuleFireExtinguisher
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
-  name: fire extinguisher cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: generic
-    - state: icon-fire-extinguisher
-  - type: ItemBorgModule
-    items:
-    - FireExtinguisher
-
 - type: entity
   id: BorgModuleGPS
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
@@ -178,6 +165,7 @@
     - Wirecutter
     - Multitool
     - WelderIndustrial
+    - FireExtinguisher
 
 # cargo modules
 - type: entity
@@ -236,20 +224,18 @@
     - state: icon-tools-adv
   - type: ItemBorgModule
     items:
-    - Omnitool
-    - WelderExperimental
-    - NetworkConfigurator
-    - RemoteSignaller
-    - GasAnalyzer
-    - GeigerCounter
-    - RemoteSignaller
-    - GasAnalyzer
+    - JawsOfLife # WD
+    - PowerDrill # WD
+    - WelderExperimental # WD
+    - Tricorder # WD
+    - AccessConfigurator # WD
+    - trayScanner # WD
     - GeigerCounter
 
 - type: entity
-  id: BorgModuleConstruction
+  id: BorgModuleAtmospherics # WD
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: construction cyborg module
+  name: atmospherics cyborg module
   components:
   - type: Sprite
     layers:
@@ -257,15 +243,15 @@
     - state: icon-construction
   - type: ItemBorgModule
     items:
-    - SheetSteelLingering0
-    - SheetGlassLingering0
-    - PartRodMetalLingering0
-    - FloorTileItemSteelLingering0
+    - HolofanProjector # WD
+    - RapidPipeDispenserRecharging # WD
+    - trayScanner # WD
+    - GasAnalyzer # WD
 
 - type: entity
-  id: BorgModuleRCD
+  id: BorgModuleConstruction # WD
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: RCD cyborg module
+  name: construction cyborg module
   components:
   - type: Sprite
     layers:
@@ -287,7 +273,7 @@
     - state: icon-light-replacer
   - type: ItemBorgModule
     items:
-    - LightReplacer
+    - LightReplacerBigger # WD
     - Crowbar
     - Screwdriver
 
@@ -319,24 +305,10 @@
     items:
     - AdvMopItem
     - HoloprojectorBorg
-    - SprayBottleSpaceCleaner
-    - Dropper
+    - SprayBottleSpaceCleanerSelfRecharging # WD
+    - TrashBagAdvanced # WD
 
 # medical modules
-- type: entity
-  id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: diagnosis cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-diagnosis
-  - type: ItemBorgModule
-    items:
-    - HandheldHealthAnalyzerUnpowered
-    - ClothingNeckStethoscope
-
 - type: entity
   id: BorgModuleTreatment
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
@@ -349,12 +321,24 @@
   - type: ItemBorgModule
     items:
     - HandheldHealthAnalyzerUnpowered
-    - Brutepack10Lingering
-    - Ointment10Lingering
-    - Gauze10Lingering
-    - Bloodpack10Lingering
+    - BorgHypo # WD
     - Syringe
 
+- type: entity # WD
+  id: BorgModuleResque
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: treatment cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-treatment
+  - type: ItemBorgModule
+    items:
+    - HandheldHealthAnalyzerUnpowered
+    - BorgHypoParamedic
+    - HandheldCrewMonitor
+
 - type: entity
   id: BorgModuleDefibrillator
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
@@ -380,10 +364,10 @@
   - type: ItemBorgModule
     items:
     - HandheldHealthAnalyzerUnpowered
+    - BorgHypoAdvanced # WD
     - Beaker
     - Beaker
     - BorgDropper
-    - BorgHypo
 
 # science modules
 # todo: if science ever gets their own custom robot, add more "sci" modules.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
index f1c6a2fa5e..d54ddeb929 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
@@ -33,3 +33,15 @@
     contents:
     - id: LightTube
       amount: 0
+
+- type: entity # WD - for borgs
+  parent: LightReplacer
+  id: LightReplacerBigger
+  suffix: 2x bulbs
+  components:
+  - type: LightReplacer
+    contents:
+    - id: LightTube
+      amount: 16
+    - id: LightBulb
+      amount: 16
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index f55add8db2..a72b6acfbd 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -409,6 +409,10 @@
     state: icon
   - type: Item
     size: Normal
+    storedRotation: -90
+    shape: # WD
+    - 0, 1, 0, 1
+    - 0, 0, 1, 0
   - type: Clothing
     sprite: Objects/Tools/rcd.rsi
     quickEquip: false
@@ -543,7 +547,15 @@
     maxCharges: 20
     charges: 20
   - type: AutoRecharge
-    rechargeDuration: 10
+    rechargeDuration: 3
+
+- type: entity # WD
+  id: RapidPipeDispenserRecharging
+  parent: RapidPipeDispenser
+  suffix: Empty
+  components:
+  - type: AutoRecharge
+    rechargeDuration: 2
 
 - type: entity
   id: RCDExperimental
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
index a9fd713e4d..ab891f8731 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -16,7 +16,7 @@
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -20
-    maxAngle: -20
+    maxAngle: -35 # WD
   - type: Gun
     minAngle: 24
     maxAngle: 45
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index e98dc0a087..535ebf6b0e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -29,6 +29,8 @@
     ignited: true
   - type: IgniteOnCollide
     fireStacks: 0.35
+  - type: ExplosionEffect # WD
+    maxShrapnel: 0
 
 - type: entity
   id: ProjectileAnomalyFireball
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index f526138e91..e7a622e298 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -41,6 +41,8 @@
     explosionType: Default
     intensitySlope: 4
     maxIntensity: 100
+  - type: ExplosionEffect # WD
+    maxShrapnel: 0
 
 - type: entity
   parent: BaseMeteor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 685b72c962..607a287909 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -743,6 +743,8 @@
     totalIntensity: 150 # a ~2 tile radius
     intensitySlope: 5
     maxIntensity: 10
+  - type: ExplosionEffect # WD
+    maxShrapnel: 0
 
 - type: entity
   id: BulletGrenadeFlash
@@ -781,6 +783,8 @@
     totalIntensity: 175 # about a ~6 tile radius
     intensitySlope: 1
     maxIntensity: 10
+  - type: ExplosionEffect # WD
+    maxShrapnel: 0
 
 - type: entity
   id: BulletGrenadeEMP
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index d982243dfe..e1cc85bd28 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -46,7 +46,7 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 15
+        Piercing: 30 # WD
   - type: Item
     storedRotation: 44 # It just works
     size: Huge
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 0313a75868..1a1be4ac89 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -36,10 +36,18 @@
           Primed: { state: primed }
           Unprimed: { state: icon }
 
+- type: entity # WD
+  abstract: true
+  parent: GrenadeBase
+  id: GrenadeBaseExplosionEffect
+  components:
+  - type: ExplosionEffect
+    maxShrapnel: 0
+
 - type: entity
   name: explosive grenade
   description: Grenade that creates a small but devastating explosion.
-  parent: GrenadeBase
+  parent: GrenadeBaseExplosionEffect # WD
   id: ExGrenade
   components:
   - type: ExplodeOnTrigger
@@ -49,13 +57,8 @@
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: OnUseTimerTrigger
-    beepSound:
-      path: "/Audio/Effects/beep1.ogg"
-      params:
-        volume: 5
-    initialBeepDelay: 0
-    beepInterval: 2 # 2 beeps total (at 0 and 2)
+  - type: ExplosionEffect
+    maxShrapnel: 12
 
 - type: entity
   name: flashbang
@@ -102,7 +105,7 @@
 - type: entity
   name: syndicate minibomb
   description: A syndicate-manufactured explosive used to stow destruction and cause chaos.
-  parent: GrenadeBase
+  parent: GrenadeBaseExplosionEffect # WD
   id: SyndieMiniBomb
   components:
   - type: Sprite
@@ -235,7 +238,7 @@
 - type: entity
   name: the nuclear option
   description: Please don't throw it, think of the children.
-  parent: GrenadeBase
+  parent: GrenadeBaseExplosionEffect # WD
   id: NuclearGrenade
   components:
   - type: Sprite
@@ -326,7 +329,7 @@
 - type: entity
   name: holy hand grenade
   description: O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy.
-  parent: GrenadeBase
+  parent: GrenadeBaseExplosionEffect # WD
   id: HolyHandGrenade
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index c52723410b..e7b70cfc8f 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -33,8 +33,8 @@
     state: base
   - type: PointLight
     color: "#FFE4CE" # 5000K color temp
-    energy: 0.8
-    radius: 10
+    energy: 0.65
+    radius: 6
     softness: 1
     offset: "0, -0.5"
   - type: Damageable
@@ -70,6 +70,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+  - type: LightingOverlay # WD
   - type: LightMark
   placement:
     mode: SnapgridCenter
@@ -154,9 +155,9 @@
       types:
         Heat: 5
   - type: PointLight
-    radius: 15
-    energy: 1
-    softness: 0.9
+    radius: 10
+    energy: 0.7
+    softness: 1
     color: "#EEEEFF"
 
 - type: entity
@@ -166,8 +167,8 @@
   components:
   - type: PointLight
     radius: 10
-    energy: 2.5
-    softness: 0.9
+    energy: 0.7
+    softness: 1
     color: "#EEEEFF"
 
 #Exterior lights
@@ -189,9 +190,9 @@
   suffix: Always Powered, Blue
   components:
   - type: PointLight
-    radius: 12
-    energy: 4.5
-    softness: 0.5
+    radius: 10
+    energy: 0.7
+    softness: 1
     color: "#B4FCF0"
 
 #Sodium lights
@@ -208,8 +209,8 @@
         Heat: 5
   - type: PointLight
     radius: 10
-    energy: 2.5
-    softness: 0.9
+    energy: 0.7
+    softness: 1
     color: "#FFAF38"
 
 - type: entity
@@ -219,8 +220,8 @@
   components:
   - type: PointLight
     radius: 10
-    energy: 4
-    softness: 0.5
+    energy: 0.7
+    softness: 1
     color: "#FFAF38"
 
 #Small lights
@@ -240,9 +241,9 @@
       sprite: Structures/Wallmounts/Lighting/light_small.rsi
       state: base
     - type: PointLight
-      energy: 1.0
-      radius: 6
-      softness: 1.1
+      radius: 4
+      energy: 0.7
+      softness: 1
       enabled: true
     - type: Damageable
       damageContainer: StructuralInorganic
@@ -324,7 +325,7 @@
   - type: PointLight
     enabled: true
     radius: 8
-    energy: 1
+    energy: 0.7
     softness: 1
     color: "#EEEEFF"
   - type: PoweredLight
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7d44fa5651..a7a46687bc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -540,15 +540,15 @@
   - type: Lathe
     idleState: fab-idle
     runningState: fab-active
-    staticRecipes:
+    staticRecipes: # WD edit - removed BorgModuleFireExtinguisher
     - MMI
     - PositronicBrain
     - SciFlash
     - BorgModuleCable
-    - BorgModuleFireExtinguisher
     - BorgModuleRadiationDetection
     - BorgModuleTool
     - BorgModuleAppraisal
+    - BorgModuleAtmospherics # WD
     - BorgModuleConstruction
     - BorgModuleService
     - BorgModuleTreatment
@@ -588,7 +588,7 @@
     - RightLegBorgService
     - HeadBorgService
     - TorsoBorgService
-    dynamicRecipes:
+    dynamicRecipes: # WD edit - removed BorgModuleDiagnosis
     - ProximitySensor
     - BorgModuleLightReplacer
     - BorgModuleAdvancedCleaning
@@ -596,14 +596,12 @@
     - BorgModuleGrapplingGun
     - BorgModuleAdvancedTool
     - BorgModuleGPS
-    - BorgModuleRCD
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening
     - BorgModuleHarvesting
     - BorgModuleMusique
     - BorgModuleClowning
-    - BorgModuleDiagnosis
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
     - RipleyHarness
@@ -886,8 +884,6 @@
     idleState: icon
     runningState: icon
     staticRecipes:
-      - Brutepack
-      - Ointment
       - Gauze
       - HandLabeler
       - Defibrillator
@@ -908,6 +904,14 @@
       - RollerBedSpawnFolded
       - CheapRollerBedSpawnFolded
       - EmergencyRollerBedSpawnFolded
+      - ChemicalCartridgeRecipe # WD
+      - Scalpel
+      - Retractor
+      - Cautery
+      - Drill
+      - Saw
+      - Hemostat
+      - ClothingEyesGlassesChemical
       - Medkit
       - MedkitBurn
       - MedkitToxin
@@ -916,13 +920,6 @@
       - MedkitAdvanced
       - MedkitRadiation
       - MedkitCombat
-      - Scalpel
-      - Retractor
-      - Cautery
-      - Drill
-      - Saw
-      - Hemostat
-      - ClothingEyesGlassesChemical
       - GenderSwapImplanter #Amour
     dynamicRecipes:
       - HandheldCrewMonitor
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index 25d219ab94..aae5096a44 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -19,8 +19,8 @@
     colliderFixtureId: EventHorizonCollider
     consumerFixtureId: EventHorizonConsumer
   - type: GravityWell # To make the singularity attract things.
-    baseRadialAcceleration: 10
-    maxRange: 4
+    baseRadialAcceleration: 20
+    maxRange: 10
   - type: Fixtures
     fixtures:
       EventHorizonCollider:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 455577a371..c820b5a236 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -35,6 +35,8 @@
     explosionType: FireBomb # WD EDIT
     totalIntensity: 120 # ~ 5 tile radius
     canCreateVacuum: false
+  - type: ExplosionEffect # WD
+    maxShrapnel: 0
 
 - type: entity
   id: WeldingFuelTankFull
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml b/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
index c9d32e6092..ce7ffd0f10 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
@@ -1,5 +1,5 @@
 #///////
-# White Dream
+# Giedi Prime
 #///////
 
 - type: itemLoadout
diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index c7eefef29b..02b98670c2 100644
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -129,18 +129,6 @@
     revertOnDeath: true
     duration: 20
 
-- type: polymorph
-  id: ArtifactCluwne
-  configuration:
-    entity: MobCluwne
-    forced: true
-    transferName: true
-    transferHumanoidAppearance: true
-    inventory: None
-    revertOnDeath: true
-    revertOnCrit: true
-    duration: 30
-
 - type: polymorph
   id: ArtifactLizard
   configuration:
@@ -449,4 +437,58 @@
     inventory: None
     revertOnDeath: true
     revertOnCrit: true
-    duration: 20
+    duration: 60
+
+- type: polymorph # WD
+  id: ArtifactWallDoor
+  configuration:
+    entity: WoodDoor
+    forced: true
+    inventory: None
+    transferName: false
+    transferDamage: false
+    revertOnCrit: true
+    revertOnDeath: true
+    duration: 120
+
+- type: polymorph # WD
+  id: ArtifactCluwne
+  configuration:
+    entity: MobCluwne
+    forced: true
+    transferName: true
+    transferHumanoidAppearance: true
+    inventory: Transfer
+    revertOnCrit: false
+    revertOnDeath: false
+    duration: 240
+
+- type: polymorph # WD
+  id: ArtifactMouse
+  configuration:
+    entity: MobMouse
+    forced: true
+    inventory: Drop
+    revertOnCrit: true
+    revertOnDeath: true
+    duration: 60
+
+- type: polymorph # WD
+  id: ArtifactChicken
+  configuration:
+    entity: MobChicken
+    forced: true
+    inventory: Drop
+    revertOnCrit: true
+    revertOnDeath: true
+    duration: 60
+
+- type: polymorph # WD
+  id: ArtifactGnome
+  configuration:
+    entity: MobGnome
+    forced: true
+    inventory: Drop
+    revertOnCrit: true
+    revertOnDeath: true
+    duration: 240
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index 44a9e2f0f2..49402a714b 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -367,15 +367,7 @@
     Glass: 250
     Plastic: 250
 
-- type: latheRecipe
-  id: BorgModuleFireExtinguisher
-  result: BorgModuleFireExtinguisher
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
+# WD edit - removed BorgModuleFireExtinguisher
 
 - type: latheRecipe
   id: BorgModuleGPS
@@ -450,18 +442,19 @@
     Gold: 50
 
 - type: latheRecipe
-  id: BorgModuleConstruction
-  result: BorgModuleConstruction
+  id: BorgModuleAtmospherics
+  result: BorgModuleAtmospherics
   category: Robotics
   completetime: 3
   materials:
     Steel: 500
     Glass: 500
     Plastic: 250
+    Gold: 50
 
 - type: latheRecipe
-  id: BorgModuleRCD
-  result: BorgModuleRCD
+  id: BorgModuleConstruction
+  result: BorgModuleConstruction
   category: Robotics
   completetime: 3
   materials:
@@ -501,15 +494,7 @@
     Plastic: 250
     Gold: 50
 
-- type: latheRecipe
-  id: BorgModuleDiagnosis
-  result: BorgModuleDiagnosis
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
+# WD edit - removed BorgModuleDiagnosis
 
 - type: latheRecipe
   id: BorgModuleTreatment
@@ -543,6 +528,16 @@
     Plastic: 250
     Gold: 50
 
+- type: latheRecipe
+  id: BorgModuleResque
+  result: BorgModuleResque
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+
 - type: latheRecipe
   id: BorgModuleArtifact
   result: BorgModuleArtifact
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index c4c39e9eda..a60e106409 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -140,9 +140,10 @@
     state: scanner
   discipline: CivilianServices
   tier: 2
-  cost: 10000
+  cost: 5000
   recipeUnlocks:
   - HandheldCrewMonitor
+  - BorgModuleResque
 
 - type: technology
   id: MechanizedTreatment
@@ -152,7 +153,7 @@
     state: medical
   discipline: CivilianServices
   tier: 2
-  cost: 5000
+  cost: 10000
   recipeUnlocks:
   - BorgModuleAdvancedTreatment
   - BorgModuleDefibrillator
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index f4acd916c0..d0c8468af2 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -164,6 +164,7 @@
   - HellfireFreezerMachineCircuitBoard
   - PortableScrubberMachineCircuitBoard
   - HolofanProjector
+  - BorgModuleAtmospherics # WD
 
 - type: technology
   id: AdvancedToolsTechnology
@@ -179,7 +180,7 @@
     - PowerDrill
     - JawsOfLife
     - BorgModuleAdvancedTool
-    - BorgModuleRCD
+    - BorgModuleConstruction # WD
 
 # Tier 3
 
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index 039c654f88..88c8e1c02c 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -164,5 +164,8 @@
 - type: playTimeTracker
   id: JobBomzh
 
+- type: playTimeTracker
+  id: JobBrigmedic
+
 - type: playTimeTracker
   id: JobMaid
diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
index 4237052c4f..f2ab912aae 100644
--- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
@@ -480,6 +480,19 @@
     - Dexalin
     - Omnizine
 
+- type: artifactEffect # WD
+  id: EffectChemicalPuddleWaterPotassium
+  targetDepth: 2
+  effectHint: artifact-effect-hint-biochemical
+  components:
+  - type: ChemicalPuddleArtifact
+    chemicalSolution:
+      maxVol: 500
+      canReact: true
+    possibleChemicals:
+    - Water
+    - Potassium
+
 - type: artifactEffect
   id: EffectChemicalPuddleRare
   targetDepth: 2
@@ -536,6 +549,46 @@
   - type: PolyOthersArtifact
     polymorphPrototypeName: ArtifactLuminous
 
+- type: artifactEffect # WD
+  id: EffectPolyWallDoor
+  targetDepth: 3
+  effectHint: artifact-effect-hint-polymorph
+  components:
+  - type: PolyOthersArtifact
+    polymorphPrototypeName: ArtifactWallDoor
+
+- type: artifactEffect # WD
+  id: EffectPolyCluwne
+  targetDepth: 3
+  effectHint: artifact-effect-hint-polymorph
+  components:
+  - type: PolyOthersArtifact
+    polymorphPrototypeName: ArtifactCluwne
+
+- type: artifactEffect # WD
+  id: EffectPolyMouse
+  targetDepth: 3
+  effectHint: artifact-effect-hint-polymorph
+  components:
+  - type: PolyOthersArtifact
+    polymorphPrototypeName: ArtifactMouse
+
+- type: artifactEffect # WD
+  id: EffectPolyChicken
+  targetDepth: 3
+  effectHint: artifact-effect-hint-polymorph
+  components:
+  - type: PolyOthersArtifact
+    polymorphPrototypeName: ArtifactChicken
+
+- type: artifactEffect # WD
+  id: EffectPolyGnome
+  targetDepth: 3
+  effectHint: artifact-effect-hint-polymorph
+  components:
+  - type: PolyOthersArtifact
+    polymorphPrototypeName: ArtifactGnome
+
 - type: artifactEffect
   id: EffectHealAll
   targetDepth: 3
@@ -583,7 +636,7 @@
   components:
   - type: ShuffleArtifact
   - type: TelepathicArtifact
-    range: 7.5
+    range: 12
     messages:
     - shuffle-artifact-popup
 
diff --git a/Resources/Prototypes/_White/Economy/salary.yml b/Resources/Prototypes/_White/Economy/salary.yml
index f0d1af2198..ea196c4da7 100644
--- a/Resources/Prototypes/_White/Economy/salary.yml
+++ b/Resources/Prototypes/_White/Economy/salary.yml
@@ -14,6 +14,7 @@
     Bartender: 200
     Botanist: 200
     Boxer: 150
+    Brigmedic: 250
     Chaplain: 150
     Chef: 200
     Clown: 150
diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Throwable/grenades.yml
new file mode 100644
index 0000000000..fea6ec5ec6
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -0,0 +1,92 @@
+- type: entity
+  id: ExplosionEffectGrenade
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: White/Effects/grenade_explosion.rsi
+    state: grenade
+  - type: TimedDespawn
+    lifetime: 0.5
+
+- type: entity
+  id: ExplosionEffectGrenadeShockWave
+  components:
+  - type: TimedDespawn
+    lifetime: 0.5
+  - type: ExplosionShockWave
+    falloffPower: 30
+    sharpness: 15
+    width: 1.3
+
+- type: entity
+  id: ExplosionEffectShrapnel1
+  noSpawn: true
+  components:
+  - type: CollisionWake
+  - type: Physics
+    bodyType: Dynamic
+    fixedRotation: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0
+  - type: Sprite
+    sprite: White/Objects/Weapons/shrapnel.rsi
+    state: shrapnel_bright1
+  - type: TimedDespawn
+    lifetime: 0.5
+#  - type: DeleteOnCollide
+
+- type: entity
+  parent: ExplosionEffectShrapnel1
+  id: ExplosionEffectShrapnel2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: shrapnel_bright2
+
+# Не работает каким-то хуем
+- type: entity
+  parent: BaseBullet
+  id: ProjectileShrapnel
+  name: shrapnel
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi
+    layers:
+    - state: buckshot
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+        - LowImpassable
+      fly-by:
+        shape: !type:PhysShapeCircle
+          radius: 1.5
+        layer:
+        - Impassable
+        - MidImpassable
+        - HighImpassable
+        - LowImpassable
+        hard: False
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 12
+    deleteOnCollide: true
+  - type: TimedDespawn
+    lifetime: 0.5
diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
index 261739babf..abb7e9a30e 100644
--- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
+++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
@@ -22,13 +22,21 @@
   ghostName: Winter's Scar
   ghostDescription: ...
 
+#- type: customGhost
+#  id: animeshka-ghost
+#  ckey: animeshka
+#  sprite: White/Ghosts/animeshka-ghost.rsi
+#  alpha: 0.7
+#  ghostName: Грабля
+#  ghostDescription: Ну привет уебан!
+
 - type: customGhost
   id: animeshka-ghost
-  ckey: animeshka
+  ckey: theredrd
   sprite: White/Ghosts/animeshka-ghost.rsi
   alpha: 0.7
-  ghostName: Грабля
-  ghostDescription: Ну привет уебан!
+  ghostName: null
+  ghostDescription: ...
 
 - type: customGhost
   id: shelupon-ghost
@@ -465,3 +473,21 @@
   alpha: 0.9
   ghostName: M̷a̴r̶i̷
   ghostDescription: Бежит от настоящего, возвращаясь в прошлое...
+
+#6mirage6
+- type: customGhost
+  id: lllkjjjklll-ghost
+  ckey: lllkjjjklll
+  sprite: White/Ghosts/lllkjjjklll-ghost.rsi
+  alpha: 0.9
+  ghostName: Ярик
+  ghostDescription: Дробилка, маска, плащ... Все эти вещи, казалось, сроднились с ним, сопровождая его даже после смерти.
+
+#Jabak
+- type: customGhost
+  id: jabak-ghost
+  ckey: Jabak
+  sprite: White/Ghosts/jabak-ghost.rsi
+  alpha: 0.9
+  ghostName: Жопа
+  ghostDescription: Хуй
diff --git a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
index 6032000928..3c643300b6 100644
--- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
+++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
@@ -183,3 +183,11 @@
   materials:
     Steel: 500
     Glass: 500
+
+- type: latheRecipe
+  id: ChemicalCartridgeRecipe
+  result: ChemicalCartridge
+  completetime: 1
+  materials:
+    Steel: 100
+    Plastic: 100
diff --git a/Resources/Prototypes/_White/Shaders/shaders.yml b/Resources/Prototypes/_White/Shaders/shaders.yml
new file mode 100644
index 0000000000..64737e2ca4
--- /dev/null
+++ b/Resources/Prototypes/_White/Shaders/shaders.yml
@@ -0,0 +1,9 @@
+- type: shader
+  id: ShockWave
+  kind: source
+  path: "/Textures/White/Shaders/shock_wave.swsl"
+
+- type: shader
+  id: LightingOverlay
+  kind: source
+  path: "/Textures/White/Shaders/light.swsl"
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Back/Satchels/inspector.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/inspector.rsi/meta.json
index b63db95452..e1a4ef359c 100644
--- a/Resources/Textures/Clothing/Back/Satchels/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Satchels/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/inspectorglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/inspectorglasses.rsi/meta.json
index a81434ecf7..4be3c4ff66 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/inspectorglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/inspectorglasses.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Hands/Gloves/inspector.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/inspector.rsi/meta.json
index 602fa5d2dd..db18218b7e 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json
index 0d9aa88dcb..43b6a3ea05 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Gargarien, property of White Dream",
+    "copyright": "Created by Gargarien, property of Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -16,4 +16,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/inspector.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/inspector.rsi/meta.json
index 2932adac4d..dd9580d736 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Gargarien, property of White Dream",
+    "copyright": "Created by Gargarien, property of Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -15,4 +15,4 @@
         "directions": 4
       }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/inspector.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/inspector.rsi/meta.json
index 3eeb088ece..ac8322122d 100644
--- a/Resources/Textures/Clothing/Head/Hats/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Hats/inspectorcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/inspectorcap.rsi/meta.json
index 3eeb088ece..ac8322122d 100644
--- a/Resources/Textures/Clothing/Head/Hats/inspectorcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/inspectorcap.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Mask/inspector.rsi/meta.json b/Resources/Textures/Clothing/Mask/inspector.rsi/meta.json
index 092d6013a9..d6ace4a2cb 100644
--- a/Resources/Textures/Clothing/Mask/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
index 27194f90cb..b634dc2a9c 100644
--- a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "icon and equipped-NECK drawn by Gargarien (White Dream), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+  "copyright": "icon and equipped-NECK drawn by Gargarien (Giedi Prime), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/inspector.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/inspector.rsi/meta.json
index a246f43483..729c336794 100644
--- a/Resources/Textures/Clothing/Neck/Cloaks/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Cloaks/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream SS14 original by Gargarien",
+    "copyright": "Giedi Prime SS14 original by Gargarien",
     "size": {
       "x": 32,
       "y": 32
@@ -24,4 +24,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Neck/Misc/inspectorbadge.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/inspectorbadge.rsi/meta.json
index bb8801d6e0..826019c8b6 100644
--- a/Resources/Textures/Clothing/Neck/Misc/inspectorbadge.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/inspectorbadge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
@@ -15,4 +15,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Neck/mantles/inspectormantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/inspectormantle.rsi/meta.json
index b4e9682cd9..a6fa1ee8ee 100644
--- a/Resources/Textures/Clothing/Neck/mantles/inspectormantle.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/mantles/inspectormantle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream SS14 original by Gargarien",
+    "copyright": "Giedi Prime SS14 original by Gargarien",
     "size": {
       "x": 32,
       "y": 32
@@ -16,4 +16,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_jacket.rsi/meta.json
index 4e00b7d4b9..fb576eb5fe 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_jacket.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_jacket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original",
+  "copyright": "Giedi Prime SS14 original",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_overcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_overcoat.rsi/meta.json
index 4e00b7d4b9..fb576eb5fe 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_overcoat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_overcoat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original",
+  "copyright": "Giedi Prime SS14 original",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_trenchcoat.rsi/meta.json
index 4e00b7d4b9..fb576eb5fe 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/inspector_trenchcoat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/inspector_trenchcoat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original",
+  "copyright": "Giedi Prime SS14 original",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json
index f152733bcd..1d90c5b557 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Gargarien, property of White Dream",
+    "copyright": "Created by Gargarien, property of Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -28,4 +28,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/inspector.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/inspector.rsi/meta.json
index 35900058d1..1d90c5b557 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Gargarien, property of White Dream",
+    "copyright": "Created by Gargarien, property of Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -27,4 +27,4 @@
         "directions": 4
       }
     ]
-  }
\ No newline at end of file
+  }
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/inspector.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/inspector.rsi/meta.json
index 11791721a1..dce9bfa342 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/inspector.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/inspector.rsi/meta.json
index f51d312db3..68c53d3780 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspector.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspector.rsi/meta.json
index b00de9e79a..e81517c00d 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspectorformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspectorformal.rsi/meta.json
index b00de9e79a..e81517c00d 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspectorformal.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/inspectorformal.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspector.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspector.rsi/meta.json
index 44c133f28b..30977db9b3 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspector.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream SS14 Original by Gargarien",
+    "copyright": "Giedi Prime SS14 Original by Gargarien",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspectorformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspectorformal.rsi/meta.json
index 44c133f28b..30977db9b3 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspectorformal.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/inspectorformal.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream SS14 Original by Gargarien",
+    "copyright": "Giedi Prime SS14 Original by Gargarien",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Overlay.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Overlay.rsi/meta.json
index f96e46ffda..6622cf45dc 100644
--- a/Resources/Textures/Clothing/Uniforms/Overlay.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Overlay.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version" : 1,
     "license" : "CC-BY-SA-3.0",
-    "copyright" : "Copyright (c) White Dream Space Station 14",
+    "copyright" : "Copyright (c) Giedi Prime Space Station 14",
     "size" : {
        "x" : 32,
        "y" : 32
@@ -11,4 +11,4 @@
            "name" : "camera"
        }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Effects/LightMasks/cone.png b/Resources/Textures/Effects/LightMasks/cone.png
index 66d0069768..24eafd1145 100644
Binary files a/Resources/Textures/Effects/LightMasks/cone.png and b/Resources/Textures/Effects/LightMasks/cone.png differ
diff --git a/Resources/Textures/Effects/LightMasks/lightmask_lamp.png b/Resources/Textures/Effects/LightMasks/lightmask_lamp.png
new file mode 100644
index 0000000000..fb7de740c9
Binary files /dev/null and b/Resources/Textures/Effects/LightMasks/lightmask_lamp.png differ
diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png
index 4b4c1a8d8a..bd4d61e340 100644
Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ
diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png
index 4e1ecf7387..b7eedf7eda 100644
Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ
diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png
index 1a320e9ef0..8963f6579b 100644
Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ
diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png
index 6339c002b3..2dab7f7d4d 100644
Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ
diff --git a/Resources/Textures/Objects/Specific/Security/body-camera.rsi/meta.json b/Resources/Textures/Objects/Specific/Security/body-camera.rsi/meta.json
index 6e6fd3aec3..b198787b49 100644
--- a/Resources/Textures/Objects/Specific/Security/body-camera.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Security/body-camera.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version" : 1,
  "license" : "CC-BY-SA-3.0",
- "copyright" : "Copyright (c) White Dream Space Station 14",
+ "copyright" : "Copyright (c) Giedi Prime Space Station 14",
  "size" : {
     "x" : 32,
     "y" : 32
@@ -105,4 +105,4 @@
         "directions" : 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 63ad0148f0..6e0842879b 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Inspector White Dream SS14 original by Gargarien",
+  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Inspector Giedi Prime SS14 original by Gargarien",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
diff --git a/Resources/Textures/White/Actions/changeling.rsi/meta.json b/Resources/Textures/White/Actions/changeling.rsi/meta.json
index fc8e5acbc5..266c5e635e 100644
--- a/Resources/Textures/White/Actions/changeling.rsi/meta.json
+++ b/Resources/Textures/White/Actions/changeling.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "By SS14 White Dream",
+    "copyright": "By SS14 Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Actions/meta.json b/Resources/Textures/White/Actions/meta.json
index f0f1a859a0..0306c2d346 100644
--- a/Resources/Textures/White/Actions/meta.json
+++ b/Resources/Textures/White/Actions/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "By SS14 White Dream",
+    "copyright": "By SS14 Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/White/Clothing/Belt/paramedwebbing.rsi/meta.json b/Resources/Textures/White/Clothing/Belt/paramedwebbing.rsi/meta.json
index 44cbd7f4e6..96e5ecd07d 100644
--- a/Resources/Textures/White/Clothing/Belt/paramedwebbing.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Belt/paramedwebbing.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modification by discord user with ID 720879793645551697 for White Dream. Modified sprite based on Jackal298 modification. Original: https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "copyright": "Modification by discord user with ID 720879793645551697 for Giedi Prime. Modified sprite based on Jackal298 modification. Original: https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json b/Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json
index 4e5cada3e0..394d2e9a5d 100644
--- a/Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream",
+    "copyright": "Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -24,4 +24,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json b/Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json
index 4e5cada3e0..394d2e9a5d 100644
--- a/Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream",
+    "copyright": "Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -24,4 +24,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
index 1a55e703b4..3e0917bde9 100644
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-    "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
index 894399d082..41c51bf307 100644
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+  "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json
index 0a84423978..382ef1be31 100644
--- a/Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream",
+    "copyright": "Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
@@ -28,4 +28,3 @@
       }
     ]
   }
-  
\ No newline at end of file
diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/boxers.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/boxers.rsi/meta.json
index 199e076570..568d7224fe 100644
--- a/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/boxers.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/boxers.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream original by Gargarien",
+  "copyright": "Giedi Prime original by Gargarien",
   "version": 1,
   "size": {
     "x": 32,
diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/panties.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/panties.rsi/meta.json
index 199e076570..568d7224fe 100644
--- a/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/panties.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/panties.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream original by Gargarien",
+  "copyright": "Giedi Prime original by Gargarien",
   "version": 1,
   "size": {
     "x": 32,
diff --git a/Resources/Textures/White/Clothing/Underwear/Top/heads/inspector/bra.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Top/heads/inspector/bra.rsi/meta.json
index b91c343711..f2be553dde 100644
--- a/Resources/Textures/White/Clothing/Underwear/Top/heads/inspector/bra.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Underwear/Top/heads/inspector/bra.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14 original by Gargarien",
+  "copyright": "Giedi Prime SS14 original by Gargarien",
   "version": 1,
   "size": {
     "x": 32,
diff --git a/Resources/Textures/White/Effects/grenade_explosion.rsi/grenade.png b/Resources/Textures/White/Effects/grenade_explosion.rsi/grenade.png
new file mode 100644
index 0000000000..d00b7283af
Binary files /dev/null and b/Resources/Textures/White/Effects/grenade_explosion.rsi/grenade.png differ
diff --git a/Resources/Textures/White/Effects/grenade_explosion.rsi/meta.json b/Resources/Textures/White/Effects/grenade_explosion.rsi/meta.json
new file mode 100644
index 0000000000..faef7a9557
--- /dev/null
+++ b/Resources/Textures/White/Effects/grenade_explosion.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/add6123ac6b3263f257e4b233ef5a8fea5d3d317/icons/effects/explosion.dmi",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "grenade",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json b/Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json
index 694aa4aac2..0181a91fac 100644
--- a/Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json
+++ b/Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "White Dream",
+    "copyright": "Giedi Prime",
     "size": {
       "x": 32,
       "y": 32
diff --git a/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json b/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json
index addefbf537..84b1c9bc4b 100644
--- a/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json
+++ b/Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14",
+  "copyright": "Giedi Prime SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json
index e71fe7e24a..422fe3c3a5 100644
--- a/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json
+++ b/Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14",
+  "copyright": "Giedi Prime SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json
index 717c531baa..2bf445660e 100644
--- a/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json
+++ b/Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14",
+  "copyright": "Giedi Prime SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Ghosts/kreses-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/kreses-ghost.rsi/meta.json
index 92f87d0b1d..7a2915c119 100644
--- a/Resources/Textures/White/Ghosts/kreses-ghost.rsi/meta.json
+++ b/Resources/Textures/White/Ghosts/kreses-ghost.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream",
+  "copyright": "Giedi Prime",
     "size": {
       "x": 64,
       "y": 64
diff --git a/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/animated.png
new file mode 100644
index 0000000000..c8b7f7639f
Binary files /dev/null and b/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/animated.png differ
diff --git a/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/meta.json
new file mode 100644
index 0000000000..296cda2f2e
--- /dev/null
+++ b/Resources/Textures/White/Ghosts/lllkjjjklll-ghost.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/frosty-dev/ss14-core",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "animated",
+      "directions": 4,
+      "delays": [
+        [
+          0.14,
+          0.14,
+          0.14,
+          0.14,
+          0.14
+        ],
+        [
+          0.14,
+          0.14,
+          0.14,
+          0.14,
+          0.14
+        ],
+        [
+          0.14,
+          0.14,
+          0.14,
+          0.14,
+          0.14
+        ],
+        [
+          0.14,
+          0.14,
+          0.14,
+          0.14,
+          0.14
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/White/Mobs/Customization/demon_tail.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/demon_tail.rsi/meta.json
index d0a9ae06ed..f5e05f5c90 100644
--- a/Resources/Textures/White/Mobs/Customization/demon_tail.rsi/meta.json
+++ b/Resources/Textures/White/Mobs/Customization/demon_tail.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 WHITE DREAM",
+    "copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json
index 2c45c5b796..2d3ae5d3f6 100644
--- a/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json
+++ b/Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "White Dream SS14",
+  "copyright": "Giedi Prime SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Mobs/Customization/warete_hair.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/warete_hair.rsi/meta.json
index 13bfbb6c98..ca2e9aafa6 100644
--- a/Resources/Textures/White/Mobs/Customization/warete_hair.rsi/meta.json
+++ b/Resources/Textures/White/Mobs/Customization/warete_hair.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 WHITE DREAM",
+    "copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Mobs/Customization/wolf_parts.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/wolf_parts.rsi/meta.json
index 130a33440e..98e8278771 100644
--- a/Resources/Textures/White/Mobs/Customization/wolf_parts.rsi/meta.json
+++ b/Resources/Textures/White/Mobs/Customization/wolf_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Mitchell#2905 SS14 WHITE DREAM",
+    "copyright": "Mitchell#2905 SS14 Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
index 479c9b2497..491e675eb5 100644
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
index 479c9b2497..491e675eb5 100644
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
index 75778d91a9..2789304217 100644
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json
index 570155bc01..e6311bc35d 100644
--- a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json
index 479c9b2497..491e675eb5 100644
--- a/Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/autocannon.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/autocannon.png
new file mode 100644
index 0000000000..9b69b25c94
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/autocannon.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/beanbag.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/beanbag.png
new file mode 100644
index 0000000000..89d54bb530
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/beanbag.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/buckshot.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/buckshot.png
new file mode 100644
index 0000000000..bf1cbac405
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/buckshot.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/flechette.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/flechette.png
new file mode 100644
index 0000000000..b8fec141ec
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/flechette.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/meta.json
new file mode 100644
index 0000000000..0bbcb43c40
--- /dev/null
+++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Projectiles/shotgun_projectiles.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/a86a9e2e57e5c00195cab704713a4962e8bc973a/icons/obj/items/weapons/projectiles.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "autocannon"
+    },
+    {
+      "name": "buckshot"
+    },
+    {
+      "name": "beanbag"
+    },
+    {
+      "name": "flechette"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/meta.json
new file mode 100644
index 0000000000..a17dcce10c
--- /dev/null
+++ b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/meta.json
@@ -0,0 +1,55 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/a86a9e2e57e5c00195cab704713a4962e8bc973a/icons/obj/items/weapons/projectiles.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "shrapnelshot"
+    },
+    {
+      "name": "shrapnelshot_bit"
+    },
+    {
+      "name": "shrapnel_glass"
+    },
+    {
+      "name": "shrapnel_light"
+    },
+    {
+      "name": "shrapnel_xeno"
+    },
+    {
+      "name": "shrapnel_human"
+    },
+    {
+      "name": "shrapnel_human1"
+    },
+    {
+      "name": "shrapnel_human2"
+    },
+    {
+      "name": "shrapnel_bright1",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "shrapnel_bright2",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright1.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright1.png
new file mode 100644
index 0000000000..e3e8c5c8d2
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright1.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright2.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright2.png
new file mode 100644
index 0000000000..b13da7ccd3
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_bright2.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_glass.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_glass.png
new file mode 100644
index 0000000000..7c399cf53c
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_glass.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human.png
new file mode 100644
index 0000000000..e0048bfb79
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human1.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human1.png
new file mode 100644
index 0000000000..30311c9210
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human1.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human2.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human2.png
new file mode 100644
index 0000000000..aaa5fd277a
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_human2.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_light.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_light.png
new file mode 100644
index 0000000000..c61e866827
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_light.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_xeno.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_xeno.png
new file mode 100644
index 0000000000..a7bbe70de6
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnel_xeno.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot.png
new file mode 100644
index 0000000000..b764cf7c00
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot.png differ
diff --git a/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot_bit.png b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot_bit.png
new file mode 100644
index 0000000000..1b85ff3b8f
Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/shrapnel.rsi/shrapnelshot_bit.png differ
diff --git a/Resources/Textures/White/Shaders/light.swsl b/Resources/Textures/White/Shaders/light.swsl
new file mode 100644
index 0000000000..20bbed01a1
--- /dev/null
+++ b/Resources/Textures/White/Shaders/light.swsl
@@ -0,0 +1,85 @@
+uniform sampler2D SCREEN_TEXTURE;
+
+const highp float[3] weights = float[](0.2, 0.0625, 0.0375);
+
+// Function to adjust alpha
+highp float adjustAlpha(highp vec4 background) {
+    highp float avgColor = dot(background.rgb, vec3(0.3333));
+    highp float boost = (1.0 - (1.0 - avgColor) / 1.25);
+    highp float transition = clamp((avgColor - 0.035) / 0.125, 0.0, 2.0);
+    return boost * (1.0 - transition) + transition;
+}
+
+// Function to warm up the color
+highp vec3 warmColor(highp vec3 color) {
+    highp vec3 warmTint = vec3(1.0, 0.8, 0.6);
+    return color * warmTint;
+}
+
+// Function to adjust saturation
+highp vec3 adjustSaturation(highp vec3 color, highp float saturation) {
+    highp float luminance = dot(color, vec3(0.299, 0.587, 0.114));
+    return mix(vec3(luminance), color, saturation);
+}
+
+// Function to add haze effect
+highp vec4 addHaze(highp vec4 color, highp float intensity) {
+    highp vec3 haze = vec3(0.9, 0.85, 0.8);
+    return vec4(mix(color.rgb, haze, intensity), color.a);
+}
+
+// Function to perform enhanced blur calculation
+highp vec4 enhancedBlur(highp vec2 offset, highp vec2 uv, highp vec2 frag, lowp int step) {
+    highp vec4 bsample = texture2D(TEXTURE, uv + offset * TEXTURE_PIXEL_SIZE) * weights[step];
+    bsample.rgb = warmColor(bsample.rgb);
+    bsample.rgb = adjustSaturation(bsample.rgb, 1.2);
+    bsample = addHaze(bsample, 0.1);
+    bsample.a *= adjustAlpha(zTextureSpec(SCREEN_TEXTURE, (frag + offset) * SCREEN_PIXEL_SIZE));
+    return bsample;
+}
+
+// Function to calculate offset based on index
+highp vec2 calculateOffset(highp int index, highp float step) {
+    highp vec3 offsetBase = vec3(1.0, 0.0, -1.0);
+    highp vec2 offsets[8];
+    offsets[0] = offsetBase.xy;
+    offsets[1] = -offsetBase.xy;
+    offsets[2] = offsetBase.yx;
+    offsets[3] = -offsetBase.yx;
+    offsets[4] = offsetBase.xx;
+    offsets[5] = offsetBase.xz;
+    offsets[6] = offsetBase.zx;
+    offsets[7] = offsetBase.zz;
+
+    return offsets[index % 8] * step;
+}
+
+void fragment() {
+    highp vec4 sprite = zTexture(UV);
+
+    if (sprite.a == 0.0) {
+        discard;
+    }
+
+    highp vec3 offsetBase = vec3(1.0, 0.0, -1.0);
+    highp vec4 sum = enhancedBlur(vec2(0), UV.xy, FRAGCOORD.xy, 0);
+
+    highp vec4 bsample;
+    highp float floatstep = 0.0;
+
+    for (lowp int i = 0; i < 2; i++) {
+        floatstep += 1.0;
+
+        for (lowp int j = 0; j < 8; j++) {
+            highp vec2 offset = calculateOffset(j, floatstep);
+            bsample = enhancedBlur(offset, UV.xy, FRAGCOORD.xy, i + 1);
+            sum += bsample;
+        }
+    }
+
+    sum.rgb = warmColor(sum.rgb);
+    sum.rgb = adjustSaturation(sum.rgb, 1.1);
+    sum = addHaze(sum, 0.05);
+
+    COLOR = sum;
+}
diff --git a/Resources/Textures/White/Shaders/shock_wave.swsl b/Resources/Textures/White/Shaders/shock_wave.swsl
new file mode 100644
index 0000000000..00531fb98a
--- /dev/null
+++ b/Resources/Textures/White/Shaders/shock_wave.swsl
@@ -0,0 +1,40 @@
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp vec2 renderScale;
+uniform lowp int count;
+uniform highp vec2[10] position;
+uniform highp float[10] sharpness;
+uniform highp float[10] width;
+uniform highp float[10] falloffPower;
+
+void fragment() {
+    highp vec2 coord = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy;
+    highp float ratio = SCREEN_PIXEL_SIZE.y / SCREEN_PIXEL_SIZE.x * 0.6;
+
+    for (int i = 0; i < count; ++i) {
+        highp vec2 WaveCentre = position[i];
+
+        highp float Dist = distance(
+            vec2(coord.x, coord.y * ratio),
+            vec2(WaveCentre.x, WaveCentre.y * ratio)
+        );
+
+        // removes the first few frames of the "animation"
+        Dist = max(Dist, 0.13);
+
+        highp float offset = (TIME - floor(TIME)) / TIME;
+        highp float CurrentTime = TIME * offset;
+
+        if (Dist <= (CurrentTime + 0.1) && Dist >= (CurrentTime - 0.1)) {
+            highp float Diff = Dist - CurrentTime;
+            highp float ScaleDiff = 1.0 - pow(abs(Diff * sharpness[i]), width[i]);
+            highp float DiffTime = Diff * ScaleDiff;
+            highp vec2 DiffTexCoord = normalize(coord - WaveCentre);
+            coord += (DiffTexCoord * DiffTime) / (CurrentTime * Dist * falloffPower[i]);
+            highp vec4 Color = zTextureSpec(SCREEN_TEXTURE, coord);
+            Color += (Color * ScaleDiff) / (CurrentTime * Dist * 40.0);
+            COLOR = Color;
+        } else {
+            COLOR = zTextureSpec(SCREEN_TEXTURE, UV);
+        }
+    }
+}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 84be52a2e6..1a56553099 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -272,3 +272,8 @@ BoxTrashbag: TrashBag
 
 # 2024-08-05 WD
 OmntnsHammer: JudgeHammer
+
+# 2024-08-07 WD
+BorgModuleDiagnosis: null
+BorgModuleRCD: BorgModuleConstruction
+BorgModuleFireExtinguisher: null