diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 09ddd64e27..e61d84c869 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -46,7 +46,7 @@ public void SwitchState(LobbyGuiState state)
                     CharacterSetupState.Visible = true;
                     // WD EDIT START
                     Center.Visible = false;
-                    RightSide.Visible = true;
+                    RightSide.Visible = false;
                     LabelName.Visible = false;
                     Changelog.Visible = false;
                     // WD EDIT END
@@ -54,8 +54,10 @@ public void SwitchState(LobbyGuiState state)
                     var actualWidth = (float) UserInterfaceManager.RootControl.PixelWidth;
                     var setupWidth = (float) LeftSide.PixelWidth;
 
-                    if (1 - (setupWidth / actualWidth) < 0.30)
-                        RightSide.Visible = false;
+                    // WD EDIT START
+                    if (1 - (setupWidth / actualWidth) < 0.15)
+                        RightSide.Visible = true;
+                    // WD EDIT END
 
                     UserInterfaceManager.GetUIController<LobbyUIController>().ReloadCharacterSetup();
 
diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs
index 899df30f7f..7c53f45e8a 100644
--- a/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@ -9,6 +9,7 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
+    [Obsolete] public override bool DeferredClose => false;
     private readonly StorageSystem _storage;
 
     public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
diff --git a/Content.Client/Weather/WeatherSystem.cs b/Content.Client/Weather/WeatherSystem.cs
index 64ce64415d..89c146b823 100644
--- a/Content.Client/Weather/WeatherSystem.cs
+++ b/Content.Client/Weather/WeatherSystem.cs
@@ -47,11 +47,12 @@ protected override void Run(EntityUid uid, WeatherData weather, WeatherPrototype
         if (!Timing.IsFirstTimePredicted || weatherProto.Sound == null)
             return;
 
-        var playStream = _audio.PlayGlobal(weatherProto.Sound, Filter.Local(), true);
-        weather.Stream ??= playStream!.Value.Entity;
+        // WD EDIT START
+        weather.Stream ??= _audio.PlayGlobal(weatherProto.Sound, Filter.Local(), true)?.Entity;
+        if (!TryComp(weather.Stream, out AudioComponent? comp))
+            return;
+        // WD EDIT END
 
-        var stream = weather.Stream.Value;
-        var comp = Comp<AudioComponent>(stream);
         var occlusion = 0f;
 
         // Work out tiles nearby to determine volume.
@@ -116,7 +117,7 @@ protected override void Run(EntityUid uid, WeatherData weather, WeatherPrototype
 
         var alpha = GetPercent(weather, uid);
         alpha *= SharedAudioSystem.VolumeToGain(weatherProto.Sound.Params.Volume);
-        _audio.SetGain(stream, alpha, comp);
+        _audio.SetGain(weather.Stream, alpha, comp); // WD EDIR
         comp.Occlusion = occlusion;
     }
 
diff --git a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
index 87ef41fe96..14b455d53a 100644
--- a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs
@@ -7,6 +7,9 @@
 using Robust.Shared.Prototypes;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Shared.Coordinates;
+using Robust.Shared.Physics;
+
 
 namespace Content.IntegrationTests.Tests.Fluids;
 
@@ -109,7 +112,7 @@ await server.WaitAssertion(() =>
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop(user, absorbent, component, refillable.ToCoordinates(), refillable); // WD EDIT
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
@@ -166,7 +169,7 @@ await server.WaitAssertion(() =>
                 solutionContainerSystem.AddSolution(refillableSoln.Value, new Solution(NonEvaporablePrototypeId, testCase.InitialRefillableSolution.VolumeOfNonEvaporable));
 
             // Act
-            absorbentSystem.Mop(user, refillable, absorbent, component);
+            absorbentSystem.Mop(user, absorbent, component, refillable.ToCoordinates(), refillable); // WD EDIT
 
             // Assert
             var absorbentComposition = absorbentSolution.GetReagentPrototypes(prototypeManager).ToDictionary(r => r.Key.ID, r => r.Value);
diff --git a/Content.Server/Animals/Systems/WoolySystem.cs b/Content.Server/Animals/Systems/WoolySystem.cs
index cbe959fb56..02cf575232 100644
--- a/Content.Server/Animals/Systems/WoolySystem.cs
+++ b/Content.Server/Animals/Systems/WoolySystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Animals.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Timing;
@@ -9,7 +9,7 @@
 namespace Content.Server.Animals.Systems;
 
 /// <summary>
-///     Gives ability to produce fiber reagents, produces endless if the 
+///     Gives ability to produce fiber reagents, produces endless if the
 ///     owner has no HungerComponent
 /// </summary>
 public sealed class WoolySystem : EntitySystem
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index 71f9347e9e..aa48ad6ef7 100644
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -21,7 +21,7 @@ public override void Initialize()
         SubscribeLocalEvent<AirlockComponent, SignalReceivedEvent>(OnSignalReceived);
 
         SubscribeLocalEvent<AirlockComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<AirlockComponent, ActivateInWorldEvent>(OnActivate, before: new[] { typeof(DoorSystem) });
+        SubscribeLocalEvent<AirlockComponent, ActivateInWorldEvent>(OnActivate, after: new[] { typeof(DoorSystem) }); // WD EDIT
     }
 
     private void OnAirlockInit(EntityUid uid, AirlockComponent component, ComponentInit args)
@@ -67,6 +67,11 @@ private void OnPowerChanged(EntityUid uid, AirlockComponent component, ref Power
 
     private void OnActivate(EntityUid uid, AirlockComponent component, ActivateInWorldEvent args)
     {
+        // WD EDIT START
+        if (args.Handled)
+            return;
+        // WD EDIT END
+
         if (TryComp<WiresPanelComponent>(uid, out var panel) &&
             panel.Open &&
             TryComp<ActorComponent>(args.User, out var actor))
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 3d0996a380..48895127fe 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
@@ -7,10 +8,14 @@
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
 using Content.Shared.Timing;
+using Content.Shared.Tools.Components;
 using Content.Shared.Weapons.Melee;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -29,6 +34,10 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly MapSystem _mapSystem = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!; // WD EDIT
+    [Dependency] private readonly EntityLookupSystem _lookup = default!; // WD EDIT
+
+    public const float AbsorptionRange = 0.25f; // WD EDIT
 
     public override void Initialize()
     {
@@ -90,20 +99,20 @@ private void OnInteractNoHand(EntityUid uid, AbsorbentComponent component, Inter
         if (args.Handled || args.Target == null)
             return;
 
-        Mop(uid, args.Target.Value, uid, component);
+        Mop(uid, uid, component, args.ClickLocation, args.Target);
         args.Handled = true;
     }
 
     private void OnAfterInteract(EntityUid uid, AbsorbentComponent component, AfterInteractEvent args)
     {
-        if (!args.CanReach || args.Handled || args.Target == null)
+        if (!args.CanReach || args.Handled)
             return;
 
-        Mop(args.User, args.Target.Value, args.Used, component);
+        Mop(args.User, args.Used, component, args.ClickLocation, args.Target);
         args.Handled = true;
     }
 
-    public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentComponent component)
+    public void Mop(EntityUid user, EntityUid used, AbsorbentComponent component, EntityCoordinates coordinates, EntityUid? target = null)
     {
         if (!_solutionContainerSystem.TryGetSolution(used, AbsorbentComponent.SolutionName, out var absorberSoln))
             return;
@@ -113,18 +122,20 @@ public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentCompo
             return;
 
         // If it's a puddle try to grab from
-        if (!TryPuddleInteract(user, used, target, component, useDelay, absorberSoln.Value))
-        {
-            // If it's refillable try to transfer
-            if (!TryRefillableInteract(user, used, target, component, useDelay, absorberSoln.Value))
-                return;
-        }
+        if (TryPuddleInteract(user, used, component, useDelay, absorberSoln.Value, coordinates))
+            return;
+
+        // If it's refillable try to transfer
+        if (!target.HasValue)
+            return;
+
+        TryRefillableInteract(user, used, target.Value, component, useDelay, absorberSoln.Value);
     }
 
     /// <summary>
     ///     Logic for an absorbing entity interacting with a refillable.
     /// </summary>
-    private bool TryRefillableInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent component, UseDelayComponent? useDelay, Entity<SolutionComponent> absorbentSoln)
+    public bool TryRefillableInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent component, UseDelayComponent? useDelay, Entity<SolutionComponent> absorbentSoln)
     {
         if (!TryComp(target, out RefillableSolutionComponent? refillable))
             return false;
@@ -268,56 +279,69 @@ private bool TryTwoWayAbsorbentRefillableTransfer(
     /// <summary>
     ///     Logic for an absorbing entity interacting with a puddle.
     /// </summary>
-    private bool TryPuddleInteract(EntityUid user, EntityUid used, EntityUid target, AbsorbentComponent absorber, UseDelayComponent? useDelay, Entity<SolutionComponent> absorberSoln)
+    private bool TryPuddleInteract(EntityUid user, EntityUid used, AbsorbentComponent absorber, UseDelayComponent? useDelay, Entity<SolutionComponent> absorberSoln, EntityCoordinates coordinates)
     {
-        if (!TryComp(target, out PuddleComponent? puddle))
+        // WD EDIT START
+        if (!_mapManager.TryFindGridAt(coordinates.ToMap(EntityManager, _transform), out var gridUid, out var mapGrid))
             return false;
 
-        if (!_solutionContainerSystem.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
+        var tileRef = _mapSystem.GetTileRef(gridUid, mapGrid, coordinates);
+        var tile = new EntityCoordinates(coordinates.EntityId, new (tileRef.X + 0.5f, tileRef.Y + 0.5f));
+        var targets = new HashSet<Entity<PuddleComponent>>();
+        _lookup.GetEntitiesInRange(tile, AbsorptionRange, targets, LookupFlags.Dynamic | LookupFlags.Uncontained);
+
+        if (targets.Count == 0)
             return false;
 
-        // Check if the puddle has any non-evaporative reagents
-        if (_puddleSystem.CanFullyEvaporate(puddleSolution))
+        var playSound = false;
+        // WD EDIT END
+
+        foreach (var (entity, component) in targets) // WD EDIT
         {
-            _popups.PopupEntity(Loc.GetString("mopping-system-puddle-evaporate", ("target", target)), user, user);
-            return true;
-        }
+            if (!_solutionContainerSystem.ResolveSolution(entity, component.SolutionName, ref component.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
+                continue;
 
-        // Check if we have any evaporative reagents on our absorber to transfer
-        var absorberSolution = absorberSoln.Comp.Solution;
-        var available = absorberSolution.GetTotalPrototypeQuantity(PuddleSystem.EvaporationReagents);
+            // Check if the puddle has any non-evaporative reagents
+            if (_puddleSystem.CanFullyEvaporate(puddleSolution))
+                continue;
 
-        // No material
-        if (available == FixedPoint2.Zero)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
-            return true;
-        }
+            // Check if we have any evaporative reagents on our absorber to transfer
+            var absorberSolution = absorberSoln.Comp.Solution;
+            var available = absorberSolution.GetTotalPrototypeQuantity(PuddleSystem.EvaporationReagents);
 
-        var transferMax = absorber.PickupAmount;
-        var transferAmount = available > transferMax ? transferMax : available;
+            // No material
+            if (available == FixedPoint2.Zero)
+            {
+                _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
+                break;
+            }
 
-        var puddleSplit = puddleSolution.SplitSolutionWithout(transferAmount, PuddleSystem.EvaporationReagents);
-        var absorberSplit = absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume, PuddleSystem.EvaporationReagents);
+            var transferMax = absorber.PickupAmount;
+            var transferAmount = available > transferMax ? transferMax : available;
 
-        // Do tile reactions first
-        var transform = Transform(target);
-        var gridUid = transform.GridUid;
-        if (TryComp(gridUid, out MapGridComponent? mapGrid))
-        {
-            var tileRef = _mapSystem.GetTileRef(gridUid.Value, mapGrid, transform.Coordinates);
+            var puddleSplit = puddleSolution.SplitSolutionWithout(transferAmount, PuddleSystem.EvaporationReagents);
+            var absorberSplit = absorberSolution.SplitSolutionWithOnly(puddleSplit.Volume, PuddleSystem.EvaporationReagents);
+
+            // Do tile reactions first
             _puddleSystem.DoTileReactions(tileRef, absorberSplit);
+
+            _solutionContainerSystem.AddSolution(component.Solution.Value, absorberSplit);
+            _solutionContainerSystem.AddSolution(absorberSoln, puddleSplit);
+
+            playSound = true; // WD EDIT
         }
 
-        _solutionContainerSystem.AddSolution(puddle.Solution.Value, absorberSplit);
-        _solutionContainerSystem.AddSolution(absorberSoln, puddleSplit);
+        // WD EDIT START
+        if (!playSound)
+            return false;
+        // WD EDIT END
+        _audio.PlayPvs(absorber.PickupSound, used);
 
-        _audio.PlayPvs(absorber.PickupSound, target);
         if (useDelay != null)
             _useDelay.TryResetDelay((used, useDelay));
 
         var userXform = Transform(user);
-        var targetPos = _transform.GetWorldPosition(target);
+        var targetPos = tile.Position; // WD EDIT
         var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
         localPos = userXform.LocalRotation.RotateVec(localPos);
 
diff --git a/Content.Server/FootPrint/FootPrintsSystem.cs b/Content.Server/FootPrint/FootPrintsSystem.cs
index 0e45acff5c..0f1c4ea656 100644
--- a/Content.Server/FootPrint/FootPrintsSystem.cs
+++ b/Content.Server/FootPrint/FootPrintsSystem.cs
@@ -6,6 +6,9 @@
 using Content.Shared.Standing;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Maps;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
@@ -20,11 +23,11 @@ public sealed class FootPrintsSystem : EntitySystem
     [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!; // WD EDIT
 
     private EntityQuery<TransformComponent> _transformQuery;
     private EntityQuery<MobThresholdsComponent> _mobThresholdQuery;
     private EntityQuery<AppearanceComponent> _appearanceQuery;
-    private EntityQuery<LayingDownComponent> _layingQuery;
 
     public override void Initialize()
     {
@@ -33,7 +36,6 @@ public override void Initialize()
         _transformQuery = GetEntityQuery<TransformComponent>();
         _mobThresholdQuery = GetEntityQuery<MobThresholdsComponent>();
         _appearanceQuery = GetEntityQuery<AppearanceComponent>();
-        _layingQuery = GetEntityQuery<LayingDownComponent>();
 
         SubscribeLocalEvent<FootPrintsComponent, ComponentStartup>(OnStartupComponent);
         SubscribeLocalEvent<FootPrintsComponent, MoveEvent>(OnMove);
@@ -53,7 +55,7 @@ private void OnMove(EntityUid uid, FootPrintsComponent component, ref MoveEvent
             return;
 
         var dragging = mobThreshHolds.CurrentThresholdState is MobState.Critical or MobState.Dead
-                       || _layingQuery.TryComp(uid, out var laying) && laying.IsCrawlingUnder;
+                       || _standingState.IsDown(uid); // WD EDIT
         var distance = (transform.LocalPosition - component.StepPos).Length();
         var stepSize = dragging ? component.DragSize : component.StepSize;
 
diff --git a/Content.Server/FootPrint/PuddleFootPrintsSystem.cs b/Content.Server/FootPrint/PuddleFootPrintsSystem.cs
index 706ba25359..54b9eb5191 100644
--- a/Content.Server/FootPrint/PuddleFootPrintsSystem.cs
+++ b/Content.Server/FootPrint/PuddleFootPrintsSystem.cs
@@ -1,9 +1,11 @@
 using System.Linq;
+using Content.Server.Fluids.EntitySystems;
 using Content.Shared.FootPrint;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
+using Content.Shared.Maps;
 using Robust.Shared.Physics.Events;
 
 namespace Content.Server.FootPrint;
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 5c970b1a74..9aca65422e 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Humanoid;
 using Content.Server.Inventory;
 using Content.Server.Mind.Commands;
-using Content.Server.Nutrition;
 using Content.Server.Polymorph.Components;
 using Content.Shared.Actions;
 using Content.Shared.Buckle;
@@ -13,6 +12,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition;
 using Content.Shared.Polymorph;
 using Content.Shared.Popups;
 using Robust.Server.Audio;
diff --git a/Content.Server/Vampire/BloodSuckerSystem.cs b/Content.Server/Vampire/BloodSuckerSystem.cs
index 41afe0d666..714d5c96a5 100644
--- a/Content.Server/Vampire/BloodSuckerSystem.cs
+++ b/Content.Server/Vampire/BloodSuckerSystem.cs
@@ -13,8 +13,8 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.DoAfter;
-using Content.Server.Nutrition.Components;
 using Content.Shared.HealthExaminable;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index df22b05d0c..d6cc176315 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1677,7 +1677,7 @@ public static readonly CVarDef<int>
         ///     Time in minutes after round start to auto-call the shuttle. Set to zero to disable.
         /// </summary>
         public static readonly CVarDef<int> EmergencyShuttleAutoCallTime =
-            CVarDef.Create("shuttle.auto_call_time", 120, CVar.SERVERONLY);
+            CVarDef.Create("shuttle.auto_call_time", 0, CVar.SERVERONLY); // WD EDIT
 
         /// <summary>
         ///     Time in minutes after the round was extended (by recalling the shuttle) to call
diff --git a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
index e050f1b4e1..60aeae4c75 100644
--- a/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
+++ b/Content.Shared/Medical/CPR/Systems/CPRSystem.cs
@@ -6,11 +6,14 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using Robust.Shared.Random;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Timing;
+
 
 namespace Content.Shared.Medical.CPR
 {
@@ -26,6 +29,7 @@ public sealed partial class CPRSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly INetManager _net = default!;
+        [Dependency] private readonly IGameTiming _timing = default!; // WD EDIT
         public override void Initialize()
         {
             base.Initialize();
@@ -56,27 +60,36 @@ private void AddCPRVerb(EntityUid uid, CPRTrainingComponent component, GetVerbsE
 
         private void StartCPR(EntityUid performer, EntityUid target, CPRTrainingComponent cprComponent)
         {
+            // WD EDIT START
+            if (!_timing.IsFirstTimePredicted)
+                return;
+            // WD EDIT END
+
             if (HasComp<RottingComponent>(target))
             {
-                _popupSystem.PopupEntity(Loc.GetString("cpr-target-rotting", ("entity", target)), performer, performer);
+                _popupSystem.PopupPredicted(Loc.GetString("cpr-target-rotting", ("entity", target)), performer, performer);
                 return;
             }
 
             if (_inventory.TryGetSlotEntity(target, "outerClothing", out var outer))
             {
-                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove", ("clothing", outer)), performer, performer, PopupType.MediumCaution);
+                _popupSystem.PopupPredicted(Loc.GetString("cpr-must-remove", ("clothing", outer)), performer, performer, PopupType.MediumCaution);
                 return;
             }
 
-            if (_inventory.TryGetSlotEntity(target, "mask", out var mask))
+            if (_inventory.TryGetSlotEntity(target, "mask", out var mask)
+                && TryComp<IngestionBlockerComponent>(mask, out var blockerTarget) // WD EDIT
+                && blockerTarget.Enabled) // WD EDIT)
             {
-                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove", ("clothing", mask)), performer, performer, PopupType.MediumCaution);
+                _popupSystem.PopupPredicted(Loc.GetString("cpr-must-remove", ("clothing", mask)), performer, performer, PopupType.MediumCaution);
                 return;
             }
 
-            if (_inventory.TryGetSlotEntity(performer, "mask", out var maskSelf))
+            if (_inventory.TryGetSlotEntity(performer, "mask", out var maskSelf)
+                && TryComp<IngestionBlockerComponent>(maskSelf, out var blockerPerformer) // WD EDIT
+                && blockerPerformer.Enabled) // WD EDIT
             {
-                _popupSystem.PopupEntity(Loc.GetString("cpr-must-remove-own-mask", ("clothing", maskSelf)), performer, performer, PopupType.MediumCaution);
+                _popupSystem.PopupPredicted(Loc.GetString("cpr-must-remove-own-mask", ("clothing", maskSelf)), performer, performer, PopupType.MediumCaution);
                 return;
             }
 
diff --git a/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
similarity index 76%
rename from Content.Server/Nutrition/Components/IngestionBlockerComponent.cs
rename to Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
index c3188d07a0..090f5e1dce 100644
--- a/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs
+++ b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
@@ -1,6 +1,4 @@
-using Content.Server.Nutrition.EntitySystems;
-
-namespace Content.Server.Nutrition.Components;
+namespace Content.Shared.Nutrition.Components;
 
 /// <summary>
 ///     Component that denotes a piece of clothing that blocks the mouth or otherwise prevents eating & drinking.
@@ -9,7 +7,7 @@ namespace Content.Server.Nutrition.Components;
 ///     In the event that more head-wear & mask functionality is added (like identity systems, or raising/lowering of
 ///     masks), then this component might become redundant.
 /// </remarks>
-[RegisterComponent, Access(typeof(FoodSystem), typeof(DrinkSystem), typeof(IngestionBlockerSystem))]
+[RegisterComponent]
 public sealed partial class IngestionBlockerComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
similarity index 82%
rename from Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
rename to Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
index ede1c21680..35f702ac8d 100644
--- a/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Clothing;
 
-namespace Content.Server.Nutrition.EntitySystems;
+namespace Content.Shared.Nutrition.EntitySystems;
 
 public sealed class IngestionBlockerSystem : EntitySystem
 {
diff --git a/Content.Server/Nutrition/IngestionEvents.cs b/Content.Shared/Nutrition/IngestionEvents.cs
similarity index 96%
rename from Content.Server/Nutrition/IngestionEvents.cs
rename to Content.Shared/Nutrition/IngestionEvents.cs
index ae1d22fb71..488605522a 100644
--- a/Content.Server/Nutrition/IngestionEvents.cs
+++ b/Content.Shared/Nutrition/IngestionEvents.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Nutrition;
+namespace Content.Shared.Nutrition;
 
 /// <summary>
 ///     Raised directed at the consumer when attempting to ingest something.
diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
index d7d1f0ac34..9f4d42f8de 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -140,6 +140,7 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t
 
         if (time <= modEv.Neglect)
             time = 0;
+        // WD EDIT END
 
         var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(time), new DoorPryDoAfterEvent(), target, target, tool) // WD EDIT END
         {
diff --git a/Resources/Audio/Announcers/RuOld/events/aliens.ogg b/Resources/Audio/Announcers/RuOld/events/aliens.ogg
new file mode 100644
index 0000000000..0c48f9dd89
Binary files /dev/null and b/Resources/Audio/Announcers/RuOld/events/aliens.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b1a2fdc2f1..a42bd1f1db 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -8100,272 +8100,345 @@ Entries:
   id: 6536
   time: '2024-11-22T01:03:22.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1256
+- author: Skubman
+  changes:
+    - type: Fix
+      message: >-
+        Piercing damage can now dismember body parts, just like Blunt and Slash
+        damage.
+  id: 6537
+  time: '2024-11-22T20:08:11.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1267
+- author: Tmanzxd
+  changes:
+    - type: Tweak
+      message: Increased applicable medication heal values.
+    - type: Tweak
+      message: Increased stack size of applicable medications.
+    - type: Tweak
+      message: Slightly increased dylovene, burn, and brute chemicals heal values.
+    - type: Tweak
+      message: Decreased Medical item application time from 3s to 2s
+  id: 6538
+  time: '2024-11-22T20:09:21.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1259
 - author: Remuchi
   changes:
     - type: Add
-      message: Upstream
+      message: Added Blood Cult Gamemode.
+  id: 6539
+  time: '2024-11-22T21:54:10.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1001
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: >-
+        As an Oni, examining the damage values of weapons now takes into account
+        the melee damage bonus from your species or trait.
+  id: 6540
+  time: '2024-11-24T18:44:48.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1268
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: >-
+        Players can set custom names, descriptions, and color tints for their
+        loadout items
+    - type: Add
+      message: Certain loadouts may have Guidebook pages shown in the editor
+    - type: Add
+      message: >-
+        Players can pick a list of loadout items to have one randomly be their
+        family heirloom for a mood bonus or deficit if they are carrying it
+    - type: Fix
+      message: Loadouts have almost as little lag as possible (hopefully none)
+    - type: Fix
+      message: Everything properly updates your character editor's live preview
+  id: 6541
+  time: '2024-11-25T05:43:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1164
+- author: sleepyyapril
+  changes:
+    - type: Fix
+      message: Fixed IPCs being unable to use the midi menu.
+  id: 6542
+  time: '2024-11-27T15:19:32.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1287
+- author: sleepyyapril
+  changes:
+  - type: Fix
+    message: >-
+      Fixed the bug with opening storage containers while there's already one
+      open.
+  id: 6543
+  time: '2024-11-29T15:26:27.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1292
+- author: Remuchi
+  changes:
+  - type: Add
+    message: Upstream
   id: 6460
   time: '2024-10-19T12:09:52.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/93
 - author: Gersoon
   changes:
-    - type: Add
-      message: translation of tiles/перевод тайлов
-    - type: Tweak
-      message: sign textures changed/изменены текстуры знаков
+  - type: Add
+    message: translation of tiles/перевод тайлов
+  - type: Tweak
+    message: sign textures changed/изменены текстуры знаков
   id: 6461
   time: '2024-10-21T06:56:21.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/90
 - author: Spatison
   changes:
-    - type: Remove
-      message: Thieves' pacifism has been removed / Убран воровской пацифизм
+  - type: Remove
+    message: Thieves' pacifism has been removed / Убран воровской пацифизм
   id: 6462
   time: '2024-10-22T16:35:54.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/95
 - author: Spatison
   changes:
-    - type: Remove
-      message: Delete Prido-O-Mat / Удален прайдомат
+  - type: Remove
+    message: Delete Prido-O-Mat / Удален прайдомат
   id: 6463
   time: '2024-10-23T03:35:00.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/84
 - author: Spatison
   changes:
-    - type: Add
-      message: Added hardlight spear implanter/ Добавлен имплант светового копья
+  - type: Add
+    message: Added hardlight spear implanter/ Добавлен имплант светового копья
   id: 6464
   time: '2024-10-23T10:20:53.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/77
 - author: Spatison
   changes:
-    - type: Tweak
-      message: The energy shield can now be discharged  / Энерго щит теперь имеет заряд
+  - type: Tweak
+    message: The energy shield can now be discharged  / Энерго щит теперь имеет заряд
   id: 6465
   time: '2024-10-23T10:23:45.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/94
 - author: Remuchi
   changes:
-    - type: Add
-      message: >-
-        Переводы всех черт персонажа, черт внешности и меню персонажа. Так же
-        переведен весь контент Нянотрайзен.
+  - type: Add
+    message: >-
+      Переводы всех черт персонажа, черт внешности и меню персонажа. Так же
+      переведен весь контент Нянотрайзен.
   id: 6466
   time: '2024-10-23T14:11:51.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/97
 - author: Gersoon458
   changes:
-    - type: Tweak
-      message: DryDock update/Обновление ДрайДока
+  - type: Tweak
+    message: DryDock update/Обновление ДрайДока
   id: 6467
   time: '2024-10-24T13:50:33.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/98
 - author: Spatison
   changes:
-    - type: Add
-      message: Added night vision goggle/ Добавлен прибор ночного видения
-    - type: Add
-      message: Added thermal vision goggle/ Добавлен прибор термального видения
+  - type: Add
+    message: Added night vision goggle/ Добавлен прибор ночного видения
+  - type: Add
+    message: Added thermal vision goggle/ Добавлен прибор термального видения
   id: 6468
   time: '2024-10-26T09:36:10.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/89
 - author: Spatison
   changes:
-    - type: Add
-      message: Added crossbow / Добавлен арбалет
+  - type: Add
+    message: Added crossbow / Добавлен арбалет
   id: 6469
   time: '2024-10-26T09:41:08.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/76
 - author: Spatison
   changes:
-    - type: Add
-      message: Added Gondola / Добавлена Гондола
+  - type: Add
+    message: Added Gondola / Добавлена Гондола
   id: 6470
   time: '2024-10-26T11:15:09.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/96
 - author: PuroSlavKing
   changes:
-    - type: Add
-      message: Added "Operative" UI style / Добавлен стиль интерфейса "Оперативник"
+  - type: Add
+    message: Added "Operative" UI style / Добавлен стиль интерфейса "Оперативник"
   id: 6471
   time: '2024-10-27T02:51:58.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/102
 - author: Spatison
   changes:
-    - type: Fix
-      message: >-
-        correction of a collision at a glass shard/ Исправление колизии у
-        осколка стекла
+  - type: Fix
+    message: >-
+      correction of a collision at a glass shard/ Исправление колизии у
+      осколка стекла
   id: 6472
   time: '2024-10-27T13:28:02.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/104
 - author: Gersoon
   changes:
-    - type: Add
-      message: New map added - Moose/Новая карта добавлена - Мус
-    - type: Tweak
-      message: Prisoners added to DryDock/На ДрайДок добавлены заключенные
+  - type: Add
+    message: New map added - Moose/Новая карта добавлена - Мус
+  - type: Tweak
+    message: Prisoners added to DryDock/На ДрайДок добавлены заключенные
   id: 6473
   time: '2024-10-27T13:49:26.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/100
 - author: Gersoon
   changes:
-    - type: Add
-      message: >-
-        5 types of Halloween gifts, namely: basic, sweet, sweet themed, clothes,
-        themed clothes!/5 видов хеллоуинских подарков, а именно: основной,
-        сладкий, сладкий тематический, одежда, одежда тематичская!
-    - type: Add
-      message: New autumn grass and trees tiles!/Новые осенние тайлы травы и деревья!
-    - type: Add
-      message: >-
-        You can 100% find Halloween gifts in tech's closets!/В шкафах техов 100%
-        можно встретить хеллоунские подарки!
-    - type: Add
-      message: >-
-        New Halloween theme! (Settings -> HUD Theme: ->
-        ui-options-hud-theme-halloween (If I didn’t manage to take away the
-        ability to change themes during the week or didn’t add
-        translations))/Новая хеллоуинская тема худа! (Настройки -> Тема HUD: ->
-        ui-options-hud-theme-halloween (Если я не успел забрать возможность
-        менять темы на протяжении недели или не добавил переводы))
-    - type: Add
-      message: >-
-        Each roundstart role has a candy bucket! (Kutos)/У каждой роли
-        раундстартом есть ведерко для конфет! (Kutos)
-    - type: Add
-      message: New costumes! (Purka)/Новые костюмы! (Purka)
-    - type: Add
-      message: >-
-        New sweets! (Purka, Kilath, Canceredpussy (Cyber ​​cutlet))/Новые
-        сладости! (Purka, Kilath, Canceredpussy (Кибер котлетка))
-    - type: Tweak
-      message: The cards are now SPOOOOOOOKY!/Карты теперь ЖУУУУТКИЕ!
+  - type: Add
+    message: >-
+      5 types of Halloween gifts, namely: basic, sweet, sweet themed, clothes,
+      themed clothes!/5 видов хеллоуинских подарков, а именно: основной,
+      сладкий, сладкий тематический, одежда, одежда тематичская!
+  - type: Add
+    message: New autumn grass and trees tiles!/Новые осенние тайлы травы и деревья!
+  - type: Add
+    message: >-
+      You can 100% find Halloween gifts in tech's closets!/В шкафах техов 100%
+      можно встретить хеллоунские подарки!
+  - type: Add
+    message: >-
+      New Halloween theme! (Settings -> HUD Theme: ->
+      ui-options-hud-theme-halloween (If I didn’t manage to take away the
+      ability to change themes during the week or didn’t add
+      translations))/Новая хеллоуинская тема худа! (Настройки -> Тема HUD: ->
+      ui-options-hud-theme-halloween (Если я не успел забрать возможность
+      менять темы на протяжении недели или не добавил переводы))
+  - type: Add
+    message: >-
+      Each roundstart role has a candy bucket! (Kutos)/У каждой роли
+      раундстартом есть ведерко для конфет! (Kutos)
+  - type: Add
+    message: New costumes! (Purka)/Новые костюмы! (Purka)
+  - type: Add
+    message: >-
+      New sweets! (Purka, Kilath, Canceredpussy (Cyber ​​cutlet))/Новые
+      сладости! (Purka, Kilath, Canceredpussy (Кибер котлетка))
+  - type: Tweak
+    message: The cards are now SPOOOOOOOKY!/Карты теперь ЖУУУУТКИЕ!
   id: 6474
   time: '2024-10-31T02:44:08.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/113
 - author: Spatison
   changes:
-    - type: Tweak
-      message: With FTL, a person now falls / При ФТЛ перемещении человек теперь падает
-    - type: Tweak
-      message: >-
-        Magnetic boots now do not let you fall / Магнитные сапоги теперь не дают
-        упасть
+  - type: Tweak
+    message: With FTL, a person now falls / При ФТЛ перемещении человек теперь падает
+  - type: Tweak
+    message: >-
+      Magnetic boots now do not let you fall / Магнитные сапоги теперь не дают
+      упасть
   id: 6475
   time: '2024-10-31T02:52:22.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/111
 - author: Spatison
   changes:
-    - type: Add
-      message: Added footsteps / Добавлены следы
+  - type: Add
+    message: Added footsteps / Добавлены следы
   id: 6476
   time: '2024-10-31T03:03:14.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/110
 - author: Spatison
   changes:
-    - type: Fix
-      message: >-
-        ПНВ и ПТВ теперь могут быть исследованы /  NVG and TVG can now be
-        researched
+  - type: Fix
+    message: >-
+      ПНВ и ПТВ теперь могут быть исследованы /  NVG and TVG can now be
+      researched
   id: 6477
   time: '2024-10-31T03:03:31.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/109
 - author: Spatison
   changes:
-    - type: Fix
-      message: >-
-        Fixing the animation of the clown's shoes / Исправление анимации ботинок
-        клоуна
+  - type: Fix
+    message: >-
+      Fixing the animation of the clown's shoes / Исправление анимации ботинок
+      клоуна
   id: 6478
   time: '2024-10-31T03:22:32.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/107
 - author: Spatison
   changes:
-    - type: Fix
-      message: Сorrection of a Butlutron collision / Исправлена коллизия Бутлетрона
+  - type: Fix
+    message: Сorrection of a Butlutron collision / Исправлена коллизия Бутлетрона
   id: 6479
   time: '2024-10-31T03:22:53.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/105
 - author: Spatison
   changes:
-    - type: Fix
-      message: Fixed bugs with sprites / Исправлены баги с спрайтами
+  - type: Fix
+    message: Fixed bugs with sprites / Исправлены баги с спрайтами
   id: 6480
   time: '2024-10-31T03:23:25.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/103
 - author: PuroSlavKing
   changes:
-    - type: Tweak
-      message: Измененён звук пожарной тревоги.
+  - type: Tweak
+    message: Измененён звук пожарной тревоги.
   id: 6481
   time: '2024-10-31T03:24:35.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/106
 - author: Spatison
   changes:
-    - type: Remove
-      message: Deleted fire alarm sound / Удален звук пожарной тревоги
+  - type: Remove
+    message: Deleted fire alarm sound / Удален звук пожарной тревоги
   id: 6482
   time: '2024-11-01T11:47:36.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/115
 - author: Gersoon458
   changes:
-    - type: Remove
-      message: >-
-        Fun removed :( Specifically the basket and the gift from the hands
-        :(/Удалено веселье :( А конкретно корзинка и подарок из рук :(
+  - type: Remove
+    message: >-
+      Fun removed :( Specifically the basket and the gift from the hands
+      :(/Удалено веселье :( А конкретно корзинка и подарок из рук :(
   id: 6483
   time: '2024-11-06T02:52:23.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/119
 - author: Spatison
   changes:
-    - type: Tweak
-      message: >-
-        Changed the chances of modes falling out / Изменены шансы выпадения
-        режимов
+  - type: Tweak
+    message: >-
+      Changed the chances of modes falling out / Изменены шансы выпадения
+      режимов
   id: 6484
   time: '2024-11-06T03:10:55.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/118
 - author: Gersoon458
   changes:
-    - type: Add
-      message: Added a new map - WhiteBox/Добавлена новая карта - ВайтБокс
-    - type: Fix
-      message: Fixed Moose (Added cadet spawner)/Починен Мус (Добавлен спавнер кадета)
-    - type: Fix
-      message: >-
-        Asterisk has been fixed, now there is no planet on it (Which do not
-        work. Thanks to Kutos)/Починен Астериск, теперь на нём нет планеты
-        (Которые не работают. Спасибо Кутосу)
+  - type: Add
+    message: Added a new map - WhiteBox/Добавлена новая карта - ВайтБокс
+  - type: Fix
+    message: Fixed Moose (Added cadet spawner)/Починен Мус (Добавлен спавнер кадета)
+  - type: Fix
+    message: >-
+      Asterisk has been fixed, now there is no planet on it (Which do not
+      work. Thanks to Kutos)/Починен Астериск, теперь на нём нет планеты
+      (Которые не работают. Спасибо Кутосу)
   id: 6485
   time: '2024-11-06T03:45:51.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/117
 - author: Spatison
   changes:
-    - type: Tweak
-      message: The pickaxe has been improved / Улучшена кирка
+  - type: Tweak
+    message: The pickaxe has been improved / Улучшена кирка
   id: 6486
   time: '2024-11-06T03:46:19.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/108
 - author: Spatison
   changes:
-    - type: Tweak
-      message: >-
-        The holoprojectors have been redesigned / Голопроекторы были
-        переработаны
+  - type: Tweak
+    message: >-
+      The holoprojectors have been redesigned / Голопроекторы были
+      переработаны
   id: 6487
   time: '2024-11-06T03:48:03.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/112
 - author: Warete
   changes:
-    - type: Fix
-      message: >-
-        Some benches had to get their rotation back / Скамьи должны были вернуть
-        свой поворот
-    - type: Tweak
-      message: >-
-        Automatic shift end is now off / Выключено автоматическое завершение
-        смены
+  - type: Fix
+    message: >-
+      Some benches had to get their rotation back / Скамьи должны были вернуть
+      свой поворот
+  - type: Tweak
+    message: >-
+      Automatic shift end is now off / Выключено автоматическое завершение
+      смены
   id: 6488
   time: '2024-11-06T04:32:07.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/99
@@ -8376,33 +8449,33 @@ Entries:
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/122
 - author: PuroSlavKing
   changes:
-    - type: Add
-      message: Добавлен КапитанШкаф, содержащий в себе все вещи капитана.
-    - type: Add
-      message: 'Добавлены новые стили одежды капитана: белый, шериф, командный.'
+  - type: Add
+    message: Добавлен КапитанШкаф, содержащий в себе все вещи капитана.
+  - type: Add
+    message: 'Добавлены новые стили одежды капитана: белый, шериф, командный.'
   id: 6490
   time: '2024-11-14T04:55:10.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/123
 - author: vanx
   changes:
-    - type: Add
-      message: Возвращена возможность казни
+  - type: Add
+    message: Возвращена возможность казни
   id: 6491
   time: '2024-11-14T09:41:30.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/126
 - author: PuroSlavKing
   changes:
-    - type: Add
-      message: >-
-        Added 5 new variations of body bags / Добавлено 5 новых вариаций мешков
-        для - тел.
+  - type: Add
+    message: >-
+      Added 5 new variations of body bags / Добавлено 5 новых вариаций мешков
+      для - тел.
   id: 6492
   time: '2024-11-14T09:45:21.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/120
 - author: Spatison
   changes:
-    - type: Add
-      message: Upstream :D
+  - type: Add
+    message: Upstream :D
   id: 6532
   time: '2024-11-21T10:49:05.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/129
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 8c8ce740a5..bd7d6d1309 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -15,8 +15,19 @@
     - state: mag-unshaded-4
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
+  # WD EDIT START
+  - type: Item
+    size: Large
+    shape:
+    - 0, 0, 3, 1
+  # WD EDIT END
   - type: Clothing
     sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi
+    # WD EDIT START
+    slots:
+      - Belt
+      - suitStorage
+    # WD EDIT END
   - type: Gun
     soundGunshot:
       path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 7f6125e73d..a5ac75bce0 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -134,7 +134,9 @@
         mask:
         - ItemMask
         layer:
-        - SlipLayer
+        - Impassable
+        - MidImpassable
+        - LowImpassable
         hard: false
   - type: IconSmooth
     key: puddles
@@ -169,39 +171,52 @@
   - type: PuddleFootPrints
 
 - type: entity
-  name: Footstep
+  name: footstep
   id: Footstep
   save: false
-  description: Trace of liquid
+  description: Trace of liquid.
   components:
-    - type: Clickable
-    - type: FootstepModifier
-      footstepSoundCollection:
-        collection: FootstepWater
-        params:
-          volume: 3
-    - type: Transform
-      noRot: false
-    - type: Sprite
-      drawdepth: FloorObjects
-      color: "#FFFFFF80"
-    - type: Physics
-      bodyType: Static
-    - type: Fixtures
-      fixtures:
-        slipFixture:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.4,-0.4,0.4,0.4"
-          mask:
-            - ItemMask
-          layer:
-            - SlipLayer
-          hard: false
-    - type: SolutionContainerManager
-      solutions:
-        step: { maxVol: 2 }
-    - type: FootPrint
-    - type: Puddle
-      solution: step
-    - type: Appearance
+  - type: Clickable
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepWater
+      params:
+        volume: 3
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    drawdepth: FloorObjects
+    color: "#FFFFFF80"
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      slipFixture:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        mask:
+          - ItemMask
+        layer:
+          - SlipLayer
+        hard: false
+  - type: SolutionContainerManager
+    solutions:
+      step: { maxVol: 2 }
+  - type: FootPrint
+  - type: Puddle
+    solution: step
+  - type: Appearance
+  - type: ExaminableSolution
+    solution: step
+  - type: MixableSolution
+    solution: step
+  - type: DrawableSolution
+    solution: step
+  - type: BadDrink
+  - type: IgnoresFingerprints
+  - type: Drink
+    delay: 3
+    transferAmount: 0.5
+    solution: step
+    examinable: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 3690727ec4..2e1f03bbb2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -42,7 +42,7 @@
     attackRate: 0.8
     damage:
       types:
-        Pierce: 7
+        Piercing: 7
     heavyRateModifier: 0.9
     heavyRangeModifier: 1.25
     maxTargets: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 780c670c49..ed197c52d8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -64,20 +64,14 @@
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 0.5
-    range: 1.4
     damage:
       types:
-        Blunt: 9
+        Blunt: 2 # WD EDIT
         Slash: 3
         Structural: 12
-    bluntStaminaDamageFactor: 4.0
-    heavyRateModifier: 1
-    heavyRangeModifier: 2
-    heavyDamageBaseModifier: 1
-    heavyStaminaCost: 10
-    maxTargets: 3
-    angle: 20
+    attackRate: 3.5 # WD EDIT
+    heavyStaminaCost: 0 # WD EDIT
+    angle: 0 # WD EDIT
 
   - type: ReverseEngineering # Nyano
     difficulty: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index b39303d9ed..c1204e4b51 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -403,7 +403,7 @@
     solution:
       reagents:
       - ReagentId: SpaceCleaner
-        Quantity: 30
+        Quantity: 50 # WD EDIT
 
 - type: entity
   parent: SmokeGrenade
diff --git a/Resources/Prototypes/Maps/drydock.yml b/Resources/Prototypes/Maps/drydock.yml
index 1f80295e34..5874d4e345 100644
--- a/Resources/Prototypes/Maps/drydock.yml
+++ b/Resources/Prototypes/Maps/drydock.yml
@@ -39,7 +39,6 @@
           Paramedic: [ 1, 1 ]
           MedicalDoctor: [ 2, 3 ]
           MedicalIntern: [ 2, 3 ]
-          Psychologist: [ 0, 0 ]
           #Cargo
           SalvageSpecialist: [ 3, 3 ]
           CargoTechnician: [ 2, 4 ]
@@ -64,7 +63,6 @@
           Clown: [ 1, 1 ]
           Musician: [ 1, 1 ]
           Reporter: [ 1, 1 ]
-          Boxer: [ 0, 0 ]
           Borg: [ 1, 2 ]
           Passenger: [ -1, -1 ]