diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4ec4f897b8..ae3b753ccc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,6 +18,8 @@
 - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал.
 - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует.
 - [ ] Я не добавлял контент нарушающий чужие авторские права.
+- [ ] Я добавил свой контент только в папку _LostParadise(только если вы не меняете оригинальный код).
+- [ ] Я не добавлял переводы в прототипы, а сделал их в файле locale.
 
 **Изменения**
 <!--
diff --git a/.github/workflows/discord-changelog.yml b/.github/workflows/discord-changelog.yml
index 589595a0d3..5342c9fb23 100644
--- a/.github/workflows/discord-changelog.yml
+++ b/.github/workflows/discord-changelog.yml
@@ -2,6 +2,8 @@
 
 on:
   workflow_dispatch:
+  schedule:
+  - cron: '0 6 * * *'
 
 jobs:
   publish_changelog:
@@ -19,4 +21,3 @@ jobs:
         CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
         CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
         GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-    continue-on-error: true
diff --git a/.github/workflows/publish-lostparadise.yml b/.github/workflows/publish-lostparadise.yml
index 1eefa1d701..f9d6777bd8 100644
--- a/.github/workflows/publish-lostparadise.yml
+++ b/.github/workflows/publish-lostparadise.yml
@@ -61,13 +61,6 @@ jobs:
         ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
-    - name: Publish changelog
-      run: Tools/actions_changelogs_since_last_run.py
-      env:
-        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
-        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
-        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-
     - uses: geekyeggo/delete-artifact@v5
       if: always()
       with:
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index b7a2c285fe..7eb597f2f3 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -3,6 +3,7 @@
 using Content.Client.Message;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
+using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -147,6 +148,10 @@ private void AddListingGui(ListingData listing)
         }
 
         var newListing = new StoreListingControl(listing, GetListingPriceString(listing), hasBalance, texture);
+
+        if (listing.DiscountValue > 0)
+            newListing.StoreItemBuyButton.AddStyleClass(StyleNano.ButtonColorDangerDefault.ToString());
+
         newListing.StoreItemBuyButton.OnButtonDown += args
             => OnListingButtonPressed?.Invoke(args, listing);
 
diff --git a/Content.Client/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs b/Content.Client/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs
new file mode 100644
index 0000000000..a12deb9d32
--- /dev/null
+++ b/Content.Client/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared._LostParadise.DiamondCrusher;
+
+namespace Content.Client._LostParadise.DiamondCrusher;
+
+/// <унаследование/>
+public sealed class DiamondCrusherSystem : SharedDiamondCrusherSystem
+{
+
+}
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
index f52f820a4c..cd95a85f20 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
@@ -57,4 +57,3 @@ public async Task ChangeMachine()
         AssertPrototype("Autolathe");
     }
 }
-
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
index 11381fb8cc..a915e5d47d 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
@@ -1,3 +1,4 @@
+
 namespace Content.IntegrationTests.Tests.Interaction;
 
 // This partial class contains various constant prototype IDs common to interaction tests.
@@ -27,8 +28,6 @@ public abstract partial class InteractionTest
 
     // Parts
     protected const string Bin1 = "MatterBinStockPart";
-    protected const string Cap1 = "CapacitorStockPart";
     protected const string Manipulator1 = "MicroManipulatorStockPart";
-    protected const string Battery1 = "PowerCellSmall";
-    protected const string Battery4 = "PowerCellHyper";
 }
+
diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
new file mode 100644
index 0000000000..85bae78dc6
--- /dev/null
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -0,0 +1,152 @@
+using Robust.Shared.Player;
+using Content.Server.DoAfter;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Events;
+using Content.Shared.Examine;
+using static Content.Shared.Examine.ExamineSystemShared;
+using Robust.Shared.Timing;
+using Content.Shared.Actions.Events;
+using Robust.Server.Audio;
+using Content.Server.Atmos.Rotting;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Psionics.Glimmer;
+
+namespace Content.Server.Abilities.Psionics;
+
+public sealed class RevivifyPowerSystem : EntitySystem
+{
+    [Dependency] private readonly AudioSystem _audioSystem = default!;
+    [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly RottingSystem _rotting = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly GlimmerSystem _glimmer = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PsionicComponent, PsionicHealOtherPowerActionEvent>(OnPowerUsed);
+        SubscribeLocalEvent<PsionicComponent, DispelledEvent>(OnDispelled);
+        SubscribeLocalEvent<PsionicComponent, PsionicHealOtherDoAfterEvent>(OnDoAfter);
+    }
+
+
+    private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        if (component.DoAfter is not null)
+            return;
+
+        if (!args.Immediate)
+            AttemptDoAfter(uid, component, args);
+        else ActivatePower(uid, component, args);
+
+        if (args.PopupText is not null
+            && _glimmer.Glimmer > args.GlimmerObviousPopupThreshold * component.CurrentDampening)
+            _popupSystem.PopupEntity(Loc.GetString(args.PopupText, ("entity", uid)), uid,
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                true,
+                args.PopupType);
+
+        if (args.PlaySound
+            && _glimmer.Glimmer > args.GlimmerObviousSoundThreshold * component.CurrentDampening)
+            _audioSystem.PlayPvs(args.SoundUse, uid, args.AudioParams);
+
+        // Sanitize the Glimmer inputs because otherwise the game will crash if someone makes MaxGlimmer lower than MinGlimmer.
+        var minGlimmer = (int) Math.Round(MathF.MinMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            + component.CurrentAmplification - component.CurrentDampening);
+        var maxGlimmer = (int) Math.Round(MathF.MaxMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            + component.CurrentAmplification - component.CurrentDampening);
+
+        _psionics.LogPowerUsed(uid, args.PowerName, minGlimmer, maxGlimmer);
+        args.Handled = true;
+    }
+
+    private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        var ev = new PsionicHealOtherDoAfterEvent(_gameTiming.CurTime);
+        ev.HealingAmount = args.HealingAmount;
+        ev.RotReduction = args.RotReduction;
+        ev.DoRevive = args.DoRevive;
+        var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid, target: args.Target)
+        {
+            BreakOnUserMove = args.BreakOnUserMove,
+            BreakOnTargetMove = args.BreakOnTargetMove,
+        };
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
+            return;
+
+        component.DoAfter = doAfterId;
+    }
+
+    private void OnDispelled(EntityUid uid, PsionicComponent component, DispelledEvent args)
+    {
+        if (component.DoAfter is null)
+            return;
+
+        _doAfterSystem.Cancel(component.DoAfter);
+        component.DoAfter = null;
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherDoAfterEvent args)
+    {
+        // It's entirely possible for the caster to stop being Psionic(due to mindbreaking) mid cast
+        if (component is null)
+            return;
+        component.DoAfter = null;
+
+        // The target can also cease existing mid-cast
+        if (args.Target is null)
+            return;
+
+        _rotting.ReduceAccumulator(args.Target.Value, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
+
+        if (!TryComp<DamageableComponent>(args.Target.Value, out var damageableComponent))
+            return;
+
+        _damageable.TryChangeDamage(args.Target.Value, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid);
+
+        if (!args.DoRevive
+            || !TryComp<MobStateComponent>(args.Target, out var mob)
+            || !_mobThreshold.TryGetThresholdForState(args.Target.Value, MobState.Dead, out var threshold)
+            || damageableComponent.TotalDamage > threshold)
+            return;
+
+        _mobState.ChangeMobState(args.Target.Value, MobState.Critical, mob, uid);
+    }
+
+    // This would be the same thing as OnDoAfter, except that here the target isn't nullable, so I have to reuse code with different arguments.
+    private void ActivatePower(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        if (component is null)
+            return;
+
+        _rotting.ReduceAccumulator(args.Target, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
+
+        if (!TryComp<DamageableComponent>(args.Target, out var damageableComponent))
+            return;
+
+        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid);
+
+        if (!args.DoRevive
+            || !TryComp<MobStateComponent>(args.Target, out var mob)
+            || !_mobThreshold.TryGetThresholdForState(args.Target, MobState.Dead, out var threshold)
+            || damageableComponent.TotalDamage > threshold)
+            return;
+
+        _mobState.ChangeMobState(args.Target, MobState.Critical, mob, uid);
+    }
+}
diff --git a/Content.Server/Anomaly/AnomalySystem.Vessel.cs b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
index 35de5c1a64..9a6c99f820 100644
--- a/Content.Server/Anomaly/AnomalySystem.Vessel.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
@@ -1,4 +1,5 @@
 using Content.Server.Anomaly.Components;
+using Content.Server.Construction;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
@@ -20,6 +21,7 @@ private void InitializeVessel()
     {
         SubscribeLocalEvent<AnomalyVesselComponent, ComponentShutdown>(OnVesselShutdown);
         SubscribeLocalEvent<AnomalyVesselComponent, MapInitEvent>(OnVesselMapInit);
+        SubscribeLocalEvent<AnomalyVesselComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         SubscribeLocalEvent<AnomalyVesselComponent, InteractUsingEvent>(OnVesselInteractUsing);
         SubscribeLocalEvent<AnomalyVesselComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<AnomalyVesselComponent, ResearchServerGetPointsPerSecondEvent>(OnVesselGetPointsPerSecond);
@@ -65,6 +67,11 @@ private void OnVesselMapInit(EntityUid uid, AnomalyVesselComponent component, Ma
         UpdateVesselAppearance(uid,  component);
     }
 
+    private void OnUpgradeExamine(EntityUid uid, AnomalyVesselComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("anomaly-vessel-component-upgrade-output", component.PointMultiplier);
+    }
+
     private void OnVesselInteractUsing(EntityUid uid, AnomalyVesselComponent component, InteractUsingEvent args)
     {
         if (component.Anomaly != null ||
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs
index e1eb0072b9..aa7e3e0b36 100644
--- a/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs
@@ -1,11 +1,12 @@
 using Content.Shared.Atmos;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Atmos.Piping.Binary.Components
 {
     [RegisterComponent]
     public sealed partial class GasRecyclerComponent : Component
     {
-        [ViewVariables(VVAccess.ReadOnly)]
         [DataField("reacting")]
         public Boolean Reacting { get; set; } = false;
 
@@ -17,10 +18,28 @@ public sealed partial class GasRecyclerComponent : Component
         [DataField("outlet")]
         public string OutletName { get; set; } = "outlet";
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float MinTemp = 300 + Atmospherics.T0C;
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
+        public float BaseMinTemp = 300 + Atmospherics.T0C;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartMinTemp = "Capacitor";
+
+        [DataField]
+        public float PartRatingMinTempMultiplier = 0.95f;
+
+        [ViewVariables(VVAccess.ReadWrite)]
         public float MinPressure = 30 * Atmospherics.OneAtmosphere;
+
+        [DataField]
+        public float BaseMinPressure = 30 * Atmospherics.OneAtmosphere;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartMinPressure = "Manipulator";
+
+        [DataField]
+        public float PartRatingMinPressureMultiplier = 0.8f;
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
index 3ebc509492..40b9d88846 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Binary.Components;
 using Content.Server.Atmos.Piping.Components;
+using Content.Server.Construction;
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
@@ -28,6 +29,8 @@ public override void Initialize()
             SubscribeLocalEvent<GasRecyclerComponent, AtmosDeviceUpdateEvent>(OnUpdate);
             SubscribeLocalEvent<GasRecyclerComponent, AtmosDeviceDisabledEvent>(OnDisabled);
             SubscribeLocalEvent<GasRecyclerComponent, ExaminedEvent>(OnExamined);
+            SubscribeLocalEvent<GasRecyclerComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<GasRecyclerComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         }
 
         private void OnEnabled(EntityUid uid, GasRecyclerComponent comp, ref AtmosDeviceEnabledEvent args)
@@ -116,5 +119,20 @@ private void UpdateAppearance(EntityUid uid, GasRecyclerComponent? comp = null)
 
             _appearance.SetData(uid, PumpVisuals.Enabled, comp.Reacting);
         }
+
+        private void OnRefreshParts(EntityUid uid, GasRecyclerComponent component, RefreshPartsEvent args)
+        {
+            var ratingTemp = args.PartRatings[component.MachinePartMinTemp];
+            var ratingPressure = args.PartRatings[component.MachinePartMinPressure];
+
+            component.MinTemp = component.BaseMinTemp * MathF.Pow(component.PartRatingMinTempMultiplier, ratingTemp - 1);
+            component.MinPressure = component.BaseMinPressure * MathF.Pow(component.PartRatingMinPressureMultiplier, ratingPressure - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, GasRecyclerComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("gas-recycler-upgrade-min-temp", component.MinTemp / component.BaseMinTemp);
+            args.AddPercentageUpgrade("gas-recycler-upgrade-min-pressure", component.MinPressure / component.BaseMinPressure);
+        }
     }
 }
diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
index ae9a5da963..fbe2d3f95a 100644
--- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
+++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Atmos;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Atmos.Portable
 {
@@ -37,13 +39,51 @@ public sealed partial class PortableScrubberComponent : Component
         /// <summary>
         /// Maximum internal pressure before it refuses to take more.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float MaxPressure = 2500;
 
         /// <summary>
-        /// The speed at which gas is scrubbed from the environment.
+        ///     The base amount of maximum internal pressure
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
+        public float BaseMaxPressure = 2500;
+
+        /// <summary>
+        ///     The machine part that modifies the maximum internal pressure
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartMaxPressure = "MatterBin";
+
+        /// <summary>
+        ///     How much the <see cref="MachinePartMaxPressure"/> will affect the pressure.
+        ///     The value will be multiplied by this amount for each increasing part tier.
+        /// </summary>
+        [DataField]
+        public float PartRatingMaxPressureModifier = 1.5f;
+
+        /// <summary>
+        ///     The speed at which gas is scrubbed from the environment.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
         public float TransferRate = 800;
+
+        /// <summary>
+        ///     The base speed at which gas is scrubbed from the environment.
+        /// </summary>
+        [DataField]
+        public float BaseTransferRate = 800;
+
+        /// <summary>
+        ///     The machine part which modifies the speed of <see cref="TransferRate"/>
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartTransferRate = "Manipulator";
+
+        /// <summary>
+        /// How much the <see cref="MachinePartTransferRate"/> will modify the rate.
+        /// The value will be multiplied by this amount for each increasing part tier.
+        /// </summary>
+        [DataField]
+        public float PartRatingTransferRateModifier = 1.4f;
     }
 }
diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
index f9043c091a..f657d713d2 100644
--- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
+++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
@@ -12,6 +12,7 @@
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.Audio;
 using Content.Server.Administration.Logs;
+using Content.Server.Construction;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Shared.Database;
 
@@ -38,6 +39,8 @@ public override void Initialize()
             SubscribeLocalEvent<PortableScrubberComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<PortableScrubberComponent, DestructionEventArgs>(OnDestroyed);
             SubscribeLocalEvent<PortableScrubberComponent, GasAnalyzerScanEvent>(OnScrubberAnalyzed);
+            SubscribeLocalEvent<PortableScrubberComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<PortableScrubberComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         }
 
         private bool IsFull(PortableScrubberComponent component)
@@ -156,5 +159,20 @@ private void OnScrubberAnalyzed(EntityUid uid, PortableScrubberComponent compone
             if (_nodeContainer.TryGetNode(uid, component.PortName, out PipeNode? port))
                 args.GasMixtures.Add(component.PortName, port.Air);
         }
+
+        private void OnRefreshParts(EntityUid uid, PortableScrubberComponent component, RefreshPartsEvent args)
+        {
+            var pressureRating = args.PartRatings[component.MachinePartMaxPressure];
+            var transferRating = args.PartRatings[component.MachinePartTransferRate];
+
+            component.MaxPressure = component.BaseMaxPressure * MathF.Pow(component.PartRatingMaxPressureModifier, pressureRating - 1);
+            component.TransferRate = component.BaseTransferRate * MathF.Pow(component.PartRatingTransferRateModifier, transferRating - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, PortableScrubberComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("portable-scrubber-component-upgrade-max-pressure", component.MaxPressure / component.BaseMaxPressure);
+            args.AddPercentageUpgrade("portable-scrubber-component-upgrade-transfer-rate", component.TransferRate / component.BaseTransferRate);
+        }
     }
 }
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index b888e35258..976ef5139c 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Bed.Components;
 using Content.Server.Bed.Sleep;
 using Content.Server.Body.Systems;
+using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Bed;
@@ -9,6 +10,7 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
+using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Timing;
@@ -32,6 +34,8 @@ public override void Initialize()
             SubscribeLocalEvent<StasisBedComponent, BuckleChangeEvent>(OnBuckleChange);
             SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnEmagged);
+            SubscribeLocalEvent<StasisBedComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<StasisBedComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         }
 
         private void ManageUpdateList(EntityUid uid, HealOnBuckleComponent component, ref BuckleChangeEvent args)
@@ -126,5 +130,18 @@ private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool
                 RaiseLocalEvent(buckledEntity, ref metabolicEvent);
             }
         }
+
+        private void OnRefreshParts(EntityUid uid, StasisBedComponent component, RefreshPartsEvent args)
+        {
+            var metabolismRating = args.PartRatings[component.MachinePartMetabolismModifier];
+            component.Multiplier = component.BaseMultiplier * metabolismRating; // Linear scaling so it's not OP
+            if (HasComp<EmaggedComponent>(uid))
+                component.Multiplier = 1f / component.Multiplier;
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, StasisBedComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("stasis-bed-component-upgrade-stasis", component.Multiplier / component.BaseMultiplier);
+        }
     }
 }
diff --git a/Content.Server/Bed/Components/StasisBedComponent.cs b/Content.Server/Bed/Components/StasisBedComponent.cs
index e2175d6e64..bb4096a2a5 100644
--- a/Content.Server/Bed/Components/StasisBedComponent.cs
+++ b/Content.Server/Bed/Components/StasisBedComponent.cs
@@ -1,12 +1,21 @@
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
 namespace Content.Server.Bed.Components
 {
     [RegisterComponent]
     public sealed partial class StasisBedComponent : Component
     {
+        [DataField]
+        public float BaseMultiplier = 10f;
+
         /// <summary>
-        /// What the metabolic update rate will be multiplied by (higher = slower metabolism)
+        ///     What the metabolic update rate will be multiplied by (higher = slower metabolism)
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         public float Multiplier = 10f;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartMetabolismModifier = "Capacitor";
     }
 }
diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs
index ddb04f213d..d765e079ce 100644
--- a/Content.Server/Botany/Components/SeedExtractorComponent.cs
+++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs
@@ -1,4 +1,7 @@
 using Content.Server.Botany.Systems;
+using Content.Server.Construction;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Botany.Components;
 
@@ -7,14 +10,33 @@ namespace Content.Server.Botany.Components;
 public sealed partial class SeedExtractorComponent : Component
 {
     /// <summary>
-    /// The minimum amount of seed packets dropped.
+    ///     The minimum amount of seed packets dropped with no machine upgrades.
     /// </summary>
-    [DataField("baseMinSeeds"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int BaseMinSeeds = 1;
 
     /// <summary>
-    /// The maximum amount of seed packets dropped.
+    ///     The maximum amount of seed packets dropped with no machine upgrades.
     /// </summary>
-    [DataField("baseMaxSeeds"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int BaseMaxSeeds = 3;
+
+    /// <summary>
+    ///     Modifier to the amount of seeds outputted, set on <see cref="RefreshPartsEvent"/>.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float SeedAmountMultiplier;
+
+    /// <summary>
+    ///     Machine part whose rating modifies the amount of seed packets dropped.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartSeedAmount = "Manipulator";
+
+    /// <summary>
+    ///     How much the machine part quality affects the amount of seeds outputted.
+    ///     Going up a tier will multiply the seed output by this amount.
+    /// </summary>
+    [DataField]
+    public float PartRatingSeedAmountMultiplier = 1.5f;
 }
diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
index f1ae6c9f11..4c547b96f0 100644
--- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs
+++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
@@ -1,8 +1,10 @@
 using Content.Server.Botany.Components;
+using Content.Server.Construction;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.Botany.Systems;
@@ -18,6 +20,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SeedExtractorComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SeedExtractorComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<SeedExtractorComponent, UpgradeExamineEvent>(OnUpgradeExamine);
     }
 
     private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor, InteractUsingEvent args)
@@ -25,8 +29,7 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
         if (!this.IsPowered(uid, EntityManager))
             return;
 
-        if (!TryComp(args.Used, out ProduceComponent? produce))
-            return;
+        if (!TryComp(args.Used, out ProduceComponent? produce)) return;
         if (!_botanySystem.TryGetSeed(produce, out var seed) || seed.Seedless)
         {
             _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds",("name", args.Used)),
@@ -39,7 +42,7 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
 
         QueueDel(args.Used);
 
-        var amount = _random.Next(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1);
+        var amount = (int) _random.NextFloat(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1) * seedExtractor.SeedAmountMultiplier;
         var coords = Transform(uid).Coordinates;
 
         if (amount > 1)
@@ -50,4 +53,15 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
             _botanySystem.SpawnSeedPacket(seed, coords, args.User);
         }
     }
+
+    private void OnRefreshParts(EntityUid uid, SeedExtractorComponent seedExtractor, RefreshPartsEvent args)
+    {
+        var manipulatorQuality = args.PartRatings[seedExtractor.MachinePartSeedAmount];
+        seedExtractor.SeedAmountMultiplier = MathF.Pow(seedExtractor.PartRatingSeedAmountMultiplier, manipulatorQuality - 1);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, SeedExtractorComponent seedExtractor, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("seed-extractor-component-upgrade-seed-yield", seedExtractor.SeedAmountMultiplier);
+    }
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index 42aabf2578..1c25b0e79d 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -1,4 +1,6 @@
 using Content.Server.Cargo.Components;
+using Content.Server.Construction;
+using Content.Server.Paper;
 using Content.Server.Power.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
@@ -13,6 +15,8 @@ public sealed partial class CargoSystem
     private void InitializeTelepad()
     {
         SubscribeLocalEvent<CargoTelepadComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<CargoTelepadComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<CargoTelepadComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         SubscribeLocalEvent<CargoTelepadComponent, PowerChangedEvent>(OnTelepadPowerChange);
         // Shouldn't need re-anchored event
         SubscribeLocalEvent<CargoTelepadComponent, AnchorStateChangedEvent>(OnTelepadAnchorChange);
@@ -79,6 +83,17 @@ private void OnInit(EntityUid uid, CargoTelepadComponent telepad, ComponentInit
         _linker.EnsureSinkPorts(uid, telepad.ReceiverPort);
     }
 
+    private void OnRefreshParts(EntityUid uid, CargoTelepadComponent component, RefreshPartsEvent args)
+    {
+        var rating = args.PartRatings[component.MachinePartTeleportDelay] - 1;
+        component.Delay = component.BaseDelay * MathF.Pow(component.PartRatingTeleportDelay, rating);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, CargoTelepadComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("cargo-telepad-delay-upgrade", component.Delay / component.BaseDelay);
+    }
+
     private void SetEnabled(EntityUid uid, CargoTelepadComponent component, ApcPowerReceiverComponent? receiver = null,
         TransformComponent? xform = null)
     {
diff --git a/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs b/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs
index c1841e022c..bc1d44e82f 100644
--- a/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs
@@ -4,8 +4,26 @@ namespace Content.Server.Chemistry.Components;
 public sealed partial class SolutionHeaterComponent : Component
 {
     /// <summary>
-    /// How much heat is added per second to the solution, taking upgrades into account.
+    ///     How much heat is added per second to the solution, with no upgrades.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float BaseHeatPerSecond = 120;
+
+    /// <summary>
+    ///     How much heat is added per second to the solution, taking upgrades into account.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
     public float HeatPerSecond;
+
+    /// <summary>
+    ///     The machine part that affects the heat multiplier.
+    /// </summary>
+    [DataField]
+    public string MachinePartHeatMultiplier = "Capacitor";
+
+    /// <summary>
+    ///     How much each upgrade multiplies the heat by.
+    /// </summary>
+    [DataField]
+    public float PartRatingHeatMultiplier = 1.5f;
 }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
index 6e6373e10b..1ef589ab5c 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Chemistry;
@@ -20,6 +21,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SolutionHeaterComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<SolutionHeaterComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<SolutionHeaterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         SubscribeLocalEvent<SolutionHeaterComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<SolutionHeaterComponent, ItemRemovedEvent>(OnItemRemoved);
     }
@@ -61,6 +64,18 @@ private void OnPowerChanged(Entity<SolutionHeaterComponent> entity, ref PowerCha
         }
     }
 
+    private void OnRefreshParts(Entity<SolutionHeaterComponent> entity, ref RefreshPartsEvent args)
+    {
+        var heatRating = args.PartRatings[entity.Comp.MachinePartHeatMultiplier] - 1;
+
+        entity.Comp.HeatPerSecond = entity.Comp.BaseHeatPerSecond * MathF.Pow(entity.Comp.PartRatingHeatMultiplier, heatRating);
+    }
+
+    private void OnUpgradeExamine(Entity<SolutionHeaterComponent> entity, ref UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("solution-heater-upgrade-heat", entity.Comp.HeatPerSecond / entity.Comp.BaseHeatPerSecond);
+    }
+
     private void OnItemPlaced(Entity<SolutionHeaterComponent> entity, ref ItemPlacedEvent args)
     {
         TryTurnOn(entity);
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
index 50be89581f..7c9d73286f 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
+++ b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
@@ -43,7 +43,7 @@ public override string GuidebookExplanation(IPrototypeManager prototype)
                 prototype.TryIndex(Reagent, out reagentProto);
 
             return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-                ("reagent", reagentProto?.LocalizedName ?? "this reagent"),
+                ("reagent", reagentProto?.LocalizedName ?? "этого реагента"),
                 ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
                 ("min", Min.Float()));
         }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 7931fae477..72104bc381 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Systems;
 using Content.Server.Cloning.Components;
+using Content.Server.Construction;
 using Content.Server.DeviceLinking.Systems;
 using Content.Server.EUI;
 using Content.Server.Fluids.EntitySystems;
@@ -9,6 +10,10 @@
 using Content.Server.Materials;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Traits.Assorted;
+using Content.Shared.Atmos;
+using Content.Shared.CCVar;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Cloning;
 using Content.Shared.Damage;
 using Content.Shared.DeviceLinking.Events;
@@ -90,8 +95,23 @@ public override void Initialize()
         SubscribeLocalEvent<CloningPodComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<CloningPodComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<CloningPodComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<CloningPodComponent, RefreshPartsEvent>(OnPartsRefreshed);
+        SubscribeLocalEvent<CloningPodComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+    }
+    private void OnPartsRefreshed(EntityUid uid, CloningPodComponent component, RefreshPartsEvent args)
+    {
+        var materialRating = args.PartRatings[component.MachinePartMaterialUse];
+        var speedRating = args.PartRatings[component.MachinePartCloningSpeed];
+
+        component.BiomassCostMultiplier = MathF.Pow(component.PartRatingMaterialMultiplier, materialRating - 1);
+        component.CloningTime = component.CloningTime * MathF.Pow(component.PartRatingSpeedMultiplier, speedRating - 1);
     }
 
+    private void OnUpgradeExamine(EntityUid uid, CloningPodComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("cloning-pod-component-upgrade-speed", component.CloningTime / component.CloningTime);
+        args.AddPercentageUpgrade("cloning-pod-component-upgrade-biomass-requirement", component.BiomassCostMultiplier);
+    }
     private void OnPortDisconnected(EntityUid uid, CloningPodComponent pod, PortDisconnectedEvent args)
     {
         pod.ConnectedConsole = null;
diff --git a/Content.Server/Construction/ConstructionSystem.Machine.cs b/Content.Server/Construction/ConstructionSystem.Machine.cs
index 2e670dbe40..65b0b70476 100644
--- a/Content.Server/Construction/ConstructionSystem.Machine.cs
+++ b/Content.Server/Construction/ConstructionSystem.Machine.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Construction;
@@ -143,7 +144,7 @@ private void CreateBoardAndStockParts(EntityUid uid, MachineComponent component)
                 var p = EntityManager.SpawnEntity(partProto.StockPartPrototype, xform.Coordinates);
 
                 if (!_container.Insert(p, partContainer))
-                    throw new Exception($"Couldn't insert machine part of type {part} to machine with prototype {partProto.StockPartPrototype}!");
+                    throw new Exception($"Couldn't insert machine part of type {part} to machine with prototype {partProto.StockPartPrototype ?? "N/A"}!");
             }
         }
 
@@ -183,7 +184,7 @@ public sealed class RefreshPartsEvent : EntityEventArgs
 {
     public IReadOnlyList<MachinePartComponent> Parts = new List<MachinePartComponent>();
 
-    public Dictionary<string, float> PartRatings = new();
+    public Dictionary<string, float> PartRatings = new Dictionary<string, float>();
 }
 
 public sealed class UpgradeExamineEvent : EntityEventArgs
diff --git a/Content.Server/Construction/PartExchangerSystem.cs b/Content.Server/Construction/PartExchangerSystem.cs
index ee5edcbd0a..f364d1b547 100644
--- a/Content.Server/Construction/PartExchangerSystem.cs
+++ b/Content.Server/Construction/PartExchangerSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
 using Content.Shared.Wires;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Collections;
 
@@ -42,7 +43,7 @@ private void OnDoAfter(EntityUid uid, PartExchangerComponent component, DoAfterE
         if (args.Handled || args.Args.Target == null)
             return;
 
-        if (!TryComp<StorageComponent>(uid, out var storage))
+        if (!TryComp<StorageComponent>(uid, out var storage) || storage.Container == null)
             return; //the parts are stored in here
 
         var machinePartQuery = GetEntityQuery<MachinePartComponent>();
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 4097996980..69c6e277ff 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -86,50 +86,31 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr
                 throw new NotImplementedException();
             }
 
-            using (var transaction = await db.DbContext.Database.BeginTransactionAsync())
-            {
-                var oldProfile = db.DbContext.Profile
-                    .Include(p => p.Preference)
-                    .Where(p => p.Preference.UserId == userId.UserId)
-                    .Include(p => p.Jobs)
-                    .Include(p => p.Antags)
-                    .Include(p => p.Traits)
+            var oldProfile = db.DbContext.Profile
+                .Include(p => p.Preference)
+                .Where(p => p.Preference.UserId == userId.UserId)
+                .Include(p => p.Jobs)
+                .Include(p => p.Antags)
+                .Include(p => p.Traits)
 #if LPP_Sponsors
-                    .Include(p => p.Donate)    // Lost Paradise Donate Preferences
+                .Include(p => p.Donate)    // Lost Paradise Donate Preferences
 #endif
-                    .Include(p => p.Loadouts)
-                    .AsSplitQuery()
-                    .SingleOrDefault(h => h.Slot == slot);
-                try
-                {
-                    if (oldProfile is not null)
-                    {
-                        oldProfile.Jobs.Clear();
-                        oldProfile.Antags.Clear();
-                        oldProfile.Traits.Clear();
-                        await db.DbContext.SaveChangesAsync(); // отдельно удаляем данные из ролей, антагов и traits, чем бы оно ни было.
-                                                               // Можно дальше убрать эти операции из ConvertProfiles, ибо они уже исполнены.
-                    }
-
-                    var newProfile = ConvertProfiles(humanoid, slot, oldProfile);
-                    if (oldProfile == null)
-                    {
-                        var prefs = await db.DbContext
-                            .Preference
-                            .Include(p => p.Profiles)
-                            .SingleAsync(p => p.UserId == userId.UserId);
-
-                        prefs.Profiles.Add(newProfile);
-                    }
-
-                    await db.DbContext.SaveChangesAsync(); // Сохраняем добавление данных.
-                }
-                catch (Exception ex)
-                {
-                    await transaction.RollbackAsync(); // при ошибке вернём всё обратно
-                    throw ex;
-                }
+                .Include(p => p.Loadouts)
+                .AsSplitQuery()
+                .SingleOrDefault(h => h.Slot == slot);
+
+            var newProfile = ConvertProfiles(humanoid, slot, oldProfile);
+            if (oldProfile == null)
+            {
+                var prefs = await db.DbContext
+                    .Preference
+                    .Include(p => p.Profiles)
+                    .SingleAsync(p => p.UserId == userId.UserId);
+
+                prefs.Profiles.Add(newProfile);
             }
+
+            await db.DbContext.SaveChangesAsync();
         }
 
         private static async Task DeleteCharacterSlot(ServerDbContext db, NetUserId userId, int slot)
diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs
index f946292038..f47d397939 100644
--- a/Content.Server/Gravity/GravityGeneratorComponent.cs
+++ b/Content.Server/Gravity/GravityGeneratorComponent.cs
@@ -37,6 +37,9 @@ public sealed partial class GravityGeneratorComponent : SharedGravityGeneratorCo
         // 0 -> 1
         [ViewVariables(VVAccess.ReadWrite)] [DataField("charge")] public float Charge { get; set; } = 1;
 
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartMaxChargeMultiplier = "Capacitor";
+
         /// <summary>
         /// Is the gravity generator currently "producing" gravity?
         /// </summary>
diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs
index ec5646457e..b1696e6a71 100644
--- a/Content.Server/Gravity/GravityGeneratorSystem.cs
+++ b/Content.Server/Gravity/GravityGeneratorSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Audio;
+using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Emp;
 using Content.Shared.Database;
@@ -27,6 +28,7 @@ public override void Initialize()
             SubscribeLocalEvent<GravityGeneratorComponent, ComponentShutdown>(OnComponentShutdown);
             SubscribeLocalEvent<GravityGeneratorComponent, EntParentChangedMessage>(OnParentChanged); // Or just anchor changed?
             SubscribeLocalEvent<GravityGeneratorComponent, InteractHandEvent>(OnInteractHand);
+            SubscribeLocalEvent<GravityGeneratorComponent, RefreshPartsEvent>(OnRefreshParts);
             SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>(
                 OnSwitchGenerator);
 
@@ -257,6 +259,12 @@ public void UpdateState(Entity<GravityGeneratorComponent, ApcPowerReceiverCompon
             }
         }
 
+        private void OnRefreshParts(EntityUid uid, GravityGeneratorComponent component, RefreshPartsEvent args)
+        {
+            var maxChargeMultipler = args.PartRatings[component.MachinePartMaxChargeMultiplier];
+            component.MaxCharge = maxChargeMultipler * 1;
+        }
+
         private void MakeBroken(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
         {
             _ambientSoundSystem.SetAmbience(ent, false);
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 815ba8f521..1e343e5e33 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -11,95 +11,99 @@ namespace Content.Server.Kitchen.Components
     [RegisterComponent]
     public sealed partial class MicrowaveComponent : Component
     {
-        [DataField("cookTimeMultiplier"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float CookTimeMultiplier = 1;
-
-        [DataField("baseHeatMultiplier"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartCookTimeMultiplier = "Capacitor";
+        [DataField]
+        public float CookTimeScalingConstant = 0.5f;
+        [DataField]
         public float BaseHeatMultiplier = 100;
 
-        [DataField("objectHeatMultiplier"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float ObjectHeatMultiplier = 100;
 
-        [DataField("failureResult", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string BadRecipeEntityId = "FoodBadRecipe";
 
         #region  audio
-        [DataField("beginCookingSound")]
+        [DataField]
         public SoundSpecifier StartCookingSound = new SoundPathSpecifier("/Audio/Machines/microwave_start_beep.ogg");
 
-        [DataField("foodDoneSound")]
+        [DataField]
         public SoundSpecifier FoodDoneSound = new SoundPathSpecifier("/Audio/Machines/microwave_done_beep.ogg");
 
-        [DataField("clickSound")]
+        [DataField]
         public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
 
-        [DataField("ItemBreakSound")]
+        [DataField]
         public SoundSpecifier ItemBreakSound = new SoundPathSpecifier("/Audio/Effects/clang.ogg");
 
         public EntityUid? PlayingStream;
 
-        [DataField("loopingSound")]
+        [DataField]
         public SoundSpecifier LoopingSound = new SoundPathSpecifier("/Audio/Machines/microwave_loop.ogg");
         #endregion
 
         [ViewVariables]
         public bool Broken;
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public ProtoId<SinkPortPrototype> OnPort = "On";
 
         /// <summary>
-        /// This is a fixed offset of 5.
-        /// The cook times for all recipes should be divisible by 5,with a minimum of 1 second.
-        /// For right now, I don't think any recipe cook time should be greater than 60 seconds.
+        ///     This is a fixed offset of 5.
+        ///     The cook times for all recipes should be divisible by 5,with a minimum of 1 second.
+        ///     For right now, I don't think any recipe cook time should be greater than 60 seconds.
         /// </summary>
-        [DataField("currentCookTimerTime"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public uint CurrentCookTimerTime = 0;
 
         /// <summary>
-        /// Tracks the elapsed time of the current cook timer.
+        ///     Tracks the elapsed time of the current cook timer.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public TimeSpan CurrentCookTimeEnd = TimeSpan.Zero;
 
         /// <summary>
-        /// The maximum number of seconds a microwave can be set to.
-        /// This is currently only used for validation and the client does not check this.
+        ///     The maximum number of seconds a microwave can be set to.
+        ///     This is currently only used for validation and the client does not check this.
         /// </summary>
-        [DataField("maxCookTime"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public uint MaxCookTime = 30;
 
         /// <summary>
         ///     The max temperature that this microwave can heat objects to.
         /// </summary>
-        [DataField("temperatureUpperThreshold")]
+        [DataField]
         public float TemperatureUpperThreshold = 373.15f;
 
         public int CurrentCookTimeButtonIndex;
 
         public Container Storage = default!;
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public int Capacity = 10;
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public ProtoId<ItemSizePrototype> MaxItemSize = "Normal";
 
         /// <summary>
-        /// How frequently the microwave can malfunction.
+        ///     How frequently the microwave can malfunction.
         /// </summary>
         [DataField]
         public float MalfunctionInterval = 1.0f;
 
         /// <summary>
-        /// Chance of an explosion occurring when we microwave a metallic object
+        ///     Chance of an explosion occurring when we microwave a metallic object
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float ExplosionChance = .1f;
 
         /// <summary>
-        /// Chance of lightning occurring when we microwave a metallic object
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        ///     Chance of lightning occurring when we microwave a metallic object
+        /// </summary>
+        [DataField]
         public float LightningChance = .75f;
     }
 
diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
index 5bbbe2dc8d..4f4531206c 100644
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Kitchen;
 using Content.Server.Kitchen.EntitySystems;
+using Content.Shared.Construction.Prototypes;
 using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Kitchen.Components
 {
@@ -13,15 +15,30 @@ namespace Content.Server.Kitchen.Components
     [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
     public sealed partial class ReagentGrinderComponent : Component
     {
-        [DataField]
+        [ViewVariables(VVAccess.ReadWrite)]
         public int StorageMaxEntities = 6;
 
         [DataField]
-        public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
+        public int BaseStorageMaxEntities = 4;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartStorageMax = "MatterBin";
+
+        [DataField]
+        public int StoragePerPartRating = 4;
 
         [DataField]
+        public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
+
+        [ViewVariables(VVAccess.ReadWrite)]
         public float WorkTimeMultiplier = 1;
 
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartWorkTime = "Manipulator";
+
+        [DataField]
+        public float PartRatingWorkTimerMulitplier = 0.6f;
+
         [DataField]
         public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
 
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 212383c463..3de7051f54 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -76,6 +76,8 @@ public override void Initialize()
             SubscribeLocalEvent<MicrowaveComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<MicrowaveComponent, AnchorStateChangedEvent>(OnAnchorChanged);
             SubscribeLocalEvent<MicrowaveComponent, SuicideEvent>(OnSuicide);
+            SubscribeLocalEvent<MicrowaveComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<MicrowaveComponent, UpgradeExamineEvent>(OnUpgradeExamine);
 
             SubscribeLocalEvent<MicrowaveComponent, SignalReceivedEvent>(OnSignalReceived);
 
@@ -342,6 +344,17 @@ private void OnAnchorChanged(EntityUid uid, MicrowaveComponent component, ref An
                 _container.EmptyContainer(component.Storage);
         }
 
+        private void OnRefreshParts(Entity<MicrowaveComponent> ent, ref RefreshPartsEvent args)
+        {
+            var cookRating = args.PartRatings[ent.Comp.MachinePartCookTimeMultiplier];
+            ent.Comp.CookTimeMultiplier = MathF.Pow(ent.Comp.CookTimeScalingConstant, cookRating - 1);
+        }
+
+        private void OnUpgradeExamine(Entity<MicrowaveComponent> ent, ref UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("microwave-component-upgrade-cook-time", ent.Comp.CookTimeMultiplier);
+        }
+
         private void OnSignalReceived(Entity<MicrowaveComponent> ent, ref SignalReceivedEvent args)
         {
             if (args.Port != ent.Comp.OnPort)
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index e8ee453986..aad33fea67 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Construction;
 using Content.Server.Kitchen.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -48,6 +49,8 @@ public override void Initialize()
             SubscribeLocalEvent<ReagentGrinderComponent, ComponentStartup>((uid, _, _) => UpdateUiState(uid));
             SubscribeLocalEvent((EntityUid uid, ReagentGrinderComponent _, ref PowerChangedEvent _) => UpdateUiState(uid));
             SubscribeLocalEvent<ReagentGrinderComponent, InteractUsingEvent>(OnInteractUsing);
+            SubscribeLocalEvent<ReagentGrinderComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<ReagentGrinderComponent, UpgradeExamineEvent>(OnUpgradeExamine);
 
             SubscribeLocalEvent<ReagentGrinderComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
             SubscribeLocalEvent<ReagentGrinderComponent, EntRemovedFromContainerMessage>(OnContainerModified);
@@ -197,6 +200,24 @@ private void OnInteractUsing(Entity<ReagentGrinderComponent> entity, ref Interac
             args.Handled = true;
         }
 
+        /// <remarks>
+        /// Gotta be efficient, you know? you're saving a whole extra second here and everything.
+        /// </remarks>
+        private void OnRefreshParts(Entity<ReagentGrinderComponent> entity, ref RefreshPartsEvent args)
+        {
+            var ratingWorkTime = args.PartRatings[entity.Comp.MachinePartWorkTime];
+            var ratingStorage = args.PartRatings[entity.Comp.MachinePartStorageMax];
+
+            entity.Comp.WorkTimeMultiplier = MathF.Pow(entity.Comp.PartRatingWorkTimerMulitplier, ratingWorkTime - 1);
+            entity.Comp.StorageMaxEntities = entity.Comp.BaseStorageMaxEntities + (int) (entity.Comp.StoragePerPartRating * (ratingStorage - 1));
+        }
+
+        private void OnUpgradeExamine(Entity<ReagentGrinderComponent> entity, ref UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("reagent-grinder-component-upgrade-work-time", entity.Comp.WorkTimeMultiplier);
+            args.AddNumberUpgrade("reagent-grinder-component-upgrade-storage", entity.Comp.StorageMaxEntities - entity.Comp.BaseStorageMaxEntities);
+        }
+
         private void UpdateUiState(EntityUid uid)
         {
             ReagentGrinderComponent? grinderComp = null;
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index aa24fde44b..de82f12598 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -1,4 +1,6 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Chemistry.EntitySystems;
+using Content.Server.Construction;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.GameTicking;
 using Content.Server.Popups;
@@ -45,6 +47,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<MaterialReclaimerComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<MaterialReclaimerComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<MaterialReclaimerComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         SubscribeLocalEvent<MaterialReclaimerComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<MaterialReclaimerComponent, InteractUsingEvent>(OnInteractUsing,
             before: new []{typeof(WiresSystem), typeof(SolutionTransferSystem)});
@@ -56,6 +60,18 @@ private void OnStartup(Entity<MaterialReclaimerComponent> entity, ref ComponentS
         _solutionContainer.EnsureSolution(entity.Owner, entity.Comp.SolutionContainerId);
     }
 
+    private void OnUpgradeExamine(Entity<MaterialReclaimerComponent> entity, ref UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade(Loc.GetString("material-reclaimer-upgrade-process-rate"), entity.Comp.MaterialProcessRate / entity.Comp.BaseMaterialProcessRate);
+    }
+
+    private void OnRefreshParts(Entity<MaterialReclaimerComponent> entity, ref RefreshPartsEvent args)
+    {
+        var rating = args.PartRatings[entity.Comp.MachinePartProcessRate] - 1;
+        entity.Comp.MaterialProcessRate = entity.Comp.BaseMaterialProcessRate * MathF.Pow(entity.Comp.PartRatingProcessRateMultiplier, rating);
+        Dirty(entity);
+    }
+
     private void OnPowerChanged(Entity<MaterialReclaimerComponent> entity, ref PowerChangedEvent args)
     {
         AmbientSound.SetAmbience(entity.Owner, entity.Comp.Enabled && args.Powered);
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
index 61d36f98b9..1358bfbcbb 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
@@ -1,4 +1,8 @@
+using System.Threading;
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.Storage;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Medical.BiomassReclaimer
 {
@@ -6,72 +10,111 @@ namespace Content.Server.Medical.BiomassReclaimer
     public sealed partial class BiomassReclaimerComponent : Component
     {
         /// <summary>
-        /// This gets set for each mob it processes.
-        /// When it hits 0, there is a chance for the reclaimer to either spill blood or throw an item.
+        ///     This gets set for each mob it processes.
+        ///     When it hits 0, there is a chance for the reclaimer to either spill blood or throw an item.
         /// </summary>
         [ViewVariables]
         public float RandomMessTimer = 0f;
 
         /// <summary>
-        /// The interval for <see cref="RandomMessTimer"/>.
+        ///     The interval for <see cref="RandomMessTimer"/>.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField]
+        [DataField]
         public TimeSpan RandomMessInterval = TimeSpan.FromSeconds(5);
 
         /// <summary>
-        /// This gets set for each mob it processes.
-        /// When it hits 0, spit out biomass.
+        ///     This gets set for each mob it processes.
+        ///     When it hits 0, spit out biomass.
         /// </summary>
         [ViewVariables]
-        public float ProcessingTimer = default;
+        public float ProcessingTimer;
 
         /// <summary>
-        /// Amount of biomass that the mob being processed will yield.
-        /// This is calculated from the YieldPerUnitMass.
-        /// Also stores non-integer leftovers.
+        ///     Amount of biomass that the mob being processed will yield.
+        ///     This is calculated from the YieldPerUnitMass.
+        ///     Also stores non-integer leftovers.
         /// </summary>
         [ViewVariables]
-        public float CurrentExpectedYield = 0f;
+        public float CurrentExpectedYield;
 
         /// <summary>
-        /// The reagent that will be spilled while processing a mob.
+        ///     The reagent that will be spilled while processing a mob.
         /// </summary>
         [ViewVariables]
         public string? BloodReagent;
 
         /// <summary>
-        /// Entities that can be randomly spawned while processing a mob.
+        ///     Entities that can be randomly spawned while processing a mob.
         /// </summary>
         public List<EntitySpawnEntry> SpawnedEntities = new();
 
         /// <summary>
-        /// How many units of biomass it produces for each unit of mass.
+        ///     How many units of biomass it produces for each unit of mass.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
-        public float YieldPerUnitMass = 0.4f;
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float YieldPerUnitMass = default;
 
         /// <summary>
-        /// How many seconds to take to insert an entity per unit of its mass.
+        ///     The base yield per mass unit when no components are upgraded.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
+        public float BaseYieldPerUnitMass = 0.4f;
+
+        /// <summary>
+        ///     Machine part whose rating modifies the yield per mass.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartYieldAmount = "MatterBin";
+
+        /// <summary>
+        ///     How much the machine part quality affects the yield.
+        ///     Going up a tier will multiply the yield by this amount.
+        /// </summary>
+        [DataField]
+        public float PartRatingYieldAmountMultiplier = 1.25f;
+
+        /// <summary>
+        ///     How many seconds to take to insert an entity per unit of its mass.
+        /// </summary>
+        [DataField]
         public float BaseInsertionDelay = 0.1f;
 
         /// <summary>
-        /// How much to multiply biomass yield from botany produce.
+        ///     How much to multiply biomass yield from botany produce.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float ProduceYieldMultiplier = 0.25f;
 
         /// <summary>
-        /// The time it takes to process a mob, per mass.
+        ///     The time it takes to process a mob, per mass.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float ProcessingTimePerUnitMass;
+
+        /// <summary>
+        ///     The base time per mass unit that it takes to process a mob
+        ///     when no components are upgraded.
+        /// </summary>
+        [DataField]
+        public float BaseProcessingTimePerUnitMass = 0.5f;
+
+        /// <summary>
+        ///     The machine part that increses the processing speed.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartProcessingSpeed = "Manipulator";
+
+        /// <summary>
+        ///     How much the machine part quality affects the yield.
+        ///     Going up a tier will multiply the speed by this amount.
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
-        public float ProcessingTimePerUnitMass = 0.5f;
+        [DataField]
+        public float PartRatingSpeedMultiplier = 1.35f;
 
         /// <summary>
-        /// Will this refuse to gib a living mob?
+        ///     Will this refuse to gib a living mob?
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField]
+        [DataField]
         public bool SafetyEnabled = true;
     }
 }
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index eaf04d64b2..97a758a5ed 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Server.Body.Components;
 using Content.Server.Botany.Components;
+using Content.Server.Construction;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Power.Components;
@@ -99,6 +100,8 @@ public override void Initialize()
             SubscribeLocalEvent<ActiveBiomassReclaimerComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
             SubscribeLocalEvent<BiomassReclaimerComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
             SubscribeLocalEvent<BiomassReclaimerComponent, ClimbedOnEvent>(OnClimbedOn);
+            SubscribeLocalEvent<BiomassReclaimerComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<BiomassReclaimerComponent, UpgradeExamineEvent>(OnUpgradeExamine);
             SubscribeLocalEvent<BiomassReclaimerComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<BiomassReclaimerComponent, SuicideEvent>(OnSuicide);
             SubscribeLocalEvent<BiomassReclaimerComponent, ReclaimerDoAfterEvent>(OnDoAfter);
@@ -173,6 +176,26 @@ private void OnClimbedOn(Entity<BiomassReclaimerComponent> reclaimer, ref Climbe
             StartProcessing(args.Climber, reclaimer);
         }
 
+        private void OnRefreshParts(EntityUid uid, BiomassReclaimerComponent component, RefreshPartsEvent args)
+        {
+            var laserRating = args.PartRatings[component.MachinePartProcessingSpeed];
+            var manipRating = args.PartRatings[component.MachinePartYieldAmount];
+
+            // Processing time slopes downwards with part rating.
+            component.ProcessingTimePerUnitMass =
+                component.BaseProcessingTimePerUnitMass / MathF.Pow(component.PartRatingSpeedMultiplier, laserRating - 1);
+
+            // Yield slopes upwards with part rating.
+            component.YieldPerUnitMass =
+                component.BaseYieldPerUnitMass * MathF.Pow(component.PartRatingYieldAmountMultiplier, manipRating - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, BiomassReclaimerComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("biomass-reclaimer-component-upgrade-speed", component.BaseProcessingTimePerUnitMass / component.ProcessingTimePerUnitMass);
+            args.AddPercentageUpgrade("biomass-reclaimer-component-upgrade-biomass-yield", component.YieldPerUnitMass / component.BaseYieldPerUnitMass);
+        }
+
         private void OnDoAfter(Entity<BiomassReclaimerComponent> reclaimer, ref ReclaimerDoAfterEvent args)
         {
             if (args.Handled
diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs
index 96de649987..15ca6cd2bd 100644
--- a/Content.Server/Medical/Components/MedicalScannerComponent.cs
+++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Construction.Prototypes;
-using Content.Shared.DragDrop;
 using Content.Shared.MedicalScanner;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -13,10 +12,15 @@ public sealed partial class MedicalScannerComponent : SharedMedicalScannerCompon
         public ContainerSlot BodyContainer = default!;
         public EntityUid? ConnectedConsole;
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [ViewVariables(VVAccess.ReadWrite)]
         public float CloningFailChanceMultiplier = 1f;
-        
-        // Nyano, needed for Metem Machine.
+
         public float MetemKarmaBonus = 0.25f;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartCloningFailChance = "Capacitor";
+
+        [DataField]
+        public float PartRatingFailMultiplier = 0.75f;
     }
 }
diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs
index a6ce43c408..ab6918e373 100644
--- a/Content.Server/Medical/MedicalScannerSystem.cs
+++ b/Content.Server/Medical/MedicalScannerSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Content.Server.Cloning.Components;
+using Content.Server.Construction;
 using Content.Server.DeviceLinking.Systems;
 using Content.Shared.DeviceLinking.Events;
 using Content.Server.Power.EntitySystems;
@@ -44,6 +45,8 @@ public override void Initialize()
             SubscribeLocalEvent<MedicalScannerComponent, DragDropTargetEvent>(OnDragDropOn);
             SubscribeLocalEvent<MedicalScannerComponent, PortDisconnectedEvent>(OnPortDisconnected);
             SubscribeLocalEvent<MedicalScannerComponent, AnchorStateChangedEvent>(OnAnchorChanged);
+            SubscribeLocalEvent<MedicalScannerComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<MedicalScannerComponent, UpgradeExamineEvent>(OnUpgradeExamine);
             SubscribeLocalEvent<MedicalScannerComponent, CanDropTargetEvent>(OnCanDragDropOn);
         }
 
@@ -220,5 +223,17 @@ public void EjectBody(EntityUid uid, MedicalScannerComponent? scannerComponent)
             _climbSystem.ForciblySetClimbing(contained, uid);
             UpdateAppearance(uid, scannerComponent);
         }
+
+        private void OnRefreshParts(EntityUid uid, MedicalScannerComponent component, RefreshPartsEvent args)
+        {
+            var ratingFail = args.PartRatings[component.MachinePartCloningFailChance];
+
+            component.CloningFailChanceMultiplier = MathF.Pow(component.PartRatingFailMultiplier, ratingFail - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, MedicalScannerComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("medical-scanner-upgrade-cloning", component.CloningFailChanceMultiplier);
+        }
     }
 }
diff --git a/Content.Server/Nutrition/Components/FatExtractorComponent.cs b/Content.Server/Nutrition/Components/FatExtractorComponent.cs
index e23c557236..fa6edc911e 100644
--- a/Content.Server/Nutrition/Components/FatExtractorComponent.cs
+++ b/Content.Server/Nutrition/Components/FatExtractorComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.Nutrition.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -8,67 +9,87 @@
 namespace Content.Server.Nutrition.Components;
 
 /// <summary>
-/// This is used for a machine that extracts hunger from entities and creates meat. Yum!
+///     This is used for a machine that extracts hunger from entities and creates meat. Yum!
 /// </summary>
 [RegisterComponent, Access(typeof(FatExtractorSystem)), AutoGenerateComponentPause]
 public sealed partial class FatExtractorComponent : Component
 {
     /// <summary>
-    /// Whether or not the extractor is currently extracting fat from someone
+    ///     Whether or not the extractor is currently extracting fat from someone
     /// </summary>
-    [DataField("processing")]
+    [DataField]
     public bool Processing = true;
 
     /// <summary>
-    /// How much nutrition is extracted per second.
+    ///     How much nutrition is extracted per second.
     /// </summary>
-    [DataField("nutritionPerSecond"), ViewVariables(VVAccess.ReadWrite)]
+    [ViewVariables(VVAccess.ReadWrite)]
     public int NutritionPerSecond = 10;
 
     /// <summary>
-    /// An accumulator which tracks extracted nutrition to determine
-    /// when to spawn a meat.
+    ///     The base rate of extraction
     /// </summary>
-    [DataField("nutrientAccumulator"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public int BaseNutritionPerSecond = 10;
+
+    #region Machine Upgrade
+    /// <summary>
+    ///     Which machine part affects the nutrition rate
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartNutritionRate = "Manipulator";
+
+    /// <summary>
+    ///     The increase in rate per each rating above 1.
+    /// </summary>
+    [DataField]
+    public float PartRatingRateMultiplier = 10;
+    #endregion
+
+    /// <summary>
+    ///     An accumulator which tracks extracted nutrition to determine
+    ///     when to spawn a meat.
+    /// </summary>
+    [DataField]
     public int NutrientAccumulator;
 
     /// <summary>
-    /// How high <see cref="NutrientAccumulator"/> has to be to spawn meat
+    ///     How high <see cref="NutrientAccumulator"/> has to be to spawn meat
     /// </summary>
-    [DataField("nutrientPerMeat"), ViewVariables(VVAccess.ReadWrite)]
-    public int NutrientPerMeat = 30;
+    [DataField]
+    public int NutrientPerMeat = 60;
 
     /// <summary>
-    /// Meat spawned by the extractor.
+    ///     Meat spawned by the extractor.
     /// </summary>
-    [DataField("meatPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string MeatPrototype = "FoodMeat";
 
     /// <summary>
-    /// When the next update will occur
+    ///     When the next update will occur
     /// </summary>
-    [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextUpdate;
 
     /// <summary>
-    /// How long each update takes
+    ///     How long each update takes
     /// </summary>
-    [DataField("updateTime"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan UpdateTime = TimeSpan.FromSeconds(1);
 
     /// <summary>
-    /// The sound played when extracting
+    ///     The sound played when extracting
     /// </summary>
-    [DataField("processSound")]
+    [DataField]
     public SoundSpecifier? ProcessSound;
 
     public EntityUid? Stream;
 
     /// <summary>
-    /// A minium hunger threshold for extracting nutrition.
-    /// Ignored when emagged.
+    ///     A minium hunger threshold for extracting nutrition.
+    ///     Ignored when emagged.
     /// </summary>
-    [DataField("minHungerThreshold")]
+    [DataField]
     public HungerThreshold MinHungerThreshold = HungerThreshold.Okay;
 }
diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
index 180e40d1e4..dc1f67c740 100644
--- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Construction;
 using Content.Server.Nutrition.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -9,6 +10,7 @@
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Storage.Components;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
@@ -27,12 +29,25 @@ public sealed class FatExtractorSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
+        SubscribeLocalEvent<FatExtractorComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<FatExtractorComponent, UpgradeExamineEvent>(OnUpgradeExamine);
         SubscribeLocalEvent<FatExtractorComponent, GotEmaggedEvent>(OnGotEmagged);
         SubscribeLocalEvent<FatExtractorComponent, StorageAfterCloseEvent>(OnClosed);
         SubscribeLocalEvent<FatExtractorComponent, StorageAfterOpenEvent>(OnOpen);
         SubscribeLocalEvent<FatExtractorComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
+    private void OnRefreshParts(EntityUid uid, FatExtractorComponent component, RefreshPartsEvent args)
+    {
+        var rating = args.PartRatings[component.MachinePartNutritionRate] - 1;
+        component.NutritionPerSecond = component.BaseNutritionPerSecond + (int) (component.PartRatingRateMultiplier * rating);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, FatExtractorComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("fat-extractor-component-rate", (float) component.NutritionPerSecond / component.BaseNutritionPerSecond);
+    }
+
     private void OnGotEmagged(EntityUid uid, FatExtractorComponent component, ref GotEmaggedEvent args)
     {
         args.Handled = true;
diff --git a/Content.Server/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/Power/Components/UpgradeBatteryComponent.cs
new file mode 100644
index 0000000000..b676883b71
--- /dev/null
+++ b/Content.Server/Power/Components/UpgradeBatteryComponent.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Power.Components
+{
+
+    [RegisterComponent]
+    public sealed partial class UpgradeBatteryComponent : Component
+    {
+        /// <summary>
+        ///     The machine part that affects the power capacity.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartPowerCapacity = "PowerCell";
+
+        /// <summary>
+        ///     The machine part rating is raised to this power when calculating power gain
+        /// </summary>
+        [DataField]
+        public float MaxChargeMultiplier = 2f;
+
+        /// <summary>
+        ///     Power gain scaling
+        /// </summary>
+        [DataField]
+        public float BaseMaxCharge = 8000000;
+    }
+}
diff --git a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs b/Content.Server/Power/Components/UpgradePowerDrawComponent.cs
new file mode 100644
index 0000000000..23db4905cc
--- /dev/null
+++ b/Content.Server/Power/Components/UpgradePowerDrawComponent.cs
@@ -0,0 +1,41 @@
+using Content.Server.Construction.Components;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Power.Components;
+
+/// <summary>
+///     This is used for machines whose power draw
+///     can be decreased through machine part upgrades.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UpgradePowerDrawComponent : Component
+{
+    /// <summary>
+    ///     The base power draw of the machine.
+    ///     Prioritizes hv/mv draw over lv draw.
+    ///     Value is initializezd on map init from <see cref="ApcPowerReceiverComponent"/>
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float BaseLoad;
+
+    /// <summary>
+    ///     The machine part that affects the power draw.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>)), ViewVariables(VVAccess.ReadWrite)]
+    public string MachinePartPowerDraw = "Capacitor";
+
+    /// <summary>
+    ///     The multiplier used for scaling the power draw.
+    /// </summary>
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    public float PowerDrawMultiplier = 1f;
+
+    /// <summary>
+    ///     What type of scaling is being used?
+    /// </summary>
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    public MachineUpgradeScalingType Scaling;
+}
+
+
diff --git a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs
new file mode 100644
index 0000000000..012c38a6b9
--- /dev/null
+++ b/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs
@@ -0,0 +1,36 @@
+using Content.Server.Construction.Components;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Power.Components;
+
+[RegisterComponent]
+public sealed partial class UpgradePowerSupplierComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float BaseSupplyRate;
+
+    /// <summary>
+    ///     The machine part that affects the power supplu.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartPowerSupply = "Capacitor";
+
+    /// <summary>
+    ///     The multiplier used for scaling the power supply.
+    /// </summary>
+    [DataField(required: true)]
+    public float PowerSupplyMultiplier = 1f;
+
+    /// <summary>
+    ///     What type of scaling is being used?
+    /// </summary>
+    [DataField(required: true)]
+    public MachineUpgradeScalingType Scaling;
+
+    /// <summary>
+    ///     The current value that the power supply is being scaled by,
+    /// </summary>
+    [DataField]
+    public float ActualScalar = 1f;
+}
diff --git a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs
new file mode 100644
index 0000000000..61a654b383
--- /dev/null
+++ b/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs
@@ -0,0 +1,36 @@
+using Content.Server.Construction.Components;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Power.Components;
+
+[RegisterComponent]
+public sealed partial class UpgradePowerSupplyRampingComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float BaseRampRate;
+
+    /// <summary>
+    ///     The machine part that affects the power supply ramping
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartRampRate = "Capacitor";
+
+    /// <summary>
+    ///     The multiplier used for scaling the power supply ramping
+    /// </summary>
+    [DataField]
+    public float SupplyRampingMultiplier = 1f;
+
+    /// <summary>
+    ///     What type of scaling is being used?
+    /// </summary>
+    [DataField(required: true)]
+    public MachineUpgradeScalingType Scaling;
+
+    /// <summary>
+    ///     The current value that the power supply is being scaled by
+    /// </summary>
+    [DataField]
+    public float ActualScalar = 1f;
+}
diff --git a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs
new file mode 100644
index 0000000000..734cf9d89c
--- /dev/null
+++ b/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.Construction;
+using Content.Server.Power.Components;
+using JetBrains.Annotations;
+
+namespace Content.Server.Power.EntitySystems
+{
+    [UsedImplicitly]
+    public sealed class UpgradeBatterySystem : EntitySystem
+    {
+        [Dependency] private readonly BatterySystem _batterySystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<UpgradeBatteryComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<UpgradeBatteryComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+        }
+
+        public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args)
+        {
+            var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity];
+
+            if (TryComp<BatteryComponent>(uid, out var batteryComp))
+            {
+                _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp);
+            }
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args)
+        {
+            // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this.
+            if (TryComp<BatteryComponent>(uid, out var batteryComp))
+            {
+                args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs b/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs
new file mode 100644
index 0000000000..d2f6ee4f56
--- /dev/null
+++ b/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs
@@ -0,0 +1,151 @@
+using Content.Server.Construction;
+using Content.Server.Construction.Components;
+using Content.Server.Power.Components;
+
+namespace Content.Server.Power.EntitySystems;
+
+/// <summary>
+///     This handles using upgraded machine parts
+///     to modify the power supply/generation of a machine.
+/// </summary>
+public sealed class UpgradePowerSystem : EntitySystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<UpgradePowerDrawComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<UpgradePowerDrawComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<UpgradePowerDrawComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+
+        SubscribeLocalEvent<UpgradePowerSupplierComponent, MapInitEvent>(OnSupplierMapInit);
+        SubscribeLocalEvent<UpgradePowerSupplierComponent, RefreshPartsEvent>(OnSupplierRefreshParts);
+        SubscribeLocalEvent<UpgradePowerSupplierComponent, UpgradeExamineEvent>(OnSupplierUpgradeExamine);
+
+        SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, MapInitEvent>(OnSupplyRampingMapInit);
+        SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, RefreshPartsEvent>(OnSupplyRampingRefreshParts);
+        SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, UpgradeExamineEvent>(OnSupplyRampingUpgradeExamine);
+    }
+
+    private void OnMapInit(EntityUid uid, UpgradePowerDrawComponent component, MapInitEvent args)
+    {
+        if (TryComp<PowerConsumerComponent>(uid, out var powa))
+            component.BaseLoad = powa.DrawRate;
+        else if (TryComp<ApcPowerReceiverComponent>(uid, out var powa2))
+            component.BaseLoad = powa2.Load;
+    }
+
+    private void OnRefreshParts(EntityUid uid, UpgradePowerDrawComponent component, RefreshPartsEvent args)
+    {
+        var load = component.BaseLoad;
+        var rating = args.PartRatings[component.MachinePartPowerDraw];
+        switch (component.Scaling)
+
+        {
+            case MachineUpgradeScalingType.Linear:
+                load += component.PowerDrawMultiplier * (rating - 1);
+                break;
+            case MachineUpgradeScalingType.Exponential:
+                load *= MathF.Pow(component.PowerDrawMultiplier, rating - 1);
+                break;
+            default:
+                Log.Error($"invalid power scaling type for {ToPrettyString(uid)}.");
+                load = 0;
+                break;
+        }
+
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var powa))
+            powa.Load = load;
+        if (TryComp<PowerConsumerComponent>(uid, out var powa2))
+            powa2.DrawRate = load;
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, UpgradePowerDrawComponent component, UpgradeExamineEvent args)
+    {
+        // UpgradePowerDrawComponent.PowerDrawMultiplier is not the actual multiplier, so we have to do this.
+        var powerDrawMultiplier = CompOrNull<ApcPowerReceiverComponent>(uid)?.Load / component.BaseLoad
+            ?? CompOrNull<PowerConsumerComponent>(uid)?.DrawRate / component.BaseLoad;
+
+        if (powerDrawMultiplier is not null)
+            args.AddPercentageUpgrade("upgrade-power-draw", powerDrawMultiplier.Value);
+    }
+
+    private void OnSupplierMapInit(EntityUid uid, UpgradePowerSupplierComponent component, MapInitEvent args)
+    {
+        if (!TryComp<PowerSupplierComponent>(uid, out var supplier))
+            return;
+
+        component.BaseSupplyRate = supplier.MaxSupply;
+    }
+
+    private void OnSupplierRefreshParts(EntityUid uid, UpgradePowerSupplierComponent component, RefreshPartsEvent args)
+    {
+        var supply = component.BaseSupplyRate;
+        var rating = args.PartRatings[component.MachinePartPowerSupply];
+        switch (component.Scaling)
+
+        {
+            case MachineUpgradeScalingType.Linear:
+                supply += component.PowerSupplyMultiplier * component.BaseSupplyRate * (rating - 1);
+                break;
+            case MachineUpgradeScalingType.Exponential:
+                supply *= MathF.Pow(component.PowerSupplyMultiplier, rating - 1);
+                break;
+            default:
+                Log.Error($"invalid power scaling type for {ToPrettyString(uid)}.");
+                supply = component.BaseSupplyRate;
+                break;
+        }
+
+        component.ActualScalar = supply / component.BaseSupplyRate;
+
+        if (!TryComp<PowerSupplierComponent>(uid, out var powa))
+            return;
+
+        powa.MaxSupply = supply;
+    }
+
+    private void OnSupplierUpgradeExamine(EntityUid uid, UpgradePowerSupplierComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("upgrade-power-supply", component.ActualScalar);
+    }
+
+    private void OnSupplyRampingMapInit(EntityUid uid, UpgradePowerSupplyRampingComponent component, MapInitEvent args)
+    {
+        if (!TryComp<PowerNetworkBatteryComponent>(uid, out var battery))
+            return;
+
+        component.BaseRampRate = battery.SupplyRampRate;
+    }
+
+    private void OnSupplyRampingRefreshParts(EntityUid uid, UpgradePowerSupplyRampingComponent component, RefreshPartsEvent args)
+    {
+        var rampRate = component.BaseRampRate;
+        var rating = args.PartRatings[component.MachinePartRampRate];
+        switch (component.Scaling)
+
+        {
+            case MachineUpgradeScalingType.Linear:
+                rampRate += component.SupplyRampingMultiplier * component.BaseRampRate * (rating - 1);
+                break;
+            case MachineUpgradeScalingType.Exponential:
+                rampRate *= MathF.Pow(component.SupplyRampingMultiplier, rating - 1);
+                break;
+            default:
+                Log.Error($"invalid power supply ramping type for {ToPrettyString(uid)}.");
+                rampRate = component.BaseRampRate;
+                break;
+        }
+
+        component.ActualScalar = rampRate / component.BaseRampRate;
+
+        if (!TryComp<PowerNetworkBatteryComponent>(uid, out var battery))
+            return;
+
+        battery.SupplyRampRate = rampRate;
+    }
+
+    private void OnSupplyRampingUpgradeExamine(EntityUid uid, UpgradePowerSupplyRampingComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("upgrade-power-supply-ramping", component.ActualScalar);
+    }
+}
diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
index a75d1e4113..721a959820 100644
--- a/Content.Server/Power/Generator/GeneratorSystem.cs
+++ b/Content.Server/Power/Generator/GeneratorSystem.cs
@@ -26,8 +26,11 @@ public sealed class GeneratorSystem : SharedGeneratorSystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly PuddleSystem _puddle = default!;
 
+    private EntityQuery<UpgradePowerSupplierComponent> _upgradeQuery;
+
     public override void Initialize()
     {
+        _upgradeQuery = GetEntityQuery<UpgradePowerSupplierComponent>();
 
         UpdatesBefore.Add(typeof(PowerNetSystem));
 
@@ -225,7 +228,9 @@ public override void Update(float frameTime)
 
             supplier.Enabled = true;
 
-            supplier.MaxSupply = gen.TargetPower;
+            var upgradeMultiplier = _upgradeQuery.CompOrNull(uid)?.ActualScalar ?? 1f;
+
+            supplier.MaxSupply = gen.TargetPower * upgradeMultiplier;
 
             var eff = 1 / CalcFuelEfficiency(gen.TargetPower, gen.OptimalPower, gen);
             var consumption = gen.OptimalBurnRate * frameTime * eff;
diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs
index 3bba9b5a7f..f64d9bdcbf 100644
--- a/Content.Server/Shuttles/Components/ThrusterComponent.cs
+++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs
@@ -1,8 +1,10 @@
 using System.Numerics;
 using Content.Server.Shuttles.Systems;
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Shuttles.Components
 {
@@ -13,7 +15,7 @@ public sealed partial class ThrusterComponent : Component
         /// <summary>
         /// Whether the thruster has been force to be enabled / disabled (e.g. VV, interaction, etc.)
         /// </summary>
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public bool Enabled { get; set; } = true;
 
         /// <summary>
@@ -22,9 +24,12 @@ public sealed partial class ThrusterComponent : Component
         public bool IsOn;
 
         // Need to serialize this because RefreshParts isn't called on Init and this will break post-mapinit maps!
-        [ViewVariables(VVAccess.ReadWrite), DataField("thrust")]
+        [DataField]
         public float Thrust = 100f;
 
+        [DataField]
+        public float BaseThrust = 100f;
+
         [DataField("thrusterType")]
         public ThrusterType Type = ThrusterType.Linear;
 
@@ -37,24 +42,31 @@ public sealed partial class ThrusterComponent : Component
         };
 
         /// <summary>
-        /// How much damage is done per second to anything colliding with our thrust.
+        ///     How much damage is done per second to anything colliding with our thrust.
         /// </summary>
-        [DataField("damage")] public DamageSpecifier? Damage = new();
+        [DataField]
+        public DamageSpecifier? Damage = new();
 
-        [DataField("requireSpace")]
+        [DataField]
         public bool RequireSpace = true;
 
         // Used for burns
 
         public List<EntityUid> Colliding = new();
 
-        public bool Firing = false;
+        public bool Firing;
 
         /// <summary>
-        /// Next time we tick damage for anyone colliding.
+        ///     Next time we tick damage for anyone colliding.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField("nextFire", customTypeSerializer:typeof(TimeOffsetSerializer))]
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
         public TimeSpan NextFire;
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+        public string MachinePartThrust = "Capacitor";
+
+        [DataField]
+        public float PartRatingThrustMultiplier = 1.5f;
     }
 
     public enum ThrusterType
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index be55cd9a62..ee131d7857 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Server.Audio;
+using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Shuttles.Components;
@@ -51,6 +52,9 @@ public override void Initialize()
 
         SubscribeLocalEvent<ThrusterComponent, ExaminedEvent>(OnThrusterExamine);
 
+        SubscribeLocalEvent<ThrusterComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<ThrusterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+
         SubscribeLocalEvent<ShuttleComponent, TileChangedEvent>(OnShuttleTileChange);
     }
 
@@ -580,6 +584,24 @@ public void SetAngularThrust(ShuttleComponent component, bool on)
         }
     }
 
+    private void OnRefreshParts(EntityUid uid, ThrusterComponent component, RefreshPartsEvent args)
+    {
+        if (component.IsOn) // safely disable thruster to prevent negative thrust
+            DisableThruster(uid, component);
+
+        var thrustRating = args.PartRatings[component.MachinePartThrust];
+
+        component.Thrust = component.BaseThrust * MathF.Pow(component.PartRatingThrustMultiplier, thrustRating - 1);
+
+        if (component.Enabled && CanEnable(uid, component))
+            EnableThruster(uid, component);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, ThrusterComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("thruster-comp-upgrade-thrust", component.Thrust / component.BaseThrust);
+    }
+
     #endregion
 
     private int GetFlagIndex(DirectionFlag flag)
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index a9763b64d9..652ca236e4 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using System.Threading;
 using Content.Server.Administration.Logs;
+using Content.Server.Construction;
 using Content.Server.DeviceLinking.Events;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -47,6 +48,8 @@ public override void Initialize()
             SubscribeLocalEvent<EmitterComponent, InteractHandEvent>(OnInteractHand);
             SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
             SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
+            SubscribeLocalEvent<EmitterComponent, RefreshPartsEvent>(OnRefreshParts);
+            SubscribeLocalEvent<EmitterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
             SubscribeLocalEvent<EmitterComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
             SubscribeLocalEvent<EmitterComponent, SignalReceivedEvent>(OnSignalReceived);
         }
@@ -176,6 +179,20 @@ private void OnApcChanged(EntityUid uid, EmitterComponent component, ref PowerCh
             }
         }
 
+        private void OnRefreshParts(EntityUid uid, EmitterComponent component, RefreshPartsEvent args)
+        {
+            var fireRateRating = args.PartRatings[component.MachinePartFireRate];
+
+            component.FireInterval = component.BaseFireInterval * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
+            component.FireBurstDelayMin = component.BaseFireBurstDelayMin * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
+            component.FireBurstDelayMax = component.BaseFireBurstDelayMax * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, EmitterComponent component, UpgradeExamineEvent args)
+        {
+            args.AddPercentageUpgrade("emitter-component-upgrade-fire-rate", (float) (component.BaseFireInterval.TotalSeconds / component.FireInterval.TotalSeconds));
+        }
+
         public void SwitchOff(EntityUid uid, EmitterComponent component)
         {
             component.IsOn = false;
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 25f64ba4b6..7187a70476 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -265,6 +265,12 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
         listing.PurchaseAmount++; //track how many times something has been purchased
         _audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching!
 
+        if (listing.SaleLimit != 0 && listing.DiscountValue > 0 && listing.PurchaseAmount >= listing.SaleLimit)
+        {
+            listing.DiscountValue = 0;
+            listing.Cost = listing.OldCost;
+        }
+
         UpdateUserInterface(buyer, uid, component);
     }
 
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 72aeb29d19..a86dffef63 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Server.StoreDiscount;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
@@ -22,6 +23,7 @@ public sealed partial class StoreSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly StoreDiscountSystem _storeDiscount = default!;
 
     public override void Initialize()
     {
@@ -199,6 +201,8 @@ public void InitializeFromPreset(StorePresetPrototype preset, EntityUid uid, Sto
         if (component.Balance == new Dictionary<string, FixedPoint2>() && preset.InitialBalance != null) //if we don't have a value stored, use the preset
             TryAddCurrency(preset.InitialBalance, uid, component);
 
+        _storeDiscount.ApplyDiscounts(component.Listings, preset);
+
         var ui = _ui.GetUiOrNull(uid, StoreUiKey.Key);
         if (ui != null)
         {
@@ -225,7 +229,7 @@ public CurrencyInsertAttemptEvent(EntityUid user, EntityUid target, EntityUid us
 
 
 /// <summary>
-/// Nyano/DeltaV Code. For penguin bombs and what not. 
+/// Nyano/DeltaV Code. For penguin bombs and what not.
 /// Raised on an item when it is purchased.
 /// An item may need to set it upself up for its purchaser.
 /// For example, to make sure it isn't hostile to them or
diff --git a/Content.Server/StoreDiscount/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/StoreDiscountSystem.cs
new file mode 100644
index 0000000000..8f77eba780
--- /dev/null
+++ b/Content.Server/StoreDiscount/StoreDiscountSystem.cs
@@ -0,0 +1,55 @@
+using System.Linq;
+using Content.Shared.FixedPoint;
+using Content.Shared.Store;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.StoreDiscount;
+
+public sealed class StoreDiscountSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public void ApplyDiscounts(IEnumerable<ListingData> listings, StorePresetPrototype store)
+    {
+        if (!store.Sales.Enabled)
+            return;
+
+        var count = _random.Next(store.Sales.MinItems, store.Sales.MaxItems + 1);
+
+        listings = listings
+            .Where(l =>
+                !l.SaleBlacklist
+                && l.Cost.Any(x => x.Value > 1)
+                && store.Categories.Overlaps(ChangedFormatCategories(l.Categories)))
+            .OrderBy(_ => _random.Next()).Take(count).ToList();
+
+        foreach (var listing in listings)
+        {
+            var sale = GetDiscount(store.Sales.MinMultiplier, store.Sales.MaxMultiplier);
+            var newCost = listing.Cost.ToDictionary(x => x.Key,
+                x => FixedPoint2.New(Math.Max(1, (int) MathF.Round(x.Value.Float() * sale))));
+
+            if (listing.Cost.All(x => x.Value.Int() == newCost[x.Key].Int()))
+                continue;
+
+            var key = listing.Cost.First(x => x.Value > 0).Key;
+            listing.OldCost = listing.Cost;
+            listing.DiscountValue = 100 - (newCost[key] / listing.Cost[key] * 100).Int();
+            listing.Cost = newCost;
+            listing.Categories = new() {store.Sales.SalesCategory};
+        }
+    }
+
+    private IEnumerable<string> ChangedFormatCategories(List<ProtoId<StoreCategoryPrototype>> categories)
+    {
+        var modified = from p in categories select p.Id;
+
+        return modified;
+    }
+
+    private float GetDiscount(float minMultiplier, float maxMultiplier)
+    {
+        return _random.NextFloat() * (maxMultiplier - minMultiplier) + minMultiplier;
+    }
+}
diff --git a/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs b/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs
index ec16083c53..d6a39fe4f4 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs
@@ -1,4 +1,7 @@
-namespace Content.Server.Xenoarchaeology.Equipment.Components;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Xenoarchaeology.Equipment.Components;
 
 /// <summary>
 /// This is used for a machine that biases
@@ -7,6 +10,18 @@
 [RegisterComponent]
 public sealed partial class TraversalDistorterComponent : Component
 {
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float BiasChance;
+
+    [DataField]
+    public float BaseBiasChance = 0.7f;
+
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartBiasChance = "Manipulator";
+
+    [DataField]
+    public float PartRatingBiasChance = 1.1f;
+
     [ViewVariables(VVAccess.ReadWrite)]
     public BiasDirection BiasDirection = BiasDirection.In;
 
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
index 230e639af4..bb662925a9 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
@@ -1,9 +1,12 @@
-using Content.Server.Popups;
+using Content.Server.Construction;
+using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Xenoarchaeology.Equipment.Components;
+using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Placeable;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Xenoarchaeology.Equipment.Systems;
@@ -20,6 +23,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<TraversalDistorterComponent, ActivateInWorldEvent>(OnInteract);
         SubscribeLocalEvent<TraversalDistorterComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<TraversalDistorterComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<TraversalDistorterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
 
         SubscribeLocalEvent<TraversalDistorterComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<TraversalDistorterComponent, ItemRemovedEvent>(OnItemRemoved);
@@ -68,10 +73,21 @@ private void OnExamine(EntityUid uid, TraversalDistorterComponent component, Exa
                 examine = Loc.GetString("traversal-distorter-desc-out");
                 break;
         }
-
         args.PushMarkup(examine);
     }
 
+    private void OnRefreshParts(EntityUid uid, TraversalDistorterComponent component, RefreshPartsEvent args)
+    {
+        var biasRating = args.PartRatings[component.MachinePartBiasChance];
+
+        component.BiasChance = component.BaseBiasChance * MathF.Pow(component.PartRatingBiasChance, biasRating - 1);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, TraversalDistorterComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("traversal-distorter-upgrade-bias", component.BiasChance / component.BaseBiasChance);
+    }
+
     private void OnItemPlaced(EntityUid uid, TraversalDistorterComponent component, ref ItemPlacedEvent args)
     {
         var bias = EnsureComp<BiasedArtifactComponent>(args.OtherEntity);
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
index 955fe827d7..a7948aa7ff 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
@@ -206,6 +206,7 @@ public void ForceActivateArtifact(EntityUid uid, EntityUid? user = null, Artifac
 
         if (TryComp<BiasedArtifactComponent>(uid, out var bias) &&
             TryComp<TraversalDistorterComponent>(bias.Provider, out var trav) &&
+            _random.Prob(trav.BiasChance) &&
             this.IsPowered(bias.Provider, EntityManager))
         {
             switch (trav.BiasDirection)
diff --git a/Content.Server/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs b/Content.Server/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs
new file mode 100644
index 0000000000..fe0baf51f9
--- /dev/null
+++ b/Content.Server/_LostParadise/DiamondCrusher/DiamondCrusherSystem.cs
@@ -0,0 +1,141 @@
+using Content.Server.Body.Systems;
+using Content.Server.Popups;
+using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Server.Stack;
+using Content.Server.Storage.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage;
+using Content.Shared.Verbs;
+using Content.Shared._LostParadise.DiamondCrusher;
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server._LostParadise.DiamondCrusher.Systems;
+
+/// <унаследование/>
+public sealed class DiamondCrusherSystem : SharedDiamondCrusherSystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly StackSystem _stack = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    /// <унаследование/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DiamondCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
+        SubscribeLocalEvent<DiamondCrusherComponent, PowerChangedEvent>(OnPowerChanged);
+    }
+
+    private void OnGetVerbs(Entity<DiamondCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
+            return;
+
+        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
+            entityStorageComp.Contents.ContainedEntities.Count == 0)
+            return;
+
+        if (!this.IsPowered(ent, EntityManager))
+            return;
+
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("diamond-crusher-verb-start-crushing"),
+            Priority = 2,
+            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp))
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void OnPowerChanged(Entity<DiamondCrusherComponent> ent, ref PowerChangedEvent args)
+    {
+        if (!args.Powered)
+            StopCrushing(ent);
+    }
+
+    public void StartCrushing(Entity<DiamondCrusherComponent, EntityStorageComponent> ent)
+    {
+        var (uid, crusher, _) = ent;
+
+        if (crusher.Crushing)
+            return;
+
+        if (crusher.AutoLock)
+            _popup.PopupEntity(Loc.GetString("diamond-crusher-autolocks-enable"), uid);
+
+        crusher.Crushing = true;
+        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
+        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
+        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent);
+        Appearance.SetData(ent, DiamondCrusherVisuals.Crushing, true);
+        Dirty(ent, ent.Comp1);
+    }
+
+    public void FinishCrushing(Entity<DiamondCrusherComponent, EntityStorageComponent> ent)
+    {
+        var (_, crusher, storage) = ent;
+        StopCrushing((ent, ent.Comp1), false);
+        AudioSystem.PlayPvs(crusher.CrushingCompleteSound, ent);
+        crusher.CrushingSoundEntity = null;
+        Dirty(ent, ent.Comp1);
+
+        var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
+        var coords = Transform(ent).Coordinates;
+        foreach (var contained in contents)
+        {
+            if (crusher.CrushingWhitelist.IsValid(contained, EntityManager))
+            {
+                var amount = _random.Next(crusher.MinFragments, crusher.MaxFragments);
+                var stacks = _stack.SpawnMultiple(crusher.FragmentStackProtoId, amount, coords);
+                foreach (var stack in stacks)
+                {
+                    ContainerSystem.Insert((stack, null, null, null), crusher.OutputContainer);
+                }
+            }
+
+            if (!TryComp<BodyComponent>(contained, out var body))
+                Del(contained);
+
+            var gibs = _body.GibBody(contained, body: body, gibOrgans: true);
+            foreach (var gib in gibs)
+            {
+                ContainerSystem.Insert((gib, null, null, null), crusher.OutputContainer);
+            }
+        }
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<DiamondCrusherComponent, EntityStorageComponent>();
+        while (query.MoveNext(out var uid, out var crusher, out var storage))
+        {
+            if (!crusher.Crushing)
+                continue;
+
+            if (crusher.NextSecond < _timing.CurTime)
+            {
+                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
+                foreach (var contained in contents)
+                {
+                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
+                }
+                crusher.NextSecond += TimeSpan.FromSeconds(1);
+                Dirty(uid, crusher);
+            }
+
+            if (crusher.CrushEndTime < _timing.CurTime)
+            {
+                FinishCrushing((uid, crusher, storage));
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
new file mode 100644
index 0000000000..8cf11b9e66
--- /dev/null
+++ b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
@@ -0,0 +1,59 @@
+using Robust.Shared.Audio;
+using Content.Shared.Damage;
+using Content.Shared.Popups;
+
+namespace Content.Shared.Actions.Events;
+public sealed partial class PsionicHealOtherPowerActionEvent : EntityTargetActionEvent
+{
+    [DataField]
+    public DamageSpecifier HealingAmount = default!;
+
+    [DataField]
+    public string PowerName;
+
+    /// Controls whether or not a power fires immediately and with no DoAfter
+    [DataField]
+    public bool Immediate;
+
+    [DataField]
+    public string? PopupText;
+
+    [DataField]
+    public float RotReduction;
+
+    [DataField]
+    public bool DoRevive;
+
+    [DataField]
+    public bool BreakOnUserMove = true;
+
+    [DataField]
+    public bool BreakOnTargetMove = false;
+
+    [DataField]
+    public float UseDelay = 8f;
+
+    [DataField]
+    public int MinGlimmer = 8;
+
+    [DataField]
+    public int MaxGlimmer = 12;
+
+    [DataField]
+    public int GlimmerObviousSoundThreshold;
+
+    [DataField]
+    public int GlimmerObviousPopupThreshold;
+
+    [DataField]
+    public PopupType PopupType = PopupType.Medium;
+
+    [DataField]
+    public AudioParams AudioParams = default!;
+
+    [DataField]
+    public bool PlaySound;
+
+    [DataField]
+    public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg");
+}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 3a9eb53064..6f5043136c 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2295,7 +2295,7 @@ public static readonly CVarDef<float>
         ///     Chance for a station goal to be sent
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
-            CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+            CVarDef.Create("game.station_goals_chance", 1f, CVar.SERVERONLY);
 
 
         #region CPR System
diff --git a/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs b/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs
index 911ea41cca..7c8a362522 100644
--- a/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -13,29 +14,47 @@ namespace Content.Shared.Cargo.Components;
 public sealed partial class CargoTelepadComponent : Component
 {
     /// <summary>
-    /// The actual amount of time it takes to teleport from the telepad
+    ///     The base amount of time it takes to teleport from the telepad
     /// </summary>
-    [DataField("delay"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float BaseDelay = 10f;
+
+    /// <summary>
+    ///     The actual amount of time it takes to teleport from the telepad
+    /// </summary>
+    [DataField]
     public float Delay = 10f;
 
     /// <summary>
-    /// How much time we've accumulated until next teleport.
+    ///     The machine part that affects <see cref="Delay"/>
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>)), ViewVariables(VVAccess.ReadWrite)]
+    public string MachinePartTeleportDelay = "Capacitor";
+
+    /// <summary>
+    ///     A multiplier applied to <see cref="Delay"/> for each level of <see cref="MachinePartTeleportDelay"/>
+    /// </summary>
+    [DataField]
+    public float PartRatingTeleportDelay = 0.8f;
+
+    /// <summary>
+    ///     How much time we've accumulated until next teleport.
     /// </summary>
-    [DataField("accumulator"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float Accumulator;
 
-    [DataField("currentState")]
+    [DataField]
     public CargoTelepadState CurrentState = CargoTelepadState.Unpowered;
 
-    [DataField("teleportSound")]
+    [DataField]
     public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Machines/phasein.ogg");
 
     /// <summary>
     ///     The paper-type prototype to spawn with the order information.
     /// </summary>
-    [DataField("printerOutput", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)), ViewVariables(VVAccess.ReadWrite)]
     public string PrinterOutput = "PaperCargoInvoice";
 
-    [DataField("receiverPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>)), ViewVariables(VVAccess.ReadWrite)]
     public string ReceiverPort = "OrderReceiver";
 }
diff --git a/Content.Shared/Cloning/CloningPodComponent.cs b/Content.Shared/Cloning/CloningPodComponent.cs
index 082b92e8b1..c9a6fd4500 100644
--- a/Content.Shared/Cloning/CloningPodComponent.cs
+++ b/Content.Shared/Cloning/CloningPodComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.DeviceLinking;
 using Content.Shared.Materials;
 using Content.Shared.Random;
@@ -38,6 +39,18 @@ public sealed partial class CloningPodComponent : Component
     [DataField]
     public ProtoId<MaterialPrototype> RequiredMaterial = "Biomass";
 
+    /// <summary>
+    ///     The multiplier for cloning duration
+    /// </summary>
+    [DataField]
+    public float PartRatingSpeedMultiplier = 0.75f;
+
+    /// <summary>
+    ///     The machine part that affects cloning speed
+    /// </summary>
+    [DataField]
+    public ProtoId<MachinePartPrototype> MachinePartCloningSpeed = "Manipulator";
+
     /// <summary>
     ///     The current amount of time it takes to clone a body
     /// </summary>
@@ -66,6 +79,18 @@ public sealed partial class CloningPodComponent : Component
         Params = AudioParams.Default.WithVolume(4),
     };
 
+    /// <summary>
+    ///     The machine part that affects how much biomass is needed to clone a body.
+    /// </summary>
+    [DataField]
+    public float PartRatingMaterialMultiplier = 0.85f;
+
+    /// <summary>
+    ///     The machine part that decreases the amount of material needed for cloning
+    /// </summary>
+    [DataField]
+    public ProtoId<MachinePartPrototype> MachinePartMaterialUse = "MatterBin";
+
     [ViewVariables(VVAccess.ReadWrite)]
     public CloningPodStatus Status;
 
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 1a19040b41..01db7fbade 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -21,6 +21,7 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<MachineBoardComponent, ExaminedEvent>(OnMachineBoardExamined);
+            SubscribeLocalEvent<MachinePartComponent, ExaminedEvent>(OnMachinePartExamined);
         }
 
         private void OnMachineBoardExamined(EntityUid uid, MachineBoardComponent component, ExaminedEvent args)
@@ -61,6 +62,20 @@ private void OnMachineBoardExamined(EntityUid uid, MachineBoardComponent compone
             }
         }
 
+        private void OnMachinePartExamined(EntityUid uid, MachinePartComponent component, ExaminedEvent args)
+        {
+            if (!args.IsInDetailsRange)
+                return;
+
+            using (args.PushGroup(nameof(MachinePartComponent)))
+            {
+                args.PushMarkup(Loc.GetString("machine-part-component-on-examine-rating-text",
+                    ("rating", component.Rating)));
+                args.PushMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type",
+                    Loc.GetString(_prototype.Index<MachinePartPrototype>(component.PartType).Name))));
+            }
+        }
+
         public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardComponent> entity, int coefficient = 1)
         {
             var (_, comp) = entity;
diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs
index 3e72baf604..2fd6cd6fc8 100644
--- a/Content.Shared/Materials/MaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs
@@ -1,100 +1,121 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Materials;
 
 /// <summary>
-/// This is a machine that handles converting entities
-/// into the raw materials and chemicals that make them up.
+///     This is a machine that handles converting entities
+///     into the raw materials and chemicals that make them up.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedMaterialReclaimerSystem))]
 public sealed partial class MaterialReclaimerComponent : Component
 {
     /// <summary>
-    /// Whether or not the machine has power. We put it here
-    /// so we can network and predict it.
+    ///     Whether or not the machine has power. We put it here
+    ///     so we can network and predict it.
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool Powered;
 
     /// <summary>
-    /// An "enable" toggle for things like interfacing with machine linking
+    ///     An "enable" toggle for things like interfacing with machine linking
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool Enabled = true;
 
     /// <summary>
-    /// How efficiently the materials are reclaimed.
-    /// In practice, a multiplier per material when calculating the output of the reclaimer.
+    ///     How efficiently the materials are reclaimed.
+    ///     In practice, a multiplier per material when calculating the output of the reclaimer.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float Efficiency = 1f;
 
     /// <summary>
-    /// Whether or not the process
-    /// speed scales with the amount of materials being processed
-    /// or if it's just <see cref="MinimumProcessDuration"/>
+    ///     Whether or not the process
+    ///     speed scales with the amount of materials being processed
+    ///     or if it's just <see cref="MinimumProcessDuration"/>
     /// </summary>
     [DataField]
     public bool ScaleProcessSpeed = true;
 
     /// <summary>
-    /// How quickly it takes to consume X amount of materials per second.
-    /// For example, with a rate of 50, an entity with 100 total material takes 2 seconds to process.
+    ///     How quickly it takes to consume X amount of materials per second.
+    ///     For example, with a rate of 50, an entity with 100 total material takes 2 seconds to process.
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float BaseMaterialProcessRate = 100f;
+
+    /// <summary>
+    ///     How quickly it takes to consume X amount of materials per second.
+    ///     For example, with a rate of 50, an entity with 100 total material takes 2 seconds to process.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public float MaterialProcessRate = 100f;
 
     /// <summary>
-    /// The minimum amount fo time it can take to process an entity.
-    /// this value supercedes the calculated one using <see cref="MaterialProcessRate"/>
+    ///     Machine part whose rating modifies <see cref="MaterialProcessRate"/>
+    /// </summary>
+    [DataField]
+    public ProtoId<MachinePartPrototype> MachinePartProcessRate = "Manipulator";
+
+    /// <summary>
+    ///     How much the machine part quality affects the <see cref="MaterialProcessRate"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float PartRatingProcessRateMultiplier = 1.5f;
+
+    /// <summary>
+    ///     The minimum amount fo time it can take to process an entity.
+    ///     this value supercedes the calculated one using <see cref="MaterialProcessRate"/>
+    /// </summary>
+    [DataField]
     public TimeSpan MinimumProcessDuration = TimeSpan.FromSeconds(0.5f);
 
     /// <summary>
-    /// The id of our output solution
+    ///     The id of our output solution
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string SolutionContainerId = "output";
 
     /// <summary>
-    /// a whitelist for what entities can be inserted into this reclaimer
+    ///     a whitelist for what entities can be inserted into this reclaimer
     /// </summary>
     [DataField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
-    /// a blacklist for what entities cannot be inserted into this reclaimer
+    ///     a blacklist for what entities cannot be inserted into this reclaimer
     /// </summary>
     [DataField]
     public EntityWhitelist? Blacklist;
 
     /// <summary>
-    /// The sound played when something is being processed.
+    ///     The sound played when something is being processed.
     /// </summary>
     [DataField]
     public SoundSpecifier? Sound;
 
     /// <summary>
-    /// whether or not we cut off the sound early when the reclaiming ends.
+    ///     whether or not we cut off the sound early when the reclaiming ends.
     /// </summary>
     [DataField]
     public bool CutOffSound = true;
 
     /// <summary>
-    /// When the next sound will be allowed to be played. Used to prevent spam.
+    ///     When the next sound will be allowed to be played. Used to prevent spam.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextSound;
 
     /// <summary>
-    /// Minimum time inbetween each <see cref="Sound"/>
+    ///     Minimum time inbetween each <see cref="Sound"/>
     /// </summary>
     [DataField]
     public TimeSpan SoundCooldown = TimeSpan.FromSeconds(0.8f);
@@ -102,10 +123,10 @@ public sealed partial class MaterialReclaimerComponent : Component
     public EntityUid? Stream;
 
     /// <summary>
-    /// A counter of how many items have been processed
+    ///     A counter of how many items have been processed
     /// </summary>
     /// <remarks>
-    /// I saw this on the recycler and i'm porting it because it's cute af
+    ///     I saw this on the recycler and i'm porting it because it's cute af
     /// </remarks>
     [DataField, AutoNetworkedField]
     public int ItemsProcessed;
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
index cf9a50c6e1..f110c9c405 100644
--- a/Content.Shared/Psionics/Events.cs
+++ b/Content.Shared/Psionics/Events.cs
@@ -1,28 +1,59 @@
 using Robust.Shared.Serialization;
+using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 
-namespace Content.Shared.Psionics.Events
+namespace Content.Shared.Psionics.Events;
+
+[Serializable, NetSerializable]
+public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
 {
-    [Serializable, NetSerializable]
-    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
+    [DataField("startedAt", required: true)]
+    public TimeSpan StartedAt;
+
+    public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
     {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
+        StartedAt = startedAt;
+    }
+
+    public override DoAfterEvent Clone() => this;
+}
 
-        private PsionicRegenerationDoAfterEvent()
-        {
-        }
+[Serializable, NetSerializable]
+public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent { }
 
-        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
+[Serializable, NetSerializable]
+public sealed partial class HealingWordDoAfterEvent : DoAfterEvent
+{
+    [DataField(required: true)]
+    public TimeSpan StartedAt;
 
-        public override DoAfterEvent Clone() => this;
+    public HealingWordDoAfterEvent(TimeSpan startedAt)
+    {
+        StartedAt = startedAt;
     }
 
-    [Serializable, NetSerializable]
-    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
+    public override DoAfterEvent Clone() => this;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class PsionicHealOtherDoAfterEvent : DoAfterEvent
+{
+    [DataField(required: true)]
+    public TimeSpan StartedAt;
+
+    [DataField]
+    public DamageSpecifier HealingAmount = default!;
+
+    [DataField]
+    public float RotReduction;
+
+    [DataField]
+    public bool DoRevive;
+
+    public PsionicHealOtherDoAfterEvent(TimeSpan startedAt)
     {
+        StartedAt = startedAt;
     }
+
+    public override DoAfterEvent Clone() => this;
 }
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 85b7e380fe..37d0a9a7ef 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DoAfter;
 using Content.Shared.Psionics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -166,6 +167,14 @@ private set
         ///     unneccesary subs for unique psionic entities like e.g. Oracle.
         /// </summary>
         [DataField]
-        public List<String>? PsychognomicDescriptors = null;
+        public List<string>? PsychognomicDescriptors = null;
+
+        /// Used for tracking what spell a Psion is actively casting
+        [DataField]
+        public DoAfterId? DoAfter;
+
+        /// Popup to play if a Psion attempts to start casting a power while already casting one
+        [DataField]
+        public string AlreadyCasting = "already-casting";
     }
 }
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index c2e7af717b..cc6e8aeede 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -1,4 +1,5 @@
 using System.Threading;
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -14,90 +15,130 @@ public sealed partial class EmitterComponent : Component
 {
     public CancellationTokenSource? TimerCancel;
 
-    // whether the power switch is in "on"
-    [ViewVariables] public bool IsOn;
-    // Whether the power switch is on AND the machine has enough power (so is actively firing)
-    [ViewVariables] public bool IsPowered;
+    /// <summary>
+    ///     Whether the power switch is on
+    /// </summary>
+    [ViewVariables]
+    public bool IsOn;
 
     /// <summary>
-    /// counts the number of consecutive shots fired.
+    /// Whether the power switch is on AND the machine has enough power (so is actively firing)
+    /// </summary>
+    [ViewVariables]
+    public bool IsPowered;
+
+    /// <summary>
+    ///     counts the number of consecutive shots fired.
     /// </summary>
     [ViewVariables]
     public int FireShotCounter;
 
     /// <summary>
-    /// The entity that is spawned when the emitter fires.
+    ///     The entity that is spawned when the emitter fires.
     /// </summary>
-    [DataField("boltType", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string BoltType = "EmitterBolt";
 
-    [DataField("selectableTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
     public List<string> SelectableTypes = new();
 
     /// <summary>
-    /// The current amount of power being used.
+    ///     The current amount of power being used.
     /// </summary>
-    [DataField("powerUseActive")]
+    [DataField]
     public int PowerUseActive = 600;
 
     /// <summary>
-    /// The amount of shots that are fired in a single "burst"
+    ///     The amount of shots that are fired in a single "burst"
     /// </summary>
-    [DataField("fireBurstSize")]
+    [DataField]
     public int FireBurstSize = 3;
 
     /// <summary>
-    /// The time between each shot during a burst.
+    ///     The time between each shot during a burst.
     /// </summary>
-    [DataField("fireInterval")]
+    [DataField]
     public TimeSpan FireInterval = TimeSpan.FromSeconds(2);
 
     /// <summary>
-    /// The current minimum delay between bursts.
+    ///     The base amount of time between each shot during a burst.
     /// </summary>
-    [DataField("fireBurstDelayMin")]
+    [DataField]
+    public TimeSpan BaseFireInterval = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    ///     The current minimum delay between bursts.
+    /// </summary>
+    [DataField]
     public TimeSpan FireBurstDelayMin = TimeSpan.FromSeconds(4);
 
     /// <summary>
-    /// The current maximum delay between bursts.
+    ///     The current maximum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMax")]
+    [DataField]
     public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10);
 
     /// <summary>
-    /// The visual state that is set when the emitter is turned on
+    ///     The base minimum delay between shot bursts.
+    ///     Used for machine part rating calculations.
+    /// </summary>
+    [DataField]
+    public TimeSpan BaseFireBurstDelayMin = TimeSpan.FromSeconds(4);
+
+    /// <summary>
+    ///     The base maximum delay between shot bursts.
+    ///     Used for machine part rating calculations.
+    /// </summary>
+    [DataField]
+    public TimeSpan BaseFireBurstDelayMax = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    ///     The multiplier for the base delay between shot bursts as well as
+    ///     the fire interval
+    /// </summary>
+    [DataField]
+    public float FireRateMultiplier = 0.8f;
+
+    /// <summary>
+    ///     The machine part that affects burst delay.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartFireRate = "Capacitor";
+
+    /// <summary>
+    ///     The visual state that is set when the emitter is turned on
     /// </summary>
-    [DataField("onState")]
+    [DataField]
     public string? OnState = "beam";
 
     /// <summary>
-    /// The visual state that is set when the emitter doesn't have enough power.
+    ///     The visual state that is set when the emitter doesn't have enough power.
     /// </summary>
-    [DataField("underpoweredState")]
+    [DataField]
     public string? UnderpoweredState = "underpowered";
 
     /// <summary>
-    /// Signal port that turns on the emitter.
+    ///     Signal port that turns on the emitter.
     /// </summary>
-    [DataField("onPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
     public string OnPort = "On";
 
     /// <summary>
-    /// Signal port that turns off the emitter.
+    ///     Signal port that turns off the emitter.
     /// </summary>
-    [DataField("offPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
     public string OffPort = "Off";
 
     /// <summary>
-    /// Signal port that toggles the emitter on or off.
+    ///     Signal port that toggles the emitter on or off.
     /// </summary>
-    [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
     public string TogglePort = "Toggle";
 
     /// <summary>
-    /// Map of signal ports to entity prototype IDs of the entity that will be fired.
+    ///     Map of signal ports to entity prototype IDs of the entity that will be fired.
     /// </summary>
-    [DataField("setTypePorts", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<string, SinkPortPrototype>))]
+    [DataField(customTypeSerializer: typeof(PrototypeIdDictionarySerializer<string, SinkPortPrototype>))]
     public Dictionary<string, string> SetTypePorts = new();
 }
 
diff --git a/Content.Shared/Store/ListingLocalisationHelpers.cs b/Content.Shared/Store/ListingLocalisationHelpers.cs
index 882300109c..19cd029488 100644
--- a/Content.Shared/Store/ListingLocalisationHelpers.cs
+++ b/Content.Shared/Store/ListingLocalisationHelpers.cs
@@ -18,6 +18,11 @@ public static string GetLocalisedNameOrEntityName(ListingData listingData, IProt
         else if (listingData.ProductEntity != null)
             name = prototypeManager.Index(listingData.ProductEntity.Value).Name;
 
+        if (listingData.DiscountValue > 0)
+            name += " " + Loc.GetString("store-sales-amount", ("amount", listingData.DiscountValue));
+        else if (listingData.OldCost.Count > 0)
+            name += " " + Loc.GetString("store-sales-over");
+
         return name;
     }
 
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index d3d2e13cdf..0b59ab48cb 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -109,6 +109,19 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField]
     public TimeSpan RestockTime = TimeSpan.Zero;
 
+    [DataField]
+    public int SaleLimit = 3;
+
+    [DataField]
+    public bool SaleBlacklist;
+
+    public int DiscountValue;
+
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> OldCost = new();
+
+    [DataField]
+    public List<string> Components = new();
+
     public bool Equals(ListingData? listing)
     {
         if (listing == null)
@@ -166,6 +179,11 @@ public object Clone()
             ProductEvent = ProductEvent,
             PurchaseAmount = PurchaseAmount,
             RestockTime = RestockTime,
+            SaleLimit = SaleLimit,
+            SaleBlacklist = SaleBlacklist,
+            DiscountValue = DiscountValue,
+            OldCost = OldCost,
+            Components = Components,
         };
     }
 }
diff --git a/Content.Shared/Store/StorePresetPrototype.cs b/Content.Shared/Store/StorePresetPrototype.cs
index ce7f0312b6..41ee510bd8 100644
--- a/Content.Shared/Store/StorePresetPrototype.cs
+++ b/Content.Shared/Store/StorePresetPrototype.cs
@@ -1,3 +1,4 @@
+using Content.Shared.StoreDiscount;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
@@ -38,4 +39,7 @@ public sealed partial class StorePresetPrototype : IPrototype
     /// </summary>
     [DataField("currencyWhitelist", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<CurrencyPrototype>))]
     public HashSet<string> CurrencyWhitelist { get; private set; } = new();
+
+    [DataField]
+    public SalesSpecifier Sales { get; private set; } = new();
 }
diff --git a/Content.Shared/StoreDiscount/SalesSpecifier.cs b/Content.Shared/StoreDiscount/SalesSpecifier.cs
new file mode 100644
index 0000000000..21539f85d4
--- /dev/null
+++ b/Content.Shared/StoreDiscount/SalesSpecifier.cs
@@ -0,0 +1,38 @@
+namespace Content.Shared.StoreDiscount;
+
+[DataDefinition]
+public sealed partial class SalesSpecifier
+{
+    [DataField]
+    public bool Enabled { get; private set; }
+
+    [DataField]
+    public float MinMultiplier { get; private set; }
+
+    [DataField]
+    public float MaxMultiplier { get; private set; }
+
+    [DataField]
+    public int MinItems { get; private set;  }
+
+    [DataField]
+    public int MaxItems { get; private set; }
+
+    [DataField]
+    public string SalesCategory { get; private set; } = string.Empty;
+
+    public SalesSpecifier()
+    {
+    }
+
+    public SalesSpecifier(bool enabled, float minMultiplier, float maxMultiplier, int minItems, int maxItems,
+        string salesCategory)
+    {
+        Enabled = enabled;
+        MinMultiplier = minMultiplier;
+        MaxMultiplier = maxMultiplier;
+        MinItems = minItems;
+        MaxItems = maxItems;
+        SalesCategory = salesCategory;
+    }
+}
diff --git a/Content.Shared/_LostParadise/DiamondCrusher/DiamondComponent.cs b/Content.Shared/_LostParadise/DiamondCrusher/DiamondComponent.cs
new file mode 100644
index 0000000000..e93829182f
--- /dev/null
+++ b/Content.Shared/_LostParadise/DiamondCrusher/DiamondComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._LostParadise.DiamondCrusher;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DiamondComponent : Component
+{
+
+}
diff --git a/Content.Shared/_LostParadise/DiamondCrusher/DiamondCrusherComponent.cs b/Content.Shared/_LostParadise/DiamondCrusher/DiamondCrusherComponent.cs
new file mode 100644
index 0000000000..f5f9dd45fa
--- /dev/null
+++ b/Content.Shared/_LostParadise/DiamondCrusher/DiamondCrusherComponent.cs
@@ -0,0 +1,116 @@
+using Content.Shared.Damage;
+using Content.Shared.Stacks;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared._LostParadise.DiamondCrusher;
+
+/// <summary>
+/// Это хранилище сущностей, которое при активации сжимает (не обработанные)алмазы внутри себя и выдает (обработанные)алмазы.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedDiamondCrusherSystem))]
+public sealed partial class DiamondCrusherComponent : Component
+{
+    /// <summary>
+    /// Независимо от того, находится ли дробилка в данный момент в процессе дробления чего-либо или нет.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Crushing;
+
+    /// <summary>
+    /// Когда закончится текущее дробление.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public TimeSpan CrushEndTime;
+
+    /// <summary>
+    /// В следующую секунду. Используется для нанесения урона с течением времени.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public TimeSpan NextSecond;
+
+    /// <summary>
+    /// Общая продолжительность дробления.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public TimeSpan CrushDuration = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// Вайтлист предметов для которых, после дробления, будет давать фрагменты.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist CrushingWhitelist = new();
+
+    /// <summary>
+    /// Минимальное число фрагментов.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public int MinFragments = 5;
+
+    /// <summary>
+    /// Максимальное число фрагментов, не включительно
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public int MaxFragments = 15;
+
+    /// <summary>
+    /// Какой прототип будет являтся результатом дробления
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<StackPrototype> FragmentStackProtoId = "LPPProcessedDiamond";
+
+    /// <summary>
+    /// Контейнер, используемый для хранения осколков и крошки от дробления.
+    /// </summary>
+    [ViewVariables]
+    public Container OutputContainer;
+
+    /// <summary>
+    /// Айди для <see cref="OutputContainer"/>
+    /// </summary>
+    [DataField]
+    public string OutputContainerName = "output_container";
+
+    /// <summary>
+    /// Урон, наносимый каждую секунду существам, находящимся внутри, во время дробления.
+    /// </summary>
+    [DataField]
+    public DamageSpecifier CrushingDamage = new();
+
+    /// <summary>
+    /// Звук воспроизводится в конце успешной обработки.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? CrushingCompleteSound = new SoundCollectionSpecifier("MetalCrunch");
+
+    /// <summary>
+    /// Звук воспроизводится на протяжении всего процесса дробления. Отключается, если он закончился раньше времени.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? CrushingSound = new SoundPathSpecifier("/Audio/Effects/hydraulic_press.ogg");
+
+    /// <summary>
+    /// Хранит сущность <see cref="CrushingSound"/> чтобы позволить покончить с этим пораньше.
+    /// </summary>
+    [DataField]
+    public (EntityUid, AudioComponent)? CrushingSoundEntity;
+
+    /// <summary>
+    /// Когда этот параметр включен, устройство для обработки алмазов не открывается во время их измельчения.
+    /// </summary>
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    public bool AutoLock = false;
+}
+
+[Serializable, NetSerializable]
+public enum DiamondCrusherVisuals : byte
+{
+    Crushing
+}
diff --git a/Content.Shared/_LostParadise/DiamondCrusher/SharedDiamondCrusherSystem.cs b/Content.Shared/_LostParadise/DiamondCrusher/SharedDiamondCrusherSystem.cs
new file mode 100644
index 0000000000..791783b62b
--- /dev/null
+++ b/Content.Shared/_LostParadise/DiamondCrusher/SharedDiamondCrusherSystem.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Examine;
+using Content.Shared.Storage.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Content.Shared.Emag.Systems;
+
+namespace Content.Shared._LostParadise.DiamondCrusher;
+
+/// <резюме>
+/// Это обрабатывает логику, относящуюся к <see cref="DiamondCrusherComponent"/>
+/// </резюме>
+public abstract class SharedDiamondCrusherSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected readonly SharedAudioSystem AudioSystem = default!;
+    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+
+    /// <унаследование/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DiamondCrusherComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<DiamondCrusherComponent, StorageAfterOpenEvent>(OnStorageAfterOpen);
+        SubscribeLocalEvent<DiamondCrusherComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
+        SubscribeLocalEvent<DiamondCrusherComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<DiamondCrusherComponent, GotEmaggedEvent>(OnEmagged);
+    }
+
+    private void OnInit(Entity<DiamondCrusherComponent> ent, ref ComponentInit args)
+    {
+        ent.Comp.OutputContainer = ContainerSystem.EnsureContainer<Container>(ent, ent.Comp.OutputContainerName);
+    }
+
+    private void OnStorageAfterOpen(Entity<DiamondCrusherComponent> ent, ref StorageAfterOpenEvent args)
+    {
+        StopCrushing(ent);
+        ContainerSystem.EmptyContainer(ent.Comp.OutputContainer);
+    }
+
+    private void OnEmagged(Entity<DiamondCrusherComponent> ent, ref GotEmaggedEvent args)
+    {
+        ent.Comp.AutoLock = true;
+        args.Handled = true;
+    }
+
+    private void OnStorageOpenAttempt(Entity<DiamondCrusherComponent> ent, ref StorageOpenAttemptEvent args)
+    {
+        if (ent.Comp.AutoLock && ent.Comp.Crushing)
+            args.Cancelled = true;
+    }
+
+    private void OnExamine(Entity<DiamondCrusherComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(ent.Comp.AutoLock ? Loc.GetString("diamond-crusher-examine-autolocks") : Loc.GetString("artifact-crusher-examine-no-autolocks"));
+    }
+
+    public void StopCrushing(Entity<DiamondCrusherComponent> ent, bool early = true)
+    {
+        var (_, crusher) = ent;
+
+        if (!crusher.Crushing)
+            return;
+
+        crusher.Crushing = false;
+        Appearance.SetData(ent, DiamondCrusherVisuals.Crushing, false);
+
+        if (early)
+        {
+            AudioSystem.Stop(crusher.CrushingSoundEntity?.Item1, crusher.CrushingSoundEntity?.Item2);
+            crusher.CrushingSoundEntity = null;
+        }
+
+        Dirty(ent, ent.Comp);
+    }
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f4bc13c117..f85816dfaf 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6576,3 +6576,54 @@ Entries:
   id: 6381
   time: '2024-09-20T21:47:16.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/940
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Part Upgrading has returned!
+  id: 6382
+  time: '2024-09-21T22:46:49.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/917
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added discounts in uplink / Добавлены скидки в аплинк
+  id: 6383
+  time: '2024-09-21T22:46:59.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/930
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Healing Word has been added as a new Psionic Power. When cast on another
+        person, it heals a small amount of every damage type(scaling with
+        Casting Stats), while also reducing rot timers. Healing Word has a very
+        short cooldown, and a fairly low Glimmer cost.
+    - type: Add
+      message: >-
+        Breath of Life has been added as a new extremely rare Psionic Power.
+        When cast on another person, it heals a large amount of damage(scaling
+        with Casting Stats), while also substantially reducing rot timers.
+        Additionally, it will revive the target if it is possible to do so.
+        Breath of Life has an incredibly long cooldown, a long interuptable cast
+        time, and an extraordinarily high glimmer cost(A typical Psion will
+        spike glimmer by more than 50 points when casting it).
+    - type: Add
+      message: The Chaplain now starts with the Healing Word power.
+  id: 6384
+  time: '2024-09-21T22:50:01.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/942
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Bottles, Drink Glasses, Plates, and all liquid containers are now struck
+        by bullets(and most likely destroyed in the process). We hope that this
+        will offer both a small tactical advantage/disadvantage, as well as
+        contribute to making gunfights around the bar more "Cinematic".
+    - type: Add
+      message: >-
+        Chairs are now hit by projectiles if a shooter clicks on them, in
+        addition to Tables.
+  id: 6385
+  time: '2024-09-21T23:22:43.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/943
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
index e1e5e490cc..a511b46531 100644
--- a/Resources/Changelog/ChangelogLPP.yml
+++ b/Resources/Changelog/ChangelogLPP.yml
@@ -575,7 +575,7 @@ Entries:
     - type: Fix
       message: Исправлен перевод вещей ПВ и прочих!
     - type: Fix
-      message: 'Исправлен баг с отображением иконки роли визорам: Мед-сб, Инж-сб! '
+      message: Исправлен баг с отображением иконки роли визорам Мед-сб, Инж-сб!
   id: 56
   time: '2024-09-20T14:51:04.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/167
@@ -602,7 +602,69 @@ Entries:
     - type: Tweak
       message: Изменены параметры появления режимов.
     - type: Tweak
-      message: 'Изменено: Вор потерял пацифизм в угоду РП и логики.'
+      message: Изменен Вор, потерял пацифизм в угоду РП и логики.
   id: 59
   time: '2024-09-21T16:25:24.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/174
+- author: BL02DL
+  changes:
+    - type: Add
+      message: Добавлен дробитель алмазов!
+    - type: Add
+      message: Добавлена не обработанная жеода алмаза!
+    - type: Add
+      message: Добавлен обработанный алмаз!
+    - type: Add
+      message: Добавлен очищенный алмаз!
+    - type: Add
+      message: Добавлена новая дисциплина РнД Алмазное производство!
+    - type: Add
+      message: >-
+        Добавлена новая технология Т1 алмазного производства Продвинутое
+        алмазное шахтёрское оборудование!
+    - type: Add
+      message: Добавлены алмазный бур и алмазная кирка!
+    - type: Add
+      message: Добавлена новая технология Т2 сервис Продвинутое отслеживание!
+    - type: Add
+      message: Добавлена плата дробителя алмазов!
+    - type: Add
+      message: Добавлена новая технология Т2 экспериментальная Обработка алмазов!
+    - type: Remove
+      message: Убран дубликат штурмового молота с карт!
+    - type: Tweak
+      message: Изменена система добычи и копания руды!
+    - type: Tweak
+      message: Теперь некоторые Т3 технологии требуют очищенный алмаз!
+    - type: Tweak
+      message: >-
+        Портативный монитор датчиков теперь в технологии Продвинутое отслеживание!
+    - type: Tweak
+      message: >-
+        Теперь  технология Базовое отслеживание открывает платы монитора и
+        сервера датчиков!
+    - type: Tweak
+      message: >-
+        Теперь для изучения любой Т3 технологии нужно изучить полностью Т2 её
+        дисциплины!
+    - type: Fix
+      message: Исправлены характеристики бура и кирки!
+    - type: Fix
+      message: Пипетку больше нельзя сделать до изучения на протолате!
+  id: 60
+  time: '2024-09-22T13:29:47.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/181
+- author: Evgencheg
+  changes:
+    - type: Fix
+      message: Исправлены переводы!
+  id: 61
+  time: '2024-09-23T13:03:59.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/186
+- author: PowerKAT1
+  changes:
+    - type: Fix
+      message: Исправлена карта Нормандия!
+  id: 62
+  time: '2024-09-23T13:14:50.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/185
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index da5882fa62..1609d77d91 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -3,6 +3,7 @@ anomaly-component-contact-damage = The anomaly sears off your skin!
 anomaly-vessel-component-anomaly-assigned = Anomaly assigned to vessel.
 anomaly-vessel-component-not-assigned = This vessel is not assigned to any anomaly. Try using a scanner on it.
 anomaly-vessel-component-assigned = This vessel is currently assigned to an anomaly.
+anomaly-vessel-component-upgrade-output = point output
 
 anomaly-particles-delta = Delta particles
 anomaly-particles-epsilon = Epsilon particles
diff --git a/Resources/Locale/en-US/atmos/gas-recycler-system.ftl b/Resources/Locale/en-US/atmos/gas-recycler-system.ftl
index cc527adf5c..a72e137732 100644
--- a/Resources/Locale/en-US/atmos/gas-recycler-system.ftl
+++ b/Resources/Locale/en-US/atmos/gas-recycler-system.ftl
@@ -1,3 +1,6 @@
 gas-recycler-reacting = It is [color=green]converting[/color] waste gases.
 gas-recycler-low-pressure = The input pressure is [color=darkred]too low[/color].
 gas-recycler-low-temperature = The input temperature is [color=darkred]too low[/color].
+
+gas-recycler-upgrade-min-temp = Minimum temperature
+gas-recycler-upgrade-min-pressure = Minimum pressure
diff --git a/Resources/Locale/en-US/atmos/portable-scrubber.ftl b/Resources/Locale/en-US/atmos/portable-scrubber.ftl
index c4071b4acc..8aadf076d9 100644
--- a/Resources/Locale/en-US/atmos/portable-scrubber.ftl
+++ b/Resources/Locale/en-US/atmos/portable-scrubber.ftl
@@ -1 +1,4 @@
 portable-scrubber-fill-level = It's at about [color=yellow]{$percent}%[/color] of its maximum internal pressure.
+
+portable-scrubber-component-upgrade-max-pressure = max pressure
+portable-scrubber-component-upgrade-transfer-rate = transfer rate
diff --git a/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl b/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl
index 84d5a5ed28..c586a594a9 100644
--- a/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl
+++ b/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl
@@ -2,3 +2,5 @@
 
 seed-extractor-component-interact-message = You extract some seeds from the { THE($name) }.
 seed-extractor-component-no-seeds = { CAPITALIZE(THE($name)) } has no seeds!
+
+seed-extractor-component-upgrade-seed-yield = seed yield
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index b56f4730cc..1caa810f1b 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -45,3 +45,5 @@ cargo-shuttle-console-station-unknown = Unknown
 cargo-shuttle-console-shuttle-not-found = Not found
 cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle
 cargo-no-shuttle = No cargo shuttle found!
+
+cargo-telepad-delay-upgrade = Teleport delay
diff --git a/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl
new file mode 100644
index 0000000000..cecf15550c
--- /dev/null
+++ b/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl
@@ -0,0 +1 @@
+solution-heater-upgrade-heat = Heat strength
diff --git a/Resources/Locale/en-US/construction/components/machine-part-component.ftl b/Resources/Locale/en-US/construction/components/machine-part-component.ftl
new file mode 100644
index 0000000000..0613f50516
--- /dev/null
+++ b/Resources/Locale/en-US/construction/components/machine-part-component.ftl
@@ -0,0 +1,2 @@
+machine-part-component-on-examine-rating-text = [color=white]Rating:[/color] [color=cyan]{$rating}[/color]
+machine-part-component-on-examine-type-text = [color=white]Type:[/color] [color=cyan]{$type}[/color]
diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index 0603b3c846..12346ee75d 100644
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -9,6 +9,7 @@ microwave-component-suicide-multi-head-others-message = {$victim} is trying to c
 microwave-component-suicide-others-message = {$victim} is trying to cook their head!
 microwave-component-suicide-multi-head-message = You cook your heads!
 microwave-component-suicide-message = You cook your head!
+microwave-component-upgrade-cook-time = cook time
 microwave-component-interact-full = It's full.
 microwave-component-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the microwave!
 
diff --git a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
index 8a3ca9eef8..3495128274 100644
--- a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
@@ -4,6 +4,9 @@ reagent-grinder-bound-user-interface-instant-button = INSTANT
 reagent-grinder-bound-user-interface-cook-time-label = COOK TIME
 reagent-grinder-component-cannot-put-entity-message = You can't put this in the reagent grinder!
 
+reagent-grinder-component-upgrade-work-time = Work time
+reagent-grinder-component-upgrade-storage = Storage
+
 grinder-menu-title = All-In-One Grinder 3000
 grinder-menu-grind-button = Grind
 grinder-menu-juice-button = Juice
diff --git a/Resources/Locale/en-US/machine/machine.ftl b/Resources/Locale/en-US/machine/machine.ftl
index ce8873df6f..2605950516 100644
--- a/Resources/Locale/en-US/machine/machine.ftl
+++ b/Resources/Locale/en-US/machine/machine.ftl
@@ -13,6 +13,11 @@ machine-part-name-manipulator = Manipulator
 machine-part-name-matter-bin = Matter Bin
 machine-part-name-power-cell = Power Cell
 
+upgrade-power-draw = power draw
+upgrade-max-charge = max charge
+upgrade-power-supply = power supply
+upgrade-power-supply-ramping = power ramp rate
+
 two-way-lever-left = push left
 two-way-lever-right = push right
 two-way-lever-cant = can't push the lever that way!
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index dca520b5b4..5a4413348e 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -35,3 +35,6 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+
+# Material Reclaimer
+material-reclaimer-upgrade-process-rate = process rate
diff --git a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
index 443429c1ef..0c0b8faf59 100644
--- a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
+++ b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl
@@ -1 +1,4 @@
 biomass-reclaimer-suicide-others = {CAPITALIZE(THE($victim))} threw themselves into the biomass reclaimer!
+
+biomass-reclaimer-component-upgrade-speed = speed
+biomass-reclaimer-component-upgrade-biomass-yield = biomass yield
diff --git a/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl b/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl
index b222d707a0..e92ac86a1e 100644
--- a/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl
+++ b/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl
@@ -1,3 +1,5 @@
 cloning-pod-biomass = It currently has [color=red]{$number}[/color] units of biomass.
 
+cloning-pod-component-upgrade-speed = cloning speed
+cloning-pod-component-upgrade-biomass-requirement = biomass requirement
 cloning-pod-component-upgrade-emag-requirement = The card zaps something inside the cloning pod.
diff --git a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
index c4b1942654..da4dc7a384 100644
--- a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
+++ b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl
@@ -2,3 +2,5 @@
 
 medical-scanner-verb-enter = Enter
 medical-scanner-verb-noun-occupant = occupant
+
+medical-scanner-upgrade-cloning = Cloning fail chance
diff --git a/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl b/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl
new file mode 100644
index 0000000000..2d8a18c263
--- /dev/null
+++ b/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl
@@ -0,0 +1 @@
+stasis-bed-component-upgrade-stasis = stasis effect
diff --git a/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl b/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl
index 20a31cd8c4..611b8ef540 100644
--- a/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl
+++ b/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl
@@ -1,3 +1,5 @@
+fat-extractor-component-rate = extraction rate
+
 fat-extractor-fact-1 = Fats are triglycerides made up of a combination of different building blocks; glycerol and fatty acids.
 fat-extractor-fact-2 = Adults should get a recommended 20-35% of their energy intake from fat.
 fat-extractor-fact-3 = Being overweight or obese puts you at an increased risk of chronic diseases, such as cardiovascular diseases, metabolic syndrome, type 2 diabetes, and some types of cancers.
diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl
index c68bb2a496..01b50cce32 100644
--- a/Resources/Locale/en-US/psionics/psionic-powers.ftl
+++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl
@@ -1,4 +1,5 @@
 generic-power-initialization-feedback = I Awaken.
+arleady-casting = I cannot channel more than one power at a time.
 
 # Dispel
 dispel-power-description = Dispel summoned entities such as familiars or forcewalls.
@@ -48,6 +49,28 @@ psionic-regeneration-power-initialization-feedback =
     I look within myself, finding a wellspring of life.
 psionic-regeneration-power-metapsionic-feedback = {CAPITALIZE($entity)} possesses an overwhelming will to live
 
+# Healing Word
+action-name-healing-word = Healing Word
+action-description-healing-word = Speak the Lesser Secret Of Life, and restore health to another.
+healing-word-power-description = Speak the Lesser Secret Of Life, and restore health to another.
+healing-word-power-initialization-feedback =
+    At the beginning of time, a word was spoken that brought life into the Spheres.
+    Though it taxes my mind to know it, this Secret is known to me now.
+    I need only speak it.
+healing-word-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Lesser Secret of Life.
+healing-word-begin = {CAPITALIZE($entity)} mutters a word that brings both joy and pain alike to those who hear it.
+
+# Revivify
+action-name-revivify = Breath of Life
+action-description-revivify = Speak the Greater Secret of Life, and restore another to life.
+revivify-power-description = Speak the Greater Secret of Life, and restore another to life.
+revivify-power-initialization-feedback =
+    For a moment, my soul journeys across time and space to the beginning of it all, there I hear it.
+    The Secret of Life in its fullness. I feel my entire existence burning out from within, merely by knowing it.
+    Power flows through me as a mighty river, begging to be released with a simple spoken word.
+revivify-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Greater Secret of Life.
+revivify-word-begin = {CAPITALIZE($entity)} enunciates a word of such divine power, that those who hear it weep from joy.
+
 # Telegnosis
 telegnosis-power-description = Create a telegnostic projection to remotely observe things.
 telegnosis-power-initialization-feedback =
diff --git a/Resources/Locale/en-US/shuttles/thruster.ftl b/Resources/Locale/en-US/shuttles/thruster.ftl
index 94035811c7..faed6e8dd2 100644
--- a/Resources/Locale/en-US/shuttles/thruster.ftl
+++ b/Resources/Locale/en-US/shuttles/thruster.ftl
@@ -3,3 +3,5 @@ thruster-comp-disabled = The thruster is turned [color=red]off[/color].
 thruster-comp-nozzle-direction = The nozzle is facing [color=yellow]{$direction}[/color].
 thruster-comp-nozzle-exposed = The nozzle [color=green]exposed[/color] to space.
 thruster-comp-nozzle-not-exposed = The nozzle [color=red]is not exposed[/color] to space.
+
+thruster-comp-upgrade-thrust = Thrust strength
diff --git a/Resources/Locale/en-US/singularity/components/emitter-component.ftl b/Resources/Locale/en-US/singularity/components/emitter-component.ftl
index c71b3d6bdf..c7db1a93bb 100644
--- a/Resources/Locale/en-US/singularity/components/emitter-component.ftl
+++ b/Resources/Locale/en-US/singularity/components/emitter-component.ftl
@@ -11,5 +11,8 @@ comp-emitter-turned-off = The {$target} turns off.
 # Shows if the user attempts to activate the emitter while it's un-anchored.
 comp-emitter-not-anchored = The {$target} isn't anchored to the ground!
 
+# Upgrades
+emitter-component-upgrade-fire-rate = fire rate
+
 emitter-component-current-type = The current selected type is: {$type}.
 emitter-component-type-set = Type set to: {$type}
diff --git a/Resources/Locale/en-US/store/sales.ftl b/Resources/Locale/en-US/store/sales.ftl
new file mode 100644
index 0000000000..7223a8a0dc
--- /dev/null
+++ b/Resources/Locale/en-US/store/sales.ftl
@@ -0,0 +1,2 @@
+store-sales-amount = [DISCOUNT] { $amount }%!
+store-sales-over = [The sale is over]
diff --git a/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl b/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl
index 5c9eac57a5..af3039e864 100644
--- a/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl
@@ -3,3 +3,5 @@ traversal-distorter-set-out = Traversal bias set to "out"
 
 traversal-distorter-desc-in = The affected artifact's traversal now favors moving inwards to the beginning.
 traversal-distorter-desc-out = The affected artifact's traversal now favors moving outwards towards more dangerous nodes.
+
+traversal-distorter-upgrade-bias = Bias effectiveness
diff --git a/Resources/Locale/ru-RU/_LostParadise/DiamondCrusher.ftl b/Resources/Locale/ru-RU/_LostParadise/DiamondCrusher.ftl
new file mode 100644
index 0000000000..a5fc1ed5b2
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/DiamondCrusher.ftl
@@ -0,0 +1,4 @@
+diamond-crusher-verb-start-crushing = Начать обработку
+artifact-crusher-examine-no-autolocks = Блокировщики [color=green]отключены[/color].
+artifact-crusher-examine-autolocks = Блокировщики [color=red]включены[/color].
+artifact-crusher-autolocks-enable = Блокировщики машины захлопнулись!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LostParadise/DiamondThings.ftl b/Resources/Locale/ru-RU/_LostParadise/DiamondThings.ftl
new file mode 100644
index 0000000000..bf150c09a8
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/DiamondThings.ftl
@@ -0,0 +1,7 @@
+ent-LPPDiamondMiningDrill = алмазный шахтёрский бур
+    .desc = Сильнейший шахтёрский бур способный в разы быстрее и сильнее пробивать камни. Имеет этикетку "BL CORP technology".
+ent-LPPDiamondPickaxe = алмазная кирка
+    .desc = Выточенный до совершенства, для забивания его в камни.
+materials-diamond = алмазы
+materials-raw-diamond = обработанный алмаз
+lppresearch-technology-diamond-processing = Обработка алмазов
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LostParadise/Guidebook/SpaceLaw.txt b/Resources/Locale/ru-RU/_LostParadise/Guidebook/SpaceLaw.txt
index a3f3a7caab..6d97fb145c 100644
--- a/Resources/Locale/ru-RU/_LostParadise/Guidebook/SpaceLaw.txt
+++ b/Resources/Locale/ru-RU/_LostParadise/Guidebook/SpaceLaw.txt
@@ -1,4 +1,4 @@
-lppguide-entry-rights = Права сотрудников корпорации
+lppguide-entry-rights = Права сотрудников корпорации
 lppguide-entry-brib = Основные Права Разумных Существ
 lppguide-entry-rightsprisoners = Права заключенных/задержанных
-lppguide-entry-spacelaw = Космический закон
\ No newline at end of file
+lppguide-entry-spacelaw = Космический закон
diff --git a/Resources/Locale/ru-RU/_LostParadise/Guidebook/spacelaw.ftl b/Resources/Locale/ru-RU/_LostParadise/Guidebook/spacelaw.ftl
new file mode 100644
index 0000000000..331697ceb9
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/Guidebook/spacelaw.ftl
@@ -0,0 +1,34 @@
+lppguide-entry-rights = Права сотрудников корпорации
+lppguide-entry-brib = Основные Права Разумных Существ
+lppguide-entry-rightsprisoners = Права заключенных/задержанных
+lppguide-entry-spacelaw = Космический закон
+lppguide-entry-arrestprocedure = Процедура ареста
+lppguide-entry-listofprohibitedsubstances = Список запрещенных веществ
+lppguide-entry-levelsofforceapplication = Уровни Применения Силы
+lppguide-entry-necessarydefense = Необходимая оборона
+lppguide-entry-articlesofthecorporatelaw = Статьи Корпоративного Закона
+lppguide-entry-minorviolations = Лёгкие нарушения
+lppguide-entry-explanationoflightarticles = Пояснение лёгких статей
+lppguide-entry-averageviolations = Средние нарушения
+lppguide-entry-explanationofaveragearticles = Пояснение средних нарушений
+lppguide-entry-seriousviolations = Тяжкие нарушения
+lppguide-entry-explanationofseriousarticles = Пояснение тяжких нарушений
+lppguide-entry-supersevereviolations = Сверхтяжкие нарушения
+lppguide-entry-explanationofsuperseverearticles = Пояснение сверхтяжких нарушений
+lppguide-entry-criticalviolations = Критические нарушения
+lppguide-entry-explanationofcriticalarticles = Пояснение критических нарушений
+lppguide-entry-punishments = Наказания
+lppguide-entry-theseverityoftheviolationandtheappropriatepenalties = Степени тяжести нарушения
+lppguide-entry-theratiooftheseverityoftheviolationandthepositionsauthorizedtocarryoutpunishments = Соотношение степени тяжести
+lppguide-entry-rulesforissuingwarnings = Правила вынесения предупреждений
+lppguide-entry-relapse = Рецидив
+lppguide-entry-execution = Казнь
+lppguide-entry-punishmentsagainstconfirmedenemiesofthecorporation = Наказания в отношении врагов
+lppguide-entry-administrativeban = Административный запрет
+lppguide-entry-additionalrulesforsentencing = Дополнительные правила
+lppguide-entry-sentencemodifiers = Модификаторы приговоров
+lppguide-entry-violationsoftheconditionsofdetention = Нарушения условий содержания
+lppguide-entry-indulgences = Послабления
+lppguide-entry-aggravatingcircumstances = Отягчающие обстоятельства
+lppguide-entry-additionally = Дополнительно
+lppguide-entry-criminal-records = Тэн-коды
diff --git a/Resources/Locale/ru-RU/_LostParadise/diamond.ftl b/Resources/Locale/ru-RU/_LostParadise/diamond.ftl
new file mode 100644
index 0000000000..7782b340d7
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/diamond.ftl
@@ -0,0 +1,21 @@
+ent-LPPAsteroidRockOreDiamond = { ent-AsteroidRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockOreDiamond = { ent-WallRock }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockBasaltOreDiamond = { ent-WallRockBasalt }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockSnowOreDiamond = { ent-WallRockSnow }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockSandOreDiamond = { ent-WallRockSand }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockChromiteOreDiamond = { ent-WallRockChromite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
+ent-LPPWallRockAndesiteOreDiamond = { ent-WallRockAndesite }
+    .desc = Каменная стена. Что это торчит из неё?
+    .suffix = не обработанный алмаз
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/core.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/core.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/help.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/help.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/noop.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/noop.ftl
new file mode 100644
index 0000000000..e8f70b7732
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/noop.ftl
@@ -0,0 +1,52 @@
+interaction-LPPPatShoulder-name = Похлопать по плечу
+interaction-LPPPatShoulder-description = Подбодрите кого-нибудь похлопав его по плечу!
+interaction-LPPPatShoulder-success-self-popup = Вы хлопаете по плечу { THE($target) }.
+interaction-LPPPatShoulder-success-target-popup = Вы чуствуете как { THE($user) } хлопает вам по плечу...
+interaction-LPPPatShoulder-success-others-popup = { THE($user) } хлопает по плечу { THE($target) }.
+interaction-LPPFuckYou-name = Показать средний палец
+interaction-LPPFuckYou-description = Покажите свое желание послать кого-то этим действием.
+interaction-LPPFuckYou-success-self-popup =
+    Вы показываете средний палец { $hasUsed ->
+        [false] { THE($target) }.
+       *[true] держа { $used } { THE($target) }.
+    }
+interaction-LPPFuckYou-success-target-popup =
+    { THE($user) } показывает средний палец { $hasUsed ->
+        [false] вам.
+       *[true] { POSS-PRONOUN($user) } { $used } вам.
+    }
+interaction-LPPFuckYou-success-others-popup =
+    { THE($user) } показывает средний палец { $hasUsed ->
+        [false] { THE($target) }.
+       *[true] { POSS-PRONOUN($user) } { $used } { THE($target) }.
+    }
+interaction-LPPKisscheek-name = Поцеловать в щеку
+interaction-LPPKisscheek-description = Наконец-то вы можете поцеловать кого-то в щеку.
+interaction-LPPKisscheek-success-self-popup = Вы целуете { THE($target) }.
+interaction-LPPKisscheek-success-target-popup = Вы чуствуете как { THE($user) } целует вас в щеку...
+interaction-LPPKisscheek-success-others-popup = { THE($user) } целует в щеку { THE($target) }.
+interaction-LPPKiss-name = Поцеловать
+interaction-LPPKiss-description = Наконец-то вы можете поцеловать кого-то.
+interaction-LPPKiss-success-self-popup = Вы целуете { THE($target) }.
+interaction-LPPKiss-success-target-popup = Вы чуствуете как { THE($user) } целует вас...
+interaction-LPPKiss-success-others-popup = { THE($user) } целует { THE($target) }.
+interaction-LPPTickle-name = Щекотать
+interaction-LPPTickle-description = Пощекотайте кого-то.
+interaction-LPPTickle-success-self-popup = Вы щекочите { THE($target) }.
+interaction-LPPTickle-success-target-popup = { THE($user) } щекочет вас.
+interaction-LPPTickle-success-others-popup = { THE($user) } щекочет { THE($target) }.
+interaction-LPPSlap-name = Пощёчина
+interaction-LPPSlap-description = Как насчет оставить след на чужой щеке?
+interaction-LPPSlap-success-self-popup = Вы наносите пощёчину { THE($target) }.
+interaction-LPPSlap-success-target-popup = { THE($user) } наносит вам пощёчину.
+interaction-LPPSlap-success-others-popup = { THE($user) } наносит пощёчину { THE($target) }.
+interaction-LPPSlap2-name = Шлёпнуть
+interaction-LPPSlap2-description = Так прекрасно, хочу шлепнуть!
+interaction-LPPSlap2-success-self-popup = Вы наносите шлепок { THE($target) }.
+interaction-LPPSlap2-success-target-popup = { THE($user) } наносит вам легкий шлепок.
+interaction-LPPSlap2-success-others-popup = { THE($user) } наносит легкий шлепок { THE($target) }.
+interaction-LPPLick-name = Лизнуть
+interaction-LPPLick-description = Фрьх~...
+interaction-LPPLick-success-self-popup = Вы лизнули { THE($target) }.
+interaction-LPPLick-success-target-popup = { THE($user) } лизнул вас.
+interaction-LPPLick-success-others-popup = { THE($user) } лизнул { THE($target) }.
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/self.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/self.ftl
new file mode 100644
index 0000000000..438d63f10c
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/self.ftl
@@ -0,0 +1,11 @@
+interaction-LPPMakeSleepIPC-name = Гибернация
+interaction-LPPMakeSleepIPC-description = Перейти в режим "Гибернации"
+interaction-LPPMakeSleepIPC-fail-self-popup = Ты не можешь сейчас перейти в гибернацию
+interaction-LPPMakeSleepIPC-success-self-popup = Твоя система наконецто погружаешся в гибернацию.
+interaction-LPPMakeSleepIPC-success-others-popup = { THE($user) } переходит в состояние гибернации.
+# Действие между собой/другим
+interaction-LPPCheckStatusSilicon-name = Диагностика
+interaction-LPPCheckStatusSilicon-description = Выполните диагностику своей системы.
+interaction-LPPCheckStatusSilicon-fail-self-popup = Ты не можешь провести диагностику системы { THE($user) }!
+interaction-LPPCheckStatusSilicon-success-self-popup = Ты успешно провёл диагностику системы { THE ($target) }.
+interaction-LPPCheckStatusSilicon-success-others-popup = { THE($user) } проводит диагностику системы { THE($target) }.
diff --git a/Resources/Locale/ru-RU/_LostParadise/misc/fibers.ftl b/Resources/Locale/ru-RU/_LostParadise/misc/fibers.ftl
new file mode 100644
index 0000000000..d6d79cab0d
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/misc/fibers.ftl
@@ -0,0 +1 @@
+lppfibers-nitrile-insulative = нитрилово-изолирующие
diff --git a/Resources/Locale/ru-RU/_LostParadise/mood/mood.ftl b/Resources/Locale/ru-RU/_LostParadise/mood/mood.ftl
new file mode 100644
index 0000000000..82760df121
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/mood/mood.ftl
@@ -0,0 +1,5 @@
+mood-effect-LPPEncouraged = Я чувствую себя ободренным(-ой), это приятно!
+mood-effect-LPPLoved = я чувствую себя любимым(-ой)... Так чудесно
+mood-effect-LPPSlapped = Наконец-то я смог(-ла) показать ему/ей свои чувства, я ударил(-а) его по лицу, мне легче...
+mood-effect-LPPGotSlap = Ай.. Получить пощечину от кого-то это крайне обидно!
+modd-effect-LPPEmbarrassment = Я чувствую себя из-за своих или чужих действий легкое смущение...
diff --git a/Resources/Locale/ru-RU/_LostParadise/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl
new file mode 100644
index 0000000000..c2ab76af54
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/research.ftl
@@ -0,0 +1,6 @@
+lppresearch-discipline-diamond-production = Алмазное производство
+lppresearch-technology-diamond-salvage-equipment = Продвинутое алмазное шахтёрское оборудование
+lppresearch-technology-combat-utility = Боевая медицина
+lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
+lppresearch-technology-basic-tracking = Базовое отслеживание
+lppresearch-technology-advanced-tracking = Продвинутое отслеживание
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LostParadise/research/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research/research.ftl
new file mode 100644
index 0000000000..243d9ddb95
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/research/research.ftl
@@ -0,0 +1,4 @@
+lppresearch-technology-combat-utility = Боевая медицина
+lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
+lppresearch-technology-basic-tracking = Базовое отслеживание
+lppresearch-technology-advanced-tracking = Продвинутое отслеживание
diff --git a/Resources/Locale/ru-RU/_LostParadise/revolvers.ftl b/Resources/Locale/ru-RU/_LostParadise/revolvers.ftl
index 743171cb09..f5874267a6 100644
--- a/Resources/Locale/ru-RU/_LostParadise/revolvers.ftl
+++ b/Resources/Locale/ru-RU/_LostParadise/revolvers.ftl
@@ -1,6 +1,6 @@
 ent-WeaponRevolverColtpeacemaker = кольт миротворец
     .desc = Легендарный револвьер из дикого запада. Использует патроны .45 калибра
-ent-LPPWeaponRevolverPeacemaker = "Миротворец"
+ent-LPPWeaponRevolverPeacemaker = Миротворец
     .desc = Оружие, которое носит детектив Артемон Веалис. Использует патроны .45 калибра. На рукоятке выгвированы его инициалы "AV".
 ent-LPPWeaponRevolverColtspecial = кольт спешл
     .desc = Гравированный кольт. Гравировка, конечно, не даёт никакого тактического преимцущества. Использует патроны .45 калибра
diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl
index ce91e2f05f..348305e572 100644
--- a/Resources/Locale/ru-RU/_LostParadise/update20.ftl
+++ b/Resources/Locale/ru-RU/_LostParadise/update20.ftl
@@ -234,3 +234,4 @@ trait-name-ElfLanguage = Эльфийский
 trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OOC словечки)
 trait-name-DwarfLanguage = Дворфийский
 trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц
+changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
diff --git a/Resources/Locale/ru-RU/abilities/psionic.ftl b/Resources/Locale/ru-RU/abilities/psionic.ftl
index 47ae6f4228..f0a9b1d897 100644
--- a/Resources/Locale/ru-RU/abilities/psionic.ftl
+++ b/Resources/Locale/ru-RU/abilities/psionic.ftl
@@ -31,8 +31,8 @@ action-description-telegnosis = Создайте проекцию что бы у
 action-name-psionic-regeneration = Псионическая регенерация
 action-description-psionic-regeneration = Доведите свой метоболизм до предела что бы ускорить регенерацию.
 glimmer-report = Текущий уровень глиммера: { $level }Ψ.
-glimmer-event-report-generic = Разрядка ноöсферы. Уровень глиммера уменьшен с { $decrease } до { $level }Ψ.
-glimmer-event-report-signatures = Проявились новые псионические сигнатуры. Уроверь глиммера уменьшен на { $decrease } до { $level }Ψ.
+glimmer-event-report-generic = Разрядка ноöсферы. Уровень глиммера уменьшен на { $decrease }, текущий { $level }Ψ.
+glimmer-event-report-signatures = Проявились новые псионические сигнатуры. Уроверь глиммера уменьшен на { $decrease }, текущий { $level }Ψ.
 glimmer-event-awakened-prefix = { $entity } пробудился
 noospheric-zap-seize = Вы задыхаетесь!
 noospheric-zap-seize-potential-regained = Ты схватываешь на лету! Кажется, какой-то ментальный барьер тоже снят.
diff --git a/Resources/Locale/ru-RU/anomaly/anomaly.ftl b/Resources/Locale/ru-RU/anomaly/anomaly.ftl
index 5e82300d31..318c45f0f6 100644
--- a/Resources/Locale/ru-RU/anomaly/anomaly.ftl
+++ b/Resources/Locale/ru-RU/anomaly/anomaly.ftl
@@ -2,6 +2,7 @@ anomaly-component-contact-damage = Аномалия сдирает с вас к
 anomaly-vessel-component-anomaly-assigned = Аномалия присвоена сосуду.
 anomaly-vessel-component-not-assigned = Этому сосуду не присвоена ни одна аномалия. Попробуйте использовать на нём сканер.
 anomaly-vessel-component-assigned = Этому сосуду уже присвоена аномалия.
+anomaly-vessel-component-upgrade-output = точка выхода
 anomaly-particles-delta = Дельта-частицы
 anomaly-particles-epsilon = Эпсилон-частицы
 anomaly-particles-zeta = Зета-частицы
diff --git a/Resources/Locale/ru-RU/artifacts/artifact-crusher.ftl b/Resources/Locale/ru-RU/artifacts/artifact-crusher.ftl
index d9f10f4334..b0bf64930f 100644
--- a/Resources/Locale/ru-RU/artifacts/artifact-crusher.ftl
+++ b/Resources/Locale/ru-RU/artifacts/artifact-crusher.ftl
@@ -1,3 +1,3 @@
-artifact-crusher-examine-no-autolocks = The machine's autolocks are [color=green]disabled[/color].
-artifact-crusher-examine-autolocks = The machine's autolocks are [color=red]enabled[/color].
-artifact-crusher-autolocks-enable = The machine's locks snap shut!
+artifact-crusher-examine-no-autolocks = Блокировщики [color=green]отключены[/color].
+artifact-crusher-examine-autolocks = Блокировщики [color=red]включены[/color].
+artifact-crusher-autolocks-enable = Блокировщики машины захлопнулись!
diff --git a/Resources/Locale/ru-RU/atmos/atmos-alerts-console.ftl b/Resources/Locale/ru-RU/atmos/atmos-alerts-console.ftl
index 01cb6f8aeb..8342c94eeb 100644
--- a/Resources/Locale/ru-RU/atmos/atmos-alerts-console.ftl
+++ b/Resources/Locale/ru-RU/atmos/atmos-alerts-console.ftl
@@ -1,35 +1,29 @@
 atmos-alerts-window-title = Компьютер Атмосферных Оповещений
-atmos-alerts-window-station-name = [color=white][font size=14]{$stationName}[/font][/color]
+atmos-alerts-window-station-name = [color=white][font size=14]{ $stationName }[/font][/color]
 atmos-alerts-window-unknown-location = Неизвестное местоположение
-
 atmos-alerts-window-tab-no-alerts = Оповещения
-atmos-alerts-window-tab-alerts = Оповещений: ({$value})
+atmos-alerts-window-tab-alerts = Оповещений: ({ $value })
 atmos-alerts-window-tab-air-alarms = Сигналы воздушной тревоги
 atmos-alerts-window-tab-fire-alarms = Пожарные сигналы
-
-atmos-alerts-window-alarm-label = {CAPITALIZE($name)} ({$address})
+atmos-alerts-window-alarm-label = { CAPITALIZE($name) } ({ $address })
 atmos-alerts-window-temperature-label = Температура
-atmos-alerts-window-temperature-value = {$valueInC} °C ({$valueInK} K)
+atmos-alerts-window-temperature-value = { $valueInC } °C ({ $valueInK } K)
 atmos-alerts-window-pressure-label = Давление
-atmos-alerts-window-pressure-value = {$value} кПа
+atmos-alerts-window-pressure-value = { $value } кПа
 atmos-alerts-window-oxygenation-label = Уровень кислорода
-atmos-alerts-window-oxygenation-value = {$value}%
+atmos-alerts-window-oxygenation-value = { $value }%
 atmos-alerts-window-other-gases-label = Присутствующие газы
-atmos-alerts-window-other-gases-value = {$shorthand} ({$value}%)
+atmos-alerts-window-other-gases-value = { $shorthand } ({ $value }%)
 atmos-alerts-window-other-gases-value-nil = Нет
 atmos-alerts-window-silence-alerts = Отключить оповещения от этого датчика
-
 atmos-alerts-window-label-alert-types = Уровни тревоги:
 atmos-alerts-window-normal-state = Нормально
 atmos-alerts-window-warning-state = Предупреждение
 atmos-alerts-window-danger-state = Опасность!
 atmos-alerts-window-invalid-state = Неактивно
-
-atmos-alerts-window-no-active-alerts = [font size=16][color=white]Нет активных оповещений -[/color] [color={$color}]ситуация нормальная[/color][/font]
+atmos-alerts-window-no-active-alerts = [font size=16][color=white]Нет активных оповещений -[/color] [color={ $color }]ситуация нормальная[/color][/font]
 atmos-alerts-window-no-data-available = Данные недоступны
 atmos-alerts-window-alerts-being-silenced = Отключение оповещений...
-
 atmos-alerts-window-toggle-overlays = Переключить отображение сигналов тревоги
-
 atmos-alerts-window-flavor-left = Обратитесь к технику по атмосфере за помощью
 atmos-alerts-window-flavor-right = v1.8
diff --git a/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl b/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
index 88d53389ac..9ca10581c9 100644
--- a/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
+++ b/Resources/Locale/ru-RU/atmos/gas-recycler-system.ftl
@@ -1,3 +1,5 @@
 gas-recycler-reacting = Он [color=green]преобразовывает[/color] газы-отходы.
 gas-recycler-low-pressure = Входное давление [color=darkred]слишком низкое[/color].
 gas-recycler-low-temperature = Входная температура [color=darkred]слишком низкая[/color].
+gas-recycler-upgrade-min-temp = Минимальная температура
+gas-recycler-upgrade-min-pressure = Минимальное давление
diff --git a/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl b/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
index d76268b3a1..6938778480 100644
--- a/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
+++ b/Resources/Locale/ru-RU/atmos/portable-scrubber.ftl
@@ -1 +1,3 @@
 portable-scrubber-fill-level = Примерно [color=yellow]{ $percent }%[/color] от максимального внутреннего давления.
+portable-scrubber-component-upgrade-max-pressure = Максимальное давление
+portable-scrubber-component-upgrade-transfer-rate = Скорость передачи
diff --git a/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl b/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
index 9e0b6c61a4..c304c9c377 100644
--- a/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
+++ b/Resources/Locale/ru-RU/botany/components/seed-extractor-component.ftl
@@ -2,3 +2,4 @@
 
 seed-extractor-component-interact-message = Вы извлекаете немного семян из { $name }.
 seed-extractor-component-no-seeds = { CAPITALIZE($name) } не имеет семян!
+seed-extractor-component-upgrade-seed-yield = Урожайность
diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
index 34759621ce..c56189f2c0 100644
--- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
@@ -44,3 +44,4 @@ cargo-shuttle-console-station-unknown = Неизвестно
 cargo-shuttle-console-shuttle-not-found = Не найден
 cargo-no-shuttle = Грузовой шаттл не найден!
 cargo-shuttle-console-organics = На шаттле обнаружены органические формы жизни
+cargo-telepad-delay-upgrade = Задержка телепортации
diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
index 2d74d5b1f1..66491d2937 100644
--- a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl
@@ -89,7 +89,7 @@ chat-speech-verb-canine-2 = лает
 chat-speech-verb-canine-3 = воет
 chat-speech-verb-name-oni = Они
 chat-speech-verb-oni-1 = ворчит
-chat-speech-verb-oni-2 = мех
+chat-speech-verb-oni-2 = мьехает
 chat-speech-verb-oni-3 = ревет
 chat-speech-verb-oni-4 = грохочет
 chat-speech-verb-name-vox = Вокс
diff --git a/Resources/Locale/ru-RU/chemistry/components/solution-heater-component.ftl b/Resources/Locale/ru-RU/chemistry/components/solution-heater-component.ftl
new file mode 100644
index 0000000000..94b2e9b468
--- /dev/null
+++ b/Resources/Locale/ru-RU/chemistry/components/solution-heater-component.ftl
@@ -0,0 +1 @@
+solution-heater-upgrade-heat = Скорость нагрева
diff --git a/Resources/Locale/ru-RU/construction/components/machine-part-component.ftl b/Resources/Locale/ru-RU/construction/components/machine-part-component.ftl
new file mode 100644
index 0000000000..7eddb99010
--- /dev/null
+++ b/Resources/Locale/ru-RU/construction/components/machine-part-component.ftl
@@ -0,0 +1,2 @@
+machine-part-component-on-examine-rating-text = [color=white]Уровень:[/color] [color=cyan]{ $rating }[/color]
+machine-part-component-on-examine-type-text = [color=white]Тип:[/color] [color=cyan]{ $type }[/color]
diff --git a/Resources/Locale/ru-RU/corvax/changelog/changelog-window.ftl b/Resources/Locale/ru-RU/corvax/changelog/changelog-window.ftl
index 99308346a1..226bd01d97 100644
--- a/Resources/Locale/ru-RU/corvax/changelog/changelog-window.ftl
+++ b/Resources/Locale/ru-RU/corvax/changelog/changelog-window.ftl
@@ -1,2 +1 @@
 changelog-tab-title-ChangelogSyndie = Обновления Corvax
-changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
diff --git a/Resources/Locale/ru-RU/forensics/fibers.ftl b/Resources/Locale/ru-RU/forensics/fibers.ftl
index 59d999705b..31276f30fe 100644
--- a/Resources/Locale/ru-RU/forensics/fibers.ftl
+++ b/Resources/Locale/ru-RU/forensics/fibers.ftl
@@ -6,7 +6,6 @@ fibers-leather = кожаные
 fibers-durathread = дюратканевые
 fibers-latex = латексные
 fibers-nitrile = нитриловые
-lppfibers-nitrile-insulative = нитрилово-изолирующие
 fibers-nanomachines = изолирующие наномашинные
 fibers-chameleon = голографические хамелеонные
 fibers-rubber = резиновые
diff --git a/Resources/Locale/ru-RU/guidebook/guides.ftl b/Resources/Locale/ru-RU/guidebook/guides.ftl
index 42ab3b95f2..546cbff055 100644
--- a/Resources/Locale/ru-RU/guidebook/guides.ftl
+++ b/Resources/Locale/ru-RU/guidebook/guides.ftl
@@ -65,40 +65,6 @@ guide-entry-ss14 = Станции и смены
 guide-entry-robotics = Робототехника
 guide-entry-cyborgs = Киборги
 guide-entry-security = Безопасность станции
-lppguide-entry-criminal-records = Тэн-коды
-lppguide-entry-rights = Права сотрудников корпорации
-lppguide-entry-brib = Основные Права Разумных Существ
-lppguide-entry-rightsprisoners = Права заключенных/задержанных
-lppguide-entry-spacelaw = Космический закон
-lppguide-entry-arrestprocedure = Процедура ареста
-lppguide-entry-listofprohibitedsubstances = Список запрещенных веществ
-lppguide-entry-levelsofforceapplication = Уровни Применения Силы
-lppguide-entry-necessarydefense = Необходимая оборона
-lppguide-entry-articlesofthecorporatelaw = Статьи Корпоративного Закона
-lppguide-entry-minorviolations = Лёгкие нарушения
-lppguide-entry-explanationoflightarticles = Пояснение лёгких статей
-lppguide-entry-averageviolations = Средние нарушения
-lppguide-entry-explanationofaveragearticles = Пояснение средних нарушений
-lppguide-entry-seriousviolations = Тяжкие нарушения
-lppguide-entry-explanationofseriousarticles = Пояснение тяжких нарушений
-lppguide-entry-supersevereviolations = Сверхтяжкие нарушения
-lppguide-entry-explanationofsuperseverearticles = Пояснение сверхтяжких нарушений
-lppguide-entry-criticalviolations = Критические нарушения
-lppguide-entry-explanationofcriticalarticles = Пояснение критических нарушений
-lppguide-entry-punishments = Наказания
-lppguide-entry-theseverityoftheviolationandtheappropriatepenalties = Степени тяжести нарушения
-lppguide-entry-theratiooftheseverityoftheviolationandthepositionsauthorizedtocarryoutpunishments = Соотношение степени тяжести
-lppguide-entry-rulesforissuingwarnings = Правила вынесения предупреждений
-lppguide-entry-relapse = Рецидив
-lppguide-entry-execution = Казнь
-lppguide-entry-punishmentsagainstconfirmedenemiesofthecorporation = Наказания в отношении врагов
-lppguide-entry-administrativeban = Административный запрет
-lppguide-entry-additionalrulesforsentencing = Дополнительные правила
-lppguide-entry-sentencemodifiers = Модификаторы приговоров
-lppguide-entry-violationsoftheconditionsofdetention = Нарушения условий содержания
-lppguide-entry-indulgences = Послабления
-lppguide-entry-aggravatingcircumstances = Отягчающие обстоятельства
-lppguide-entry-additionally = Дополнительно
 guide-entry-forensics = Криминалистика
 guide-entry-defusal = Обезвреживание крупной бомбы
 guide-entry-criminal-records = Криминальные записи
diff --git a/Resources/Locale/ru-RU/interaction/verbs/core.ftl b/Resources/Locale/ru-RU/interaction/verbs/core.ftl
index b5051c6c87..783989ec30 100644
--- a/Resources/Locale/ru-RU/interaction/verbs/core.ftl
+++ b/Resources/Locale/ru-RU/interaction/verbs/core.ftl
@@ -1,5 +1,5 @@
 interaction-verb-invalid = Некоторые требования к этому действию не соблюдены. Вы не можете использовать его прямо сейчас.
-interaction-verb-cooldown = Этот слово находится в режиме "Кулдауна". Подождите{ TOSTRING($seconds, "F1") } секунд.
+interaction-verb-cooldown = Этот слово находится в режиме "Кулдауна". Подождите: { TOSTRING($seconds, "F1") } секунд.
 interaction-verb-too-strong = Вы слишком сильны чтобы взаимодействовать.
 interaction-verb-too-weak = Вы слишком слабы чтобы взаимодействовать.
 interaction-verb-invalid-target = Вы не можете взаимодействовать с этим/ним.
diff --git a/Resources/Locale/ru-RU/kitchen/components/microwave-component.ftl b/Resources/Locale/ru-RU/kitchen/components/microwave-component.ftl
index 303f71ed2e..ac567a1ca6 100644
--- a/Resources/Locale/ru-RU/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/ru-RU/kitchen/components/microwave-component.ftl
@@ -9,6 +9,7 @@ microwave-component-suicide-multi-head-others-message = { $victim } пытает
 microwave-component-suicide-others-message = { $victim } пытается зажарить свою голову!
 microwave-component-suicide-multi-head-message = Вы зажариваете свои головы!
 microwave-component-suicide-message = Вы зажариваете свою голову!
+microwave-component-upgrade-cook-time = Время готовки!
 microwave-component-interact-full = Она заполнена.
 microwave-component-interact-item-too-big = { CAPITALIZE($item) } не может поместиться в микроволновой печи из-за размера!
 
diff --git a/Resources/Locale/ru-RU/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/ru-RU/kitchen/components/reagent-grinder-component.ftl
index 28fe0878c5..3033f9435a 100644
--- a/Resources/Locale/ru-RU/kitchen/components/reagent-grinder-component.ftl
+++ b/Resources/Locale/ru-RU/kitchen/components/reagent-grinder-component.ftl
@@ -3,6 +3,8 @@
 reagent-grinder-bound-user-interface-instant-button = МГНОВЕННО
 reagent-grinder-bound-user-interface-cook-time-label = ВРЕМЯ:
 reagent-grinder-component-cannot-put-entity-message = Вы не можете поместить это в измельчитель реагентов!
+reagent-grinder-component-upgrade-work-time = Время работы
+reagent-grinder-component-upgrade-storage = Объем хранилища
 grinder-menu-title = Универсальный Измельчитель 3000
 grinder-menu-grind-button = Измельчить
 grinder-menu-juice-button = Выжать
diff --git a/Resources/Locale/ru-RU/language/commands.ftl b/Resources/Locale/ru-RU/language/commands.ftl
index 7c01700d65..f62d823393 100644
--- a/Resources/Locale/ru-RU/language/commands.ftl
+++ b/Resources/Locale/ru-RU/language/commands.ftl
@@ -1,17 +1,13 @@
 command-list-langs-desc = Перечислите языки, на которых сущность может говорить.
 command-list-langs-help = Исп: { $command }
-
 command-saylang-desc = Отправьте сообщение на определенном языке. Чтобы выбрать язык, вы можете использовать либо название языка, либо его позицию в списке языков.
 command-saylang-help = Исп: { $command } <имя языка> <текст>. Пример: { $command } TauCetiBasic "Привет мир!". Пример: { $command } 1 "Привет мир!"
-
 command-language-select-desc = Выберите язык, на котором в данный момент будет говорить существо. Вы можете использовать либо название языка, либо его позицию в списке языков.
 command-language-select-help = Исп: { $command } <имя языка>. Пример: { $command } TauCetiBasic
-
 command-language-spoken = Говорит:
 command-language-understood = Понимает:
 command-language-current-entry = { $id }. { $language } - { $name } (текущий)
 command-language-entry = { $id }. { $language } - { $name }
-
 command-language-invalid-number = Номер языка должен быть между 0 и { $total }. Ну либо используйте имя языка.
 command-language-invalid-language = Язык { $id } не существует или им нельзя говорить.
 
@@ -21,7 +17,6 @@ command-description-language-add = Добавляет новый язык к с
 command-description-language-rm = Удаляет язык из передаваемого объекта. Работает аналогично language:add. Пример: 'self language:rm "TauCetiBasic" true true'.
 command-description-language-lsspoken = Выводит список всех языков, на которых может говорить объект. Пример: 'self language:lsspoken'
 command-description-language-lsunderstood = Содержит список всех языков, которые может понимать сущность. Пример: 'self language:lssunderstood'
-
 command-description-translator-addlang = Добавляет язык переводчику. Смотрите language:add для деталей.
 command-description-translator-rmlang = Удаляет целевой язык из переводчика. Смотрите language:rm для деталей.
 command-description-translator-addrequired = Добавляет новый необходимый язык к переводчику. Пример: 'ent 1234 translator:addrequired "TauCetiBasic"'
@@ -29,6 +24,5 @@ command-description-translator-rmrequired = Удаляет необходимы
 command-description-translator-lsspoken = Выводит список всех языков на которых говорит переводчик. Пример: 'ent 1234 translator:lsspoken'
 command-description-translator-lsunderstood = Выводит список всех понятных языков для переводчика. Пример: 'ent 1234 translator:lssunderstood'
 command-description-translator-lsrequired = Выводит список всех необходимых языков для переводчика. Пример: 'ent 1234 translator:lsrequired'
-
 command-language-error-this-will-not-work = Не сработает.
 command-language-error-not-a-translator = Сущность { $entity } не переводчик.
diff --git a/Resources/Locale/ru-RU/language/languages.ftl b/Resources/Locale/ru-RU/language/languages.ftl
index 56a4212fad..7e0d1555a5 100644
--- a/Resources/Locale/ru-RU/language/languages.ftl
+++ b/Resources/Locale/ru-RU/language/languages.ftl
@@ -1,97 +1,71 @@
 language-Universal-name = Универсальный
 language-Universal-description = Что ты такое?
-
 language-Bubblish-name = Пузырчатый
 language-Bubblish-description = Язык слаймолюдов. Это смесь булькающих звуков и хлюпов. Человеку очень трудно говорить без механической помощи.
-
 language-RootSpeak-name = Песнь корней
 language-RootSpeak-description = Странный шелестящий язык, на котором говорят дионы.
-
 language-Nekomimetic-name = Некоязык
 language-Nekomimetic-description = Для стороннего наблюдателя этот язык представляет собой непонятную смесь ломаного японского. Для фелинидов он каким-то образом понятен.
-
 language-Draconic-name = Синта'унати
 language-Draconic-description = Общий язык унатхов с преобладающими шипящими звуками.
-
 language-SolCommon-name = Солнечный язык
 language-SolCommon-description =
     Общий язык Солнечного Альянса берёт свои корни из мандаринского диалекта китайского языка и эволюционировал как официальный язык Солнечного Альянса, при этом чиновники стремились объединить его в единый общий язык.
     На нём говорят государственные служащие, его преподают в школах, и его используют те, кто либо испытывает чувство национальной гордости за Альянс, либо оказался под влиянием его культуры.
-
 language-TauCetiBasic-name = Общегалактический
-language-TauCetiBasic-description = Духовный преемник эсперанто, созданный в 2404 году в системе Тау Кита её интеллектуалами.
-        Его уникальный, полностью настроенный алфавит и структура позволяют говорить на нем даже большинству инопланетных видов.
-        Это официальный язык Тау Кита, который набирает все большую популярность в дипломатических кругах и среди универсалистов по всему человеческому пространству.
-
+language-TauCetiBasic-description =
+    Духовный преемник эсперанто, созданный в 2404 году в системе Тау Кита её интеллектуалами.
+    Его уникальный, полностью настроенный алфавит и структура позволяют говорить на нем даже большинству инопланетных видов.
+    Это официальный язык Тау Кита, который набирает все большую популярность в дипломатических кругах и среди универсалистов по всему человеческому пространству.
 language-Tradeband-name = Торговый язык
 language-Tradeband-description =
-        Происходящий от латинских и романских языков старой Земли, Торговый остается основным языком высшего класса человечества.
-        Язык звучит элегантно и хорошо структурированно для большинства ушей. Он по-прежнему популярен среди торговцев, дипломатов и тех, кто стремится сохранить частичку романтического прошлого.
-
+    Происходящий от латинских и романских языков старой Земли, Торговый остается основным языком высшего класса человечества.
+    Язык звучит элегантно и хорошо структурированно для большинства ушей. Он по-прежнему популярен среди торговцев, дипломатов и тех, кто стремится сохранить частичку романтического прошлого.
 language-Freespeak-name = Свободная речь
 language-Freespeak-description =
-        Язык ренегатов и пограничников, происходящий от различных языков Земли, таких как хинди, объединенных в многокорневую мешанину, которая звучит несвязно или даже варварски для неносителей языка.
-        Этот язык является единственной общей культурной идентичностью для людей на границе. Само по себе владение этим языком смело заявляет о свободном духе говорящего.
-        Граждане Альянса часто называют его Уличным языком.
-
+    Язык ренегатов и пограничников, происходящий от различных языков Земли, таких как хинди, объединенных в многокорневую мешанину, которая звучит несвязно или даже варварски для неносителей языка.
+    Этот язык является единственной общей культурной идентичностью для людей на границе. Само по себе владение этим языком смело заявляет о свободном духе говорящего.
+    Граждане Альянса часто называют его Уличным языком.
+language-Elyran-name = Стандартный Элиранский
 trait-name-Elyran = Элиранский язык
 language-Elyran-description =
     Стандартный Элиранский — это официальный язык Республики Элира. Он был создан на основе элементов фарси, арабского и турецкого языков.
     Влияние всех трёх этих языков прослеживается в его грамматике и словарном составе.
-
 language-Canilunzt-name = Канилунц
 language-Canilunzt-description = Гортанный язык, на котором говорят и используют обитатели системы Ваззенда, состоящий из рычания, лая, тявканья и интенсивного использования движений ушей и хвоста, вулпканины говорят на этом языке с легкостью.
-
 language-Moffic-name = Мольный
 language-Moffic-description = Язык народа мотыльков граничит с полной неразборчивостью.
-
 language-RobotTalk-name = Робоязык
 language-RobotTalk-description = Язык, состоящий из резких бинарных звуков - чириканья, свиста, шипения и завывания. Органические языки не могут говорить на нем без помощи специальных переводчиков.
-
 language-Sign-name = Галактический язык жестов
 language-Sign-description = Этот язык жестов распространен среди немых и глухих людей.
-
 language-Cat-name = Кот
 language-Cat-description = Мяу
-
 language-Dog-name = Собака
 language-Dog-description = Гав!
-
 language-Fox-name = Лиса
 language-Fox-description = Япиии!
-
 language-Xeno-name = Ксено
 language-Xeno-description = СССССССССССССР!
-
 language-Monkey-name = Мартышка
 language-Monkey-description = уаааааак!
-
 language-Mouse-name = Мышка
 language-Mouse-description = Сквик!
-
 language-Chicken-name = Курица
 language-Chicken-description = Курлык ёпта!
-
 language-Duck-name = Курица
 language-Duck-description = Кудах!
-
 language-Cow-name = Корова
 language-Cow-description = Муууу!
-
 language-Sheep-name = Овца
 language-Sheep-description = Бееее!
-
 language-Kangaroo-name = Кенгуру
 language-Kangaroo-description = Чуууу!
-
 language-Pig-name = Свинья
 language-Pig-description = Хрю!
-
 language-Crab-name = Краб
 language-Crab-description = Клик!
-
 language-Kobold-name = Кобольды
 language-Kobold-description = Хиссс!
-
 language-Hissing-name = Шипящий
 language-Hissing-description = Хисс!
diff --git a/Resources/Locale/ru-RU/loadouts/itemgroups.ftl b/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
index c1acc8cda5..0888580621 100644
--- a/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
+++ b/Resources/Locale/ru-RU/loadouts/itemgroups.ftl
@@ -8,7 +8,6 @@ character-item-group-LoadoutNeck = Гражданская Одежда На Ше
 character-item-group-LoadoutOuter = Гражданская Верхняя Одежда
 character-item-group-LoadoutShoes = Гражданская Обувь
 character-item-group-LoadoutUniformsCivilian = Гражданская Униформа
-
 # Generic - Items
 character-item-group-LoadoutAirTank = Аварийные Баллоны С Воздухом
 character-item-group-LoadoutLighters = Зажигалки
@@ -16,18 +15,15 @@ character-item-group-LoadoutInstrumentsAny = Музыкальные Инстру
 character-item-group-LoadoutSmokes = Табачное
 character-item-group-LoadoutBoxKits = Наборы Для Выживания
 character-item-group-LoadoutWritables = Канцелярия
-
 # Cargo
 character-item-group-LoadoutNeckCargo = Одежда На Шею Отдела Снабжения
 character-item-group-LoadoutOuterCargo = Верхняя Одежда Отдела Снабжения
 character-item-group-LoadoutShoesCargo = Обувь Отдела Снабжения
-
 # Engineering
 character-item-group-LoadoutEyesEngineering = Очки Инженерного Отдела
 character-item-group-LoadoutHeadEngineering = Головные Уборы Инженерного Отдела
 character-item-group-LoadoutOuterEngineering = Верхняя Одежда Инженерного Отдела
 character-item-group-LoadoutUniformsEngineering = Униформа Инженерного Отдела
-
 # Medical
 character-item-group-LoadoutEyesMedical = Очки Медицинского Отдела
 character-item-group-LoadoutGlovesMedical = Перчатки Медицинского отдела
@@ -36,7 +32,6 @@ character-item-group-LoadoutNeckMedical = Одежда На Шею Медици
 character-item-group-LoadoutOuterMedical = Верхняя Одежда Медицинского Отдела
 character-item-group-LoadoutShoesMedical = Обувь Медицинского Отдела
 character-item-group-LoadoutUniformsMedical = Униформа Медицинского Отдела
-
 # Security
 character-item-group-LoadoutBeltSecurity = Ремни Отдела Службы Безопасности
 character-item-group-LoadoutEquipmentSecurity = Снаряжение Отдела Службы Безопасности
@@ -48,7 +43,6 @@ character-item-group-LoadoutNeckSecurity = Одежда На Шею Отдела
 character-item-group-LoadoutOuterSecurity = Верхняя Одежда Отдела Службы Безопасности
 character-item-group-LoadoutShoesSecurity = Обувь Отдела Службы Безопасности
 character-item-group-LoadoutUniformsSecurity = Униформа Отдела Службы Безопасности
-
 # Service
 character-item-group-LoadoutEquipmentService = Снаряжение Сервиса
 character-item-group-LoadoutMaskService = Маски Сервиса
@@ -56,15 +50,12 @@ character-item-group-LoadoutNeckService = Одежда На Шею Сервис
 character-item-group-LoadoutOuterService = Верхняя Одежда Сервиса
 character-item-group-LoadoutShoesService = Обувь Сервиса
 character-item-group-LoadoutUniformsService = Униформа Сервиса
-
 # Service - Bartender
 character-item-group-LoadoutBartenderAmmo = Аммуниция Бармена
 character-item-group-LoadoutBartenderOuterwear = Верхняя Одежда Бармена
 character-item-group-LoadoutBartenderWeapon = Оружие Бармена
-
 # Service - Musician
 character-item-group-LoadoutMusicianInstruments = Музыкальные Инструменты
-
 # Traits - Languages
 character-item-group-TraitsLanguagesBasic = Основные языки
 character-item-group-TraitsAccents = Акценты
diff --git a/Resources/Locale/ru-RU/machine/machine.ftl b/Resources/Locale/ru-RU/machine/machine.ftl
index d597123490..e3b85d0d0f 100644
--- a/Resources/Locale/ru-RU/machine/machine.ftl
+++ b/Resources/Locale/ru-RU/machine/machine.ftl
@@ -9,6 +9,10 @@ machine-upgrade-not-upgraded = Параметр [color=yellow]{ $upgraded }[/col
 machine-part-name-capacitor = Конденсатор
 machine-part-name-manipulator = Манипулятор
 machine-part-name-matter-bin = Ёмкость материи
+upgrade-power-draw = Потребление энергии
+upgrade-max-charge = Максимальный заряд
+upgrade-power-supply = Питание
+upgrade-power-supply-ramping = Скорость наращивания мощности
 machine-part-name-power-cell = Батарея
 two-way-lever-left = сдвинуть рычаг влево
 two-way-lever-right = сдвинуть рычаг вправо
diff --git a/Resources/Locale/ru-RU/materials/materials.ftl b/Resources/Locale/ru-RU/materials/materials.ftl
index 8d555bc5c1..f206cb45d0 100644
--- a/Resources/Locale/ru-RU/materials/materials.ftl
+++ b/Resources/Locale/ru-RU/materials/materials.ftl
@@ -23,7 +23,6 @@ materials-meat = мясо
 materials-web = шёлк
 materials-bones = кости
 materials-coal = уголь
-materials-diamond = алмазы
 materials-gunpowder = чёрный порох
 # Ores
 materials-raw-iron = руда железа
@@ -35,3 +34,5 @@ materials-raw-uranium = руда урана
 materials-raw-bananium = руда бананиума
 materials-raw-salt = каменная соль
 materials-raw-diamond = необработанные алмазы
+# Material Reclaimer
+material-reclaimer-upgrade-process-rate = Скорость обработки
diff --git a/Resources/Locale/ru-RU/medical/components/biomass-reclaimer-component.ftl b/Resources/Locale/ru-RU/medical/components/biomass-reclaimer-component.ftl
index 177bd8fda5..e1671fdeba 100644
--- a/Resources/Locale/ru-RU/medical/components/biomass-reclaimer-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/biomass-reclaimer-component.ftl
@@ -1 +1,3 @@
 biomass-reclaimer-suicide-others = { CAPITALIZE($victim) } запрыгивает в переработчик биомассы!
+biomass-reclaimer-component-upgrade-speed = Скорость
+biomass-reclaimer-component-upgrade-biomass-yield = Урожайность биомассы
diff --git a/Resources/Locale/ru-RU/medical/components/cloning-pod-component.ftl b/Resources/Locale/ru-RU/medical/components/cloning-pod-component.ftl
index b6e6e81a0d..ee41d78077 100644
--- a/Resources/Locale/ru-RU/medical/components/cloning-pod-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/cloning-pod-component.ftl
@@ -1,2 +1,4 @@
 cloning-pod-biomass = Содержит [color=red]{ $number }[/color] единиц биомассы.
+cloning-pod-component-upgrade-speed = Скорость клонирования
+cloning-pod-component-upgrade-biomass-requirement = Необходимо биомассы
 cloning-pod-component-upgrade-emag-requirement = Карточка замыкает что-то внутри капсулы клонирования.
diff --git a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
index 9b69dd637e..6519de2657 100644
--- a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
@@ -2,3 +2,4 @@
 
 medical-scanner-verb-enter = Залезть
 medical-scanner-verb-noun-occupant = пациента
+medical-scanner-upgrade-cloning = Шанс неудачного клонирования
diff --git a/Resources/Locale/ru-RU/medical/components/stasis-bed-component.ftl b/Resources/Locale/ru-RU/medical/components/stasis-bed-component.ftl
new file mode 100644
index 0000000000..24e043f5a7
--- /dev/null
+++ b/Resources/Locale/ru-RU/medical/components/stasis-bed-component.ftl
@@ -0,0 +1 @@
+stasis-bed-component-upgrade-stasis = Эффект стазиса
diff --git a/Resources/Locale/ru-RU/nuke/nuke-component.ftl b/Resources/Locale/ru-RU/nuke/nuke-component.ftl
index 7f9516f183..3bc3b2fa36 100644
--- a/Resources/Locale/ru-RU/nuke/nuke-component.ftl
+++ b/Resources/Locale/ru-RU/nuke/nuke-component.ftl
@@ -1,6 +1,6 @@
 nuke-component-cant-anchor-floor = Крепёжным болтам не удаётся закрепиться в полу!
 nuke-component-announcement-sender = Ядерная боеголовка
-nuke-component-announcement-armed = Внимание! Механизм самоуничтожения станции был активирован { $location }. До детонации { $time } секунд.
+nuke-component-announcement-armed = Внимание! Механизм самоуничтожения станции был активирован { $position }. До детонации {$time} секунд.
 nuke-component-announcement-unarmed = Механизм самоуничтожение станции деактивирован! Хорошего дня!
 nuke-component-announcement-send-codes = Внимание! Запрошенные коды самоуничтожения были отправлены на факс капитана.
 nuke-component-doafter-warning = Вы начинаете перебирать провода и кнопки, в попытке обезвредить ядерную бомбу. Это может занять некоторое время.
diff --git a/Resources/Locale/ru-RU/nutrition/components/fat-extractor.ftl b/Resources/Locale/ru-RU/nutrition/components/fat-extractor.ftl
index a0abe051fc..df8d461338 100644
--- a/Resources/Locale/ru-RU/nutrition/components/fat-extractor.ftl
+++ b/Resources/Locale/ru-RU/nutrition/components/fat-extractor.ftl
@@ -1,3 +1,4 @@
+fat-extractor-component-rate = Скорость извлечения
 fat-extractor-fact-1 = Жиры - это триглицериды, состоящие из комбинации различных структурных элементов: глицерина и жирных кислот.
 fat-extractor-fact-2 = Взрослым рекомендуется получать 20-35% потребляемой энергии из жиров.
 fat-extractor-fact-3 = Избыточный вес или ожирение повышают риск развития хронических заболеваний, таких как сердечно-сосудистые патологии, метаболический синдром, диабет 2 типа и некоторые виды рака.
diff --git a/Resources/Locale/ru-RU/psionics/psionic-powers.ftl b/Resources/Locale/ru-RU/psionics/psionic-powers.ftl
index 8b297e5104..d6e17004e5 100644
--- a/Resources/Locale/ru-RU/psionics/psionic-powers.ftl
+++ b/Resources/Locale/ru-RU/psionics/psionic-powers.ftl
@@ -1,4 +1,5 @@
 generic-power-initialization-feedback = Я проснулся.
+arleady-casting = Я не могу использовать более одной силы одновременно.
 # Dispel
 dispel-power-description = Рассеивайте вызванные сущности, такие как фамильяры или силовые стены.
 dispel-power-initialization-feedback = Силы судьбы для меня ничто. Я чувствую, что могу дотянуться до окружающих меня нитей и навязать реальность другим.
@@ -39,6 +40,26 @@ metapsionic-power-metapsionic-feedback = { CAPITALIZE($entity) } взирает
 psionic-regeneration-power-description = Доведите свой метоболизм до предела что бы ускорить регенерацию.
 psionic-regeneration-power-initialization-feedback = Я смотрю внутрь себя и нахожу источник жизни.
 psionic-regeneration-power-metapsionic-feedback = { CAPITALIZE($entity) } обладает непреодолимой волей к жизни
+# Healing Word
+action-name-healing-word = Слово Исцеления
+action-description-healing-word = Произнесите Меньший Секрет Жизни и восстановите здоровье другого.
+healing-word-power-description = Произнесите Меньший Секрет Жизни и восстановите здоровье другого.
+healing-word-power-initialization-feedback =
+    В начале времен было произнесено слово, которое принесло жизнь в Сферы.
+    Хотя это тяжело для моего разума, этот Секрет теперь известен мне.
+    Мне нужно лишь произнести его.
+healing-word-power-metapsionic-feedback = { CAPITALIZE($entity) } хранит Меньший Секрет Жизни.
+healing-word-begin = { CAPITALIZE($entity) } произносит слово, которое приносит радость и боль тем, кто его слышит.
+# Revivify
+action-name-revivify = Дыхание Жизни
+action-description-revivify = Произнесите Большой Секрет Жизни и верните другого к жизни.
+revivify-power-description = Произнесите Большой Секрет Жизни и верните другого к жизни.
+revivify-power-initialization-feedback =
+    На мгновение моя душа путешествует сквозь время и пространство к началу всего, и там я слышу это.
+    Секрет Жизни во всей его полноте. Я чувствую, как вся моя сущность выгорает изнутри, просто зная это.
+    Сила течет через меня, как могучая река, прося высвободиться простым произнесением слова.
+revivify-power-metapsionic-feedback = { CAPITALIZE($entity) } хранит Большой Секрет Жизни.
+revivify-word-begin = { CAPITALIZE($entity) } произносит слово такой божественной силы, что те, кто его слышит, плачут от радости.
 # Telegnosis
 telegnosis-power-description = Создайте проекцию что бы удалённо осматривать местность.
 telegnosis-power-initialization-feedback =
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
index fd8c4a846c..94d0a62c02 100644
--- a/Resources/Locale/ru-RU/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -3,6 +3,8 @@ research-discipline-industrial = Промышленность
 research-discipline-arsenal = Арсенал
 research-discipline-experimental = Экспериментальное
 research-discipline-civilian-services = Обслуживание персонала
+research-discipline-diamond-production = Алмазное производство
+lppresearch-technology-diamond-salvage-equipment = Продвинутое алмазное шахтёрское оборудование
 research-technology-fulton = Фултоны
 research-technology-Ion-gun = Ионное Оружие
 research-technology-salvage-equipment = Снаряжение для утилизации
@@ -35,9 +37,6 @@ research-technology-nonlethal-ammunition = Нелетальные боеприп
 research-technology-practice-ammunition = Учебные боеприпасы
 research-technology-concentrated-laser-weaponry = Концентрированное лазерное оружие
 research-technology-wave-particle-harnessing = Применение волновых частиц
-lppresearch-technology-combat-utility = Боевая медицина
-lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
-lppresearch-technology-basic-tracking = Базовое отслеживание
 research-technology-advanced-riot-control = Продвинутое противодействие беспорядкам
 research-technology-portable-microfusion-weaponry = Оруженый портативный микросинтез
 research-technology-experimental-battery-ammo = Экспериментальные батарейные боеприпасы
diff --git a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
index c141c684e8..71e6445808 100644
--- a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl
@@ -11,7 +11,7 @@ salvage-magnet-resources =
         [OreCoal] Уголь
         [OreQuartz] Кварц
         [OreGold] Золото
-        [OreDiamond] Алмазы
+        [LPPOreDiamond] Алмазы
         [OreSilver] Серебро
         [OrePlasma] Плазма
         [OreUranium] Уран
diff --git a/Resources/Locale/ru-RU/shuttles/thruster.ftl b/Resources/Locale/ru-RU/shuttles/thruster.ftl
index 0bab26ca13..3dba21cfc9 100644
--- a/Resources/Locale/ru-RU/shuttles/thruster.ftl
+++ b/Resources/Locale/ru-RU/shuttles/thruster.ftl
@@ -3,3 +3,4 @@ thruster-comp-disabled = Двигатель [color=red]выключён[/color].
 thruster-comp-nozzle-direction = Сопло направлено на [color=yellow]{ $direction }[/color].
 thruster-comp-nozzle-exposed = Сопло [color=green]расправлено[/color] в космос.
 thruster-comp-nozzle-not-exposed = Сопло [color=red]не расправлено[/color] в космос.
+thruster-comp-upgrade-thrust = Сила тяги
diff --git a/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl b/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl
index 89ee6d16db..05d36158aa 100644
--- a/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl
+++ b/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl
@@ -8,5 +8,7 @@ comp-emitter-turned-off = { $target } отключается.
 # Shows if the user attempts to activate the emitter while it's un-anchored.
 comp-emitter-not-anchored = { $target } не закреплён!
 # Upgrades
+emitter-component-upgrade-fire-rate = Скорострельность
+# Upgrades
 emitter-component-current-type = Установленный тип: { $type }.
 emitter-component-type-set = Установить тип: { $type }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl
index 0ea030f35d..f709616302 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl
@@ -65,5 +65,5 @@ ent-SuitStorageParamedic = { ent-SuitStorageBase }
     .suffix = Парамедик
     .desc = { ent-SuitStorageBase.desc }
 ent-SuitStorageCorpsman = { ent-SuitStorageBase }
-    .suffix = Морг
+    .suffix = Полевой Врач
     .desc = { ent-SuitStorageBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/backpack.ftl
index 86a9ba38ae..72d0665431 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/backpack.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/backpack.ftl
@@ -3,6 +3,5 @@ ent-ClothingBackpackMafiaFilled = { ent-ClothingBackpackSatchelLeather }
     .desc = { ent-ClothingBackpackSatchelLeather.desc }
 ent-ClothingBackpackParamedicFilledDV = { ent-ClothingBackpackMedical }
     .desc = { ent-ClothingBackpackMedical.desc }
-
 ent-ClothingBackpackLawyerFilled = { ent-ClothingBackpack }
     .desc = { ent-ClothingBackpack.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/duffelbag.ftl
index 2009854e71..8fa00d89f7 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/duffelbag.ftl
@@ -1,5 +1,4 @@
 ent-ClothingBackpackDuffelParamedicFilledDV = { ent-ClothingBackpackDuffelMedical }
     .desc = { ent-ClothingBackpackDuffelMedical.desc }
-
 ent-ClothingBackpackDuffelLawyerFilled = { ent-ClothingBackpackDuffel }
     .desc = { ent-ClothingBackpackDuffel.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/satchel.ftl
index 4e395685f7..a6d42cead3 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/satchel.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/backpacks/startergear/satchel.ftl
@@ -1,5 +1,4 @@
 ent-ClothingBackpackSatchelParamedicFilledDV = { ent-ClothingBackpackSatchelMedical }
     .desc = { ent-ClothingBackpackSatchelMedical.desc }
-
 ent-ClothingBackpackSatchelLawyerFilled = { ent-ClothingBackpackSatchel }
     .desc = { ent-ClothingBackpackSatchel.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl
deleted file mode 100644
index 139597f9cb..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/armory.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/food.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/food.ftl
deleted file mode 100644
index 139597f9cb..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/food.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/npc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/npc.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/npc.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/vending.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/vending.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/vending.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/head/hardsuit-helmets.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/head/hardsuit-helmets.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/head/hardsuit-helmets.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/hardsuits.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/hardsuits.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/hardsuits.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/mobs/player/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/mobs/player/vulpkanin.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/mobs/player/vulpkanin.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl
index bff9a984ed..500b1872bc 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl
@@ -10,11 +10,9 @@ ent-DrinkLemonDropGlass = { ent-DrinkGlass }
 ent-DrinkGreenGrassGlass = { ent-DrinkGlass }
     .desc = Необычно зелёный коктейль приправленный льдом, долькой лемона и трубочкой для питья.
     .suffix = зелёная травка
-
 ent-DrinkArsonistsBrewGlass = { ent-DrinkGlass }
     .desc = Ничего обычного в том, что он дымится.. или светится.. Всё в норме.
     .suffix = отвар поджигателя
-
 ent-DrinkMothamphetamineGlass = { ent-DrinkGlass }
     .desc = На удивление газированный напиток.. От него веет аурой хаоса.
     .suffix = метамфетамин
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
index 58474351ed..724d9016f9 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
@@ -44,7 +44,7 @@ ent-DefaultStationBeaconPark = { ent-DefaultStationBeacon }
     .suffix = Парк
     .desc = { ent-DefaultStationBeacon.desc }
 ent-DefaultStationBeaconCorpsman = { ent-DefaultStationBeaconSecurity }
-    .suffix = Морг
+    .suffix = Полевой Врач
     .desc = { ent-DefaultStationBeaconSecurity.desc }
 ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon }
     .suffix = Адвокатская
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/misc/rubber_stamp.ftl
index 444e0de5a8..69184d48b4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/misc/rubber_stamp.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/misc/rubber_stamp.ftl
@@ -1,4 +1,3 @@
-
 ent-RubberStampLawyer = печать адвоката
     .suffix = НЕ МАППИТЬ
     .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl
index 2023819be9..d92b58ee77 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl
@@ -32,10 +32,10 @@ ent-AirlockMaintProsecutorLocked = { ent-AirlockMaint }
     .suffix = Прокурор, Закрыто
     .desc = { ent-AirlockMaint.desc }
 ent-AirlockCorpsmanLocked = { ent-AirlockSecurity }
-    .suffix = Морг, Закрыто
+    .suffix = Полевой Врач, Закрыто
     .desc = { ent-AirlockSecurity.desc }
 ent-AirlockCorpsmanGlassLocked = { ent-AirlockSecurityGlass }
-    .suffix = Морг, Закрыто
+    .suffix = Полевой Врач, Закрыто
     .desc = { ent-AirlockSecurityGlass.desc }
 ent-AirlockExternalGlassShuttleEscapeSub = { ent-AirlockGlassShuttle }
     .suffix = Внешний, Выход, Стеклянный, Док
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl
deleted file mode 100644
index 139597f9cb..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl
new file mode 100644
index 0000000000..b118af2c47
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl
@@ -0,0 +1,2 @@
+ent-ClothingHeadHelmetHardsuitERTChaplain = шлем скафандра ОБР священника
+    .desc = Защитный костюм, который носят капитаны груп быстрого реагирования на чрезвычайные ситуации.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
new file mode 100644
index 0000000000..e17d1a0192
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
@@ -0,0 +1,2 @@
+ent-ClothingOuterHardsuitERTChaplain = скафандр ОБР священника
+    .desc = Защитный костюм, который носят капитаны груп быстрого реагирования на чрезвычайные ситуации.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl
index 54e4013aa6..0931b59ecb 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl
@@ -11,4 +11,3 @@ ent-ClothingOuterHardsuitEVAPrisoner = тюремный скафандр EVA
     .desc = Лёгкий космический скафандр, способный защитить заключённого от космического вакуума во время аварийной ситуации.
 ent-ClothingOuterHardsuitAncientEVA = пустотный скафандр NTSRA
     .desc = Древний космический скафандр, разработанный по заказу Центкома подразделением NTSRA - агентством космических исследований Nanotrasen. Он изготовлен с особой тщательностью, обеспечивая большую мобильность, чем большинство современных космических костюмов.
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/environmental.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/environmental.ftl
new file mode 100644
index 0000000000..54ffee9406
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/environmental.ftl
@@ -0,0 +1,23 @@
+ent-MarkerRadiation1 = Маркер уровня радиации
+    .suffix = интенсивность 1
+    .desc = { ent-MarkerBase.desc }
+ent-MarkerRadiation2 = { ent-MarkerRadiation1 }
+    .suffix = интенсивность 2
+    .desc = { ent-MarkerRadiation1.desc }
+ent-MarkerRadiation3 = { ent-MarkerRadiation1 }
+    .suffix = интенсивность 3
+    .desc = { ent-MarkerRadiation1.desc }
+ent-MarkerRadiation4 = { ent-MarkerRadiation1 }
+    .suffix = интенсивность 4
+    .desc = { ent-MarkerRadiation1.desc }
+ent-MarkerRadiation5 = { ent-MarkerRadiation1 }
+    .suffix = интенсивность 5
+    .desc = { ent-MarkerRadiation1.desc }
+ent-MarkerRadiation10 = { ent-MarkerRadiation1 }
+    .suffix = интенсивность 10
+    .desc = { ent-MarkerRadiation1.desc }
+ent-MarkerBlocker = маркер "Стена"
+    .suffix = невидимая стена
+    .desc = { ent-MarkerBase.desc }
+ent-MarkerWeatherblocker = маркер блокирования погодных условий
+    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/materials.ftl
index b5da72d16a..2f37d84006 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/materials.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/materials.ftl
@@ -43,7 +43,7 @@ ent-MaterialHideBear = медвежья шкура
     .desc = { ent-MaterialBase.desc }
 ent-MaterialHideCorgi = шкура корги
     .desc = Роскошная шкура, используемая в высокой моде. Ходят слухи, что их находят, когда старые корги отправляются на ферму.
-ent-MaterialDiamond = очищенный бриллиант
+ent-MaterialDiamond = очищенный алмаз
     .suffix = Полный
     .desc = { ent-MaterialBase.desc }
 ent-MaterialDiamond1 = { ent-MaterialDiamond }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
index 96ff217e68..c8de0e28e1 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
@@ -64,7 +64,7 @@ ent-RDIDCard = ID карта научного директора
     .desc = { ent-IDCardStandard.desc }
 ent-HoSIDCard = ID карта главы службы безопасности
     .desc = { ent-IDCardStandard.desc }
-ent-BrigmedicIDCard = ID карта медициского офицера
+ent-BrigmedicIDCard = ID карта полевого врача
     .desc = { ent-IDCardStandard.desc }
 ent-CentcomIDCard = ID карта старшего офицера
     .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
index b28b268e3f..1028c6d96c 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
@@ -11,7 +11,6 @@ ent-RubberStampCentcom = печать Центком
 ent-RubberStampChaplain = печать священника
     .suffix = НЕ МАППИТЬ
     .desc = { ent-RubberStampBase.desc }
-
 ent-RubberStampClown = печать клоуна
     .suffix = НЕ МАППИТЬ
     .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/base_cartridge.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/base_cartridge.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/base_cartridge.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/nuke.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/nuke.ftl
deleted file mode 100644
index 139597f9cb..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/nuke.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/epistemics.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/epistemics.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/epistemics.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/syndicate.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/syndicate.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/catalog/fills/crates/syndicate.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl
index 13350a41ed..74268625b4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl
@@ -5,4 +5,3 @@ ent-MobGiantSpiderVampire = онейрофаг
 ent-MobGiantSpiderVampireAngry = онейрофаг
     .suffix = Злой
     .desc = { ent-MobGiantSpiderVampire.desc }
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl
index 52e0da2aec..06093adff8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl
@@ -1,4 +1,3 @@
-
 ent-DrinkOrangeCreamiceGlass = { ent-DrinkGlass }
     .desc = Апельсиново, кремово, божественно.
     .suffix = апельсиновый кремовик
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl
index ab710ad406..d561f7e4e5 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl
@@ -1,4 +1,3 @@
-
 ent-DrinkSojuBottleFull = бутылка соджу
     .desc = Это как саке, но в этот раз вы реально хотите напиться.
 ent-DrinkTokkuri = токкури
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl
index d854aa1f9d..aa2d8b41e1 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl
@@ -1,2 +1,3 @@
 ent-SecBreachingHammer = штурмовой молот
     .desc = Огромный, тяжелый молот для пробития различных дверей или окон.
+    .suffix = НЕ МАППИТЬ
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl
deleted file mode 100644
index 8b13789179..0000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl
index 39a82ff404..32a0931bb4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl
@@ -1,4 +1,3 @@
-
 ent-WallPaper = бумажная стена
     .desc = Помогает изолироваться от страшных криков из додзё.
 ent-WallDrywall = гипсокартоновая стена
diff --git a/Resources/Locale/ru-RU/store/sales.ftl b/Resources/Locale/ru-RU/store/sales.ftl
new file mode 100644
index 0000000000..93f1798fe7
--- /dev/null
+++ b/Resources/Locale/ru-RU/store/sales.ftl
@@ -0,0 +1,2 @@
+store-sales-amount = [СКИДКА] { $amount }%!
+store-sales-over = [Скидка закончилась]
diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl
index 5f3cfb7c62..a74d8862d9 100644
--- a/Resources/Locale/ru-RU/traits/traits.ftl
+++ b/Resources/Locale/ru-RU/traits/traits.ftl
@@ -1,274 +1,214 @@
 trait-name-Blindness = Слепота
 trait-description-Blindness = Вы совершенно слепы и не можете видеть дальше нескольких метров перед собой.
 trait-examined-Blindness = [color=lightblue]{ CAPITALIZE(POSS-ADJ($target)) } глаза остекленелые и расфокусированные. Не похоже, что { SUBJECT($target) } может хорошо вас видеть, если может вообще.[/color]
-
 trait-name-Narcolepsy = Нарколепсия
 trait-description-Narcolepsy = Вас одолевают приступы сонливости
-
 trait-name-Pacifist = Пацифист
 trait-description-Pacifist = Вы не можете атаковать или причинить вред живым существам.
-
 trait-name-SelfAware = Самосознание
 trait-description-SelfAware =
     Вы обладаете острой интуицией своего тела и чувств.
     Вы можете точно оценить тяжесть своих ран и ожогов, как анализатор здоровья,
     и можете определить, есть ли у вас повреждения от токсинов или потери воздуха.
-
 trait-name-LightweightDrunk = Быстрое опьянение
 trait-description-LightweightDrunk = Алкоголь оказывает на вас более сильное воздействие
-
 trait-name-HeavyweightDrunk = Толерантность к алкоголю
-trait-description-HeavyweightDrunk =
-    Алкоголь боится тебя.
-
+trait-description-HeavyweightDrunk = Алкоголь боится тебя.
 trait-name-LiquorLifeline = Спасательный круг для ликера
 trait-description-LiquorLifeline =
     Забудьте о враче — просто зайдите в бар и получите свой "рецепт на этанол"!
     Когда вы пьёте, лечите [color=red]Механические[/color], [color=orange]Термические[/color], [color=orange]Электрические[/color], и [color=orange]Обморожение[/color], смотря на сколько вы пьяны.
     Вы также получаете преимущества [color=lightblue]Толерантности к алкоголю[/color].
-
 trait-name-Muted = Немой
 trait-description-Muted = Вы не можете говорить
-
 trait-name-BloodDeficiency = Дефицит крови
 trait-description-BloodDeficiency =
     Ваше тело теряет больше крови, чем может восполнить.
     Со временем вы теряете кровь, и если не лечиться, вы в конечном итоге умрете от потери крови.
-
 trait-name-Hemophilia = Гемофилия
 trait-description-Hemophilia =
     Способность вашего организма образовывать тромбы нарушена.
     Вы истекаете кровью в два раза дольше, у вас легкие синяки, и вы получаете на 10% больше дробящего урона.
-
 trait-name-Paracusia = Паракузия
 trait-description-Paracusia = Вы слышите звуки, которых на самом деле нет
-
 trait-name-PirateAccent = Пиратский акцент
 trait-description-PirateAccent = Ты не можешь перестать говорить как пират!
-
 trait-name-Accentless = Без акцента
 trait-description-Accentless = У вас нет того акцента, который обычно бывает у представителей вашего вида.
-
 trait-name-FrontalLisp = Сигматизм
 trait-description-FrontalLisp = У ваф имеютшя проблемы ш произношением.
-
 trait-name-Stutter = Социофобия
 trait-description-Stutter = Вы испытываете тревожность, когда говорите, что приводит к заиканию.
-
 trait-name-Snoring = Храп
 trait-description-Snoring = Вы храпите во время сна.
-
 trait-name-CPRTraining = Обученный СЛР
 trait-description-CPRTraining =
     В какой-то момент вашей жизни вы прошли обучение тому, как выполнять СЛР.
     Эта черта автоматически бесплатно предоставляется врачам и предназначена для немедицинских персонажей.
-
 trait-name-NormalVisionHarpy = Модификация трихромата
 trait-description-NormalVisionHarpy = Ваши глаза были модифицированы с помощью передовой медицины, чтобы видеть стандартные цвета: красный, зеленый и синий.
-
 trait-name-Southern = Южный протяжный говор
 trait-description-Southern = У тебя другая манера говорить. (Работает только на английском)
-
 trait-name-NormalVision = Модификация трихромата
 trait-description-NormalVision = Ваши глаза были изменены с помощью передовых медицинских технологий, чтобы они могли видеть стандартные цвета - красный, зеленый и синий.
-
 trait-name-Thieving = Бывалый вор
 trait-description-Thieving =
     У вас ловкие руки, и вы талантливо умеете убеждать людей в том, что у них есть вещи.
     Вы можете распознавать спрятанные в карман предметы, красть их тише и на 33% быстрее.
-
 trait-name-ForeignerLight = Унесённый ядерным взрывом (Легкое)
 trait-description-ForeignerLight =
     Вам трудно выучить основной язык этой станции, и поэтому вы не можете на нем говорить. Однако вы можете понимать, что другие говорят на этом языке.
     Чтобы помочь вам преодолеть это препятствие, у вас есть переводчик, который поможет вам говорить на основном языке этой станции.
-
 trait-name-Foreigner = Унесённый ядерным взрывом
 trait-description-Foreigner =
     По той или иной причине вы не говорите на основном языке станции.
     Вместо этого вам выдан переводчик, которым можете пользоваться только вы.
-
 trait-name-Saturnine = Мрачный
 trait-description-Saturnine = Вы от природы суровы и угрюмый человек. Ваше настроение постоянно ухудшается.
-
 trait-name-Sanguine = Оптимистичный
 trait-description-Sanguine = Вы от природы оптимистичны и жизнерадостны! Ваше настроение постоянно повышается в разы.
-
 trait-name-WillToLive = Воля К Жизни
 trait-description-WillToLive =
     У вас необычайно сильная "воля к жизни", и вы будете сопротивляться смерти сильнее, чем другие.
     ваш порог урона, при котором вы становитесь мертвым, увеличен на 10 пунктов.
-
 trait-name-WillToDie = Воля к Смерти
 trait-description-WillToDie =
     У вас необычайно слабая "воля к жизни", и вы будете умирать от ранений раньше, чем другие.
     ваш порог урона, при котором вы становитесь мертвым, снижен на 15 пунктов.
-
 trait-name-Tenacity = Упорство
 trait-description-Tenacity =
     Будь то благодаря упорству, силе воли или тонким бионическим усилениям, вы становитесь выносливее других.
     Ваш порог получения критического урона увеличен на 5 пунктов.
-
 trait-name-GlassJaw = Стеклянная челюсть
 trait-description-GlassJaw =
     Ваше тело более хрупкое, чем у других, что приводит к большему урону критическими травмами
     Ваш порог получения критического урона снижен на 10 пунктов.
-
 trait-name-HighAdrenaline = Высокий уровень адреналина
 trait-description-HighAdrenaline =
     В силу естественных причин, генетических или бионических особенностей, у вас более мощная надпочечниковая железа.
     При ранении ваши атаки в ближнем бою наносят на 10% больше урона, в дополнение к естественным бонусам от адреналина.
     Стандартные адреналиновые бонусы к урону в ближнем бою увеличиваются на 20%.
-
 trait-name-AdrenalDysfunction = Дисфункция надпочечников
 trait-description-AdrenalDysfunction =
     Ваши надпочечники полностью выведены из строя или, возможно, полностью отсутствуют.
     При ранении ваши атаки в ближнем бою не получают бонус.
     Стандартные бонусы от адреналина к урону в ближнем бою увеличиваются на 20%.
-
 trait-name-Masochism = Мазохизм
 trait-description-Masochism =
     Получая удовольствие от собственной боли, вы не испытываете такой скованности, как другие.
     Вы игнорируете первые 10% урона выносливости при атаках в ближнем бою.
-
 trait-name-LowPainTolerance = Низкая переносимость боли
 trait-description-LowPainTolerance =
     Ваша переносимость боли намного ниже средней, а ее воздействие более подавляюще.
     При получении урона выносливости ваш урон в ближнем бою уменьшается еще на 15%.
-
 trait-name-MartialArtist = Мастер боевых искусств
 trait-description-MartialArtist =
     Вы прошли подготовку по рукопашному бою, будь то на кулаках, ногах или когтях.
     Ваши кулаки бьют дальше и наносят на 50% больше урона.
     Это не относится ни к какому виду ручного оружия, а только к оружию, с которым вы родились.
-
 trait-name-Vigor = Сила
 trait-description-Vigor =
     Ваша выносливость повышается благодаря целеустремленности, физической подготовке или бионическим усилениям.
     Ваша выносливость увеличивается на 10 пунктов.
-
 trait-name-Lethargy = Летаргия
 trait-description-Lethargy =
     Вы устаете быстрее других, что делает вас более уязвимым к переутомлению.
     Ваша выносливость снижена на 15 пунктов.
-
 trait-name-SignLanguage = Язык жестов
 trait-description-SignLanguage =
     Вы можете понимать и использовать галактический язык жестов.
     Если вы по какой-либо причине не можете говорить, вы все равно можете общаться с помощью языка жестов.
-
 trait-name-SolCommon = Общий язык Солнечного Альянса
 trait-description-SolCommon =
     Общий язык Солнечного Альянса берёт свои корни из мандаринского диалекта китайского языка и эволюционировал как официальный язык Солнечного Альянса, при этом чиновники стремились объединить его в единый общий язык.
     На нём говорят государственные служащие, его преподают в школах, и его используют те, кто либо испытывает чувство национальной гордости за Альянс, либо оказался под влиянием его культуры.
-
 trait-name-Tradeband = Торговый язык
 trait-description-Tradeband =
     Происходящий от латинских и романских языков старой Земли, Торговый остается основным языком высшего класса человечества.
     Язык звучит элегантно и хорошо структурированно для большинства ушей. Он по-прежнему популярен среди торговцев, дипломатов и тех, кто стремится сохранить частичку романтического прошлого.
-
 trait-name-Freespeak = Свободная речь (Уличный)
 trait-description-Freespeak =
     Язык ренегатов и пограничников, происходящий от различных языков Земли, таких как хинди, объединенных в многокорневую мешанину, которая звучит несвязно или даже варварски для неносителей языка.
     Этот язык является единственной общей культурной идентичностью для людей на границе. Само по себе владение этим языком смело заявляет о свободном духе говорящего.
     Граждане Альянса часто называют его Уличным.
-
 trait-name-Elyran = Элиранский язык
 trait-description-Elyran =
     Стандартный Элиранский — это официальный язык Республики Элира. Он был создан на основе элементов фарси, арабского и турецкого языков.
     Влияние всех трёх этих языков прослеживается в его грамматике и словарном составе.
-
 trait-name-Voracious = Прожорливый
 trait-description-Voracious =
     Ничто не встанет между вами и вашей едой.
     Вы будете потреблять еду и напитки в два раза быстрее, чем обычно.
-
 trait-name-ParkourTraining = Тренировка по паркуру
 trait-description-ParkourTraining =
     Паркур - это ваше хобби, стиль жизни или профессиональная тренировка.
     Вы становитесь быстрее в лазании, ползании, лежании и вставании.
-
 trait-name-Sluggish = Вялый
 trait-description-Sluggish =
     Вы ориентируетесь в мире медленнее, чем другие, возможно, из-за состояния здоровья, гиподинамии или возраста.
     Вы двигаетесь медленнее, и вам требуется больше времени, чтобы подняться, лечь и встать с постели.
-
 trait-name-SnailPaced = Черепашьим шагом
 trait-description-SnailPaced =
     Вы передвигаетесь со скоростью улитки, возможно, из-за состояния здоровья, нарушения подвижности или возраста.
     Вы двигаетесь значительно медленнее, и вам требуется гораздо больше времени, чтобы подняться, лечь и встать.
-
 trait-name-LightStep = Легкий шаг
 trait-description-LightStep = Вы двигаетесь легким шагом, делая свои шаги тише.
-
 trait-name-Swashbuckler = Фехтовальщик
 trait-description-Swashbuckler =
     Вы являетесь экспертом в фехтовании, владея мечами, ножами и другими видами клинков с непревзойденным мастерством.
     Ваш бонус за удар ножом в ближнем бою увеличен до 35%, но бонус за удар тупым предметом в ближнем бою снижен до 20%.
-
 trait-name-Spearmaster = Мастер копья
 trait-description-Spearmaster =
     Вы превосходно владеете копьями, используя их как продолжение своего тела.
     Ваш бонус к прокалыванию в ближнем бою увеличен до 35%, но бонус к нанесению ударов тупым предметом в ближнем бою снижен до 20%.
-
 trait-name-WeaponsGeneralist = Специалист по оружию
 trait-description-WeaponsGeneralist =
     Вы мастер на все руки в обращении с оружием ближнего боя, что позволяет вам быть универсальным в своем арсенале.
     Ваш бонус к урону в ближнем бою за все виды грубого урона составляет 25%.
-
 trait-name-Singer = Певец
 trait-description-Singer = Вы, естественно, способны петь своим голосом простые мелодии.
-
 trait-name-LatentPsychic = Скрытый экстрасенс
 trait-description-LatentPsychic =
     Ваш разум и душа открыты ноосфере, что позволяет использовать телепатию.
     Таким образом, вы имеете право на потенциальное получение экстрасенсорных способностей.
     Вполне возможно, что за вами охотятся потусторонние силы, поэтому подумайте о том, чтобы сохранить свои способности в секрете.
-
 trait-name-PsionicInsulation = Изменение формы сигнала
 trait-description-PsionicInsulation =
     Вы - автомат из плоти и крови, оживляемый нейротрансмиттерами. Внутри вашего черепа находится полуторакилограммовый мешок мяса, дающий вам разум. Согласно современной теории познания, вы даже не существо с правами.
     Из хороших новостей то, что вы невосприимчивы к большинству положительных и отрицательных воздействий экстрасенсорных способностей.
     У этого заболевания могут быть и другие, неизвестные последствия.
-
 trait-name-NaturalTelepath = Врождённая телепатия
 trait-description-NaturalTelepath =
     Как одарённый с рождения, вы способны к быстрому телепатическому общению, независимо от того
     обладаете ли вы какими-либо заметными экстрасенсорными способностями. Это дает все те же преимущества и
     недостатки, что и экстрасенс, за исключением того, что вы гарантированно начнете с телепатической связью.
      Вы все еще можете обрести способности, так же, как и обычный экстрасенс.
-
 trait-name-TrapAvoider = Избегатель ловушек
 trait-description-TrapAvoider =
     Вы обладаете сверхъестественным чутьем на ловушки и будете неосознанно избегать их.
     Вы никогда не сможете их активировать.
-
 trait-name-AnomalousPositronics = Аномальная позитроника
 trait-description-AnomalousPositronics =
     Будь то преднамеренный дизайн от производителя, модификации на черном рынке или случайное упущение,
     вашему позитронному мозгу не хватает стандартной псионической изоляции. Как существо, у которого, как можно утверждать, есть душа,
     это, в более широком смысле, означает, что вы можете подвергаться влиянию Ноосферы.
-
 trait-name-Photophobia = Светобоязнь
 trait-description-Photophobia =
     Ваши глаза чрезвычайно чувствительны к яркому свету.
     В результате вы можете быть ослеплены на больший срок, чем другие, когда подвергаетесь воздействию внезапных вспышек света.
     Кроме того, ваши глаза с большей вероятностью могут пострадать от вспышек.
-
 trait-name-Clumsy = Неуклюжий
 trait-description-Clumsy =
     У вас серьезный дефицит зрительно-моторной координации, что приводит к неспособности делать некоторые вещи, которые другие воспринимали бы как должное.
     Любое оружие, которое вы попытаетесь использовать, скорее всего, повредит вам, чем другим. Вы не сможете взобраться на какой-либо объект, не поранившись.
-
 trait-name-Small = Низкий
 trait-description-Small =
     Вы намного меньше обычного человека и можете забираться в места, в которые другие обычно не помещаются, например в спортивные сумки.
     Эта черта никоим образом не изменяет размер вашего персонажа, она просто требует, чтобы ваш персонаж был размером не более стандартного Феленида.
-
 trait-name-TemperatureTolerance = Температурная терпимость
 trait-description-TemperatureTolerance =
     Вы хорошо переносите более низкие температуры. Вы можете длительное время находиться в условиях, температура которых немного ниже точки замерзания, например, внутри кухонной морозилки,
     или на залитом солнцем склоне горы, где находится знаменитая ледниковая станция.
-
 trait-name-Talons = Колющие Когти
 trait-description-Talons =
     Кончики ваших пальцев были заменены колющими когтями.
@@ -276,7 +216,6 @@ trait-description-Talons =
     или даже выдвижные когти из твердого пластика, встроенные в протез конечности.
     Ваши атаки в ближнем бою без оружия наносят колющий урон вместо стандартного для вашей расы урона.
     Это не влияет на урон, наносимый в любой форме вооруженного ближнего боя.
-
 trait-name-Claws = Режущие Когти
 trait-description-Claws =
     Кончики ваших пальцев были заменены острыми когтями.
@@ -284,14 +223,12 @@ trait-description-Claws =
     или даже выдвижные когти из твердого пластика, встроенные в протез конечности.
     Ваши атаки в ближнем бою без оружия наносят режущий урон вместо стандартного для вашей расы урона.
     Это не влияет на урон, наносимый в любой форме вооруженного ближнего боя.
-
 trait-name-NaturalWeaponRemoval = Удаление природного оружия
 trait-description-NaturalWeaponRemoval =
     Любое "природное оружие", с которым обычно рождается ваш вид, было удалено хирургическим путем.
     Это могло быть сделано для того, чтобы лучше вписаться в земные космические станции, или в качестве косметического решения.
     В результате ваши атаки без оружия наносят тупой урон вместо стандартного для вашего вида урона.
     Это не влияет на урон, наносимый в любой форме вооруженного ближнего боя.
-
 trait-name-StrikingCalluses = Поразительные мозоли
 trait-description-StrikingCalluses =
     Культовое усовершенствование, широко распространенное в мире кибернетических боевых искусств.
@@ -300,12 +237,10 @@ trait-description-StrikingCalluses =
     Владельцы протезов или бионических конечностей вместо этого будут иметь твердую пластиковую оболочку на костяшках пальцев.
     Эти улучшения увеличивают ваш урон от удара без оружия на 1 базовое очко, но не дают
     любые преимущества в любой форме вооруженного ближнего боя.
-
 trait-name-Spinarette = Бионические Фильеры
 trait-description-Spinarette =
     Этот орган, выращенный в пробирке, отмеченный торговой маркой и запатентованный корпорацией Cybersun, позиционируется как сугубо утилитарное усовершенствование, и продается в клиниках по всему известному миру. Он состоит из узелка, который традиционно
     имплантированный прямо под запястьем, он впитывает липиды организма и превращается в натуральный шелк.. Небольшое отверстие
     на ладони позволяет пользователю "раскручивать" эту нить. Пользователям этого усовершенствования обычно требуется в два раза больше пищи, чем обычному солнечному человеку, из-за высокой метаболической стоимости искусственного шелководства.
-
 trait-name-AddictionNicotine = Никотиновая зависимость
 trait-description-AddictionNicotine = У вас зависимость от никотина, и вам понадобятся частые перекуры, чтобы сохранить свой рассудок.
diff --git a/Resources/Locale/ru-RU/xenoarchaeology/traversal-distorter.ftl b/Resources/Locale/ru-RU/xenoarchaeology/traversal-distorter.ftl
index cd76267f30..cf37621a3e 100644
--- a/Resources/Locale/ru-RU/xenoarchaeology/traversal-distorter.ftl
+++ b/Resources/Locale/ru-RU/xenoarchaeology/traversal-distorter.ftl
@@ -6,3 +6,4 @@ traversal-distorter-set-up = Искажение обхода узлов наст
 traversal-distorter-set-down = Искажение обхода узлов настроено "в глубину", к более опасным узлам
 traversal-distorter-desc-up = Активация артефакта с большей вероятностью заставит его продвинуться к поверхности, к менее опасным узлам.
 traversal-distorter-desc-down = Активация артефакта с большей вероятностью заставит его продвинуться в глубину, к более опасным узлам.
+traversal-distorter-upgrade-bias = Эффективность смещения
diff --git a/Resources/Maps/_LostParadise/LP_Normandy.yml b/Resources/Maps/_LostParadise/LP_Normandy.yml
index 2bc50b526e..500d498812 100644
--- a/Resources/Maps/_LostParadise/LP_Normandy.yml
+++ b/Resources/Maps/_LostParadise/LP_Normandy.yml
@@ -107,7 +107,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAADwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAADwAAAAAADwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAAIwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAAIwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIQAAAAAAIQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAADwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAADwAAAAAADwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAAIwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAtQAAAAAAIwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAIQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -115,7 +115,7 @@ entities:
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAfgAAAAAAtQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
@@ -127,7 +127,7 @@ entities:
           version: 6
         -3,0:
           ind: -3,0
-          tiles: AQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAJQAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAJQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAJQAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAJQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAABgAAAAAABgAAAAAABgAAAAAAtQAAAAAABgAAAAAABgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAABgAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtQAAAAAABgAAAAAAGAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAfgAAAAAAfgAAAAAAGAAAAAAAfgAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-1:
           ind: -3,-1
@@ -167,7 +167,7 @@ entities:
           version: 6
         3,0:
           ind: 3,0
-          tiles: HAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAADAAAAAAADAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAEQAAAAAAEQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAEgAAAAAAEgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAANwAAAAAANwAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAA
+          tiles: HAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAtQAAAAAADAAAAAAADAAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAEgAAAAAAEgAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAANwAAAAAANwAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
@@ -183,7 +183,7 @@ entities:
           version: 6
         3,1:
           ind: 3,1
-          tiles: tQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAKgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAKgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAEgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAAMQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAA
+          tiles: tQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAKgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAANwAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAKgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtAAAAAAAtQAAAAAAKgAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAANwAAAAAAAgAAAAAANwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAANwAAAAAAAgAAAAAANwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAANwAAAAAANwAAAAAANwAAAAAAMQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAAQAAAAAAEgAAAAAAEgAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAJwAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAAtQAAAAAA
           version: 6
         2,1:
           ind: 2,1
@@ -1785,6 +1785,8 @@ entities:
             2744: 28,25
             2745: 28,25
             2793: 40,30
+            3120: -44,8
+            3122: -43,10
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -1876,6 +1878,8 @@ entities:
             2942: 81,-18
             2943: 81,-11
             2944: 79,-9
+            3123: -43,9
+            3124: -43,8
         - node:
             cleanable: True
             angle: 2.0943951023931953 rad
@@ -2264,6 +2268,7 @@ entities:
             2876: 73,-8
             2877: 69,-11
             2878: 81,-16
+            3125: -43,9
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
@@ -2388,6 +2393,7 @@ entities:
             2900: -13,-10
             2901: -22,-9
             2902: -31,-8
+            3126: -43,10
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2946,6 +2952,18 @@ entities:
             id: Rock03
           decals:
             882: 55.557835,19.889378
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Rock03
+          decals:
+            3118: -45,8
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Rock04
+          decals:
+            3119: -43,6
         - node:
             color: '#D4D4D428'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -3210,11 +3228,7 @@ entities:
             id: TrimlineInnerNeOverlayGreyscale
           decals:
             1261: 36,-3
-        - node:
-            color: '#52B4E9BE'
-            id: TrimlineInnerNeOverlayGreyscale
-          decals:
-            753: 57,5
+            3128: 57,5
         - node:
             color: '#9FED5896'
             id: TrimlineInnerNeOverlayGreyscale
@@ -3276,7 +3290,7 @@ entities:
             color: '#49C423FF'
             id: TrimlineInnerSeOverlayGreyscale
           decals:
-            747: 57,5
+            3131: 56,5
         - node:
             color: '#52B4E996'
             id: TrimlineInnerSeOverlayGreyscale
@@ -3358,7 +3372,7 @@ entities:
             color: '#49C423FF'
             id: TrimlineLineEOverlayGreyscale
           decals:
-            746: 57,4
+            3129: 56,4
         - node:
             color: '#52B4E996'
             id: TrimlineLineEOverlayGreyscale
@@ -3734,6 +3748,7 @@ entities:
           decals:
             744: 59,5
             745: 58,5
+            3130: 57,5
         - node:
             color: '#52B4E996'
             id: TrimlineLineSOverlayGreyscale
@@ -4171,6 +4186,12 @@ entities:
             id: TrimlineThinBoxOverlayGreyscale
           decals:
             1710: 35,-6
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#D381C996'
+            id: TrimlineThinBoxOverlayGreyscale
+          decals:
+            3127: 72,9
         - node:
             color: '#D4D4D428'
             id: TrimlineThinBoxOverlayGreyscale
@@ -6141,7 +6162,8 @@ entities:
           11,3:
             0: 7676
           11,-1:
-            0: 62702
+            0: 62694
+            3: 8
           11,4:
             0: 36863
           12,0:
@@ -6179,9 +6201,11 @@ entities:
           12,-3:
             0: 65535
           12,-2:
-            0: 30511
+            0: 13103
+            3: 17408
           12,-1:
-            0: 61559
+            3: 1
+            0: 61558
           12,4:
             0: 28775
           13,0:
@@ -6245,7 +6269,8 @@ entities:
           14,-5:
             0: 32631
           15,-4:
-            0: 29691
+            0: 13307
+            4: 16384
           15,-3:
             0: 30711
           15,-2:
@@ -6375,7 +6400,8 @@ entities:
             0: 12339
             1: 34952
           16,7:
-            0: 12339
+            0: 12307
+            3: 32
             1: 34952
           8,5:
             0: 57344
@@ -6561,10 +6587,10 @@ entities:
             0: 187
             1: 28672
           17,6:
-            3: 224
-            4: 57344
+            5: 224
+            6: 57344
           17,7:
-            5: 57568
+            7: 57568
           18,5:
             0: 61661
           18,6:
@@ -6680,15 +6706,15 @@ entities:
             0: 48051
           17,9:
             1: 65296
-            5: 12
+            7: 12
           17,10:
             0: 65280
             1: 8
           17,11:
             0: 65535
           17,8:
-            6: 224
-            5: 57344
+            8: 224
+            7: 57344
           18,9:
             1: 61696
             0: 206
@@ -6713,7 +6739,7 @@ entities:
             0: 206
           20,8:
             0: 2219
-            5: 13056
+            7: 13056
           20,9:
             1: 48
             0: 61576
@@ -6866,36 +6892,36 @@ entities:
           21,12:
             0: 17527
           22,10:
-            5: 65280
+            7: 65280
           22,11:
-            5: 65535
+            7: 65535
           22,8:
             0: 238
           22,12:
-            5: 36863
+            7: 36863
           22,7:
             0: 61166
           23,10:
-            5: 62208
+            7: 62208
           23,11:
-            5: 65535
+            7: 65535
           23,7:
             0: 65535
           23,12:
-            5: 65535
+            7: 65535
           23,8:
             0: 136
           24,10:
-            5: 61440
+            7: 61440
             1: 17
           24,11:
-            5: 16383
+            7: 16383
           21,13:
             0: 68
           24,12:
-            5: 65343
+            7: 65343
           24,13:
-            5: 15
+            7: 15
             1: 8704
           23,14:
             1: 8
@@ -6958,7 +6984,7 @@ entities:
             1: 61152
             0: 8
           25,12:
-            5: 1
+            7: 1
             1: 61166
           25,10:
             0: 34816
@@ -6971,7 +6997,7 @@ entities:
           25,14:
             1: 15
           25,13:
-            5: 8
+            7: 8
             1: 34816
           26,14:
             1: 3
@@ -7025,6 +7051,36 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -7111,6 +7167,17 @@ entities:
       - 4073
       - 6375
       - 6257
+  - uid: 6937
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -39.5,9.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7010
+      - 6943
+      - 16215
   - uid: 7145
     components:
     - type: Transform
@@ -7653,7 +7720,7 @@ entities:
       - 4137
       - 4138
       - 6276
-      - 6275
+      - 12440
   - uid: 15349
     components:
     - type: Transform
@@ -7669,7 +7736,7 @@ entities:
       - 4137
       - 4136
       - 6277
-      - 6274
+      - 12383
   - uid: 15351
     components:
     - type: Transform
@@ -8436,7 +8503,7 @@ entities:
       - 15455
       - 4016
       - 12166
-      - 6204
+      - 12382
       - 6324
   - uid: 15485
     components:
@@ -8724,6 +8791,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 62.5,45.5
       parent: 2
+  - uid: 12619
+    components:
+    - type: Transform
+      pos: -41.5,10.5
+      parent: 2
 - proto: AirlockArmoryGlassLocked
   entities:
   - uid: 14
@@ -8738,11 +8810,6 @@ entities:
     - type: Transform
       pos: 80.5,22.5
       parent: 2
-  - uid: 12203
-    components:
-    - type: Transform
-      pos: 83.5,17.5
-      parent: 2
   - uid: 12204
     components:
     - type: Transform
@@ -8950,6 +9017,12 @@ entities:
     - type: Transform
       pos: 53.5,-28.5
       parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,17.5
+      parent: 2
   - uid: 3957
     components:
     - type: Transform
@@ -9258,6 +9331,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,-1.5
       parent: 2
+- proto: AirlockJusticeLocked
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 2
 - proto: AirlockKitchenGlassLocked
   entities:
   - uid: 12143
@@ -9276,11 +9356,6 @@ entities:
       parent: 2
 - proto: AirlockLawyerLocked
   entities:
-  - uid: 74
-    components:
-    - type: Transform
-      pos: -5.5,10.5
-      parent: 2
   - uid: 75
     components:
     - type: Transform
@@ -9806,13 +9881,6 @@ entities:
     - type: Transform
       pos: 46.5,25.5
       parent: 2
-- proto: AirlockSecurity
-  entities:
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -38.5,6.5
-      parent: 2
 - proto: AirlockSecurityGlassLocked
   entities:
   - uid: 145
@@ -9891,6 +9959,13 @@ entities:
     - type: Transform
       pos: -20.5,-1.5
       parent: 2
+- proto: AirlockSecurityLocked
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      pos: -38.5,6.5
+      parent: 2
 - proto: AirlockShuttle
   entities:
   - uid: 15469
@@ -10027,11 +10102,6 @@ entities:
       parent: 2
 - proto: APCBasic
   entities:
-  - uid: 171
-    components:
-    - type: Transform
-      pos: -46.5,4.5
-      parent: 2
   - uid: 172
     components:
     - type: Transform
@@ -10241,6 +10311,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 96.5,-26.5
       parent: 2
+  - uid: 2275
+    components:
+    - type: Transform
+      pos: -65.5,4.5
+      parent: 2
   - uid: 11653
     components:
     - type: Transform
@@ -10339,6 +10414,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 72.5,-9.5
       parent: 2
+  - uid: 16220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,8.5
+      parent: 2
 - proto: APCElectronics
   entities:
   - uid: 211
@@ -10490,21 +10571,6 @@ entities:
     - type: Transform
       pos: 81.5,34.5
       parent: 2
-  - uid: 254
-    components:
-    - type: Transform
-      pos: 89.5,43.5
-      parent: 2
-  - uid: 255
-    components:
-    - type: Transform
-      pos: 88.5,44.5
-      parent: 2
-  - uid: 256
-    components:
-    - type: Transform
-      pos: 88.5,46.5
-      parent: 2
   - uid: 257
     components:
     - type: Transform
@@ -10515,15 +10581,10 @@ entities:
     - type: Transform
       pos: 88.5,50.5
       parent: 2
-  - uid: 259
-    components:
-    - type: Transform
-      pos: 88.5,45.5
-      parent: 2
   - uid: 260
     components:
     - type: Transform
-      pos: 89.5,42.5
+      pos: 94.5,51.5
       parent: 2
   - uid: 261
     components:
@@ -10570,6 +10631,21 @@ entities:
     - type: Transform
       pos: 81.5,35.5
       parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 92.5,51.5
+      parent: 2
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 93.5,51.5
+      parent: 2
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 95.5,51.5
+      parent: 2
   - uid: 1595
     components:
     - type: Transform
@@ -10600,11 +10676,6 @@ entities:
     - type: Transform
       pos: 93.5,42.5
       parent: 2
-  - uid: 2271
-    components:
-    - type: Transform
-      pos: 93.5,43.5
-      parent: 2
   - uid: 2272
     components:
     - type: Transform
@@ -10615,11 +10686,6 @@ entities:
     - type: Transform
       pos: 93.5,46.5
       parent: 2
-  - uid: 2274
-    components:
-    - type: Transform
-      pos: 93.5,44.5
-      parent: 2
   - uid: 2280
     components:
     - type: Transform
@@ -10660,16 +10726,6 @@ entities:
     - type: Transform
       pos: 98.5,50.5
       parent: 2
-  - uid: 3269
-    components:
-    - type: Transform
-      pos: 88.5,42.5
-      parent: 2
-  - uid: 4312
-    components:
-    - type: Transform
-      pos: 95.5,48.5
-      parent: 2
   - uid: 4313
     components:
     - type: Transform
@@ -10678,28 +10734,23 @@ entities:
   - uid: 4314
     components:
     - type: Transform
-      pos: 88.5,43.5
+      pos: 95.5,43.5
       parent: 2
-  - uid: 4337
+  - uid: 4336
     components:
     - type: Transform
-      pos: 89.5,44.5
+      pos: 95.5,44.5
       parent: 2
-  - uid: 4338
+  - uid: 4337
     components:
     - type: Transform
-      pos: 89.5,46.5
+      pos: 94.5,43.5
       parent: 2
   - uid: 4339
     components:
     - type: Transform
       pos: 89.5,47.5
       parent: 2
-  - uid: 4340
-    components:
-    - type: Transform
-      pos: 89.5,45.5
-      parent: 2
   - uid: 4341
     components:
     - type: Transform
@@ -10725,16 +10776,6 @@ entities:
     - type: Transform
       pos: 89.5,50.5
       parent: 2
-  - uid: 4607
-    components:
-    - type: Transform
-      pos: 90.5,42.5
-      parent: 2
-  - uid: 4608
-    components:
-    - type: Transform
-      pos: 90.5,45.5
-      parent: 2
   - uid: 4609
     components:
     - type: Transform
@@ -10765,16 +10806,6 @@ entities:
     - type: Transform
       pos: 96.5,50.5
       parent: 2
-  - uid: 4615
-    components:
-    - type: Transform
-      pos: 90.5,43.5
-      parent: 2
-  - uid: 4616
-    components:
-    - type: Transform
-      pos: 90.5,44.5
-      parent: 2
   - uid: 4618
     components:
     - type: Transform
@@ -10815,15 +10846,15 @@ entities:
     - type: Transform
       pos: 94.5,49.5
       parent: 2
-  - uid: 6321
+  - uid: 6764
     components:
     - type: Transform
-      pos: 94.5,51.5
+      pos: 93.5,43.5
       parent: 2
-  - uid: 6765
+  - uid: 6769
     components:
     - type: Transform
-      pos: 95.5,51.5
+      pos: 94.5,44.5
       parent: 2
   - uid: 6770
     components:
@@ -10855,26 +10886,11 @@ entities:
     - type: Transform
       pos: 91.5,49.5
       parent: 2
-  - uid: 6776
-    components:
-    - type: Transform
-      pos: 92.5,43.5
-      parent: 2
   - uid: 6777
     components:
     - type: Transform
       pos: 91.5,46.5
       parent: 2
-  - uid: 6779
-    components:
-    - type: Transform
-      pos: 95.5,47.5
-      parent: 2
-  - uid: 6780
-    components:
-    - type: Transform
-      pos: 95.5,43.5
-      parent: 2
   - uid: 6781
     components:
     - type: Transform
@@ -10885,11 +10901,6 @@ entities:
     - type: Transform
       pos: 99.5,45.5
       parent: 2
-  - uid: 6914
-    components:
-    - type: Transform
-      pos: 92.5,51.5
-      parent: 2
   - uid: 6916
     components:
     - type: Transform
@@ -10945,21 +10956,11 @@ entities:
     - type: Transform
       pos: 93.5,48.5
       parent: 2
-  - uid: 8072
-    components:
-    - type: Transform
-      pos: 93.5,51.5
-      parent: 2
   - uid: 8073
     components:
     - type: Transform
       pos: 98.5,44.5
       parent: 2
-  - uid: 8074
-    components:
-    - type: Transform
-      pos: 94.5,44.5
-      parent: 2
   - uid: 8076
     components:
     - type: Transform
@@ -10975,21 +10976,11 @@ entities:
     - type: Transform
       pos: 98.5,46.5
       parent: 2
-  - uid: 8079
-    components:
-    - type: Transform
-      pos: 95.5,44.5
-      parent: 2
   - uid: 8080
     components:
     - type: Transform
       pos: 98.5,45.5
       parent: 2
-  - uid: 8081
-    components:
-    - type: Transform
-      pos: 94.5,43.5
-      parent: 2
   - uid: 8107
     components:
     - type: Transform
@@ -11010,11 +11001,6 @@ entities:
     - type: Transform
       pos: 93.5,49.5
       parent: 2
-  - uid: 8683
-    components:
-    - type: Transform
-      pos: 91.5,43.5
-      parent: 2
   - uid: 8701
     components:
     - type: Transform
@@ -11040,11 +11026,6 @@ entities:
     - type: Transform
       pos: 92.5,42.5
       parent: 2
-  - uid: 10177
-    components:
-    - type: Transform
-      pos: 92.5,44.5
-      parent: 2
   - uid: 10178
     components:
     - type: Transform
@@ -11055,11 +11036,6 @@ entities:
     - type: Transform
       pos: 92.5,46.5
       parent: 2
-  - uid: 11538
-    components:
-    - type: Transform
-      pos: 95.5,46.5
-      parent: 2
   - uid: 11539
     components:
     - type: Transform
@@ -11070,11 +11046,6 @@ entities:
     - type: Transform
       pos: 91.5,45.5
       parent: 2
-  - uid: 12008
-    components:
-    - type: Transform
-      pos: 91.5,44.5
-      parent: 2
   - uid: 12639
     components:
     - type: Transform
@@ -11130,6 +11101,31 @@ entities:
     - type: Transform
       pos: 69.5,35.5
       parent: 2
+  - uid: 16267
+    components:
+    - type: Transform
+      pos: 93.5,44.5
+      parent: 2
+  - uid: 16268
+    components:
+    - type: Transform
+      pos: 92.5,43.5
+      parent: 2
+  - uid: 16269
+    components:
+    - type: Transform
+      pos: 92.5,44.5
+      parent: 2
+  - uid: 16270
+    components:
+    - type: Transform
+      pos: 91.5,43.5
+      parent: 2
+  - uid: 16271
+    components:
+    - type: Transform
+      pos: 91.5,44.5
+      parent: 2
 - proto: AtmosFixFreezerMarker
   entities:
   - uid: 271
@@ -11280,6 +11276,11 @@ entities:
     - type: Transform
       pos: 83.5,14.5
       parent: 2
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: -46.5,5.5
+      parent: 2
 - proto: AutolatheMachineCircuitboard
   entities:
   - uid: 214
@@ -11692,10 +11693,10 @@ entities:
       parent: 2
 - proto: BaseBallBat
   entities:
-  - uid: 338
+  - uid: 2248
     components:
     - type: Transform
-      pos: -42.528946,8.562815
+      pos: -45.889557,8.607788
       parent: 2
 - proto: BaseChemistryEmptyVial
   entities:
@@ -11705,6 +11706,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.677868,23.338121
       parent: 2
+- proto: Basketball
+  entities:
+  - uid: 2245
+    components:
+    - type: Transform
+      pos: -45.717552,8.451538
+      parent: 2
 - proto: Bed
   entities:
   - uid: 339
@@ -11732,21 +11740,6 @@ entities:
     - type: Transform
       pos: -20.5,3.5
       parent: 2
-  - uid: 344
-    components:
-    - type: Transform
-      pos: -46.5,5.5
-      parent: 2
-  - uid: 345
-    components:
-    - type: Transform
-      pos: -48.5,8.5
-      parent: 2
-  - uid: 347
-    components:
-    - type: Transform
-      pos: -48.5,5.5
-      parent: 2
   - uid: 348
     components:
     - type: Transform
@@ -11777,6 +11770,16 @@ entities:
     - type: Transform
       pos: 16.5,-2.5
       parent: 2
+  - uid: 8079
+    components:
+    - type: Transform
+      pos: -37.5,11.5
+      parent: 2
+  - uid: 8081
+    components:
+    - type: Transform
+      pos: -37.5,10.5
+      parent: 2
 - proto: BedsheetBlack
   entities:
   - uid: 354
@@ -11877,20 +11880,15 @@ entities:
     - type: Transform
       pos: -33.5,-4.5
       parent: 2
-  - uid: 12440
-    components:
-    - type: Transform
-      pos: -48.5,5.5
-      parent: 2
-  - uid: 12442
+  - uid: 6946
     components:
     - type: Transform
-      pos: -46.5,5.5
+      pos: -37.5,11.5
       parent: 2
-  - uid: 12444
+  - uid: 12624
     components:
     - type: Transform
-      pos: -48.5,8.5
+      pos: -37.5,10.5
       parent: 2
 - proto: BedsheetQM
   entities:
@@ -12058,6 +12056,11 @@ entities:
       parent: 2
 - proto: BenchSteelLeft
   entities:
+  - uid: 13393
+    components:
+    - type: Transform
+      pos: -14.5,-6.5
+      parent: 2
   - uid: 13442
     components:
     - type: Transform
@@ -12071,6 +12074,16 @@ entities:
       parent: 2
 - proto: BenchSteelMiddle
   entities:
+  - uid: 2252
+    components:
+    - type: Transform
+      pos: -15.5,-6.5
+      parent: 2
+  - uid: 2261
+    components:
+    - type: Transform
+      pos: -16.5,-6.5
+      parent: 2
   - uid: 13441
     components:
     - type: Transform
@@ -12084,6 +12097,11 @@ entities:
       parent: 2
 - proto: BenchSteelRight
   entities:
+  - uid: 13394
+    components:
+    - type: Transform
+      pos: -17.5,-6.5
+      parent: 2
   - uid: 13443
     components:
     - type: Transform
@@ -12921,16 +12939,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 88.5,28.5
       parent: 2
-  - uid: 13391
-    components:
-    - type: Transform
-      pos: -16.5,-5.5
-      parent: 2
-  - uid: 13393
-    components:
-    - type: Transform
-      pos: -15.5,-5.5
-      parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 472
@@ -14511,26 +14519,11 @@ entities:
     - type: Transform
       pos: -68.5,6.5
       parent: 2
-  - uid: 786
-    components:
-    - type: Transform
-      pos: -68.5,5.5
-      parent: 2
   - uid: 787
     components:
     - type: Transform
       pos: -68.5,4.5
       parent: 2
-  - uid: 788
-    components:
-    - type: Transform
-      pos: -70.5,4.5
-      parent: 2
-  - uid: 789
-    components:
-    - type: Transform
-      pos: -71.5,4.5
-      parent: 2
   - uid: 790
     components:
     - type: Transform
@@ -14541,11 +14534,6 @@ entities:
     - type: Transform
       pos: -73.5,4.5
       parent: 2
-  - uid: 792
-    components:
-    - type: Transform
-      pos: -69.5,4.5
-      parent: 2
   - uid: 793
     components:
     - type: Transform
@@ -18241,11 +18229,21 @@ entities:
     - type: Transform
       pos: 89.5,48.5
       parent: 2
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: 92.5,43.5
+      parent: 2
   - uid: 1578
     components:
     - type: Transform
       pos: 99.5,49.5
       parent: 2
+  - uid: 1579
+    components:
+    - type: Transform
+      pos: 90.5,43.5
+      parent: 2
   - uid: 1580
     components:
     - type: Transform
@@ -18271,16 +18269,116 @@ entities:
     - type: Transform
       pos: 97.5,50.5
       parent: 2
+  - uid: 1596
+    components:
+    - type: Transform
+      pos: 91.5,43.5
+      parent: 2
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 94.5,43.5
+      parent: 2
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: 95.5,43.5
+      parent: 2
+  - uid: 2230
+    components:
+    - type: Transform
+      pos: 93.5,43.5
+      parent: 2
+  - uid: 2241
+    components:
+    - type: Transform
+      pos: 88.5,45.5
+      parent: 2
+  - uid: 2242
+    components:
+    - type: Transform
+      pos: 87.5,46.5
+      parent: 2
+  - uid: 2262
+    components:
+    - type: Transform
+      pos: -71.5,6.5
+      parent: 2
+  - uid: 2271
+    components:
+    - type: Transform
+      pos: -69.5,6.5
+      parent: 2
+  - uid: 2274
+    components:
+    - type: Transform
+      pos: -70.5,6.5
+      parent: 2
+  - uid: 2279
+    components:
+    - type: Transform
+      pos: 90.5,44.5
+      parent: 2
   - uid: 2544
     components:
     - type: Transform
       pos: 72.5,-8.5
       parent: 2
+  - uid: 3068
+    components:
+    - type: Transform
+      pos: 88.5,46.5
+      parent: 2
   - uid: 4291
     components:
     - type: Transform
       pos: 42.5,-24.5
       parent: 2
+  - uid: 5507
+    components:
+    - type: Transform
+      pos: -67.5,3.5
+      parent: 2
+  - uid: 5723
+    components:
+    - type: Transform
+      pos: -68.5,-3.5
+      parent: 2
+  - uid: 5971
+    components:
+    - type: Transform
+      pos: -68.5,-4.5
+      parent: 2
+  - uid: 5972
+    components:
+    - type: Transform
+      pos: -68.5,-5.5
+      parent: 2
+  - uid: 5973
+    components:
+    - type: Transform
+      pos: -67.5,-5.5
+      parent: 2
+  - uid: 5974
+    components:
+    - type: Transform
+      pos: -68.5,-1.5
+      parent: 2
+  - uid: 5975
+    components:
+    - type: Transform
+      pos: -68.5,3.5
+      parent: 2
+  - uid: 5986
+    components:
+    - type: Transform
+      pos: -68.5,2.5
+      parent: 2
+  - uid: 5987
+    components:
+    - type: Transform
+      pos: -65.5,4.5
+      parent: 2
   - uid: 6907
     components:
     - type: Transform
@@ -18291,6 +18389,31 @@ entities:
     - type: Transform
       pos: 65.5,48.5
       parent: 2
+  - uid: 6947
+    components:
+    - type: Transform
+      pos: -43.5,7.5
+      parent: 2
+  - uid: 6948
+    components:
+    - type: Transform
+      pos: -43.5,8.5
+      parent: 2
+  - uid: 6950
+    components:
+    - type: Transform
+      pos: -42.5,10.5
+      parent: 2
+  - uid: 6951
+    components:
+    - type: Transform
+      pos: -42.5,11.5
+      parent: 2
+  - uid: 7020
+    components:
+    - type: Transform
+      pos: -43.5,10.5
+      parent: 2
   - uid: 7088
     components:
     - type: Transform
@@ -18311,6 +18434,26 @@ entities:
     - type: Transform
       pos: 58.5,43.5
       parent: 2
+  - uid: 7142
+    components:
+    - type: Transform
+      pos: -43.5,11.5
+      parent: 2
+  - uid: 7143
+    components:
+    - type: Transform
+      pos: -41.5,10.5
+      parent: 2
+  - uid: 7465
+    components:
+    - type: Transform
+      pos: -42.5,8.5
+      parent: 2
+  - uid: 7543
+    components:
+    - type: Transform
+      pos: -42.5,9.5
+      parent: 2
   - uid: 7559
     components:
     - type: Transform
@@ -19726,51 +19869,6 @@ entities:
     - type: Transform
       pos: 87.5,42.5
       parent: 2
-  - uid: 11981
-    components:
-    - type: Transform
-      pos: 87.5,43.5
-      parent: 2
-  - uid: 11982
-    components:
-    - type: Transform
-      pos: 88.5,43.5
-      parent: 2
-  - uid: 11983
-    components:
-    - type: Transform
-      pos: 89.5,43.5
-      parent: 2
-  - uid: 11984
-    components:
-    - type: Transform
-      pos: 90.5,43.5
-      parent: 2
-  - uid: 11985
-    components:
-    - type: Transform
-      pos: 91.5,43.5
-      parent: 2
-  - uid: 11986
-    components:
-    - type: Transform
-      pos: 92.5,43.5
-      parent: 2
-  - uid: 11987
-    components:
-    - type: Transform
-      pos: 93.5,43.5
-      parent: 2
-  - uid: 11988
-    components:
-    - type: Transform
-      pos: 94.5,43.5
-      parent: 2
-  - uid: 11989
-    components:
-    - type: Transform
-      pos: 95.5,43.5
-      parent: 2
   - uid: 11990
     components:
     - type: Transform
@@ -20176,6 +20274,21 @@ entities:
     - type: Transform
       pos: 103.5,43.5
       parent: 2
+  - uid: 12501
+    components:
+    - type: Transform
+      pos: 90.5,42.5
+      parent: 2
+  - uid: 12566
+    components:
+    - type: Transform
+      pos: 89.5,42.5
+      parent: 2
+  - uid: 12614
+    components:
+    - type: Transform
+      pos: -46.5,2.5
+      parent: 2
   - uid: 12660
     components:
     - type: Transform
@@ -20666,6 +20779,11 @@ entities:
     - type: Transform
       pos: 81.5,35.5
       parent: 2
+  - uid: 12833
+    components:
+    - type: Transform
+      pos: 89.5,44.5
+      parent: 2
   - uid: 12852
     components:
     - type: Transform
@@ -20836,6 +20954,36 @@ entities:
     - type: Transform
       pos: -15.5,-12.5
       parent: 2
+  - uid: 13336
+    components:
+    - type: Transform
+      pos: 88.5,42.5
+      parent: 2
+  - uid: 13357
+    components:
+    - type: Transform
+      pos: 89.5,45.5
+      parent: 2
+  - uid: 13385
+    components:
+    - type: Transform
+      pos: -45.5,2.5
+      parent: 2
+  - uid: 13391
+    components:
+    - type: Transform
+      pos: -47.5,2.5
+      parent: 2
+  - uid: 13405
+    components:
+    - type: Transform
+      pos: -40.5,10.5
+      parent: 2
+  - uid: 13410
+    components:
+    - type: Transform
+      pos: -38.5,10.5
+      parent: 2
   - uid: 13547
     components:
     - type: Transform
@@ -23251,6 +23399,16 @@ entities:
     - type: Transform
       pos: 92.5,13.5
       parent: 2
+  - uid: 16203
+    components:
+    - type: Transform
+      pos: -46.5,1.5
+      parent: 2
+  - uid: 16219
+    components:
+    - type: Transform
+      pos: -39.5,10.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 1532
@@ -23275,11 +23433,31 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -59.5,-4.5
+      parent: 2
   - uid: 376
     components:
     - type: Transform
       pos: 14.5,1.5
       parent: 2
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 79.5,42.5
+      parent: 2
+  - uid: 789
+    components:
+    - type: Transform
+      pos: -59.5,-3.5
+      parent: 2
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -60.5,-3.5
+      parent: 2
   - uid: 1534
     components:
     - type: Transform
@@ -23478,22 +23656,12 @@ entities:
   - uid: 1575
     components:
     - type: Transform
-      pos: 83.5,47.5
+      pos: -62.5,-3.5
       parent: 2
   - uid: 1576
     components:
     - type: Transform
-      pos: 82.5,47.5
-      parent: 2
-  - uid: 1577
-    components:
-    - type: Transform
-      pos: 81.5,47.5
-      parent: 2
-  - uid: 1579
-    components:
-    - type: Transform
-      pos: 84.5,47.5
+      pos: -61.5,-3.5
       parent: 2
   - uid: 1581
     components:
@@ -23530,31 +23698,6 @@ entities:
     - type: Transform
       pos: 80.5,47.5
       parent: 2
-  - uid: 1593
-    components:
-    - type: Transform
-      pos: 86.5,44.5
-      parent: 2
-  - uid: 1594
-    components:
-    - type: Transform
-      pos: 86.5,43.5
-      parent: 2
-  - uid: 1596
-    components:
-    - type: Transform
-      pos: 86.5,42.5
-      parent: 2
-  - uid: 1597
-    components:
-    - type: Transform
-      pos: 86.5,46.5
-      parent: 2
-  - uid: 1598
-    components:
-    - type: Transform
-      pos: 86.5,45.5
-      parent: 2
   - uid: 1602
     components:
     - type: Transform
@@ -24700,11 +24843,6 @@ entities:
     - type: Transform
       pos: -64.5,4.5
       parent: 2
-  - uid: 1833
-    components:
-    - type: Transform
-      pos: -54.5,4.5
-      parent: 2
   - uid: 1834
     components:
     - type: Transform
@@ -25810,30 +25948,180 @@ entities:
     - type: Transform
       pos: 74.5,-30.5
       parent: 2
-  - uid: 2807
+  - uid: 2276
     components:
     - type: Transform
-      pos: 86.5,41.5
+      pos: 79.5,43.5
+      parent: 2
+  - uid: 2277
+    components:
+    - type: Transform
+      pos: 79.5,44.5
+      parent: 2
+  - uid: 2278
+    components:
+    - type: Transform
+      pos: 79.5,41.5
+      parent: 2
+  - uid: 3123
+    components:
+    - type: Transform
+      pos: 91.5,45.5
+      parent: 2
+  - uid: 4222
+    components:
+    - type: Transform
+      pos: 80.5,40.5
+      parent: 2
+  - uid: 4240
+    components:
+    - type: Transform
+      pos: 83.5,40.5
+      parent: 2
+  - uid: 4241
+    components:
+    - type: Transform
+      pos: 82.5,40.5
       parent: 2
   - uid: 4279
     components:
     - type: Transform
-      pos: 85.5,47.5
+      pos: 79.5,40.5
+      parent: 2
+  - uid: 4298
+    components:
+    - type: Transform
+      pos: -57.5,3.5
+      parent: 2
+  - uid: 4299
+    components:
+    - type: Transform
+      pos: 81.5,40.5
+      parent: 2
+  - uid: 4338
+    components:
+    - type: Transform
+      pos: 91.5,44.5
+      parent: 2
+  - uid: 4340
+    components:
+    - type: Transform
+      pos: 93.5,44.5
+      parent: 2
+  - uid: 4360
+    components:
+    - type: Transform
+      pos: 96.5,45.5
       parent: 2
   - uid: 4362
     components:
     - type: Transform
-      pos: 86.5,47.5
+      pos: 96.5,47.5
       parent: 2
-  - uid: 8075
+  - uid: 4450
     components:
     - type: Transform
-      pos: 87.5,47.5
+      pos: 96.5,49.5
       parent: 2
-  - uid: 8083
+  - uid: 4453
     components:
     - type: Transform
-      pos: 88.5,47.5
+      pos: 95.5,49.5
+      parent: 2
+  - uid: 4454
+    components:
+    - type: Transform
+      pos: 94.5,44.5
+      parent: 2
+  - uid: 4529
+    components:
+    - type: Transform
+      pos: 91.5,49.5
+      parent: 2
+  - uid: 4608
+    components:
+    - type: Transform
+      pos: 95.5,44.5
+      parent: 2
+  - uid: 6204
+    components:
+    - type: Transform
+      pos: -55.5,3.5
+      parent: 2
+  - uid: 6274
+    components:
+    - type: Transform
+      pos: -56.5,3.5
+      parent: 2
+  - uid: 6275
+    components:
+    - type: Transform
+      pos: 86.5,48.5
+      parent: 2
+  - uid: 6321
+    components:
+    - type: Transform
+      pos: 85.5,48.5
+      parent: 2
+  - uid: 6442
+    components:
+    - type: Transform
+      pos: 84.5,48.5
+      parent: 2
+  - uid: 6443
+    components:
+    - type: Transform
+      pos: 83.5,48.5
+      parent: 2
+  - uid: 6450
+    components:
+    - type: Transform
+      pos: 82.5,48.5
+      parent: 2
+  - uid: 6453
+    components:
+    - type: Transform
+      pos: 81.5,48.5
+      parent: 2
+  - uid: 6765
+    components:
+    - type: Transform
+      pos: 88.5,48.5
+      parent: 2
+  - uid: 6768
+    components:
+    - type: Transform
+      pos: 87.5,48.5
+      parent: 2
+  - uid: 6776
+    components:
+    - type: Transform
+      pos: 95.5,45.5
+      parent: 2
+  - uid: 6778
+    components:
+    - type: Transform
+      pos: 89.5,48.5
+      parent: 2
+  - uid: 6785
+    components:
+    - type: Transform
+      pos: 92.5,44.5
+      parent: 2
+  - uid: 6914
+    components:
+    - type: Transform
+      pos: 96.5,46.5
+      parent: 2
+  - uid: 6915
+    components:
+    - type: Transform
+      pos: 96.5,48.5
+      parent: 2
+  - uid: 8403
+    components:
+    - type: Transform
+      pos: 93.5,50.5
       parent: 2
   - uid: 11743
     components:
@@ -25890,11 +26178,6 @@ entities:
     - type: Transform
       pos: 52.5,31.5
       parent: 2
-  - uid: 12569
-    components:
-    - type: Transform
-      pos: 89.5,47.5
-      parent: 2
   - uid: 12570
     components:
     - type: Transform
@@ -25910,210 +26193,235 @@ entities:
     - type: Transform
       pos: 90.5,45.5
       parent: 2
-  - uid: 12573
+  - uid: 12580
     components:
     - type: Transform
-      pos: 90.5,44.5
+      pos: 90.5,48.5
       parent: 2
-  - uid: 12574
+  - uid: 12581
     components:
     - type: Transform
-      pos: 90.5,43.5
+      pos: 90.5,49.5
       parent: 2
-  - uid: 12575
+  - uid: 12583
     components:
     - type: Transform
-      pos: 91.5,43.5
+      pos: 91.5,50.5
       parent: 2
-  - uid: 12576
+  - uid: 12607
     components:
     - type: Transform
-      pos: 92.5,43.5
+      pos: 95.5,50.5
       parent: 2
-  - uid: 12577
+  - uid: 12622
     components:
     - type: Transform
-      pos: 93.5,43.5
+      pos: 79.5,45.5
       parent: 2
-  - uid: 12578
+  - uid: 12626
     components:
     - type: Transform
-      pos: 94.5,43.5
+      pos: 79.5,47.5
       parent: 2
-  - uid: 12579
+  - uid: 12631
     components:
     - type: Transform
-      pos: 95.5,43.5
+      pos: 94.5,50.5
       parent: 2
-  - uid: 12580
+  - uid: 12705
     components:
     - type: Transform
-      pos: 90.5,48.5
+      pos: 92.5,50.5
       parent: 2
-  - uid: 12581
+  - uid: 13402
     components:
     - type: Transform
-      pos: 90.5,49.5
+      pos: -58.5,3.5
       parent: 2
-  - uid: 12582
+  - uid: 13416
     components:
     - type: Transform
-      pos: 90.5,50.5
+      pos: 79.5,46.5
       parent: 2
-  - uid: 12583
+  - uid: 13964
     components:
     - type: Transform
-      pos: 91.5,50.5
+      pos: 67.5,-27.5
       parent: 2
-  - uid: 12584
+  - uid: 13965
     components:
     - type: Transform
-      pos: 91.5,51.5
+      pos: 66.5,-27.5
       parent: 2
-  - uid: 12585
+  - uid: 13966
     components:
     - type: Transform
-      pos: 92.5,51.5
+      pos: 66.5,-28.5
       parent: 2
-  - uid: 12586
+  - uid: 13967
     components:
     - type: Transform
-      pos: 93.5,51.5
+      pos: 66.5,-29.5
       parent: 2
-  - uid: 12587
+  - uid: 13968
     components:
     - type: Transform
-      pos: 94.5,51.5
+      pos: 66.5,-30.5
       parent: 2
-  - uid: 12588
+  - uid: 13982
     components:
     - type: Transform
-      pos: 95.5,51.5
+      pos: 69.5,-33.5
       parent: 2
-  - uid: 12601
+  - uid: 13983
     components:
     - type: Transform
-      pos: 95.5,44.5
+      pos: 70.5,-33.5
       parent: 2
-  - uid: 12602
+  - uid: 13984
     components:
     - type: Transform
-      pos: 95.5,45.5
+      pos: 71.5,-33.5
       parent: 2
-  - uid: 12603
+  - uid: 13985
     components:
     - type: Transform
-      pos: 95.5,46.5
+      pos: 72.5,-33.5
       parent: 2
-  - uid: 12604
+  - uid: 14632
     components:
     - type: Transform
-      pos: 95.5,47.5
+      pos: 47.5,21.5
       parent: 2
-  - uid: 12605
+  - uid: 14638
     components:
     - type: Transform
-      pos: 95.5,48.5
+      pos: 47.5,25.5
       parent: 2
-  - uid: 12606
+  - uid: 14729
     components:
     - type: Transform
-      pos: 95.5,49.5
+      pos: 47.5,26.5
       parent: 2
-  - uid: 12607
+  - uid: 14732
     components:
     - type: Transform
-      pos: 95.5,50.5
+      pos: 47.5,27.5
       parent: 2
-  - uid: 12608
+  - uid: 14733
     components:
     - type: Transform
-      pos: 85.5,41.5
+      pos: 47.5,28.5
       parent: 2
-  - uid: 12649
+  - uid: 14734
     components:
     - type: Transform
-      pos: 84.5,41.5
+      pos: 47.5,29.5
       parent: 2
-  - uid: 13964
+  - uid: 14736
     components:
     - type: Transform
-      pos: 67.5,-27.5
+      pos: 47.5,23.5
       parent: 2
-  - uid: 13965
+  - uid: 16272
     components:
     - type: Transform
-      pos: 66.5,-27.5
+      pos: -63.5,-3.5
       parent: 2
-  - uid: 13966
+  - uid: 16273
     components:
     - type: Transform
-      pos: 66.5,-28.5
+      pos: -64.5,-3.5
       parent: 2
-  - uid: 13967
+  - uid: 16274
     components:
     - type: Transform
-      pos: 66.5,-29.5
+      pos: -65.5,-3.5
       parent: 2
-  - uid: 13968
+  - uid: 16277
     components:
     - type: Transform
-      pos: 66.5,-30.5
+      pos: -59.5,3.5
       parent: 2
-  - uid: 13982
+  - uid: 16278
     components:
     - type: Transform
-      pos: 69.5,-33.5
+      pos: -59.5,4.5
       parent: 2
-  - uid: 13983
+  - uid: 16279
     components:
     - type: Transform
-      pos: 70.5,-33.5
+      pos: -59.5,5.5
       parent: 2
-  - uid: 13984
+  - uid: 16280
     components:
     - type: Transform
-      pos: 71.5,-33.5
+      pos: -59.5,6.5
       parent: 2
-  - uid: 13985
+  - uid: 16281
     components:
     - type: Transform
-      pos: 72.5,-33.5
+      pos: -59.5,7.5
       parent: 2
-  - uid: 14632
+  - uid: 16282
     components:
     - type: Transform
-      pos: 47.5,21.5
+      pos: -59.5,8.5
       parent: 2
-  - uid: 14638
+  - uid: 16283
     components:
     - type: Transform
-      pos: 47.5,25.5
+      pos: -58.5,8.5
       parent: 2
-  - uid: 14729
+  - uid: 16284
     components:
     - type: Transform
-      pos: 47.5,26.5
+      pos: -57.5,8.5
       parent: 2
-  - uid: 14732
+  - uid: 16285
     components:
     - type: Transform
-      pos: 47.5,27.5
+      pos: -56.5,8.5
       parent: 2
-  - uid: 14733
+  - uid: 16286
     components:
     - type: Transform
-      pos: 47.5,28.5
+      pos: -56.5,7.5
       parent: 2
-  - uid: 14734
+  - uid: 16287
     components:
     - type: Transform
-      pos: 47.5,29.5
+      pos: -56.5,6.5
       parent: 2
-  - uid: 14736
+  - uid: 16288
     components:
     - type: Transform
-      pos: 47.5,23.5
+      pos: -55.5,6.5
+      parent: 2
+  - uid: 16289
+    components:
+    - type: Transform
+      pos: -54.5,6.5
+      parent: 2
+  - uid: 16290
+    components:
+    - type: Transform
+      pos: -53.5,6.5
+      parent: 2
+  - uid: 16292
+    components:
+    - type: Transform
+      pos: -53.5,7.5
+      parent: 2
+  - uid: 16293
+    components:
+    - type: Transform
+      pos: -52.5,7.5
+      parent: 2
+  - uid: 16294
+    components:
+    - type: Transform
+      pos: -51.5,7.5
       parent: 2
 - proto: CableHVStack
   entities:
@@ -26144,6 +26452,16 @@ entities:
     - type: Transform
       pos: 19.5,31.5
       parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -37.5,6.5
+      parent: 2
+  - uid: 1598
+    components:
+    - type: Transform
+      pos: 95.5,50.5
+      parent: 2
   - uid: 2040
     components:
     - type: Transform
@@ -26234,11 +26552,6 @@ entities:
     - type: Transform
       pos: -32.5,11.5
       parent: 2
-  - uid: 2094
-    components:
-    - type: Transform
-      pos: -33.5,11.5
-      parent: 2
   - uid: 2097
     components:
     - type: Transform
@@ -26899,11 +27212,6 @@ entities:
     - type: Transform
       pos: -64.5,4.5
       parent: 2
-  - uid: 2230
-    components:
-    - type: Transform
-      pos: -64.5,3.5
-      parent: 2
   - uid: 2231
     components:
     - type: Transform
@@ -26954,66 +27262,6 @@ entities:
     - type: Transform
       pos: -68.5,9.5
       parent: 2
-  - uid: 2241
-    components:
-    - type: Transform
-      pos: -68.5,2.5
-      parent: 2
-  - uid: 2242
-    components:
-    - type: Transform
-      pos: -68.5,1.5
-      parent: 2
-  - uid: 2243
-    components:
-    - type: Transform
-      pos: -68.5,0.5
-      parent: 2
-  - uid: 2244
-    components:
-    - type: Transform
-      pos: -68.5,-0.5
-      parent: 2
-  - uid: 2245
-    components:
-    - type: Transform
-      pos: -68.5,-1.5
-      parent: 2
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: -68.5,-2.5
-      parent: 2
-  - uid: 2247
-    components:
-    - type: Transform
-      pos: -68.5,-3.5
-      parent: 2
-  - uid: 2248
-    components:
-    - type: Transform
-      pos: -68.5,-4.5
-      parent: 2
-  - uid: 2249
-    components:
-    - type: Transform
-      pos: -68.5,-5.5
-      parent: 2
-  - uid: 2250
-    components:
-    - type: Transform
-      pos: -67.5,-5.5
-      parent: 2
-  - uid: 2251
-    components:
-    - type: Transform
-      pos: -66.5,-5.5
-      parent: 2
-  - uid: 2252
-    components:
-    - type: Transform
-      pos: -65.5,-5.5
-      parent: 2
   - uid: 2253
     components:
     - type: Transform
@@ -27054,16 +27302,6 @@ entities:
     - type: Transform
       pos: -53.5,3.5
       parent: 2
-  - uid: 2261
-    components:
-    - type: Transform
-      pos: -54.5,4.5
-      parent: 2
-  - uid: 2262
-    components:
-    - type: Transform
-      pos: -54.5,3.5
-      parent: 2
   - uid: 2263
     components:
     - type: Transform
@@ -27099,41 +27337,11 @@ entities:
     - type: Transform
       pos: -49.5,0.5
       parent: 2
-  - uid: 2275
-    components:
-    - type: Transform
-      pos: 84.5,47.5
-      parent: 2
-  - uid: 2276
-    components:
-    - type: Transform
-      pos: 83.5,47.5
-      parent: 2
-  - uid: 2277
-    components:
-    - type: Transform
-      pos: 82.5,47.5
-      parent: 2
-  - uid: 2278
-    components:
-    - type: Transform
-      pos: 81.5,47.5
-      parent: 2
-  - uid: 2279
-    components:
-    - type: Transform
-      pos: 80.5,47.5
-      parent: 2
   - uid: 2283
     components:
     - type: Transform
       pos: 78.5,49.5
       parent: 2
-  - uid: 2284
-    components:
-    - type: Transform
-      pos: 79.5,47.5
-      parent: 2
   - uid: 2285
     components:
     - type: Transform
@@ -28749,10 +28957,10 @@ entities:
     - type: Transform
       pos: 33.5,27.5
       parent: 2
-  - uid: 4299
+  - uid: 4242
     components:
     - type: Transform
-      pos: 89.5,47.5
+      pos: 79.5,48.5
       parent: 2
   - uid: 4389
     components:
@@ -28769,10 +28977,40 @@ entities:
     - type: Transform
       pos: 24.5,28.5
       parent: 2
-  - uid: 6778
+  - uid: 4604
     components:
     - type: Transform
-      pos: 86.5,47.5
+      pos: 94.5,50.5
+      parent: 2
+  - uid: 4686
+    components:
+    - type: Transform
+      pos: 81.5,48.5
+      parent: 2
+  - uid: 4688
+    components:
+    - type: Transform
+      pos: 80.5,48.5
+      parent: 2
+  - uid: 5014
+    components:
+    - type: Transform
+      pos: -40.5,6.5
+      parent: 2
+  - uid: 6046
+    components:
+    - type: Transform
+      pos: -65.5,4.5
+      parent: 2
+  - uid: 6145
+    components:
+    - type: Transform
+      pos: -65.5,-5.5
+      parent: 2
+  - uid: 6193
+    components:
+    - type: Transform
+      pos: -65.5,-4.5
       parent: 2
   - uid: 6783
     components:
@@ -28784,11 +29022,6 @@ entities:
     - type: Transform
       pos: 92.5,50.5
       parent: 2
-  - uid: 6915
-    components:
-    - type: Transform
-      pos: 85.5,47.5
-      parent: 2
   - uid: 6919
     components:
     - type: Transform
@@ -28809,26 +29042,16 @@ entities:
     - type: Transform
       pos: 90.5,50.5
       parent: 2
-  - uid: 8082
-    components:
-    - type: Transform
-      pos: 88.5,47.5
-      parent: 2
-  - uid: 11259
+  - uid: 8116
     components:
     - type: Transform
-      pos: 93.5,44.5
+      pos: 93.5,49.5
       parent: 2
   - uid: 11396
     components:
     - type: Transform
       pos: 78.5,40.5
       parent: 2
-  - uid: 11511
-    components:
-    - type: Transform
-      pos: 87.5,47.5
-      parent: 2
   - uid: 11635
     components:
     - type: Transform
@@ -29369,16 +29592,6 @@ entities:
     - type: Transform
       pos: 93.5,50.5
       parent: 2
-  - uid: 12382
-    components:
-    - type: Transform
-      pos: 90.5,45.5
-      parent: 2
-  - uid: 12383
-    components:
-    - type: Transform
-      pos: 90.5,46.5
-      parent: 2
   - uid: 12473
     components:
     - type: Transform
@@ -29394,20 +29607,35 @@ entities:
     - type: Transform
       pos: 43.5,15.5
       parent: 2
-  - uid: 12488
+  - uid: 12490
     components:
     - type: Transform
-      pos: 90.5,44.5
+      pos: 83.5,48.5
       parent: 2
-  - uid: 12513
+  - uid: 12627
     components:
     - type: Transform
-      pos: 91.5,44.5
+      pos: 96.5,50.5
       parent: 2
-  - uid: 12544
+  - uid: 12628
     components:
     - type: Transform
-      pos: 92.5,44.5
+      pos: 96.5,48.5
+      parent: 2
+  - uid: 12629
+    components:
+    - type: Transform
+      pos: 96.5,49.5
+      parent: 2
+  - uid: 12630
+    components:
+    - type: Transform
+      pos: 82.5,48.5
+      parent: 2
+  - uid: 12646
+    components:
+    - type: Transform
+      pos: 96.5,47.5
       parent: 2
   - uid: 12786
     components:
@@ -29434,6 +29662,11 @@ entities:
     - type: Transform
       pos: 48.5,17.5
       parent: 2
+  - uid: 13401
+    components:
+    - type: Transform
+      pos: -38.5,6.5
+      parent: 2
   - uid: 13762
     components:
     - type: Transform
@@ -30019,6 +30252,176 @@ entities:
     - type: Transform
       pos: 64.5,-10.5
       parent: 2
+  - uid: 16214
+    components:
+    - type: Transform
+      pos: -32.5,10.5
+      parent: 2
+  - uid: 16218
+    components:
+    - type: Transform
+      pos: -39.5,6.5
+      parent: 2
+  - uid: 16261
+    components:
+    - type: Transform
+      pos: 84.5,48.5
+      parent: 2
+  - uid: 16262
+    components:
+    - type: Transform
+      pos: 85.5,48.5
+      parent: 2
+  - uid: 16263
+    components:
+    - type: Transform
+      pos: 86.5,48.5
+      parent: 2
+  - uid: 16264
+    components:
+    - type: Transform
+      pos: 87.5,48.5
+      parent: 2
+  - uid: 16265
+    components:
+    - type: Transform
+      pos: 88.5,48.5
+      parent: 2
+  - uid: 16266
+    components:
+    - type: Transform
+      pos: 89.5,48.5
+      parent: 2
+  - uid: 16275
+    components:
+    - type: Transform
+      pos: -65.5,-3.5
+      parent: 2
+  - uid: 16291
+    components:
+    - type: Transform
+      pos: -54.5,3.5
+      parent: 2
+  - uid: 16295
+    components:
+    - type: Transform
+      pos: -55.5,3.5
+      parent: 2
+  - uid: 16296
+    components:
+    - type: Transform
+      pos: -56.5,3.5
+      parent: 2
+  - uid: 16297
+    components:
+    - type: Transform
+      pos: -57.5,3.5
+      parent: 2
+  - uid: 16298
+    components:
+    - type: Transform
+      pos: -58.5,3.5
+      parent: 2
+  - uid: 16299
+    components:
+    - type: Transform
+      pos: -59.5,3.5
+      parent: 2
+  - uid: 16300
+    components:
+    - type: Transform
+      pos: -59.5,4.5
+      parent: 2
+  - uid: 16301
+    components:
+    - type: Transform
+      pos: -59.5,5.5
+      parent: 2
+  - uid: 16302
+    components:
+    - type: Transform
+      pos: -59.5,6.5
+      parent: 2
+  - uid: 16303
+    components:
+    - type: Transform
+      pos: -59.5,7.5
+      parent: 2
+  - uid: 16304
+    components:
+    - type: Transform
+      pos: -60.5,7.5
+      parent: 2
+  - uid: 16305
+    components:
+    - type: Transform
+      pos: -61.5,7.5
+      parent: 2
+  - uid: 16306
+    components:
+    - type: Transform
+      pos: -62.5,7.5
+      parent: 2
+  - uid: 16307
+    components:
+    - type: Transform
+      pos: -63.5,7.5
+      parent: 2
+  - uid: 16308
+    components:
+    - type: Transform
+      pos: -64.5,7.5
+      parent: 2
+  - uid: 16309
+    components:
+    - type: Transform
+      pos: -65.5,7.5
+      parent: 2
+  - uid: 16310
+    components:
+    - type: Transform
+      pos: -66.5,7.5
+      parent: 2
+  - uid: 16311
+    components:
+    - type: Transform
+      pos: -67.5,7.5
+      parent: 2
+  - uid: 16312
+    components:
+    - type: Transform
+      pos: -41.5,6.5
+      parent: 2
+  - uid: 16313
+    components:
+    - type: Transform
+      pos: -42.5,6.5
+      parent: 2
+  - uid: 16316
+    components:
+    - type: Transform
+      pos: -42.5,8.5
+      parent: 2
+  - uid: 16317
+    components:
+    - type: Transform
+      pos: -43.5,6.5
+      parent: 2
+  - uid: 16318
+    components:
+    - type: Transform
+      pos: -43.5,7.5
+      parent: 2
+  - uid: 16319
+    components:
+    - type: Transform
+      pos: -43.5,8.5
+      parent: 2
+  - uid: 16320
+    components:
+    - type: Transform
+      pos: -41.5,8.5
+      parent: 2
 - proto: CableMVStack
   entities:
   - uid: 2614
@@ -30068,6 +30471,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 86.5,18.5
       parent: 2
+  - uid: 16276
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -59.5,-4.5
+      parent: 2
 - proto: CandleBlueSmallInfinite
   entities:
   - uid: 13354
@@ -30250,10 +30659,10 @@ entities:
       parent: 2
 - proto: CannabisSeeds
   entities:
-  - uid: 2639
+  - uid: 12567
     components:
     - type: Transform
-      pos: -42.326252,8.414097
+      pos: -45.436092,8.498413
       parent: 2
 - proto: CarbonDioxideCanister
   entities:
@@ -33962,16 +34371,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.830437,5.6190715
       parent: 2
-  - uid: 13425
-    components:
-    - type: Transform
-      pos: -15.31891,-6.51791
-      parent: 2
-  - uid: 14050
+  - uid: 13408
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 49.47059,-3.5406685
+      pos: 49.657784,-2.8150163
       parent: 2
   - uid: 14191
     components:
@@ -34171,38 +34575,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.54207,23.693987
       parent: 2
-- proto: CheapLighter
-  entities:
-  - uid: 13396
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
-  - uid: 13420
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
-  - uid: 13421
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
-  - uid: 13422
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
-  - uid: 13423
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
-  - uid: 13424
-    components:
-    - type: Transform
-      pos: -14.156409,-7.36166
-      parent: 2
 - proto: CheapRollerBedSpawnFolded
   entities:
   - uid: 3054
@@ -34249,10 +34621,10 @@ entities:
     - type: Transform
       pos: 47.5,-2.5
       parent: 2
-  - uid: 4222
+  - uid: 12589
     components:
     - type: Transform
-      pos: 49.5,-2.5
+      pos: 48.5,-3.5
       parent: 2
 - proto: ChessBoard
   entities:
@@ -34315,17 +34687,6 @@ entities:
     - type: Transform
       pos: 16.89298,-24.980135
       parent: 2
-- proto: CigCartonBlack
-  entities:
-  - uid: 12292
-    components:
-    - type: Transform
-      parent: 12291
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CigCartonMixed
   entities:
   - uid: 12294
@@ -34344,56 +34705,6 @@ entities:
     - type: Transform
       pos: -17.770985,-4.47945
       parent: 2
-  - uid: 13408
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.456409,-7.6054096
-      parent: 2
-  - uid: 13409
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.456409,-7.6054096
-      parent: 2
-  - uid: 13410
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.456409,-7.6054096
-      parent: 2
-  - uid: 13411
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.456409,-7.6054096
-      parent: 2
-- proto: CigPackGreen
-  entities:
-  - uid: 13415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.137659,-7.6054096
-      parent: 2
-  - uid: 13416
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.137659,-7.6054096
-      parent: 2
-  - uid: 13417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.137659,-7.6054096
-      parent: 2
-  - uid: 13418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.137659,-7.6054096
-      parent: 2
 - proto: CigPackRed
   entities:
   - uid: 3064
@@ -34401,30 +34712,6 @@ entities:
     - type: Transform
       pos: -17.47411,-4.2607
       parent: 2
-  - uid: 13407
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.812659,-7.62416
-      parent: 2
-  - uid: 13412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.812659,-7.6054096
-      parent: 2
-  - uid: 13413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.812659,-7.6054096
-      parent: 2
-  - uid: 13414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.812659,-7.6054096
-      parent: 2
 - proto: CircuitImprinter
   entities:
   - uid: 3065
@@ -34507,22 +34794,6 @@ entities:
     - type: Transform
       pos: 10.5,12.5
       parent: 2
-  - uid: 12291
-    components:
-    - type: Transform
-      pos: -36.5,11.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 12292
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 12453
     components:
     - type: Transform
@@ -34553,6 +34824,11 @@ entities:
     - type: Transform
       pos: 69.5,-27.5
       parent: 2
+  - uid: 14050
+    components:
+    - type: Transform
+      pos: -34.5,11.5
+      parent: 2
   - uid: 14337
     components:
     - type: Transform
@@ -35466,13 +35742,6 @@ entities:
     - type: Transform
       pos: -23.447702,4.800497
       parent: 2
-- proto: ClothingHeadHelmetEVA
-  entities:
-  - uid: 3123
-    components:
-    - type: Transform
-      pos: -42.215073,10.864062
-      parent: 2
 - proto: ClothingHeadHelmetSwat
   entities:
   - uid: 3124
@@ -35783,13 +36052,6 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterHardsuitEVA
-  entities:
-  - uid: 3143
-    components:
-    - type: Transform
-      pos: -42.34528,10.434375
-      parent: 2
 - proto: ClothingOuterHardsuitSalvage
   entities:
   - uid: 3144
@@ -38260,8 +38522,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -38278,24 +38540,26 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 10775
-          - 11480
-          - 11486
-          - 11830
-          - 11831
-          - 11832
-          - 12106
-          - 12131
-          - 12132
-          - 12201
-          - 12545
-          - 12551
-          - 12557
+          - 8074
+          - 8072
           - 16012
+          - 12557
+          - 12551
+          - 12545
+          - 12201
+          - 12132
+          - 12131
+          - 12106
+          - 11832
+          - 11831
+          - 11830
+          - 11486
+          - 11480
+          - 10775
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: null
+          ent: 8075
 - proto: CrateMedicalSurgery
   entities:
   - uid: 3288
@@ -38647,15 +38911,15 @@ entities:
       parent: 2
 - proto: CryogenicSleepUnitSpawnerPrisoner
   entities:
-  - uid: 9624
+  - uid: 8082
     components:
     - type: Transform
-      pos: -44.5,8.5
+      pos: -40.5,11.5
       parent: 2
-  - uid: 9625
+  - uid: 15617
     components:
     - type: Transform
-      pos: -45.5,8.5
+      pos: -39.5,11.5
       parent: 2
 - proto: CryoPod
   entities:
@@ -38664,6 +38928,13 @@ entities:
     - type: Transform
       pos: 50.5,-9.5
       parent: 2
+- proto: CryostasisBeaker
+  entities:
+  - uid: 13382
+    components:
+    - type: Transform
+      pos: 48.028965,-2.4634538
+      parent: 2
 - proto: CryoxadoneBeakerSmall
   entities:
   - uid: 14174
@@ -39281,6 +39552,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 64.5,-21.5
       parent: 2
+  - uid: 16326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-12.5
+      parent: 2
 - proto: DinnerSofaCorner
   entities:
   - uid: 3388
@@ -42208,13 +42485,6 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: DoubleEmergencyOxygenTankFilled
-  entities:
-  - uid: 3885
-    components:
-    - type: Transform
-      pos: -42.20205,10.265103
-      parent: 2
 - proto: DresserCaptainFilled
   entities:
   - uid: 3886
@@ -42584,10 +42854,10 @@ entities:
       parent: 2
 - proto: DrinkMugMetal
   entities:
-  - uid: 12501
+  - uid: 16221
     components:
     - type: Transform
-      pos: -8.440036,10.657619
+      pos: -8.669537,10.430412
       parent: 2
 - proto: DrinkMugRed
   entities:
@@ -42867,22 +43137,22 @@ entities:
       parent: 2
 - proto: Emitter
   entities:
-  - uid: 4298
+  - uid: 345
     components:
     - type: Transform
-      pos: 93.5,50.5
+      rot: -1.5707963267948966 rad
+      pos: 96.5,47.5
       parent: 2
-  - uid: 8066
+  - uid: 1833
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 90.5,47.5
+      pos: 93.5,49.5
       parent: 2
-  - uid: 11537
+  - uid: 8066
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 93.5,44.5
+      rot: 1.5707963267948966 rad
+      pos: 90.5,47.5
       parent: 2
 - proto: EmpGrenade
   entities:
@@ -46828,6 +47098,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15501
+  - uid: 16215
+    components:
+    - type: Transform
+      pos: -41.5,10.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6937
 - proto: Fireplace
   entities:
   - uid: 4217
@@ -46919,11 +47197,11 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 6768
+  - uid: 8635
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 56.5,-19.5
+      pos: 58.5,-16.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -46971,6 +47249,14 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 16323
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-18.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: FloorLavaEntity
   entities:
   - uid: 4226
@@ -47183,24 +47469,6 @@ entities:
     - type: Transform
       pos: 64.569855,9.483208
       parent: 2
-  - uid: 4240
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.38584,5.677499
-      parent: 2
-  - uid: 4241
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.57348,5.489999
-      parent: 2
-  - uid: 4242
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.417114,5.239999
-      parent: 2
   - uid: 4243
     components:
     - type: Transform
@@ -47956,6 +48224,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 71.5,36.5
       parent: 2
+  - uid: 16231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,46.5
+      parent: 2
+  - uid: 16232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,47.5
+      parent: 2
+  - uid: 16233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,48.5
+      parent: 2
 - proto: GasPassiveGate
   entities:
   - uid: 4300
@@ -48050,6 +48336,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 71.5,35.5
       parent: 2
+  - uid: 16234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 92.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 92.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
 - proto: GasPipeBend
   entities:
   - uid: 51
@@ -48902,14 +49204,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 82.5,39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4451
     components:
     - type: Transform
@@ -49271,13 +49565,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4597
-    components:
-    - type: Transform
-      pos: 85.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4601
     components:
     - type: Transform
@@ -49285,13 +49572,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 5975
-    components:
-    - type: Transform
-      pos: 84.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 6787
     components:
     - type: Transform
@@ -49303,6 +49583,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 101.5,45.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
   - uid: 6904
     components:
     - type: Transform
@@ -49314,6 +49596,14 @@ entities:
     - type: Transform
       pos: 102.5,50.5
       parent: 2
+  - uid: 7019
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8100
     components:
     - type: Transform
@@ -49322,6 +49612,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9624
+    components:
+    - type: Transform
+      pos: 81.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10773
     components:
     - type: Transform
@@ -49333,36 +49630,151 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 101.5,50.5
       parent: 2
-  - uid: 12618
+  - uid: 11983
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 80.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 11984
+    components:
+    - type: Transform
+      pos: 84.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 11985
+    components:
+    - type: Transform
+      pos: 85.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 11986
+    components:
+    - type: Transform
+      pos: 80.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 11987
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 79.5,39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 11988
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 77.5,39.5
+      pos: 79.5,48.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12619
+  - uid: 12602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12603
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 81.5,39.5
+      pos: -42.5,8.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#008000FF'
-  - uid: 12631
+      color: '#FF1212FF'
+  - uid: 12604
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 81.5,48.5
+      pos: -42.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12605
+    components:
+    - type: Transform
+      pos: -37.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12606
+    components:
+    - type: Transform
+      pos: -36.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,39.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
+  - uid: 13395
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 14624
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 23.5,29.5
       parent: 2
+  - uid: 16225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,46.5
+      parent: 2
+  - uid: 16243
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 97.5,49.5
+      parent: 2
+  - uid: 16244
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,51.5
+      parent: 2
+  - uid: 16245
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,49.5
+      parent: 2
+  - uid: 16253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 91.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
 - proto: GasPipeBroken
   entities:
   - uid: 13608
@@ -49511,6 +49923,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 12328
+    components:
+    - type: Transform
+      pos: -36.5,5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPipeStraight
   entities:
   - uid: 2539
@@ -49525,22 +49944,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 72.5,36.5
       parent: 2
-  - uid: 4453
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 4454
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 83.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4519
     components:
     - type: Transform
@@ -49615,14 +50018,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4529
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4530
     components:
     - type: Transform
@@ -49994,14 +50389,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 80.5,34.5
       parent: 2
-  - uid: 4596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 81.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4598
     components:
     - type: Transform
@@ -50010,14 +50397,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4599
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 82.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4600
     components:
     - type: Transform
@@ -50484,14 +50863,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4680
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 83.5,39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4687
     components:
     - type: Transform
@@ -50500,20 +50871,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4688
-    components:
-    - type: Transform
-      pos: 85.5,41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 4689
-    components:
-    - type: Transform
-      pos: 85.5,42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4690
     components:
     - type: Transform
@@ -53018,14 +53375,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 5014
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 5015
     components:
     - type: Transform
@@ -56823,14 +57172,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 5507
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5508
     components:
     - type: Transform
@@ -58506,14 +58847,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 5723
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -43.5,6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5724
     components:
     - type: Transform
@@ -60246,61 +60579,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5971
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5972
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 84.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5973
-    components:
-    - type: Transform
-      pos: 85.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5974
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 82.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5986
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5987
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 83.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 6046
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 81.5,43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 6438
     components:
     - type: Transform
@@ -60327,6 +60605,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 99.5,45.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
   - uid: 6939
     components:
     - type: Transform
@@ -60335,6 +60615,37 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 6940
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -43.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 6941
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -42.5,9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 6942
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 6944
+    components:
+    - type: Transform
+      pos: -37.5,9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7148
     components:
     - type: Transform
@@ -60351,6 +60662,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 98.5,45.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 7421
+    components:
+    - type: Transform
+      pos: -36.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7499
     components:
     - type: Transform
@@ -60375,6 +60695,36 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8792
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 80.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8933
+    components:
+    - type: Transform
+      pos: 79.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 9006
+    components:
+    - type: Transform
+      pos: 79.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
   - uid: 9128
     components:
     - type: Transform
@@ -60382,6 +60732,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9625
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10177
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 81.5,40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10926
     components:
     - type: Transform
@@ -60394,120 +60760,156 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 100.5,45.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
   - uid: 10988
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 99.5,51.5
       parent: 2
-  - uid: 12615
+  - uid: 11257
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,43.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,41.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12616
+  - uid: 11259
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 77.5,43.5
+      pos: 82.5,40.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12617
+  - uid: 11260
     components:
     - type: Transform
-      pos: 77.5,38.5
+      rot: 1.5707963267948966 rad
+      pos: 83.5,41.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#008000FF'
-  - uid: 12620
+      color: '#FF1212FF'
+  - uid: 11511
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,39.5
+      rot: 1.5707963267948966 rad
+      pos: 82.5,41.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#008000FF'
-  - uid: 12621
+      color: '#FF1212FF'
+  - uid: 11981
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 79.5,39.5
+      pos: 80.5,44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 11982
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 11989
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 81.5,48.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12622
+  - uid: 11996
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,39.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,48.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12623
+  - uid: 12008
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,40.5
+      pos: 79.5,47.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12624
+  - uid: 12203
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,41.5
+      pos: 79.5,46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12625
+  - uid: 12286
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,42.5
+      pos: 79.5,45.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12626
+  - uid: 12287
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,43.5
+      pos: 79.5,44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12627
+  - uid: 12291
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,44.5
+      pos: 79.5,43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12628
+  - uid: 12292
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,45.5
+      pos: 79.5,42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12629
+  - uid: 12601
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,46.5
+      rot: 1.5707963267948966 rad
+      pos: -40.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 78.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12616
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12617
+    components:
+    - type: Transform
+      pos: 77.5,38.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
-  - uid: 12630
+  - uid: 12620
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,47.5
+      rot: -1.5707963267948966 rad
+      pos: 78.5,39.5
       parent: 2
     - type: AtmosPipeColor
       color: '#008000FF'
@@ -60573,6 +60975,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 75.5,27.5
       parent: 2
+  - uid: 13355
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 13409
+    components:
+    - type: Transform
+      pos: -37.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 13611
     components:
     - type: Transform
@@ -60593,6 +61010,108 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16222
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16223
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 79.5,35.5
+      parent: 2
+  - uid: 16230
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 79.5,34.5
+      parent: 2
+  - uid: 16237
+    components:
+    - type: Transform
+      pos: 91.5,47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,49.5
+      parent: 2
+  - uid: 16246
+    components:
+    - type: Transform
+      pos: 97.5,50.5
+      parent: 2
+  - uid: 16247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 92.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16248
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 93.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16251
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 96.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 97.5,45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 84.5,41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 5950
@@ -62006,13 +62525,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 6145
-    components:
-    - type: Transform
-      pos: -36.5,5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 6146
     components:
     - type: Transform
@@ -62273,6 +62785,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 11537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 11538
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -43.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 14626
     components:
     - type: Transform
@@ -62286,6 +62814,33 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16236
+    components:
+    - type: Transform
+      pos: 91.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 16239
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,47.5
+      parent: 2
+  - uid: 16240
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,48.5
+      parent: 2
 - proto: GasPort
   entities:
   - uid: 4107
@@ -62542,6 +63097,22 @@ entities:
       parent: 2
     - type: GasValve
       open: False
+  - uid: 12442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 77.5,37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
+  - uid: 13329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
 - proto: GasVentPump
   entities:
   - uid: 4603
@@ -62598,16 +63169,6 @@ entities:
       - 11541
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 6204
-    components:
-    - type: Transform
-      pos: 82.5,40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15479
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 6206
     components:
     - type: Transform
@@ -63320,28 +63881,6 @@ entities:
       - 15368
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 6274
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,6.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15349
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 6275
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,6.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15342
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 6276
     components:
     - type: Transform
@@ -63805,6 +64344,28 @@ entities:
     - type: Transform
       pos: 77.5,25.5
       parent: 2
+  - uid: 7010
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -38.5,10.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6937
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12382
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 83.5,39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15479
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 15288
     components:
     - type: Transform
@@ -65029,6 +65590,17 @@ entities:
       - 15374
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 6943
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,10.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6937
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 6991
     components:
     - type: Transform
@@ -65045,6 +65617,28 @@ entities:
       - 15378
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 12383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15349
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12440
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15342
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 15289
     components:
     - type: Transform
@@ -65066,6 +65660,14 @@ entities:
       - 15359
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasVolumePump
   entities:
   - uid: 4280
@@ -65086,14 +65688,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 78.5,34.5
       parent: 2
-  - uid: 12614
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 77.5,37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#008000FF'
 - proto: Gateway
   entities:
   - uid: 6440
@@ -65151,19 +65745,17 @@ entities:
       parent: 2
 - proto: GlimmerDrain
   entities:
-  - uid: 6442
+  - uid: 12625
     components:
     - type: Transform
-      pos: 63.5,25.5
+      pos: 63.5,29.5
       parent: 2
-    - type: ApcPowerReceiver
-      powerDisabled: True
 - proto: GlimmerProber
   entities:
-  - uid: 6443
+  - uid: 8677
     components:
     - type: Transform
-      pos: 65.5,25.5
+      pos: 62.5,29.5
       parent: 2
 - proto: GrassBattlemap
   entities:
@@ -65181,35 +65773,23 @@ entities:
       parent: 2
 - proto: Grille
   entities:
-  - uid: 4017
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 78.5,44.5
-      parent: 2
-  - uid: 4360
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,44.5
-      parent: 2
-  - uid: 4684
+  - uid: 1594
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,42.5
+      rot: 1.5707963267948966 rad
+      pos: 90.5,45.5
       parent: 2
-  - uid: 4685
+  - uid: 2807
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,43.5
+      rot: 3.141592653589793 rad
+      pos: 89.5,45.5
       parent: 2
-  - uid: 4686
+  - uid: 4017
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,45.5
+      rot: 3.141592653589793 rad
+      pos: 78.5,44.5
       parent: 2
   - uid: 6445
     components:
@@ -65238,11 +65818,6 @@ entities:
     - type: Transform
       pos: -44.5,11.5
       parent: 2
-  - uid: 6450
-    components:
-    - type: Transform
-      pos: -43.5,11.5
-      parent: 2
   - uid: 6451
     components:
     - type: Transform
@@ -65253,11 +65828,6 @@ entities:
     - type: Transform
       pos: -32.5,-10.5
       parent: 2
-  - uid: 6453
-    components:
-    - type: Transform
-      pos: -42.5,11.5
-      parent: 2
   - uid: 6454
     components:
     - type: Transform
@@ -66913,11 +67483,11 @@ entities:
     - type: Transform
       pos: 82.5,-19.5
       parent: 2
-  - uid: 6769
+  - uid: 6779
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,46.5
+      rot: 3.141592653589793 rad
+      pos: 90.5,44.5
       parent: 2
   - uid: 6789
     components:
@@ -67482,23 +68052,33 @@ entities:
       rot: 3.141592653589793 rad
       pos: 100.5,45.5
       parent: 2
-  - uid: 8316
+  - uid: 7739
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-11.5
+      pos: -43.5,11.5
       parent: 2
-  - uid: 8648
+  - uid: 7997
+    components:
+    - type: Transform
+      pos: -42.5,11.5
+      parent: 2
+  - uid: 8316
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 87.5,41.5
+      pos: -2.5,-11.5
       parent: 2
   - uid: 8659
     components:
     - type: Transform
       pos: 65.5,48.5
       parent: 2
+  - uid: 9066
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,42.5
+      parent: 2
   - uid: 9449
     components:
     - type: Transform
@@ -67562,6 +68142,12 @@ entities:
     - type: Transform
       pos: 35.5,14.5
       parent: 2
+  - uid: 11542
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,43.5
+      parent: 2
   - uid: 11611
     components:
     - type: Transform
@@ -67673,12 +68259,23 @@ entities:
     - type: Transform
       pos: 60.5,28.5
       parent: 2
+  - uid: 12544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 87.5,46.5
+      parent: 2
   - uid: 12645
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 79.5,35.5
       parent: 2
+  - uid: 12814
+    components:
+    - type: Transform
+      pos: -43.5,10.5
+      parent: 2
   - uid: 12957
     components:
     - type: Transform
@@ -67694,6 +68291,12 @@ entities:
     - type: Transform
       pos: 30.5,22.5
       parent: 2
+  - uid: 13337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,46.5
+      parent: 2
   - uid: 13557
     components:
     - type: Transform
@@ -67759,6 +68362,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 72.5,35.5
       parent: 2
+  - uid: 16258
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 89.5,46.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 6889
@@ -67878,6 +68487,24 @@ entities:
     - type: Transform
       pos: 78.636055,-27.493525
       parent: 2
+  - uid: 13440
+    components:
+    - type: Transform
+      parent: 13425
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 13495
+    components:
+    - type: Transform
+      parent: 13494
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: HeadTerminator
   entities:
   - uid: 6902
@@ -67893,6 +68520,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 101.5,46.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#008000FF'
   - uid: 4358
     components:
     - type: Transform
@@ -68015,87 +68644,89 @@ entities:
     - type: Transform
       pos: 46.5,-11.5
       parent: 2
-  - uid: 6932
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,5.5
-      parent: 2
-  - uid: 6933
+  - uid: 11258
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -46.5,5.5
+      pos: -37.5,11.5
       parent: 2
-  - uid: 6935
+  - uid: 16212
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,8.5
+      pos: -37.5,10.5
       parent: 2
-- proto: HydroponicsTrayEmpty
+- proto: hydroponicsTray
   entities:
-  - uid: 6937
+  - uid: 12573
     components:
     - type: Transform
-      pos: 20.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 23.5,7.5
       parent: 2
-  - uid: 6940
+  - uid: 12574
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -44.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -45.5,5.5
       parent: 2
-  - uid: 6941
+  - uid: 12575
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -45.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -44.5,5.5
       parent: 2
-  - uid: 6942
+  - uid: 12576
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,4.5
       parent: 2
-  - uid: 6943
+  - uid: 12577
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 18.5,4.5
       parent: 2
-  - uid: 6944
+  - uid: 12578
     components:
     - type: Transform
-      pos: 23.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 19.5,6.5
       parent: 2
-  - uid: 6945
+  - uid: 12579
     components:
     - type: Transform
-      pos: 23.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 18.5,6.5
       parent: 2
-  - uid: 6946
+  - uid: 12582
     components:
     - type: Transform
-      pos: 23.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 23.5,4.5
       parent: 2
-  - uid: 6947
+  - uid: 12584
     components:
     - type: Transform
-      pos: 23.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 23.5,5.5
       parent: 2
-  - uid: 6948
+  - uid: 12585
     components:
     - type: Transform
-      pos: 21.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 23.5,6.5
       parent: 2
-  - uid: 6950
+  - uid: 12586
     components:
     - type: Transform
-      pos: 18.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,4.5
       parent: 2
-  - uid: 6951
+  - uid: 12587
     components:
     - type: Transform
-      pos: 19.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 21.5,4.5
       parent: 2
 - proto: IDComputerCircuitboard
   entities:
@@ -68705,6 +69336,11 @@ entities:
     - type: Transform
       pos: 20.739563,8.419169
       parent: 2
+  - uid: 13383
+    components:
+    - type: Transform
+      pos: 48.563217,-2.8670998
+      parent: 2
 - proto: LGBTQFlag
   entities:
   - uid: 16121
@@ -68837,6 +69473,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 82.5,30.5
       parent: 2
+  - uid: 16256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,38.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        16255:
+        - Pressed: Toggle
 - proto: LockableButtonBar
   entities:
   - uid: 6993
@@ -69548,26 +70194,74 @@ entities:
       parent: 2
 - proto: LockerChemistryFilled
   entities:
-  - uid: 7019
+  - uid: 13425
     components:
     - type: Transform
-      anchored: True
-      pos: 47.5,-3.5
+      pos: 50.5,-4.5
       parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      bodyType: Static
-  - uid: 7020
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 13440
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 13494
     components:
     - type: Transform
-      anchored: True
-      pos: 48.5,-3.5
+      pos: 50.5,-5.5
       parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-      bodyType: Static
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 13495
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerChiefEngineerFilled
   entities:
   - uid: 3095
@@ -69767,6 +70461,40 @@ entities:
     - type: Transform
       pos: 65.5,29.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 12590
+          - 12595
+          - 12596
+          - 12597
+          - 12599
+          - 12600
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerFreezer
   entities:
   - uid: 12113
@@ -70390,6 +71118,24 @@ entities:
     - type: Transform
       pos: 55.863064,-27.171606
       parent: 2
+- proto: LPPBookSpaceLaw
+  entities:
+  - uid: 6933
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-1.5
+      parent: 2
+  - uid: 16213
+    components:
+    - type: Transform
+      pos: -8.309894,10.649162
+      parent: 2
+  - uid: 16216
+    components:
+    - type: Transform
+      pos: -7.188752,-4.334501
+      parent: 2
 - proto: LPPBoxerBriefsLightpurple
   entities:
   - uid: 12561
@@ -70793,6 +71539,13 @@ entities:
     - type: Transform
       pos: -8.5,2.5
       parent: 2
+- proto: LPPHammer
+  entities:
+  - uid: 12985
+    components:
+    - type: Transform
+      pos: 66.52352,45.10759
+      parent: 2
 - proto: LPPHopComputerComms
   entities:
   - uid: 7181
@@ -70841,7 +71594,7 @@ entities:
   - uid: 7187
     components:
     - type: MetaData
-      name: Касуми Энигматикс
+      name: Касуми Каннингем-Конала
     - type: Transform
       pos: 55.4641,-27.64262
       parent: 2
@@ -71134,36 +71887,6 @@ entities:
     - type: Transform
       pos: 1.3380122,10.36076
       parent: 2
-  - uid: 13400
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
-  - uid: 13401
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
-  - uid: 13402
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
-  - uid: 13403
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
-  - uid: 13405
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
-  - uid: 13406
-    components:
-    - type: Transform
-      pos: -14.570671,-7.28666
-      parent: 2
 - proto: LunchboxLogisticsFilledRandom
   entities:
   - uid: 7274
@@ -71783,11 +72506,6 @@ entities:
     - type: Transform
       pos: 81.5,-36.5
       parent: 2
-  - uid: 12287
-    components:
-    - type: Transform
-      pos: -40.5,10.5
-      parent: 2
   - uid: 12427
     components:
     - type: Transform
@@ -71838,6 +72556,26 @@ entities:
     - type: Transform
       pos: 33.5,23.5
       parent: 2
+- proto: MaterialBiomass
+  entities:
+  - uid: 8072
+    components:
+    - type: Transform
+      parent: 8110
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 8074
+    components:
+    - type: Transform
+      parent: 8110
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MaterialCloth
   entities:
   - uid: 7302
@@ -71854,6 +72592,11 @@ entities:
       parent: 2
 - proto: MaterialReclaimer
   entities:
+  - uid: 6932
+    components:
+    - type: Transform
+      pos: -48.5,5.5
+      parent: 2
   - uid: 16131
     components:
     - type: Transform
@@ -72676,11 +73419,6 @@ entities:
       parent: 2
 - proto: NoticeBoard
   entities:
-  - uid: 12490
-    components:
-    - type: Transform
-      pos: -16.5,-7.5
-      parent: 2
   - uid: 14569
     components:
     - type: Transform
@@ -73074,12 +73812,6 @@ entities:
     - type: Transform
       pos: -6.923914,-4.669271
       parent: 2
-  - uid: 7421
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -48.609932,8.458669
-      parent: 2
   - uid: 7422
     components:
     - type: Transform
@@ -73193,6 +73925,17 @@ entities:
       parent: 2
     - type: Paper
       content: Джеси, ты можеш, наконец-то, ПОЧИНИТЬ ЭТОТ ГРЁБАНЫЙ ПЕРЕРАБОЧИК МУСОРА!!!
+  - uid: 8075
+    components:
+    - type: Transform
+      parent: 8110
+    - type: Paper
+      content: >
+        Использовать при клонировании. Внутри Биомасса!!
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
   - uid: 12562
     components:
     - type: Transform
@@ -73295,7 +74038,7 @@ entities:
   - uid: 16204
     components:
     - type: Transform
-      pos: 83.45673,45.344048
+      pos: 85.46628,44.539917
       parent: 2
     - type: Paper
       content: >-
@@ -73320,6 +74063,9 @@ entities:
 
 
         Сделай выбор и выброси мусор....
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
 - proto: PaperBin10
   entities:
   - uid: 7437
@@ -73369,6 +74115,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-5.5
       parent: 2
+  - uid: 12621
+    components:
+    - type: Transform
+      pos: 59.5,9.5
+      parent: 2
   - uid: 12961
     components:
     - type: Transform
@@ -73572,12 +74323,6 @@ entities:
     - type: Transform
       pos: 63.70575,27.749767
       parent: 2
-  - uid: 7465
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.682938,5.052499
-      parent: 2
   - uid: 11593
     components:
     - type: Transform
@@ -73616,6 +74361,11 @@ entities:
     - type: Transform
       pos: 83.14486,-25.412575
       parent: 2
+  - uid: 13381
+    components:
+    - type: Transform
+      pos: 59.559853,9.655121
+      parent: 2
 - proto: PenCap
   entities:
   - uid: 7466
@@ -73885,6 +74635,62 @@ entities:
     - type: Transform
       pos: 48.64683,-10.44799
       parent: 2
+- proto: PillMindbreakerToxin
+  entities:
+  - uid: 12590
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 12595
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 12596
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 12597
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 12599
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 12600
+    components:
+    - type: Transform
+      parent: 7029
+    - type: Physics
+      angularDamping: 0
+      linearDamping: 0
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: PlasmaCanister
   entities:
   - uid: 7487
@@ -73924,6 +74730,18 @@ entities:
       parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
+  - uid: 3143
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,10.5
+      parent: 2
+  - uid: 3269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,10.5
+      parent: 2
   - uid: 4297
     components:
     - type: Transform
@@ -73952,6 +74770,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,6.5
       parent: 2
+  - uid: 13413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,10.5
+      parent: 2
   - uid: 14894
     components:
     - type: Transform
@@ -73965,6 +74789,12 @@ entities:
       parent: 2
 - proto: PlasmaWindoorSecureScienceLocked
   entities:
+  - uid: 4335
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,10.5
+      parent: 2
   - uid: 16080
     components:
     - type: Transform
@@ -74161,14 +74991,14 @@ entities:
       parent: 2
 - proto: PosterContrabandAtmosiaDeclarationIndependence
   entities:
-  - uid: 12814
+  - uid: 13420
     components:
     - type: MetaData
       desc: '"О боже, спаси и сохрани отдел, не дав всяким бездарям дотянутся до сверхважных элементов станции!"'
       name: Инженерная Молитва
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 87.5,41.5
+      rot: 3.141592653589793 rad
+      pos: 88.5,41.5
       parent: 2
   - uid: 15809
     components:
@@ -74429,11 +75259,6 @@ entities:
     - type: Transform
       pos: 43.5,-2.5
       parent: 2
-  - uid: 7543
-    components:
-    - type: Transform
-      pos: 66.5,-2.5
-      parent: 2
   - uid: 7544
     components:
     - type: Transform
@@ -74484,6 +75309,11 @@ entities:
     - type: Transform
       pos: 57.5,-6.5
       parent: 2
+  - uid: 16327
+    components:
+    - type: Transform
+      pos: 66.5,-4.5
+      parent: 2
 - proto: PottedPlantRandomPlastic
   entities:
   - uid: 12305
@@ -75336,6 +76166,12 @@ entities:
     - type: Transform
       pos: -8.5,13.5
       parent: 2
+  - uid: 12444
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-12.5
+      parent: 2
   - uid: 12651
     components:
     - type: Transform
@@ -76136,11 +76972,6 @@ entities:
     - type: Transform
       pos: -30.5,11.5
       parent: 2
-  - uid: 12705
-    components:
-    - type: Transform
-      pos: -39.5,10.5
-      parent: 2
   - uid: 12706
     components:
     - type: Transform
@@ -76739,6 +77570,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,28.5
       parent: 2
+  - uid: 15922
+    components:
+    - type: Transform
+      pos: -38.5,11.5
+      parent: 2
   - uid: 16029
     components:
     - type: Transform
@@ -76798,11 +77634,6 @@ entities:
     - type: Transform
       pos: 56.5,-4.5
       parent: 2
-  - uid: 7739
-    components:
-    - type: Transform
-      pos: 63.5,29.5
-      parent: 2
 - proto: PuddleVomit
   entities:
   - uid: 13254
@@ -77109,55 +77940,45 @@ entities:
     - type: InsideEntityStorage
 - proto: RadiationCollectorFullTank
   entities:
-  - uid: 6785
-    components:
-    - type: Transform
-      pos: 94.5,43.5
-      parent: 2
-  - uid: 11257
-    components:
-    - type: Transform
-      pos: 93.5,51.5
-      parent: 2
-  - uid: 11258
+  - uid: 344
     components:
     - type: Transform
-      pos: 91.5,51.5
+      pos: 96.5,46.5
       parent: 2
-  - uid: 11260
+  - uid: 1593
     components:
     - type: Transform
-      pos: 92.5,51.5
+      pos: 90.5,46.5
       parent: 2
-  - uid: 12563
+  - uid: 2094
     components:
     - type: Transform
-      pos: 95.5,43.5
+      pos: 92.5,49.5
       parent: 2
-  - uid: 12564
+  - uid: 2639
     components:
     - type: Transform
-      pos: 92.5,43.5
+      pos: 96.5,48.5
       parent: 2
-  - uid: 12565
+  - uid: 4596
     components:
     - type: Transform
-      pos: 91.5,43.5
+      pos: 94.5,49.5
       parent: 2
-  - uid: 12566
+  - uid: 4597
     components:
     - type: Transform
-      pos: 94.5,51.5
+      pos: 90.5,48.5
       parent: 2
-  - uid: 12567
+  - uid: 12649
     components:
     - type: Transform
-      pos: 95.5,51.5
+      pos: 92.5,45.5
       parent: 2
-  - uid: 12568
+  - uid: 13414
     components:
     - type: Transform
-      pos: 93.5,43.5
+      pos: 94.5,45.5
       parent: 2
 - proto: RagItem
   entities:
@@ -77628,6 +78449,11 @@ entities:
     - type: Transform
       pos: 89.5,13.5
       parent: 2
+  - uid: 8676
+    components:
+    - type: Transform
+      pos: 55.5,5.5
+      parent: 2
   - uid: 13491
     components:
     - type: Transform
@@ -77978,6 +78804,16 @@ entities:
       parent: 2
 - proto: RandomPosterAny
   entities:
+  - uid: 8083
+    components:
+    - type: Transform
+      pos: -41.5,9.5
+      parent: 2
+  - uid: 13406
+    components:
+    - type: Transform
+      pos: -40.5,12.5
+      parent: 2
   - uid: 15413
     components:
     - type: Transform
@@ -78307,6 +79143,11 @@ entities:
     - type: Transform
       pos: 48.5,18.5
       parent: 2
+  - uid: 16217
+    components:
+    - type: Transform
+      pos: -38.5,12.5
+      parent: 2
 - proto: RandomPosterContraband
   entities:
   - uid: 15615
@@ -78321,12 +79162,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,9.5
       parent: 2
-  - uid: 15617
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,9.5
-      parent: 2
 - proto: RandomPosterLegit
   entities:
   - uid: 10320
@@ -79498,29 +80333,17 @@ entities:
       parent: 2
 - proto: ReinforcedPlasmaWindow
   entities:
-  - uid: 4335
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,46.5
-      parent: 2
-  - uid: 4336
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,45.5
-      parent: 2
-  - uid: 4604
+  - uid: 2284
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,44.5
+      rot: 3.141592653589793 rad
+      pos: 89.5,45.5
       parent: 2
-  - uid: 6764
+  - uid: 6780
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,41.5
+      rot: 3.141592653589793 rad
+      pos: 90.5,44.5
       parent: 2
   - uid: 7860
     components:
@@ -79675,18 +80498,6 @@ entities:
     - type: Transform
       pos: 78.5,40.5
       parent: 2
-  - uid: 11542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,42.5
-      parent: 2
-  - uid: 11996
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,43.5
-      parent: 2
   - uid: 12104
     components:
     - type: Transform
@@ -79711,6 +80522,54 @@ entities:
       rot: 3.141592653589793 rad
       pos: 78.5,45.5
       parent: 2
+  - uid: 12513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,45.5
+      parent: 2
+  - uid: 12565
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 87.5,46.5
+      parent: 2
+  - uid: 12902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,41.5
+      parent: 2
+  - uid: 13360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,41.5
+      parent: 2
+  - uid: 13403
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,42.5
+      parent: 2
+  - uid: 13412
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,43.5
+      parent: 2
+  - uid: 16259
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 89.5,46.5
+      parent: 2
+  - uid: 16260
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,46.5
+      parent: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 3307
@@ -79719,12 +80578,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 66.5,-46.5
       parent: 2
-  - uid: 6193
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 91.5,41.5
-      parent: 2
   - uid: 6702
     components:
     - type: Transform
@@ -80347,11 +81200,6 @@ entities:
     - type: Transform
       pos: 88.5,40.5
       parent: 2
-  - uid: 7997
-    components:
-    - type: Transform
-      pos: 92.5,41.5
-      parent: 2
   - uid: 7999
     components:
     - type: Transform
@@ -80841,6 +81689,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,34.5
       parent: 2
+  - uid: 12563
+    components:
+    - type: Transform
+      pos: -43.5,10.5
+      parent: 2
+  - uid: 12564
+    components:
+    - type: Transform
+      pos: -43.5,11.5
+      parent: 2
   - uid: 12929
     components:
     - type: Transform
@@ -81019,6 +81877,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 73.5,37.5
       parent: 2
+  - uid: 16192
+    components:
+    - type: Transform
+      pos: -42.5,11.5
+      parent: 2
   - uid: 16193
     components:
     - type: Transform
@@ -81055,10 +81918,10 @@ entities:
       parent: 2
 - proto: ReverseEngineeringMachine
   entities:
-  - uid: 8116
+  - uid: 13400
     components:
     - type: Transform
-      pos: 72.5,9.5
+      pos: 57.5,4.5
       parent: 2
 - proto: RevolverCapGun
   entities:
@@ -81580,19 +82443,19 @@ entities:
     - type: Transform
       pos: 58.739925,9.466386
       parent: 2
-- proto: SecBreachingHammer
+- proto: SecurityTechFab
   entities:
-  - uid: 12985
+  - uid: 8142
     components:
     - type: Transform
-      pos: 66.52352,45.10759
+      pos: -39.5,-2.5
       parent: 2
-- proto: SecurityTechFab
+- proto: SeedExtractor
   entities:
-  - uid: 8142
+  - uid: 16228
     components:
     - type: Transform
-      pos: -39.5,-2.5
+      pos: 22.5,10.5
       parent: 2
 - proto: SeismicCharge
   entities:
@@ -81767,17 +82630,20 @@ entities:
       parent: 2
 - proto: SheetPlasma1
   entities:
-  - uid: 7142
+  - uid: 6945
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.059296,-2.4390674
+      pos: 47.7032,-2.9842873
       parent: 2
-  - uid: 16124
+  - uid: 16324
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.966217,-2.3765674
+      pos: 47.65108,-3.4009538
+      parent: 2
+  - uid: 16325
+    components:
+    - type: Transform
+      pos: 47.59896,-3.2056413
       parent: 2
 - proto: SheetPlasteel
   entities:
@@ -82233,14 +83099,26 @@ entities:
       links:
       - 3244
       - 3240
-  - uid: 13495
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 2247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -43.5,11.5
       parent: 2
-- proto: ShuttersNormalOpen
-  entities:
+    - type: DeviceLinkSink
+      links:
+      - 8248
+  - uid: 2251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,10.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 8248
   - uid: 8207
     components:
     - type: Transform
@@ -82534,6 +83412,14 @@ entities:
       links:
       - 15259
       - 15258
+  - uid: 12569
+    components:
+    - type: Transform
+      pos: -42.5,11.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 8248
   - uid: 15234
     components:
     - type: Transform
@@ -82992,6 +83878,14 @@ entities:
       links:
       - 3263
       - 3268
+  - uid: 16255
+    components:
+    - type: Transform
+      pos: 84.5,38.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 16256
 - proto: ShuttersWindow
   entities:
   - uid: 8239
@@ -83032,12 +83926,6 @@ entities:
       links:
       - 15432
       - 15439
-  - uid: 13494
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-7.5
-      parent: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 8243
@@ -83128,16 +84016,12 @@ entities:
         - Pressed: Toggle
         8238:
         - Pressed: Toggle
-  - uid: 13394
-    components:
-    - type: Transform
-      pos: -16.5,-5.5
-      parent: 2
-  - uid: 13395
-    components:
-    - type: Transform
-      pos: -15.5,-5.5
-      parent: 2
+        2251:
+        - Pressed: Toggle
+        2247:
+        - Pressed: Toggle
+        12569:
+        - Pressed: Toggle
 - proto: SignalButtonDirectional
   entities:
   - uid: 8249
@@ -83891,6 +84775,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,4.5
       parent: 2
+  - uid: 16227
+    components:
+    - type: Transform
+      pos: 15.5,6.5
+      parent: 2
 - proto: SmartFridge
   entities:
   - uid: 8288
@@ -83905,6 +84794,11 @@ entities:
       parent: 2
 - proto: SMESBasic
   entities:
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -59.5,-3.5
+      parent: 2
   - uid: 8290
     components:
     - type: Transform
@@ -84083,19 +84977,19 @@ entities:
     - type: Transform
       pos: 68.5,20.5
       parent: 2
-- proto: SpawnMobCorgi
+- proto: SpawnMobCleanBot
   entities:
-  - uid: 8304
+  - uid: 8683
     components:
     - type: Transform
-      pos: 30.5,-3.5
+      pos: 19.5,1.5
       parent: 2
-- proto: SpawnMobCrabAtmos
+- proto: SpawnMobCorgi
   entities:
-  - uid: 12833
+  - uid: 8304
     components:
     - type: Transform
-      pos: 82.5,42.5
+      pos: 30.5,-3.5
       parent: 2
 - proto: SpawnMobFoxRenault
   entities:
@@ -84638,6 +85532,13 @@ entities:
     - type: Transform
       pos: 16.5,-2.5
       parent: 2
+- proto: SpawnPointObserver
+  entities:
+  - uid: 13411
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
 - proto: SpawnPointParamedic
   entities:
   - uid: 13082
@@ -84824,20 +85725,25 @@ entities:
       parent: 2
 - proto: SpawnPointPrisoner
   entities:
-  - uid: 12328
+  - uid: 12903
     components:
     - type: Transform
-      pos: -36.5,-3.5
+      pos: -44.5,6.5
       parent: 2
-  - uid: 12902
+  - uid: 16314
     components:
     - type: Transform
-      pos: -32.5,-3.5
+      pos: -48.5,6.5
       parent: 2
-  - uid: 12903
+  - uid: 16315
     components:
     - type: Transform
-      pos: -44.5,6.5
+      pos: -46.5,7.5
+      parent: 2
+  - uid: 16321
+    components:
+    - type: Transform
+      pos: -38.5,10.5
       parent: 2
 - proto: SpawnPointPrisonGuard
   entities:
@@ -85591,14 +86497,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 76.5,43.5
       parent: 2
-- proto: SteelBench
-  entities:
-  - uid: 13440
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-7.5
-      parent: 2
 - proto: StimpackMini
   entities:
   - uid: 15165
@@ -85684,6 +86582,11 @@ entities:
       parent: 2
 - proto: SubstationBasic
   entities:
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -65.5,-3.5
+      parent: 2
   - uid: 8390
     components:
     - type: Transform
@@ -85776,11 +86679,6 @@ entities:
     - type: Transform
       pos: -64.5,4.5
       parent: 2
-  - uid: 8403
-    components:
-    - type: Transform
-      pos: -54.5,4.5
-      parent: 2
 - proto: SuitStorageCaptain
   entities:
   - uid: 8404
@@ -86329,16 +87227,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Вход к СМ
-  - uid: 15922
-    components:
-    - type: Transform
-      pos: 89.5,42.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: СуперМатерия
   - uid: 15923
     components:
     - type: Transform
@@ -87994,15 +88882,10 @@ entities:
     - type: Transform
       pos: 74.5,-29.5
       parent: 2
-  - uid: 13329
-    components:
-    - type: Transform
-      pos: -15.5,-7.5
-      parent: 2
-  - uid: 13355
+  - uid: 13424
     components:
     - type: Transform
-      pos: -14.5,-7.5
+      pos: -45.5,8.5
       parent: 2
   - uid: 13543
     components:
@@ -88076,11 +88959,6 @@ entities:
     - type: Transform
       pos: 37.5,31.5
       parent: 2
-  - uid: 12286
-    components:
-    - type: Transform
-      pos: -40.5,10.5
-      parent: 2
   - uid: 13390
     components:
     - type: Transform
@@ -88711,6 +89589,12 @@ entities:
     - type: Transform
       pos: 53.5,5.5
       parent: 2
+  - uid: 6935
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-3.5
+      parent: 2
   - uid: 7085
     components:
     - type: Transform
@@ -88836,12 +89720,6 @@ entities:
     - type: Transform
       pos: 56.5,-16.5
       parent: 2
-  - uid: 7143
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-2.5
-      parent: 2
   - uid: 7161
     components:
     - type: Transform
@@ -89022,12 +89900,28 @@ entities:
     - type: Transform
       pos: 89.5,-27.5
       parent: 2
+  - uid: 8648
+    components:
+    - type: Transform
+      pos: 55.5,5.5
+      parent: 2
   - uid: 9096
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -23.5,6.5
       parent: 2
+  - uid: 12588
+    components:
+    - type: Transform
+      pos: 48.5,-3.5
+      parent: 2
+  - uid: 13396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-20.5
+      parent: 2
   - uid: 15891
     components:
     - type: Transform
@@ -89176,18 +90070,6 @@ entities:
       parent: 2
 - proto: TableWood
   entities:
-  - uid: 407
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
-      parent: 2
-  - uid: 3068
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-7.5
-      parent: 2
   - uid: 3146
     components:
     - type: Transform
@@ -89718,26 +90600,27 @@ entities:
       parent: 2
 - proto: TegCenter
   entities:
-  - uid: 16203
+  - uid: 3885
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 83.5,45.5
+      rot: 3.141592653589793 rad
+      pos: 85.5,44.5
       parent: 2
 - proto: TegCirculator
   entities:
-  - uid: 7010
+  - uid: 3490
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 82.5,45.5
+      rot: 1.5707963267948966 rad
+      pos: 85.5,45.5
       parent: 2
     - type: PointLight
       color: '#FF3300FF'
-  - uid: 16192
+  - uid: 4312
     components:
     - type: Transform
-      pos: 84.5,45.5
+      rot: -1.5707963267948966 rad
+      pos: 85.5,43.5
       parent: 2
     - type: PointLight
       color: '#FF3300FF'
@@ -89789,6 +90672,11 @@ entities:
     - type: Transform
       pos: -62.5,-4.5
       parent: 2
+  - uid: 12488
+    components:
+    - type: Transform
+      pos: 65.5,25.5
+      parent: 2
 - proto: TelecomServerFilledEngineering
   entities:
   - uid: 8626
@@ -89844,54 +90732,48 @@ entities:
       parent: 2
 - proto: TeslaCoil
   entities:
-  - uid: 12589
-    components:
-    - type: Transform
-      pos: 95.5,50.5
-      parent: 2
-  - uid: 12590
-    components:
-    - type: Transform
-      pos: 95.5,46.5
-      parent: 2
-  - uid: 12595
+  - uid: 12647
     components:
     - type: Transform
-      pos: 95.5,44.5
+      rot: 3.141592653589793 rad
+      pos: 91.5,49.5
       parent: 2
-  - uid: 12597
+  - uid: 13418
     components:
     - type: Transform
-      pos: 95.5,48.5
+      rot: 3.141592653589793 rad
+      pos: 95.5,49.5
       parent: 2
-  - uid: 12599
+  - uid: 13422
     components:
     - type: Transform
-      pos: 90.5,50.5
+      rot: 3.141592653589793 rad
+      pos: 95.5,45.5
       parent: 2
-  - uid: 12600
+  - uid: 13423
     components:
     - type: Transform
-      pos: 90.5,44.5
+      rot: 3.141592653589793 rad
+      pos: 91.5,45.5
       parent: 2
 - proto: TeslaGroundingRod
   entities:
-  - uid: 12596
+  - uid: 2244
     components:
     - type: Transform
-      pos: 95.5,47.5
+      pos: 96.5,51.5
       parent: 2
-  - uid: 12646
+  - uid: 4599
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 91.5,45.5
+      rot: 3.141592653589793 rad
+      pos: 88.5,50.5
       parent: 2
-  - uid: 12647
+  - uid: 4607
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 91.5,49.5
+      rot: 3.141592653589793 rad
+      pos: 97.5,44.5
       parent: 2
 - proto: ThermomachineFreezerMachineCircuitBoard
   entities:
@@ -89954,11 +90836,10 @@ entities:
       parent: 2
 - proto: ToiletDirtyWater
   entities:
-  - uid: 8635
+  - uid: 2249
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -42.5,8.5
+      pos: -48.5,8.5
       parent: 2
   - uid: 8636
     components:
@@ -90484,17 +91365,17 @@ entities:
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
-  - uid: 8676
+  - uid: 12623
     components:
     - type: Transform
-      pos: 50.5,-5.5
+      pos: 66.5,-2.5
       parent: 2
 - proto: VendingMachineChemicals
   entities:
-  - uid: 8677
+  - uid: 16322
     components:
     - type: Transform
-      pos: 50.5,-4.5
+      pos: 64.5,-3.5
       parent: 2
 - proto: VendingMachineClothing
   entities:
@@ -90654,6 +91535,11 @@ entities:
     - type: Transform
       pos: 23.5,10.5
       parent: 2
+  - uid: 12568
+    components:
+    - type: Transform
+      pos: -44.5,8.5
+      parent: 2
 - proto: VendingMachineRepDrobe
   entities:
   - uid: 8688
@@ -90931,17 +91817,19 @@ entities:
     - type: Transform
       pos: 14.5,-2.5
       parent: 2
-- proto: WallReinforced
+- proto: WallmountTelevision
   entities:
-  - uid: 1592
+  - uid: 2250
     components:
     - type: Transform
-      pos: 63.5,48.5
+      pos: -37.5,9.5
       parent: 2
-  - uid: 2095
+- proto: WallReinforced
+  entities:
+  - uid: 1592
     components:
     - type: Transform
-      pos: -34.5,11.5
+      pos: 63.5,48.5
       parent: 2
   - uid: 3067
     components:
@@ -90961,6 +91849,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 87.5,49.5
       parent: 2
+  - uid: 4689
+    components:
+    - type: Transform
+      pos: -33.5,11.5
+      parent: 2
   - uid: 6905
     components:
     - type: Transform
@@ -91344,11 +92237,6 @@ entities:
     - type: Transform
       pos: -38.5,-2.5
       parent: 2
-  - uid: 8792
-    components:
-    - type: Transform
-      pos: -41.5,10.5
-      parent: 2
   - uid: 8793
     components:
     - type: Transform
@@ -91860,11 +92748,6 @@ entities:
     - type: Transform
       pos: -49.5,-0.5
       parent: 2
-  - uid: 8895
-    components:
-    - type: Transform
-      pos: -40.5,11.5
-      parent: 2
   - uid: 8896
     components:
     - type: Transform
@@ -92050,11 +92933,6 @@ entities:
     - type: Transform
       pos: -52.5,-9.5
       parent: 2
-  - uid: 8933
-    components:
-    - type: Transform
-      pos: -39.5,11.5
-      parent: 2
   - uid: 8934
     components:
     - type: Transform
@@ -92418,11 +93296,6 @@ entities:
     - type: Transform
       pos: -30.5,-1.5
       parent: 2
-  - uid: 9006
-    components:
-    - type: Transform
-      pos: -38.5,11.5
-      parent: 2
   - uid: 9007
     components:
     - type: Transform
@@ -92724,11 +93597,6 @@ entities:
     - type: Transform
       pos: -43.5,4.5
       parent: 2
-  - uid: 9066
-    components:
-    - type: Transform
-      pos: -42.5,9.5
-      parent: 2
   - uid: 9067
     components:
     - type: Transform
@@ -102270,12 +103138,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,31.5
       parent: 2
+  - uid: 12608
+    components:
+    - type: Transform
+      pos: -39.5,12.5
+      parent: 2
   - uid: 13182
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-1.5
       parent: 2
+  - uid: 13407
+    components:
+    - type: Transform
+      pos: -40.5,12.5
+      parent: 2
   - uid: 13438
     components:
     - type: Transform
@@ -102363,6 +103241,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,31.5
       parent: 2
+  - uid: 15988
+    components:
+    - type: Transform
+      pos: -36.5,10.5
+      parent: 2
   - uid: 16030
     components:
     - type: Transform
@@ -102393,6 +103276,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,31.5
       parent: 2
+  - uid: 16124
+    components:
+    - type: Transform
+      pos: -36.5,11.5
+      parent: 2
+  - uid: 16211
+    components:
+    - type: Transform
+      pos: -41.5,12.5
+      parent: 2
 - proto: WallSolid
   entities:
   - uid: 987
@@ -105656,12 +106549,6 @@ entities:
       parent: 2
 - proto: WallWood
   entities:
-  - uid: 3490
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-7.5
-      parent: 2
   - uid: 7141
     components:
     - type: Transform
@@ -106008,13 +106895,6 @@ entities:
       parent: 2
     missingComponents:
     - WarpPoint
-  - uid: 15988
-    components:
-    - type: Transform
-      pos: -41.5,12.5
-      parent: 2
-    missingComponents:
-    - WarpPoint
   - uid: 15989
     components:
     - type: Transform
@@ -106360,6 +107240,13 @@ entities:
     - type: Transform
       pos: 35.5,23.5
       parent: 2
+- proto: WaterTankHighCapacity
+  entities:
+  - uid: 16226
+    components:
+    - type: Transform
+      pos: 16.5,6.5
+      parent: 2
 - proto: WaterVaporCanister
   entities:
   - uid: 11382
@@ -106645,11 +107532,6 @@ entities:
     - type: Transform
       pos: 40.5,16.5
       parent: 2
-  - uid: 2096
-    components:
-    - type: Transform
-      pos: -37.5,11.5
-      parent: 2
   - uid: 8609
     components:
     - type: Transform
@@ -106781,11 +107663,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 78.5,-14.5
       parent: 2
-  - uid: 13385
-    components:
-    - type: Transform
-      pos: -15.5,-7.5
-      parent: 2
   - uid: 14685
     components:
     - type: Transform
@@ -106995,6 +107872,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 82.5,13.5
       parent: 2
+  - uid: 16254
+    components:
+    - type: Transform
+      pos: 93.5,46.5
+      parent: 2
 - proto: WindoorSecureHeadOfPersonnelLocked
   entities:
   - uid: 11429
@@ -107151,28 +108033,6 @@ entities:
     - type: Transform
       pos: -12.5,-1.5
       parent: 2
-- proto: WindoorSecureServiceLocked
-  entities:
-  - uid: 13381
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-6.5
-      parent: 2
-  - uid: 13383
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-7.5
-      parent: 2
-- proto: WindoorServiceLocked
-  entities:
-  - uid: 13382
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
-      parent: 2
 - proto: Window
   entities:
   - uid: 9766
@@ -107404,6 +108264,53 @@ entities:
       parent: 2
 - proto: WindowReinforcedDirectional
   entities:
+  - uid: 407
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,47.5
+      parent: 2
+  - uid: 1597
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 92.5,48.5
+      parent: 2
+  - uid: 2243
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,48.5
+      parent: 2
+  - uid: 4615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,46.5
+      parent: 2
+  - uid: 4616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 93.5,48.5
+      parent: 2
+  - uid: 4680
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 94.5,48.5
+      parent: 2
+  - uid: 4684
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,48.5
+      parent: 2
+  - uid: 4685
+    components:
+    - type: Transform
+      pos: 92.5,46.5
+      parent: 2
   - uid: 8018
     components:
     - type: Transform
@@ -107862,10 +108769,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,10.5
       parent: 2
-  - uid: 13336
+  - uid: 13415
     components:
     - type: Transform
-      pos: -14.5,-7.5
+      pos: 94.5,46.5
+      parent: 2
+  - uid: 13417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,47.5
+      parent: 2
+  - uid: 13421
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,46.5
       parent: 2
   - uid: 14885
     components:
@@ -108066,24 +108985,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,25.5
       parent: 2
-  - uid: 13337
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-7.5
-      parent: 2
-  - uid: 13357
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-7.5
-      parent: 2
-  - uid: 13360
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-6.5
-      parent: 2
   - uid: 13554
     components:
     - type: Transform
diff --git a/Resources/Migrations/LostParadiseMigrations.yml b/Resources/Migrations/LostParadiseMigrations.yml
index 9c9a8bc8e8..a86d247227 100644
--- a/Resources/Migrations/LostParadiseMigrations.yml
+++ b/Resources/Migrations/LostParadiseMigrations.yml
@@ -19,3 +19,4 @@ LPPFlagPoleSYND: null
 LPPLockerElectricalSuppliesSynFilled: null
 LPPRusUnder: null
 PlastitaniumPwindow: WindowReinforcedDirectional
+SecBreachingHammer: LPPHammer
\ No newline at end of file
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 7f19699ad8..3b4a7178cf 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -126,28 +126,6 @@ DrinkGoldschlagerGlass: DrinkGildlagerGlass
 ClosetBase: ClosetSteelBase
 MonkeyCubeBox: VariantCubeBox
 
-# 2024-01-08
-SalvagePartsT4Spawner: SalvageLootSpawner
-SalvagePartsT3Spawner: SalvageLootSpawner
-SalvagePartsT3T4Spawner: SalvageLootSpawner
-SalvagePartsT2Spawner: SalvageLootSpawner
-AdvancedCapacitorStockPart: CapacitorStockPart
-SuperCapacitorStockPart: CapacitorStockPart
-QuadraticCapacitorStockPart: CapacitorStockPart
-NanoManipulatorStockPart: MicroManipulatorStockPart
-PicoManipulatorStockPart: MicroManipulatorStockPart
-FemtoManipulatorStockPart: MicroManipulatorStockPart
-AdvancedMatterBinStockPart: MatterBinStockPart
-SuperMatterBinStockPart: MatterBinStockPart
-BluespaceMatterBinStockPart: MatterBinStockPart
-AnsibleSubspaceStockPart: null
-FilterSubspaceStockPart: null
-AmplifierSubspaceStockPart: null
-TreatmentSubspaceStockPart: null
-AnalyzerSubspaceStockPart: null
-CrystalSubspaceStockPart: null
-TransmitterSubspaceStockPart: null
-
 # 2024-01-10
 ClothingHeadHatHoodRad: null
 
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 981d53884e..d38608a469 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -146,3 +146,76 @@
     icon: Interface/VerbIcons/psionic_invisibility_off.png
     event: !type:RemovePsionicInvisibilityOffPowerActionEvent
 
+- type: entity
+  id: ActionHealingWord
+  name: action-name-healing-word
+  description: action-description-healing-word
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: { sprite : Interface/Actions/psionics.rsi, state: healing_word }
+    useDelay: 10
+    checkCanAccess: false
+    range: 6
+    itemIconStyle: BigAction
+    canTargetSelf: true
+    blacklist:
+      components:
+        - PsionicInsulation
+        - Mindbroken
+    event: !type:PsionicHealOtherPowerActionEvent
+            healingAmount:
+              groups: # These all get divided by the number of damage types in the group. So they're all -2.5.
+                Genetic: -2.5
+                Toxin: -5
+                Airloss: -5
+                Brute: -7.5
+                Burn: -10
+            rotReduction: 10
+            useDelay: 1
+            doRevive: true
+            powerName: Healing Word
+            popupText: healing-word-begin
+            playSound: true
+            minGlimmer: 2
+            maxGlimmer: 4
+            glimmerObviousSoundThreshold: 100
+            glimmerObviousPopupThreshold: 200
+
+- type: entity
+  id: ActionRevivify
+  name: action-name-revivify
+  description: action-description-revivify
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: { sprite : Interface/Actions/psionics.rsi, state: revivify }
+    useDelay: 120
+    checkCanAccess: false
+    range: 2
+    itemIconStyle: BigAction
+    canTargetSelf: false
+    blacklist:
+      components:
+        - PsionicInsulation
+        - Mindbroken
+    event: !type:PsionicHealOtherPowerActionEvent
+            healingAmount:
+              # These all get divided by the number of damage types in the group. So they're all -15
+              # Additionally, they're multiplied by the caster's Amplification, which,
+              #   assuming this is the only power they have, the multiplier is between 2.9-3.9
+              groups:
+                Genetic: -15
+                Toxin: -30
+                Airloss: -60 # Except airloss, which heals 30 per type
+                Brute: -45
+                Burn: -60
+            rotReduction: 60
+            doRevive: true
+            powerName: Revivify
+            popupText: revivify-begin
+            playSound: true
+            minGlimmer: 10 # These also get multiplied by caster stats. So,
+            maxGlimmer: 15 # keeping in mind the ~3.5x multiplier, this spikes glimmer by as much as 60 points.
+            glimmerObviousSoundThreshold: 50
+            glimmerObviousPopupThreshold: 100
diff --git a/Resources/Prototypes/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
index d099493956..faf917ea78 100644
--- a/Resources/Prototypes/Catalog/Jukebox/Standard.yml
+++ b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
@@ -38,4 +38,4 @@
   id: LPPPivoDance
   name: Pivo Dance - BL02DL
   path:
-    path: /Audio/Jukebox/PivoDance.ogg
\ No newline at end of file
+    path: /Audio/Jukebox/PivoDance.ogg
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index db17f1254b..20d1dbc9b0 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -10,6 +10,7 @@
     Telecrystal: 3
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 - type: listing
   id: UplinkRevolverPython
@@ -20,6 +21,7 @@
     Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 # Inbuilt suppressor so it's sneaky + more expensive.
 - type: listing
@@ -31,6 +33,7 @@
     Telecrystal: 4
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 # Poor accuracy, slow to fire, cheap option
 - type: listing
@@ -42,6 +45,7 @@
     Telecrystal: 1
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 - type: listing
   id: UplinkEsword
@@ -53,6 +57,7 @@
     Telecrystal: 8
   categories:
   - UplinkWeapons
+  saleLimit: 2
 
 - type: listing
   id: UplinkEnergyDagger
@@ -64,6 +69,7 @@
     Telecrystal: 2
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 - type: listing
   id: UplinkThrowingKnivesKit
@@ -85,6 +91,7 @@
     Telecrystal: 5
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 - type: listing
   id: UplinkDisposableTurret
@@ -100,6 +107,7 @@
       blacklist:
         tags:
           - NukeOpsUplink
+  saleLimit: 2
 
 - type: listing
   id: BaseBallBatHomeRun
@@ -112,6 +120,7 @@
     Telecrystal: 16
   categories:
   - UplinkWeapons
+  saleLimit: 1
 
 # Explosives
 
@@ -214,6 +223,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkC4Bundle
@@ -224,6 +234,7 @@
     Telecrystal: 12 #you're buying bulk so its a 25% discount
   categories:
   - UplinkExplosives
+  saleLimit: 1
 
 - type: listing
   id: UplinkEmpGrenade
@@ -261,6 +272,7 @@
     blacklist:
       tags:
       - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkSyndicateBombNukie
@@ -276,6 +288,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkClusterGrenade
@@ -451,6 +464,7 @@
       blacklist:
         tags:
           - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
@@ -467,6 +481,7 @@
       whitelist:
         tags:
           - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateCyborgAssault
@@ -483,6 +498,7 @@
       whitelist:
         tags:
           - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkReinforcementRadioSyndicateMonkey
@@ -515,6 +531,7 @@
       whitelist:
         tags:
           - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkStealthBox
@@ -545,7 +562,6 @@
   productEntity: EncryptionKeyBinary
   cost:
     Telecrystal: 1
-
   categories:
   - UplinkUtility
 
@@ -748,6 +764,7 @@
       blacklist:
         tags:
           - NukeOpsUplink
+  saleBlacklist: true
 
 - type: listing
   id: UplinkDeathRattle
@@ -821,6 +838,7 @@
       blacklist:
         components:
           - SurplusBundle
+  saleLimit: 1
 
 - type: listing
   id: UplinkChemistryKitBundle
@@ -862,6 +880,7 @@
       blacklist:
         components:
           - SurplusBundle
+  saleLimit: 1
 
 - type: listing
   id: UplinkSniperBundle
@@ -873,6 +892,7 @@
     Telecrystal: 12
   categories:
   - UplinkBundles
+  saleLimit: 1
 
 - type: listing
   id: UplinkC20RBundle
@@ -884,6 +904,7 @@
     Telecrystal: 17
   categories:
   - UplinkBundles
+  saleLimit: 1
 
 - type: listing
   id: UplinkBulldogBundle
@@ -895,6 +916,7 @@
     Telecrystal: 20
   categories:
   - UplinkBundles
+  saleLimit: 1
 
 - type: listing
   id: UplinkGrenadeLauncherBundle
@@ -906,6 +928,7 @@
     Telecrystal: 25
   categories:
   - UplinkBundles
+  saleLimit: 1
 
 - type: listing
   id: UplinkL6SawBundle
@@ -917,6 +940,7 @@
     Telecrystal: 30
   categories:
   - UplinkBundles
+  saleLimit: 1
 
 - type: listing
   id: UplinkZombieBundle
@@ -937,6 +961,7 @@
     blacklist:
       components:
       - SurplusBundle
+  saleLimit: 1
 
 - type: listing
   id: UplinkSurplusBundle
@@ -956,6 +981,7 @@
     blacklist:
       components:
       - SurplusBundle
+  saleBlacklist: true
 
 - type: listing
   id: UplinkSuperSurplusBundle
@@ -975,6 +1001,7 @@
     blacklist:
       components:
       - SurplusBundle
+  saleBlacklist: true
 
 # Tools
 
@@ -1113,6 +1140,7 @@
   - !type:BuyerJobCondition
     whitelist:
     - Chaplain
+  saleLimit: 1
 
 - type: listing
   id: uplinkRevolverCapGunFake
@@ -1128,6 +1156,7 @@
     whitelist:
     - Mime
     - Clown
+  saleLimit: 1
 
 - type: listing
   id: uplinkBananaPeelExplosive
@@ -1172,6 +1201,7 @@
   - !type:BuyerJobCondition
     whitelist:
     - Clown
+  saleLimit: 1
 
 - type: listing
   id: uplinkHotPotato
@@ -1335,6 +1365,7 @@
     Telecrystal: 8
   categories:
   - UplinkArmor
+  saleLimit: 1
 
 - type: listing
   id: UplinkHardsuitSyndieElite
@@ -1346,6 +1377,7 @@
     Telecrystal: 10
   categories:
   - UplinkArmor
+  saleLimit: 1
 
 - type: listing
   id: UplinkClothingOuterHardsuitJuggernaut
@@ -1357,6 +1389,7 @@
     Telecrystal: 11
   categories:
   - UplinkArmor
+  saleLimit: 1
 
 # Misc
 
@@ -1425,6 +1458,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkSoapSyndie
@@ -1515,6 +1549,7 @@
     Telecrystal: 12
   categories:
   - UplinkMisc
+  saleLimit: 1
 
 - type: listing
   id: UplinkBribe
@@ -1541,6 +1576,7 @@
       whitelist:
         tags:
           - NukeOpsUplink
+  saleLimit: 1
 
 - type: listing
   id: UplinkBackpackSyndicate
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
index 575687336a..363f270227 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
@@ -1,44 +1,13 @@
 - type: entity
   id: AsteroidAltRock #It's 1994
-  parent: BaseStructure
+  parent: AsteroidRock
   name: asteroid rock
   suffix: Low Ore Yield
   description: A rocky asteroid.
   components:
-  - type: Gatherable
-    whitelist:
-      tags:
-        - Pickaxe
   - type: Sprite
-    sprite: DeltaV/Structures/Walls/asteroid_rock.rsi
+    sprite: Structures/Walls/rock.rsi
     state: full
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Occluder
-  - type: Airtight
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        density: 100
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-  - type: IconSmooth
-    key: walls
-    base: rock_
   - type: OreVein
     oreChance: 0.2
     oreRarityPrototypeId: RandomOreDistributionStandard
@@ -52,7 +21,7 @@
   components:
   - type: Sprite
     sprite: DeltaV/Structures/Walls/mountain_rock_ore.rsi
-    state: full
+    state: full_two
   - type: Destructible
     thresholds:
     - trigger:
@@ -110,10 +79,6 @@
   suffix: Higher Ore Yield
   description: A rocky asteroid.
   components:
-  - type: Gatherable
-    whitelist:
-      tags:
-        - Pickaxe
   - type: OreVein
     oreChance: 0.33
     oreRarityPrototypeId: RandomOreDistributionStandard
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
index cd79417a44..a872164ba3 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -172,6 +172,7 @@
   category: Weapons
   completetime: 15
   materials:
+    LPPDiamond: 2500
     Steel: 2000
     Glass: 1000
     Plastic: 500
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index 34bf32d8d7..4beffbc9c2 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -63,23 +63,78 @@
       offset: 0.0
 
 - type: entity
-  name: salvage loot spawner
-  id: SalvageLootSpawner
+  name: Salvage T2 Machine Parts Spawner
+  id: SalvagePartsT2Spawner
   parent: MarkerBase
   components:
     - type: Sprite
       layers:
         - state: red
-        - sprite: Objects/Weapons/Melee/crusher.rsi
-          state: icon
+        - sprite: Objects/Misc/stock_parts.rsi
+          state: advanced_matter_bin
     - type: RandomSpawner
       prototypes:
-      - WeaponCrusher
-      - WeaponCrusherDagger
-      - WeaponCrusherGlaive
-      - MiningDrill
+        - AdvancedCapacitorStockPart
+        - NanoManipulatorStockPart
+        - AdvancedMatterBinStockPart
       offset: 0.0
 
+- type: entity
+  parent: MarkerBase
+  id: SalvagePartsT3T4Spawner
+  name: tier 3/4 machine part
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Objects/Misc/stock_parts.rsi
+      state: super_matter_bin
+  - type: RandomSpawner
+    rarePrototypes:
+    - QuadraticCapacitorStockPart
+    - FemtoManipulatorStockPart
+    - BluespaceMatterBinStockPart
+    rareChance: 0.05
+    prototypes:
+    - SuperCapacitorStockPart
+    - PicoManipulatorStockPart
+    - SuperMatterBinStockPart
+    chance: 0.95
+    offset: 0.0
+
+- type: entity
+  parent: MarkerBase
+  id: SalvagePartsT3Spawner
+  name: tier 3 machine part
+  suffix: Spawner
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Objects/Misc/stock_parts.rsi
+      state: super_matter_bin
+  - type: RandomSpawner
+    prototypes:
+    - SuperCapacitorStockPart
+    - PicoManipulatorStockPart
+    - SuperMatterBinStockPart
+    offset: 0.0
+
+- type: entity
+  parent: MarkerBase
+  id: SalvagePartsT4Spawner
+  name: tier 4 machine part
+  suffix: Spawner
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Objects/Misc/stock_parts.rsi
+      state: bluespace_matter_bin
+  - type: RandomSpawner
+    prototypes:
+    - QuadraticCapacitorStockPart
+    - PicoManipulatorStockPart
+    - BluespaceMatterBinStockPart
+    offset: 0.0
+
 - type: entity
   name: Salvage Mob Spawner
   id: SalvageMobSpawner
@@ -228,3 +283,25 @@
       - MobFleshLoverSalvage
       chance: 1
       offset: 0.2
+
+- type: entity
+  name: Salvage Loot Spawner
+  id: SalvageLootSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/Crates/generic.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - SalvagePartsT2Spawner
+        - SalvagePartsT3Spawner
+        - SalvagePartsT3T4Spawner
+        - SalvagePartsT4Spawner
+      rareChance: 0.4
+      prototypes:
+        - CrateSalvageAssortedGoodies
+      chance: 0.9
+      offset: 0.2
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 536c9156f6..700eb2f557 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2067,7 +2067,7 @@
         Heat : 0.2 #per second, scales with temperature & other constants
   - type: RandomBark
     barks:
-      - Wank
+      - Пипипи..
     barkMultiplier: 0.6
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 93d4b957fe..743d9a1792 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -48,6 +48,31 @@
       path: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
       params:
         volume: -2
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 30
+        mask:
+        - ItemMask
+        layer:
+        - BulletImpassable # Ever seen a John Woo movie?
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
 
 - type: entity
   parent: DrinkBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 8f28b63a40..764f75603e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -31,6 +31,9 @@
         !type:DamageTrigger
         damage: 5
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
       - !type:SpillBehavior { }
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index 63c47df67e..3bd66e8a48 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -54,6 +54,17 @@
     materialComposition:
       Glass: 60
   - type: SpaceGarbage
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 25
+        mask:
+        - ItemMask
+        layer:
+        - BulletImpassable # Ever seen a John Woo movie?
 
 - type: entity
   name: broken plate
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 891dfc1e79..ee1b0576b1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -619,7 +619,7 @@
     - type: ReverseEngineering # Delta
       difficulty: 3
       recipes:
-        - CrewMonitoringServerMachineCircuitboard
+        - LPPCrewMonitoringServerMachineCircuitboard
 
 - type: entity
   id: CryoPodMachineCircuitboard
@@ -1407,6 +1407,7 @@
       materialRequirements:
         Steel: 5
         Bluespace: 2  #DeltaV Bluespace Exists
+        Diamond: 3  # LostParadise
     - type: ReverseEngineering # Delta
       difficulty: 3
       recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index e71a163b5d..ee0d7d70ab 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -348,12 +348,21 @@
   name: refined diamond
   suffix: Full
   components:
+  - type: Tag
+    tags:
+    - Ingot
+    - LPPProcessedDiamond
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      LPPDiamond: 500
   - type: Stack
     stackType: Diamond
   - type: Sprite
     state: diamond
   - type: Item
     heldPrefix: diamond
+  - type: Appearance
   - type: Extractable
     grindableSolutionName: diamond
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 341acb52f0..d90b03528e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -16,6 +16,10 @@
       sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg
     - type: EmitSoundOnLand
       sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg
+# Rating 1
+    - type: GuideHelp
+      guides:
+      - MachineUpgrading
 
 # Rating 1
 
@@ -69,3 +73,218 @@
     - type: ReverseEngineering # Nyano
       recipes:
         - MatterBinStockPart
+
+# Rating 2
+
+- type: entity
+  id: AdvancedCapacitorStockPart
+  name: advanced capacitor
+  parent: CapacitorStockPart
+  description: An advanced capacitor used in the construction of a variety of devices.
+  suffix: Rating 2
+  components:
+    - type: Sprite
+      state: adv_capacitor
+    - type: MachinePart
+      rating: 2
+    - type: ReverseEngineering # Nyano
+      difficulty: 2
+      recipes:
+        - AdvancedCapacitorStockPart
+
+- type: entity
+  id: NanoManipulatorStockPart
+  name: advanced manipulator
+  parent: MicroManipulatorStockPart
+  description: An advanced manipulator used in the construction of a variety of devices.
+  suffix: Rating 2
+  components:
+    - type: Sprite
+      state: nano_mani
+    - type: MachinePart
+      rating: 2
+    - type: ReverseEngineering # Nyano
+      difficulty: 2
+      recipes:
+        - NanoManipulatorStockPart
+
+- type: entity
+  id: AdvancedMatterBinStockPart
+  name: advanced matter bin
+  parent: MatterBinStockPart
+  description: An advanced matter bin used in the construction of a variety of devices.
+  suffix: Rating 2
+  components:
+    - type: Sprite
+      state: advanced_matter_bin
+    - type: MachinePart
+      rating: 2
+    - type: ReverseEngineering # Nyano
+      difficulty: 2
+      recipes:
+        - AdvancedMatterBinStockPart
+
+# Rating 3
+
+- type: entity
+  id: SuperCapacitorStockPart
+  name: super capacitor
+  parent: CapacitorStockPart
+  description: A super capacitor used in the construction of a variety of devices.
+  suffix: Rating 3
+  components:
+    - type: Sprite
+      state: super_capacitor
+    - type: MachinePart
+      rating: 3
+    - type: ReverseEngineering # Nyano
+      difficulty: 3
+      recipes:
+        - SuperCapacitorStockPart
+
+- type: entity
+  id: PicoManipulatorStockPart
+  name: super manipulator
+  parent: MicroManipulatorStockPart
+  description: A super manipulator used in the construction of a variety of devices.
+  suffix: Rating 3
+  components:
+    - type: Sprite
+      state: pico_mani
+    - type: MachinePart
+      rating: 3
+    - type: ReverseEngineering # Nyano
+      difficulty: 3
+      recipes:
+        - PicoManipulatorStockPart
+
+- type: entity
+  id: SuperMatterBinStockPart
+  name: super matter bin
+  parent: MatterBinStockPart
+  description: A super matter bin used in the construction of a variety of devices.
+  suffix: Rating 3
+  components:
+    - type: Sprite
+      state: super_matter_bin
+    - type: MachinePart
+      rating: 3
+    - type: ReverseEngineering # Nyano
+      difficulty: 3
+      recipes:
+        - SuperMatterBinStockPart
+
+# Rating 4
+
+- type: entity
+  id: QuadraticCapacitorStockPart
+  name: bluespace capacitor
+  parent: CapacitorStockPart
+  description: A bluespace capacitor used in the construction of a variety of devices.
+  suffix: Rating 4
+  components:
+    - type: Sprite
+      state: quadratic_capacitor
+    - type: MachinePart
+      rating: 4
+    - type: ReverseEngineering # Nyano
+      difficulty: 4
+      recipes:
+        - QuadraticCapacitorStockPart
+
+- type: entity
+  id: FemtoManipulatorStockPart
+  name: bluespace manipulator
+  parent: MicroManipulatorStockPart
+  description: A bluespace manipulator used in the construction of a variety of devices.
+  suffix: Rating 4
+  components:
+    - type: Sprite
+      state: femto_mani
+    - type: MachinePart
+      rating: 4
+    - type: ReverseEngineering # Nyano
+      difficulty: 4
+      recipes:
+        - FemtoManipulatorStockPart
+
+- type: entity
+  id: BluespaceMatterBinStockPart
+  name: bluespace matter bin
+  parent: MatterBinStockPart
+  description: A bluespace matter bin used in the construction of a variety of devices.
+  suffix: Rating 4
+  components:
+    - type: Sprite
+      state: bluespace_matter_bin
+    - type: MachinePart
+      rating: 4
+    - type: ReverseEngineering # Nyano
+      difficulty: 4
+      recipes:
+        -  BluespaceMatterBinStockPart
+
+# Subspace stock parts (REMOVE THESE)
+
+- type: entity
+  id: AnsibleSubspaceStockPart
+  name: subspace ansible
+  parent: BaseStockPart
+  description: A compact module capable of sensing extradimensional activity.
+  components:
+    - type: Sprite
+      state: subspace_ansible
+
+- type: entity
+  id: FilterSubspaceStockPart
+  name: hyperwave filter
+  parent: BaseStockPart
+  description: A tiny device capable of filtering and converting super-intense radiowaves.
+  components:
+    - type: Sprite
+      state: hyperwave_filter
+
+- type: entity
+  id: AmplifierSubspaceStockPart
+  name: subspace amplifier
+  parent: BaseStockPart
+  description: A compact micro-machine capable of amplifying weak subspace transmissions.
+  components:
+    - type: Sprite
+      state: subspace_amplifier
+
+- type: entity
+  id: TreatmentSubspaceStockPart
+  name: subspace treatment disk
+  parent: BaseStockPart
+  description: A compact micro-machine capable of stretching out hyper-compressed radio waves.
+  components:
+    - type: Sprite
+      state: treatment_disk
+
+- type: entity
+  id: AnalyzerSubspaceStockPart
+  name: subspace wavelength analyzer
+  parent: BaseStockPart
+  description: A sophisticated analyzer capable of analyzing cryptic subspace wavelengths.
+  components:
+    - type: Sprite
+      state: wavelength_analyzer
+
+- type: entity
+  id: CrystalSubspaceStockPart
+  name: ansible crystal
+  parent: BaseStockPart
+  description: A crystal made from pure glass used to transmit laser databursts to subspace.
+  components:
+    - type: Sprite
+      state: ansible_crystal
+
+- type: entity
+  id: TransmitterSubspaceStockPart
+  name: subspace transmitter
+  parent: BaseStockPart
+  description: A large piece of equipment used to open a window into the subspace dimension.
+  components:
+    - type: Sprite
+      state: subspace_transmitter
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
index 84a51b4f34..fca8c8ae85 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
@@ -10,6 +10,9 @@
   - type: Item
     sprite: Objects/Specific/Research/rped.rsi
     size: Normal
+  - type: GuideHelp
+    guides:
+    - MachineUpgrading
   - type: PartExchanger
   - type: Storage
     grid:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
index a36bfaf676..e2a3bb176c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -23,6 +23,7 @@
     areaInsert: true
     whitelist:
       tags:
+        - LPPProcessedDiamond
         - ArtifactFragment
         - Ore
   - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 55baa13d83..3f37d308db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -61,21 +61,6 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: impact_laser
 
-- type: hitscan
-  id: LPPRedMediumLightLaser
-  damage:
-    types:
-      Heat: 13
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_laser
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_laser
-
 - type: hitscan
   id: RedLightLaser
   damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index fb1eb3d7fe..013a97c099 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -12,7 +12,7 @@
     state: pickaxe
   - type: MeleeWeapon
     attackRate: 0.85
-    range: 1.5
+    range: 1.25
     wideAnimationRotation: -135
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -31,7 +31,7 @@
     damage:
       types:
         Blunt: 5
-        Structural: 30
+        Structural: 12
   - type: Item
     size: Normal
     shape:
@@ -61,7 +61,7 @@
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
     attackRate: 1.2
-    range: 1.5
+    range: 1.25
     damage:
       types:
         Blunt: 6
@@ -72,7 +72,6 @@
     heavyRangeModifier: 2
     heavyDamageBaseModifier: 1
     angle: 20
-
   - type: ReverseEngineering # Nyano
     difficulty: 2
     recipes:
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 681f0a390c..6e331a13a8 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -31,6 +31,9 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
+  - type: UpgradePowerDraw
+    powerDrawMultiplier: 0.75
+    scaling: Exponential
   - type: GuideHelp
     guides:
     - Chemicals
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index dbef5a7504..6c6504e05d 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -40,7 +40,7 @@
     footstepSoundCollection:
       collection: FootstepHull
   - type: RequireProjectileTarget
-  
+
 - type: entity
   id: CounterBase
   parent: TableBase
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 0fb69b4fdb..14b3270ba8 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -33,7 +33,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 25
       behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -48,6 +48,7 @@
           collection: MetalBreak
   - type: StaticPrice
     price: 10
+  - type: RequireProjectileTarget
 
 #Starts unanchored, cannot be rotated while anchored
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index ab09a03fef..e6f08fe846 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -176,8 +176,8 @@
       SetParticleZeta: AnomalousParticleZeta
       SetParticleSigma: AnomalousParticleSigma
     fireBurstSize: 1
-    fireBurstDelayMin: 2
-    fireBurstDelayMax: 6
+    baseFireBurstDelayMin: 2
+    baseFireBurstDelayMax: 6
   - type: ApcPowerReceiver
     powerLoad: 100
   - type: GuideHelp
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
index 3019b8adf8..eeaae611c3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
@@ -41,7 +41,7 @@
           bounds: "-0.35,-0.35,0.35,0.35"
         density: 100
         mask:
-        - ItemMask 
+        - ItemMask
         hard: True
   - type: Transform
     anchored: true
@@ -49,6 +49,9 @@
   - type: ApcPowerReceiver
     powerLoad: 2500
     needsPower: true
+  - type: UpgradePowerDraw
+    powerDrawMultiplier: 0.80
+    scaling: Exponential
   - type: ItemPlacer
     whitelist:
       components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index 18999a6ab2..2bea530e90 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -107,6 +107,9 @@
         hard: False
   - type: Transform
     noRot: false
+  - type: UpgradePowerDraw
+    powerDrawMultiplier: 0.80
+    scaling: Exponential
   - type: TraversalDistorter
   - type: ItemPlacer
     # don't limit the number of artifacts that can be biased
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0c8031c6f8..40fd3599e1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -272,9 +272,11 @@
     runningState: building
     staticRecipes:
     - LargeBeaker
-    - Dropper
     - ClothingEyesGlassesChemical
     dynamicRecipes:
+      - LPPDiamondPickaxe
+      - LPPDiamondMiningDrill
+      - Dropper
       - LPPRCDFAPDevice
       - LPPRCDFAPAmmo
       - PowerDrill
@@ -297,6 +299,12 @@
       - Implanter
       - PillCanister
       - ChemistryEmptyBottle01
+      - AdvancedCapacitorStockPart
+      - AdvancedMatterBinStockPart
+      - NanoManipulatorStockPart
+      - SuperCapacitorStockPart
+      - SuperMatterBinStockPart
+      - PicoManipulatorStockPart
       - AdvMopItem
       - WeaponSprayNozzle
       - ClothingBackpackWaterTank
@@ -433,6 +441,7 @@
     - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
     - SpaceHeaterMachineCircuitBoard
     dynamicRecipes:
+      - LPPDiamondCrusherMachineCircuitboard
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
       - PortableScrubberMachineCircuitBoard
@@ -503,6 +512,7 @@
       - MassMediaCircuitboard
       - ReagentGrinderIndustrialMachineCircuitboard
     # Begin Nyano additions
+      - LPPCrewMonitoringServerMachineCircuitboard
       - ReverseEngineeringMachineCircuitboard
       - CrewMonitoringComputerCircuitboard
       - DoorElectronics
@@ -1211,11 +1221,13 @@
       ignoreColor: true
       whitelist:
         tags:
+          - LPPProcessedDiamond
           - Ore
     - type: Lathe
       idleState: icon
       runningState: building
       staticRecipes:
+        - LPPMaterialDiamond
         - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
         - SheetSteel30
         - SheetGlass30
@@ -1245,6 +1257,8 @@
     materialUseMultiplier: 0.75
     timeMultiplier: 0.5
     staticRecipes:
+      - LPPMaterialDiamond
+      - BluespaceCrystal
       - SheetSteel30
       - SheetGlass30
       - SheetRGlass30
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 948b3f84b2..7f97499ae8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -18,6 +18,7 @@
     - Arsenal
     - Experimental
     - CivilianServices
+    - LPPDiamondProduction
   - type: ApcPowerReceiver
     powerLoad: 200
   - type: ExtensionCableReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
index ec07294bfb..4ecd1c29e2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -35,3 +35,6 @@
   - type: SeedExtractor
   - type: Machine
     board: SeedExtractorMachineCircuitboard
+  - type: UpgradePowerDraw
+    powerDrawMultiplier: 0.75
+    scaling: Exponential
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index 4fa1bcbd91..35d65ffe87 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -171,6 +171,9 @@
       materialWhiteList: [Plasma]
     - type: PortableGenerator
       startChance: 0.8
+    - type: UpgradePowerSupplier
+      powerSupplyMultiplier: 1.25
+      scaling: Exponential
     - type: GeneratorExhaustGas
       gasType: CarbonDioxide
       # 2 moles of gas for every sheet of plasma.
@@ -228,6 +231,9 @@
       storageLimit: 3000
       materialWhiteList: [Uranium]
     - type: PortableGenerator
+    - type: UpgradePowerSupplier
+      powerSupplyMultiplier: 1.25
+      scaling: Exponential
     - type: PowerMonitoringDevice
       group: Generator
       loadNodes:
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 1e3559e5a9..762e8d375f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -29,10 +29,15 @@
           state: "smes-op1"
           shader: unshaded
     - type: Smes
+    - type: UpgradeBattery
+      maxChargeMultiplier: 2
+      baseMaxCharge: 8000000
+    - type: UpgradePowerSupplyRamping
+      scaling: Linear
+      supplyRampingMultiplier: 1     
     - type: Appearance
     - type: Battery
       startingCharge: 0
-      maxCharge: 8000000
     - type: ExaminableBattery
     - type: NodeContainer
       examinable: true
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 347b18ecae..489cfff659 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -17,8 +17,13 @@
       shader: unshaded
     - state: full
       shader: unshaded
+  - type: UpgradeBattery
+    maxChargeMultiplier: 2
+    baseMaxCharge: 2500000
+  - type: UpgradePowerSupplyRamping
+    scaling: Linear
+    supplyRampingMultiplier: 1
   - type: Battery
-    maxCharge: 2500000
     startingCharge: 0
   - type: ExaminableBattery
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index f87be42659..eb299e3f3a 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -143,6 +143,7 @@
   - type: Thruster
     thrusterType: Angular
     requireSpace: false
+    baseThrust: 2000
     thrust: 2000
     machinePartThrust: Manipulator
   - type: Sprite
@@ -192,6 +193,9 @@
             collection: MetalBreak
         - !type:ChangeConstructionNodeBehavior
           node: machineFrame
+  - type: UpgradePowerDraw
+    powerDrawMultiplier: 0.75
+    scaling: Exponential
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Electronic
@@ -216,6 +220,7 @@
   - type: Thruster
     thrusterType: Angular
     requireSpace: false
+    baseThrust: 100
     thrust: 100
   - type: ApcPowerReceiver
     needsPower: false
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index a8cb0b1cb8..4b2eef6df8 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -9,7 +9,6 @@
   description: A rocky asteroid.
   components:
   - type: Transform
-    noRot: true
   - type: IconSmooth
     key: walls
     mode: NoSprite
@@ -36,7 +35,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 120
+        damage: 250
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -367,35 +366,13 @@
 # Rocks and ore veins
 - type: entity
   id: WallRock
-  parent: BaseWall
+  parent: AsteroidRock
   name: rock
   suffix: planetmap
   components:
-    - type: Transform
-      noRot: true
-    - type: SoundOnGather
-    - type: Gatherable
-      whitelist:
-        tags:
-          - Pickaxe
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 150
-          behaviors:
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-    - type: IconSmooth
-      key: walls
-      mode: NoSprite
     - type: Icon
       sprite: Structures/Walls/rock.rsi
       state: rock
-    - type: SmoothEdge
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml
index a21be1678c..c73b666f68 100644
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -7,6 +7,7 @@
   - AnomalousResearch
   - Xenoarchaeology
   - Robotics
+  - MachineUpgrading
   - Psionics # Nyanotrasen - Psionics guidebook
   # - AltarsGolemancy # When it's added # Nyanotrasen - Golemancy guidebook
   - ReverseEngineering # Nyanotrasen - Reverse Engineering guidebook
@@ -60,6 +61,11 @@
   name: guide-entry-traversal-distorter
   text: "/ServerInfo/Guidebook/Science/TraversalDistorter.xml"
 
+- type: guideEntry
+  id: MachineUpgrading
+  name: guide-entry-machine-upgrading
+  text: "/ServerInfo/Guidebook/Science/MachineUpgrading.xml"
+
 - type: guideEntry
   id: Cyborgs
   name: guide-entry-cyborgs
diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml
index d0a4e29568..59ed27e82b 100644
--- a/Resources/Prototypes/Guidebook/security.yml
+++ b/Resources/Prototypes/Guidebook/security.yml
@@ -22,8 +22,3 @@
   id: CriminalRecords
   name: guide-entry-criminal-records
   text: "/ServerInfo/Guidebook/Security/CriminalRecords.xml"
-
-- type: guideEntry
-  id: LPPTenCodes
-  name: lppguide-entry-criminal-records
-  text: "/ServerInfo/Guidebook/Security/TenCodes.xml"
\ No newline at end of file
diff --git a/Resources/Prototypes/Interactions/help_interactions.yml b/Resources/Prototypes/Interactions/help_interactions.yml
index 0e383389d9..9b78001c6a 100644
--- a/Resources/Prototypes/Interactions/help_interactions.yml
+++ b/Resources/Prototypes/Interactions/help_interactions.yml
@@ -17,6 +17,7 @@
 - type: Interaction
   id: HelpUp
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 1.5
   cooldown: 0.5
   hideByRequirement: true
@@ -42,6 +43,7 @@
 - type: Interaction
   id: ForceDown
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   delay: 4.5
   hideByRequirement: true
   requirement:
@@ -54,6 +56,7 @@
 - type: Interaction
   id: MakeSleepOther
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   priority: -6
   delay: 10 # Should be long enough to be non-abusable, right?
   hideByRequirement: true
@@ -73,6 +76,7 @@
 - type: Interaction
   id: ShakeOther
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: -5
   delay: 0.8
   cooldown: 10 # Slightly abusable
diff --git a/Resources/Prototypes/Interactions/mood_interactions.yml b/Resources/Prototypes/Interactions/mood_interactions.yml
index 6a50704b03..22df65edfc 100644
--- a/Resources/Prototypes/Interactions/mood_interactions.yml
+++ b/Resources/Prototypes/Interactions/mood_interactions.yml
@@ -3,7 +3,7 @@
   id: Hug
   parent: [BaseGlobal, BaseHands]
   priority: 2
-  #icon: /Textures/Interface/Actions/hug.png
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 0.7
   range: {max: 1}
   hideByRequirement: true
@@ -20,7 +20,7 @@
   id: Pet
   parent: [BaseGlobal, BaseHands]
   priority: 1
-  #icon: /Textures/Interface/Actions/hug.png
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 0.4
   range: {max: 1}
   hideByRequirement: true
@@ -40,6 +40,7 @@
 - type: Interaction
   id: PetAnimal
   parent: Pet
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   requirement:
     !type:ComplexRequirement
     requirements:
diff --git a/Resources/Prototypes/Interactions/noop_interactions.yml b/Resources/Prototypes/Interactions/noop_interactions.yml
index 6729b36e75..d624e22d26 100644
--- a/Resources/Prototypes/Interactions/noop_interactions.yml
+++ b/Resources/Prototypes/Interactions/noop_interactions.yml
@@ -18,6 +18,7 @@
 - type: Interaction
   id: WaveAt
   parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: 3
   requiresCanInteract: false
   contactInteraction: false
@@ -36,6 +37,7 @@
 # Knocking on the target - windows, doors, etc.
 - type: Interaction
   id: KnockOn
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   parent: BaseHands
   priority: 20
   effectSuccess:
@@ -48,6 +50,7 @@
 - type: Interaction
   id: Rattle
   parent: BaseHands
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: 20
   effectSuccess:
     popup: VisibleNoChat
diff --git a/Resources/Prototypes/Interactions/self_interactions.yml b/Resources/Prototypes/Interactions/self_interactions.yml
index 0c3aad0118..003b47dfd1 100644
--- a/Resources/Prototypes/Interactions/self_interactions.yml
+++ b/Resources/Prototypes/Interactions/self_interactions.yml
@@ -16,6 +16,7 @@
 - type: Interaction
   id: PinchSelf
   parent: SelfInteractionBase
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   delay: 1
   action:
     !type:ComplexAction
@@ -35,6 +36,7 @@
 # Sleeping on the floor is real
 - type: Interaction
   id: MakeSleepSelf
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   parent: [SelfInteractionBase, MakeSleepOther]
   delay: 4.5
   requirement:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
index d019cee136..1469f6ac4d 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/breaching_hammer.yml
@@ -1,5 +1,6 @@
 - type: entity
   name: breaching hammer
+  suffix: DO NOT MAP
   parent: BaseItem
   id: SecBreachingHammer
   description: A large, heavy hammer with a long handle, used for breaking stones or other heavy material such as the skulls of violent criminals, also perfect for forcing your way trough airlocks.
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index 0781122b8e..2aee2273a1 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -11,3 +11,5 @@
 #    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
     TelepathyPower: 1
+    HealingWordPower: 0.85
+    RevivifyPower: 0.1
diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml
index 461098eab2..b881f1f11f 100644
--- a/Resources/Prototypes/Psionics/psionics.yml
+++ b/Resources/Prototypes/Psionics/psionics.yml
@@ -140,3 +140,25 @@
   initializationFeedback: telepathy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
   powerSlotCost: 0
+
+- type: psionicPower
+  id: HealingWordPower
+  name: HealingWord
+  description: healing-word-power-description
+  actions:
+    - ActionHealingWord
+  initializationFeedback: healing-word-power-initialization-feedback
+  metapsionicFeedback: healing-word-power-feedback
+  amplificationModifier: 0.5
+  dampeningModifier: 0.5
+
+- type: psionicPower
+  id: RevivifyPower
+  name: Revivify
+  description: revivify-power-description
+  actions:
+    - ActionRevivify
+  initializationFeedback: revivify-power-initialization-feedback
+  metapsionicFeedback: revivify-power-feedback
+  amplificationModifier: 2.5 # An extremely rare and dangerous power
+  powerSlotCost: 2
diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml
index 90cff2174d..496bc3a8a4 100644
--- a/Resources/Prototypes/Recipes/Lathes/Parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml
@@ -1,3 +1,4 @@
+#Rating 1
 - type: latheRecipe
   id: CapacitorStockPart
   result: CapacitorStockPart
@@ -24,3 +25,62 @@
   materials:
     Steel: 50
     Plastic: 50
+
+#Rating 2
+- type: latheRecipe
+  id: AdvancedCapacitorStockPart
+  result: AdvancedCapacitorStockPart
+  completetime: 3
+  materials:
+    Steel: 80
+    Plastic: 80
+    Plasma: 75
+
+- type: latheRecipe
+  id: AdvancedMatterBinStockPart
+  result: AdvancedMatterBinStockPart
+  completetime: 3
+  materials:
+    Steel: 80
+    Plastic: 80
+    Plasma: 75
+
+- type: latheRecipe
+  id: NanoManipulatorStockPart
+  result: NanoManipulatorStockPart
+  completetime: 3
+  materials:
+    Steel: 80
+    Plastic: 80
+    Plasma: 75
+
+#Rating 3
+- type: latheRecipe
+  id: SuperCapacitorStockPart
+  result: SuperCapacitorStockPart
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75
+
+- type: latheRecipe
+  id: SuperMatterBinStockPart
+  result: SuperMatterBinStockPart
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75
+
+- type: latheRecipe
+  id: PicoManipulatorStockPart
+  result: PicoManipulatorStockPart
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 7ee8f1ed49..f4a243b45c 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -49,6 +49,7 @@
   result: BluespaceBeaker
   completetime: 2
   materials:
+    LPPDiamond: 2000
     Steel: 200  #Cheaper Due to Needing Bluespace
     Plastic: 200
     Plasma: 50
@@ -60,6 +61,7 @@
   result: SyringeBluespace
   completetime: 2
   materials:
+    LPPDiamond: 2000
     Steel: 100  #Cheaper Due to Needing Bluespace
     Plastic: 100
     Glass: 200
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index d41b5fdce8..aa9a43b2db 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -76,7 +76,7 @@
     Steel: 100
     Plastic: 200
     Glass: 100
-    
+
 - type: latheRecipe
   id: SignallerAdvanced
   result: RemoteSignallerAdvanced
@@ -173,6 +173,7 @@
   result: OreBagOfHolding
   completetime: 5
   materials:
+    LPPDiamond: 2500
     Steel: 2000
     Silver: 750
     Plasma: 1000 #DeltaV: Bluespace Exists so less plasma used, no uranium
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index 12b5bedf10..2b1cc7037e 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -974,7 +974,7 @@
      Steel: 100
      Glass: 900
      Gold: 100
- 
+
 - type: latheRecipe
   id: JukeboxCircuitBoard
   result: JukeboxCircuitBoard
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index ab13dc4573..81ccb3d351 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -131,6 +131,7 @@
   result: ClothingShoesBootsSpeed
   completetime: 2
   materials:
+    LPPDiamond: 2500
     Steel: 1500
     Plastic: 1000
     Silver: 500
diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml
index 21928a53d2..b7e6fd0c2a 100644
--- a/Resources/Prototypes/Recipes/Lathes/powercells.yml
+++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -35,6 +35,7 @@
   category: Parts
   completetime: 10
   materials:
+    LPPDiamond: 2000
     Steel: 500
     Glass: 400
     Uranium: 200
@@ -63,6 +64,7 @@
   result: PowerCageHigh
   completetime: 10
   materials:
+    LPPDiamond: 2000
     Steel: 600
     Glass: 800
     Plastic: 400
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 08e11e4ff8..7eea7064b0 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -38,7 +38,7 @@
   materials:
     Steel: 250
     Plastic: 100
-    
+
 - type: latheRecipe
   id: WeaponLaserCarbine
   result: WeaponLaserCarbine
@@ -55,6 +55,7 @@
   category: Weapons
   completetime: 5
   materials:
+    LPPDiamond: 2000
     Steel: 1500
     Glass: 1000
     Gold: 850
@@ -621,7 +622,7 @@
     Steel: 1000
     Glass: 500
     Plastic: 500
-     
+
 - type: latheRecipe
   id: MagazineGrenadeEmpty
   result: MagazineGrenadeEmpty
@@ -629,7 +630,7 @@
   materials:
      Steel: 150
      Plastic: 50
-     
+
 - type: latheRecipe
   id: GrenadeEMP
   result: GrenadeEMP
@@ -638,7 +639,7 @@
      Steel: 150
      Plastic: 100
      Glass: 20
-     
+
 - type: latheRecipe
   id: GrenadeBlast
   result: GrenadeBlast
@@ -647,7 +648,7 @@
      Steel: 150
      Plastic: 100
      Gold: 50
-     
+
 - type: latheRecipe
   id: GrenadeFlash
   result: GrenadeFlash
@@ -656,4 +657,3 @@
      Steel: 150
      Plastic: 100
      Glass: 20
-     
\ No newline at end of file
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 7f88798d33..7432d4225f 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -116,19 +116,6 @@
 
 # Tier 2
 
-- type: technology
-  id: LPPCombatUtilitys
-  name: lppresearch-technology-combat-utility
-  icon:
-    sprite: _LostParadise/Objects/Specific/Medical/CombatHypospray.rsi
-    state: hypo
-  discipline: Arsenal
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - LPPCombatDefibrillator
-  - LPPCombatHypospray
-
 - type: technology
   id: ExplosiveTechnology
   name: research-technology-explosive-technology
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 489bef1800..0a9f74b86d 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -1,31 +1,5 @@
 # Tier 1
 
-- type: technology
-  id: LPPBasicAdministrationOfDrugs
-  name: lppresearch-technology-basic-administration-of-drugs
-  icon:
-    sprite: _LostParadise/Objects/Specific/Medical/hyposprayzero.rsi
-    state: hypo
-  discipline: CivilianServices
-  tier: 1
-  cost: 2000
-  recipeUnlocks:
-  - LPPHypospray
-  - Syringe
-  - Dropper
-
-- type: technology
-  id: LPPBasicTracking
-  name: lppresearch-technology-basic-tracking
-  icon:
-    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
-    state: scanner
-  discipline: CivilianServices
-  tier: 1
-  cost: 2000
-  recipeUnlocks:
-  - HandheldCrewMonitor
-
 - type: technology
   id: Hydroponics
   name: research-technology-basic-hydroponics
diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml
index 7a661da1a3..baecd5f346 100644
--- a/Resources/Prototypes/Research/disciplines.yml
+++ b/Resources/Prototypes/Research/disciplines.yml
@@ -8,7 +8,7 @@
   tierPrerequisites:
     1: 0
     2: 0.75
-    3: 0.75
+    3: 1.0
 
 - type: techDiscipline
   id: Arsenal
@@ -20,7 +20,7 @@
   tierPrerequisites:
     1: 0
     2: 0.75
-    3: 0.75
+    3: 1.0
 
 - type: techDiscipline
   id: Experimental
@@ -32,7 +32,7 @@
   tierPrerequisites:
     1: 0
     2: 0.75
-    3: 0.75
+    3: 1.0
 
 - type: techDiscipline
   id: CivilianServices
@@ -44,4 +44,4 @@
   tierPrerequisites:
     1: 0
     2: 0.75
-    3: 0.75
+    3: 1.0
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index d46e1db144..85523033f8 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -84,6 +84,20 @@
 
 # Tier 2
 
+- type: technology
+  id: AdvancedParts
+  name: research-technology-advanced-parts
+  icon:
+    sprite: Objects/Misc/stock_parts.rsi
+    state: advanced_matter_bin
+  discipline: Experimental
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - AdvancedCapacitorStockPart
+  - AdvancedMatterBinStockPart
+  - NanoManipulatorStockPart
+
 - type: technology
   id: AbnormalArtifactManipulation
   name: research-technology-abnormal-artifact-manipulation
@@ -155,6 +169,20 @@
 
 # Tier 3
 
+- type: technology
+  id: SuperParts
+  name: research-technology-super-parts
+  icon:
+    sprite: Objects/Misc/stock_parts.rsi
+    state: super_matter_bin
+  discipline: Experimental
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - SuperCapacitorStockPart
+  - SuperMatterBinStockPart
+  - PicoManipulatorStockPart
+
 #- type: technology # DeltaV - LRP
 #  id: GravityManipulation
 #  name: research-technology-gravity-manipulation
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 8e4605909d..5c5e7c7545 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -21,7 +21,7 @@
   supervisors: job-supervisors-hop
   access:
   - Chapel
-  - Research # DeltaV - Move Chaplain into Epistemics
+  - Research
   - Maintenance
   special:
   - !type:AddComponentSpecial
@@ -32,6 +32,7 @@
     - type: InnatePsionicPowers
       powersToAdd:
         - TelepathyPower
+        - HealingWordPower
 
 - type: startingGear
   id: ChaplainGear
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index e623f4c8cd..bbf9699795 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -13,5 +13,13 @@
   - UplinkJob
   - UplinkArmor
   - UplinkPointless
+  - UplinkSales
   currencyWhitelist:
   - Telecrystal
+  sales:
+    enabled: true
+    minMultiplier: 0.2
+    maxMultiplier: 0.8
+    minItems: 3
+    maxItems: 8
+    salesCategory: UplinkSales
diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
index b9564c0366..0a0b9bcbcc 100644
--- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
@@ -584,6 +584,24 @@
     messages:
     - shuffle-artifact-popup
 
+- type: artifactEffect
+  id: EffectT4PartsSpawn
+  targetDepth: 3
+  effectHint: artifact-effect-hint-creation
+  components:
+  - type: SpawnArtifact
+    maxSpawns: 10
+    spawns:
+    - id: QuadraticCapacitorStockPart
+      prob: 0.5
+      maxAmount: 3
+    - id: FemtoManipulatorStockPart
+      prob: 0.5
+      maxAmount: 3
+    - id: BluespaceMatterBinStockPart
+      prob: 0.5
+      maxAmount: 3
+
 - type: artifactEffect
   id: EffectFoamDangerous
   targetDepth: 3
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml
new file mode 100644
index 0000000000..0970528dd2
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml
@@ -0,0 +1,73 @@
+- type: entity
+  parent: BaseItem
+  id: LPPDiamondMiningDrill
+  name: diamond mining drill
+  description: Powerful tool used to quickly drill through rocks.
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: _LostParadise/Objects/Tools/DiamondHandDrill.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 3.0
+    range: 1.5
+    damage:
+      types:
+        Blunt: 6
+        Slash: 4
+        Structural: 42
+    heavyRateModifier: 1
+    heavyRangeModifier: 2
+    heavyDamageBaseModifier: 1
+    angle: 75
+
+- type: entity
+  name: diamond pickaxe
+  parent: BaseItem
+  id: LPPDiamondPickaxe
+  description: Notched to perfection, for jamming it into rocks
+  components:
+  - type: Tag
+    tags:
+    - Pickaxe
+  - type: Sprite
+    sprite: _LostParadise/Objects/Tools/DiamondPickaxe.rsi
+    state: pickaxe
+  - type: MeleeWeapon
+    attackRate: 2.5
+    range: 1.5
+    wideAnimationRotation: -135
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
+      params:
+        volume: -3
+    damage:
+      types:
+        Blunt: 6
+        Pierce: 5
+    bluntStaminaDamageFactor: 2.0
+    heavyDamageBaseModifier: 1.75
+    maxTargets: 5
+    angle: 80
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
+        Structural: 42
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
+    sprite: Objects/Weapons/Melee/pickaxe.rsi
+    storedRotation: -45
+  - type: UseDelay
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index af6b2dc486..5749749da5 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -129,6 +129,21 @@
   - type: TimedDespawn
     lifetime: 0.2
 
+- type: hitscan
+  id: LPPRedMediumLightLaser
+  damage:
+    types:
+      Heat: 13
+  muzzleFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_laser
+  travelFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam
+  impactFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_laser
+
 # - type: entity
 #   name : Cutter bolt
 #   id: BulletCutter2
diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/DiamondCrusher.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/DiamondCrusher.yml
new file mode 100644
index 0000000000..a419da8edc
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/DiamondCrusher.yml
@@ -0,0 +1,152 @@
+- type: entity
+  id: LPPMachineDiamondCrusher
+  parent: [ ConstructibleMachine, BaseMachinePowered ]
+  name: дробитель алмазов
+  description: Лучше не совать туда пальцы...
+  components:
+  - type: PlaceableSurface
+  - type: DiamondCrusher
+    crushingWhitelist:
+      components:
+      - Diamond
+    crushingDamage:
+      types:
+        Blunt: 10
+  - type: Machine
+    board: LPPDiamondCrusherMachineCircuitboard
+  - type: WiresPanel
+  - type: Sprite
+    sprite: _LostParadise/Structures/Machines/diamond_crusher.rsi
+    offset: 0,0.5
+    noRot: true
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: door-closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: piston
+      map: ["pistonlayer"]
+    - state: glass
+    - state: lights
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      shader: unshaded
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 55
+        mask: # tables should collide with other tables
+        - TableMask
+        layer:
+        - TableLayer
+        - BulletImpassable
+  - type: EntityStorage
+    isCollidableWhenOpen: true
+    capacity: 1
+    whitelist:
+      components:
+      - Diamond
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.DiamondCrusherVisuals.Crushing:
+        pistonlayer:
+          True: {state: piston-push}
+          False: {state: piston}
+      enum.PowerDeviceVisuals.Powered:
+        enum.PowerDeviceVisualLayers.Powered:
+          True: { visible: true }
+          False: { visible: false }
+  - type: EntityStorageVisuals
+    stateDoorClosed: door-closed
+    openDrawDepth: 0
+    closedDrawDepth: 4
+  - type: Construction
+    containers:
+    - machine_board
+    - machine_parts
+    - entity_storage
+    - output_container
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+      entity_storage: !type:Container
+      output_container: !type:Container
+
+- type: entity
+  id: LPPDiamondCrusherMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: дробитель алмазов (машинная плата)
+  description: Машинная плата для сборки дробителя алмазов.
+  components:
+  - type: Sprite
+    state: supply
+  - type: MachineBoard
+    prototype: LPPMachineDiamondCrusher
+    requirements:
+      Manipulator: 2
+    materialRequirements:
+      Glass: 1
+      Steel: 5
+
+- type: entity
+  parent: BaseItem
+  id: LPPOreDiamond
+  name: не обработанная жеода алмаза
+  description: Не обработанная жеода вся в пыли, грязи и прочих радостях шахтёрства.. явно надо обработать.
+  components:
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.90
+  - type: HeldSpeedModifier
+  - type: Sprite
+    sprite: _LostParadise/Objects/Specific/Mining/OreDiamond.rsi
+    state: icon
+  - type: Item
+    sprite: _LostParadise/Objects/Specific/Mining/OreDiamond.rsi
+    size: Huge
+  - type: MultiHandedItem
+  - type: Diamond
+
+- type: entity
+  id: LPPProcessedDiamond
+  parent: BaseItem
+  name: обработанный алмаз
+  description: Обработанный алмаз, очищенный от пыли и грязи, но не до идеала. Не пригоден для использования в таком виде..
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      LPPRawDiamond: 500
+  - type: Sprite
+    sprite: Objects/Materials/ingots.rsi
+    state: diamond
+  - type: Appearance
+  - type: Item
+    size: Normal
+  - type: Tag
+    tags:
+    - Ore
+    - LPPProcessedDiamond
+  - type: StaticPrice
+    price: 0
+  - type: Stack
+    stackType: LPPProcessedDiamond
+
+- type: entity
+  parent: LPPProcessedDiamond
+  id: LPPProcessedDiamond1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
+- type: latheRecipe
+  id: LPPMaterialDiamond
+  result: MaterialDiamond
+  completetime: 2
+  materials:
+    LPPRawDiamond: 15000
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml
new file mode 100644
index 0000000000..87a3fcad16
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml
@@ -0,0 +1,153 @@
+- type: entity
+  id: LPPAsteroidRockOreDiamond
+  parent: AsteroidRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockOreDiamond
+  parent: WallRock
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockBasaltOreDiamond
+  parent: WallRockBasalt
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockSnowOreDiamond
+  parent: WallRockSnow
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockSandOreDiamond
+  parent: WallRockSand
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockChromiteOreDiamond
+  parent: WallRockChromite
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_ore_diamond
+
+- type: entity
+  id: LPPWallRockAndesiteOreDiamond
+  parent: WallRockAndesite
+  description: A rock wall. What's that sticking out of it?
+  suffix: не обработанный алмаз
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: LPPOreDiamond
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_ore_diamond
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Guidebook/SpaceLaw.yml b/Resources/Prototypes/_LostParadise/Guidebook/SpaceLaw.yml
index 85878d3848..6df4a19ecc 100644
--- a/Resources/Prototypes/_LostParadise/Guidebook/SpaceLaw.yml
+++ b/Resources/Prototypes/_LostParadise/Guidebook/SpaceLaw.yml
@@ -197,4 +197,9 @@
 - type: guideEntry
   id: LPPNecessaryDefense
   name: lppguide-entry-necessarydefense
-  text: "/ServerInfo/Guidebook/_LostParadise/SpaceLaw/NecessaryDefense.xml"
\ No newline at end of file
+  text: "/ServerInfo/Guidebook/_LostParadise/SpaceLaw/NecessaryDefense.xml"
+
+- type: guideEntry
+  id: LPPTenCodes
+  name: lppguide-entry-criminal-records
+  text: "/ServerInfo/Guidebook/Security/TenCodes.xml"
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/body/organs/vulpkanin.ftl b/Resources/Prototypes/_LostParadise/Interactions/Popups/interaction_popups.yml
similarity index 100%
rename from Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/body/organs/vulpkanin.ftl
rename to Resources/Prototypes/_LostParadise/Interactions/Popups/interaction_popups.yml
diff --git a/Resources/Prototypes/_LostParadise/Interactions/interactions.yml b/Resources/Prototypes/_LostParadise/Interactions/interactions.yml
new file mode 100644
index 0000000000..b1d5859d02
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Interactions/interactions.yml
@@ -0,0 +1,204 @@
+# MrDarkSide - Lost Paradise
+# <
+
+# С КЕМ-ТО / ЧЕМ-ТО
+- type: Interaction
+  id: LPPKiss # Поцелуй
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood7.png
+  delay: 0.5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:MoodAction
+    effect: LPPLoved
+
+- type: Interaction
+  id: LPPKisscheek # Поцелуй в щеку
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPLoved
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPLoved
+
+- type: Interaction
+  id: LPPPatShoulder # Похлопать по плечу
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.7
+  cooldown: 5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: VisibleNoChat
+    sound: {collection: Claps}
+  action:
+    !type:OnUserAction
+    action:
+      !type:MoodAction
+      effect: LPPEncouraged
+
+- type: Interaction
+  id: LPPLick # Лизнуть
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.2
+  cooldown: 5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:ComplexRequirement
+    requirements:
+    - !type:MobStateRequirement
+      inverted: true
+    # - !type:EntityWhitelistRequirement
+    #   blacklist:
+    #     components: [Silicon, BorgChassis]
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPEmbarrassment
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPEmbarrassment
+
+- type: Interaction
+  id: LPPSlap
+  parent: [BaseGlobal, BaseHands]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png
+  delay: 0.2
+  cooldown: 10
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: Dangerous
+    sound: {path: /Audio/_LostParadise/Effects/whip.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:ModifyHealthAction
+      damage:
+        types: {Blunt: 3}
+    - !type:ConditionalAction
+      condition:
+        !type:ChanceRequirement
+        chance: 0.5
+      true:
+        !type:ModifyHealthAction
+        damage:
+          types: {Blunt: 5.5}
+    - !type:MoodAction
+      effect: LPPSlapped
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPGotSlap
+
+- type: Interaction
+  id: LPPSlap2 # Шлёпнуть
+  parent: [BaseGlobal, BaseHands]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png
+  delay: 0.2
+  cooldown: 5
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/_LostParadise/Effects/whip.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPEmbarrassment
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPEmbarrassment
+
+- type: Interaction
+  id: LPPFuckYou # Показать кому-то средний палец
+  parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png
+  priority: -2
+  requiresCanInteract: false
+  contactInteraction: false
+  range: {max: 20}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:NoOpAction
+
+- type: Interaction
+  id: LPPTickle # Щекотать
+  parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png
+  priority: 3
+  requiresCanInteract: false
+  contactInteraction: false
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: VisibleNoChat
+  action:
+    !type:NoOpAction
+
+# С СОБОЙ
+
+- type: Interaction
+  id: LPPCheckStatusSilicon # Проверка своего состояния / Состояние другого синтетика
+  parent: SelfInteractionBase
+  icon: /Textures/Interface/Actions/malfunction.png # Иконка для синтетиков  
+  priority: -6
+  delay: 1.2
+  cooldown: 30
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/Effects/poster_being_set.ogg}
+    soundPerceivedByOthers: true
+  hideByRequirement: true
+  requirement:
+    !type:ComplexRequirement
+    requirements:
+    - !type:EntityWhitelistRequirement
+      whitelist:
+        components: [Silicon, BorgChassis]
+  action:
+    !type:NoOpAction
+
+# >
diff --git a/Resources/Prototypes/_LostParadise/Mood/genericNegativeEffects.yml b/Resources/Prototypes/_LostParadise/Mood/genericNegativeEffects.yml
new file mode 100644
index 0000000000..8853329cbb
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Mood/genericNegativeEffects.yml
@@ -0,0 +1,10 @@
+# Made DarkSide <
+# Негативные эффекты настроения
+
+
+- type: moodEffect
+  id: LPPGotSlap
+  moodChange: -3
+  timeout: 180
+
+# >
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Mood/genericNeutralEffects.yml b/Resources/Prototypes/_LostParadise/Mood/genericNeutralEffects.yml
new file mode 100644
index 0000000000..2227477177
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Mood/genericNeutralEffects.yml
@@ -0,0 +1,10 @@
+# Made DarkSide <
+# Нейтральные эффекты настроения (0)
+
+- type: moodEffect
+  id: LPPEmbarrassment
+  moodChange: 0
+  timeout: 300
+  category: NeutralInteraction
+
+# >
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Mood/genericPositiveEffects.yml b/Resources/Prototypes/_LostParadise/Mood/genericPositiveEffects.yml
new file mode 100644
index 0000000000..20e3162333
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Mood/genericPositiveEffects.yml
@@ -0,0 +1,22 @@
+# Made DarkSide <
+# Положительные эффекты настроения
+
+- type: moodEffect
+  id: LPPEncouraged
+  moodChange: 3
+  timeout: 300
+  category: PositiveInteraction
+
+- type: moodEffect
+  id: LPPLoved
+  moodChange: 3
+  timeout: 480
+  category: PositiveInteraction
+
+- type: moodEffect
+  id: LPPSlapped
+  moodChange: 2
+  timeout: 300
+  category: PositiveInteraction
+
+# >
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Reagents/material.yml b/Resources/Prototypes/_LostParadise/Reagents/material.yml
new file mode 100644
index 0000000000..4dea6e5afa
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Reagents/material.yml
@@ -0,0 +1,15 @@
+- type: material
+  id: LPPRawDiamond
+  stackEntity: LPPProcessedDiamond1
+  name: materials-raw-diamond
+  unit: materials-unit-chunk
+  icon: { sprite: Objects/Materials/ingots.rsi, state: diamond }
+  price: 0.15
+
+- type: material
+  id: LPPDiamond
+  stackEntity: MaterialDiamond1
+  name: materials-diamond
+  unit: materials-unit-chunk
+  icon: { sprite: Objects/Materials/materials.rsi, state: diamond }
+  price: 0.15
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/devices.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/devices.yml
index 7587ccc51d..fe46616f8b 100644
--- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/devices.yml
@@ -39,6 +39,7 @@
   result: BluespacePlantBag
   completetime: 7
   materials:
+    LPPDiamond: 500
     Steel: 1300
     Glass: 1400
     Silver: 900
@@ -63,6 +64,7 @@
   result: BluespaceChemBag
   completetime: 6
   materials:
+    LPPDiamond: 500
     Steel: 1300
     Glass: 1400
     Silver: 900
@@ -88,3 +90,10 @@
 #     Glass: 85
 #     Silver: 640
 #     Gold: 950
+
+- type: latheRecipe
+  id: LPPCrewMonitoringServerMachineCircuitboard
+  result: CrewMonitoringServerMachineCircuitboard
+  completetime: 10
+  materials:
+    Steel: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/diamondindustry.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/diamondindustry.yml
new file mode 100644
index 0000000000..3507ccf234
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/diamondindustry.yml
@@ -0,0 +1,29 @@
+- type: latheRecipe
+  id: LPPDiamondMiningDrill
+  result: LPPDiamondMiningDrill
+  category: Tools
+  completetime: 3
+  materials:
+    Steel: 500
+    Plastic: 100
+    LPPDiamond: 2500
+
+- type: latheRecipe
+  id: LPPDiamondPickaxe
+  result: LPPDiamondPickaxe
+  category: Tools
+  completetime: 4
+  materials:
+    Steel: 1000
+    Plastic: 500
+    LPPDiamond: 2500
+
+- type: latheRecipe
+  id: LPPDiamondCrusherMachineCircuitboard
+  result: LPPDiamondCrusherMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900
+    Gold: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Research/CivilianServices.yml b/Resources/Prototypes/_LostParadise/Research/CivilianServices.yml
new file mode 100644
index 0000000000..d776d61453
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Research/CivilianServices.yml
@@ -0,0 +1,55 @@
+# Tier 1
+
+- type: technology
+  id: LPPBasicAdministrationOfDrugs
+  name: lppresearch-technology-basic-administration-of-drugs
+  icon:
+    sprite: _LostParadise/Objects/Specific/Medical/hyposprayzero.rsi
+    state: hypo
+  discipline: CivilianServices
+  tier: 1
+  cost: 2000
+  recipeUnlocks:
+  - LPPHypospray
+  - Syringe
+  - Dropper
+
+- type: technology
+  id: LPPBasicTracking
+  name: lppresearch-technology-basic-tracking
+  icon:
+    sprite: Structures/Machines/computers.rsi
+    state: tracking_icon
+  discipline: CivilianServices
+  tier: 1
+  cost: 4000
+  recipeUnlocks:
+  - LPPCrewMonitoringServerMachineCircuitboard
+  - CrewMonitoringComputerCircuitboard
+
+# Tier 2
+
+- type: technology
+  id: LPPAdvancedTracking
+  name: lppresearch-technology-advanced-tracking
+  icon:
+    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
+    state: scanner
+  discipline: CivilianServices
+  tier: 2
+  cost: 4000
+  recipeUnlocks:
+  - HandheldCrewMonitor
+
+- type: technology
+  id: LPPCombatUtilitys
+  name: lppresearch-technology-combat-utility
+  icon:
+    sprite: _LostParadise/Objects/Specific/Medical/CombatHypospray.rsi
+    state: hypo
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - LPPCombatDefibrillator
+  - LPPCombatHypospray
diff --git a/Resources/Prototypes/_LostParadise/Research/DiamondProduction.yml b/Resources/Prototypes/_LostParadise/Research/DiamondProduction.yml
new file mode 100644
index 0000000000..d1cfbd3c10
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Research/DiamondProduction.yml
@@ -0,0 +1,11 @@
+- type: techDiscipline
+  id: LPPDiamondProduction
+  name: lppresearch-discipline-diamond-production
+  color: "#96EEFF"
+  icon:
+    sprite: Interface/Misc/research_disciplines.rsi
+    state: diamond_production
+  tierPrerequisites:
+    1: 0
+    2: 0.75
+    3: 1.0
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Research/Experimental.yml b/Resources/Prototypes/_LostParadise/Research/Experimental.yml
new file mode 100644
index 0000000000..9e0d1e4093
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Research/Experimental.yml
@@ -0,0 +1,11 @@
+- type: technology
+  id: LPPDiamondProcessing
+  name: lppresearch-technology-diamond-processing
+  icon:
+    sprite: _LostParadise/Structures/Machines/diamond_crusher.rsi
+    state: base
+  discipline: Experimental
+  tier: 2
+  cost: 2500
+  recipeUnlocks:
+  - LPPDiamondCrusherMachineCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Research/diamond_production.yml b/Resources/Prototypes/_LostParadise/Research/diamond_production.yml
new file mode 100644
index 0000000000..4d904dae13
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Research/diamond_production.yml
@@ -0,0 +1,46 @@
+# Tier 1
+
+- type: technology
+  id: LPPDiamondSalvageEquipment
+  name: lppresearch-technology-diamond-salvage-equipment
+  icon:
+    sprite: _LostParadise/Objects/Tools/DiamondHandDrill.rsi
+    state: handdrill
+  discipline: LPPDiamondProduction
+  tier: 1
+  cost: 1000
+  recipeUnlocks:
+  - LPPDiamondMiningDrill
+  - LPPDiamondPickaxe
+
+# Tier 2
+
+# - type: technology
+#   id: LPPLSpaceScanning
+#   name: research-technology-space-scanning
+#   icon:
+#     sprite: Objects/Tools/handheld_mass_scanner.rsi
+#     state: icon
+#   discipline: LPPDiamondProduction
+#   tier: 2
+#   cost: 7500
+#   recipeUnlocks:
+#   - RadarConsoleCircuitboard
+#   - HandHeldMassScanner
+#   - BorgModuleGPS
+
+# Tier 3
+
+# - type: technology
+#   id: LPPBluespaceStorage
+#   name: research-technology-bluespace-storage
+#   icon:
+#     sprite: Clothing/Back/Backpacks/holding.rsi
+#     state: holding
+#   discipline: LPPDiamondProduction
+#   tier: 3
+#   cost: 15000
+#   recipeUnlocks:
+#   - ClothingBackpackHolding
+#   - ClothingBackpackSatchelHolding
+#   - ClothingBackpackDuffelHolding
diff --git a/Resources/Prototypes/_LostParadise/Stacks/stack.yml b/Resources/Prototypes/_LostParadise/Stacks/stack.yml
new file mode 100644
index 0000000000..be6e00d209
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Stacks/stack.yml
@@ -0,0 +1,7 @@
+- type: stack
+  id: LPPProcessedDiamond
+  name: обработанный алмаз
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
+  spawn: LPPProcessedDiamond1
+  maxCount: 30
+  itemSize: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Store/categories.yml b/Resources/Prototypes/_White/Store/categories.yml
new file mode 100644
index 0000000000..cb9cfbc88f
--- /dev/null
+++ b/Resources/Prototypes/_White/Store/categories.yml
@@ -0,0 +1,4 @@
+- type: storeCategory
+  id: UplinkSales
+  name: Sales
+  priority: 10
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index dde1516c85..b61f220949 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -84,6 +84,12 @@
   minOreYield: 2
   maxOreYield: 4
 
+- type: ore
+  id: LPPOreDiamond
+  oreEntity: LPPOreDiamond
+  minOreYield: 1
+  maxOreYield: 2
+
 - type: weightedRandomOre
   id: RandomOreDistributionStandard
   weights:
@@ -96,6 +102,7 @@
     OreUranium: 1
     OreBananium: 0.5
     OreArtifactFragment: 0.5
+    LPPOreDiamond: 1
 
 - type: weightedRandomOre
   id: OreCrab
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 6a5791844c..18f476c9df 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -22,6 +22,9 @@
 - type: Tag
   id: ArtifactFragment
 
+- type: Tag
+  id: LPPProcessedDiamond
+
 - type: Tag
   id: Arrow
 
diff --git a/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml b/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
new file mode 100644
index 0000000000..286219b4d9
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
@@ -0,0 +1,38 @@
+<Document>
+# Machine Upgrading
+
+Machines help the station run smoothly, and as a scientist, you can help them run even better!
+
+## Parts
+<Box>Stock Parts:</Box>
+<Box>
+<GuideEntityEmbed Entity="CapacitorStockPart"/>
+<GuideEntityEmbed Entity="MatterBinStockPart"/>
+<GuideEntityEmbed Entity="MicroManipulatorStockPart"/>
+</Box>
+You can examine each machine part to see both the type and the rating, which range from 1 to 4.
+
+Parts of higher levels can be researched as well as found through artifacts or salvage.
+<Box>
+<GuideEntityEmbed Entity="AdvancedMatterBinStockPart"/>
+<GuideEntityEmbed Entity="SuperMatterBinStockPart"/>
+<GuideEntityEmbed Entity="BluespaceMatterBinStockPart"/>
+</Box>
+
+## Upgrading
+To know if a machine can be upgraded, you can examine it and check for the [color=#a4885c]lightning bolt[/color] icon in the lower right corner. Clicking on it will allow you to see what kinds of upgrades the machine has.
+
+To check what parts a machine needs, you can examine its board. Try it here:
+<Box Orientation="Vertical">
+<GuideEntityEmbed Entity="ProtolatheMachineCircuitboard"/>
+<GuideEntityEmbed Entity="CloningPodMachineCircuitboard"/>
+<GuideEntityEmbed Entity="TraversalDistorterMachineCircuitboard"/>
+<GuideEntityEmbed Entity="ThermomachineFreezerMachineCircuitBoard"/>
+</Box>
+You can use any rating part for any part requirement. Using higher rated parts will increase how effective the machine is.
+
+If you want to upgrade an existing machine, simply deconstruct it with a screwdriver and crowbar, and replace the existing parts with parts of a higher level.
+
+You can also quickly upgrade machines by using an RPED, loading it with machine parts, and then clicking on a machine. It will quickly be upgraded with whatever parts were inserted.
+<GuideEntityEmbed Entity="RPED"/>
+</Document>
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/meta.json
index 4621946ff8..32d2c4edd3 100644
--- a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/meta.json
@@ -41,6 +41,21 @@
         },
         {
             "name": "full"
+        },
+        {
+            "name": "rock_asteroid"
+        },
+        {
+            "name": "rock_asteroid_east"
+        },
+        {
+            "name": "rock_asteroid_north"
+        },
+        {
+            "name": "rock_asteroid_south"
+        },
+        {
+            "name": "rock_asteroid_west"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid.png b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid.png
new file mode 100644
index 0000000000..51db57b9b7
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_east.png b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_east.png
new file mode 100644
index 0000000000..678e06dd58
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_east.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_north.png b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_north.png
new file mode 100644
index 0000000000..94c7e76e00
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_north.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_south.png b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_south.png
new file mode 100644
index 0000000000..beb4369ffc
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_south.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_west.png b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_west.png
new file mode 100644
index 0000000000..eb95c87758
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Walls/mountain_rock_ore.rsi/rock_asteroid_west.png differ
diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/healing_word.png b/Resources/Textures/Interface/Actions/psionics.rsi/healing_word.png
new file mode 100644
index 0000000000..800e2a46e6
Binary files /dev/null and b/Resources/Textures/Interface/Actions/psionics.rsi/healing_word.png differ
diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
new file mode 100644
index 0000000000..085cc41281
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by leonardo_dabepis (discord)",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "healing_word"
+    },
+    {
+      "name": "revivify"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/revivify.png b/Resources/Textures/Interface/Actions/psionics.rsi/revivify.png
new file mode 100644
index 0000000000..087f40b4c9
Binary files /dev/null and b/Resources/Textures/Interface/Actions/psionics.rsi/revivify.png differ
diff --git a/Resources/Textures/Interface/Misc/research_disciplines.rsi/diamond_production.png b/Resources/Textures/Interface/Misc/research_disciplines.rsi/diamond_production.png
new file mode 100644
index 0000000000..fb7471ea62
Binary files /dev/null and b/Resources/Textures/Interface/Misc/research_disciplines.rsi/diamond_production.png differ
diff --git a/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json b/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json
index 0284c3b1fd..1cac681ea1 100644
--- a/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json
@@ -21,6 +21,9 @@
     },
     {
       "name": "industrial"
+    },
+    {
+        "name": "diamond_production"
     }
   ]
 }
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 0b8ae856bd..69aa4650b3 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -7,3 +7,6 @@ https://game-icons.net/1x1/lorc/padlock.html
 
 unlock.svg by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
+
+healing_word.png by LeonardoDaBepis under CC BY 3.0
+revivify.png by LeonardoDaBepis under CC BY 3.0
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/diamond.png b/Resources/Textures/Objects/Materials/ingots.rsi/diamond.png
new file mode 100644
index 0000000000..fa4665de89
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json
index 05b9647ea1..0cceaea938 100644
--- a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json
@@ -117,6 +117,9 @@
     {
       "name": "silver-inhand-right",
       "directions": 4
+    },
+    {
+        "name": "diamond"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png
index b2a3c788d3..fa9a798525 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png and b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png differ
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index b6741b195d..97cab81f75 100644
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1688,6 +1688,9 @@
         {
             "name": "service_keys",
             "directions": 4
+        },
+        {
+            "name": "tracking_icon"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/tracking_icon.png b/Resources/Textures/Structures/Machines/computers.rsi/tracking_icon.png
new file mode 100644
index 0000000000..bf8bf1bb15
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/tracking_icon.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full.png b/Resources/Textures/Structures/Walls/rock.rsi/full.png
new file mode 100644
index 0000000000..26034ae376
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full_two.png b/Resources/Textures/Structures/Walls/rock.rsi/full_two.png
new file mode 100644
index 0000000000..0ecec3d6ef
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/full_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index a29513356c..6dd8f54d83 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -214,6 +214,95 @@
         },
         {
             "name": "rock_andesite_west"
+        },
+        {
+            "name": "rock_0",
+            "directions": 4
+        },
+        {
+            "name": "rock_1",
+            "directions": 4
+        },
+        {
+            "name": "rock_2",
+            "directions": 4
+        },
+        {
+            "name": "rock_3",
+            "directions": 4
+        },
+        {
+            "name": "rock_4",
+            "directions": 4
+        },
+        {
+            "name": "rock_5",
+            "directions": 4
+        },
+        {
+            "name": "rock_6",
+            "directions": 4
+        },
+        {
+            "name": "rock_7",
+            "directions": 4
+        },
+        {
+            "name": "full"
+        },
+        {
+            "directions": 4,
+            "name": "rock_0_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_1_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_2_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_3_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_4_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_5_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_6_two"
+        },
+        {
+            "directions": 4,
+            "name": "rock_7_two"
+        },
+        {
+            "name": "full_two"
+        },
+        {
+            "name": "rock_ore_diamond",
+            "delays":[
+            [
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2,
+               0.2
+            ]
+        ]
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png
new file mode 100644
index 0000000000..ba1045c22b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png
new file mode 100644
index 0000000000..2a64ecdddf
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png
new file mode 100644
index 0000000000..2a2baa735d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png
new file mode 100644
index 0000000000..694dd628fb
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png
new file mode 100644
index 0000000000..ba1045c22b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png
new file mode 100644
index 0000000000..2a64ecdddf
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png
new file mode 100644
index 0000000000..2a2baa735d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png
new file mode 100644
index 0000000000..694dd628fb
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png
new file mode 100644
index 0000000000..1d5d4320fa
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png
new file mode 100644
index 0000000000..b5a6e30f7b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png
new file mode 100644
index 0000000000..6524c4facf
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png
new file mode 100644
index 0000000000..e7ebe59915
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png
new file mode 100644
index 0000000000..1d5d4320fa
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png
new file mode 100644
index 0000000000..b5a6e30f7b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png
new file mode 100644
index 0000000000..753c8293f2
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png
new file mode 100644
index 0000000000..8456763d94
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png
new file mode 100644
index 0000000000..49c9097057
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/icon.png
new file mode 100644
index 0000000000..fecaa06d10
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/icon.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-left.png
new file mode 100644
index 0000000000..d91cf316f6
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-right.png
new file mode 100644
index 0000000000..da083f4d25
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/meta.json
new file mode 100644
index 0000000000..633f8f462b
--- /dev/null
+++ b/Resources/Textures/_LostParadise/Objects/Specific/Mining/OreDiamond.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by bruhman_cringe (discord)",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+}
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/handdrill.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/handdrill.png
new file mode 100644
index 0000000000..e0aadfc06e
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/handdrill.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-left.png
new file mode 100644
index 0000000000..5172d17781
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-right.png
new file mode 100644
index 0000000000..b378089c74
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/meta.json
new file mode 100644
index 0000000000..ec4d863cf2
--- /dev/null
+++ b/Resources/Textures/_LostParadise/Objects/Tools/DiamondHandDrill.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Blue Moon ss13",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+        {
+            "name": "handdrill"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-left.png
new file mode 100644
index 0000000000..f2c738ea10
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-right.png
new file mode 100644
index 0000000000..851ee38cce
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/meta.json
new file mode 100644
index 0000000000..c170464e70
--- /dev/null
+++ b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Blue Moon ss13",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+        {
+            "name": "pickaxe"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/pickaxe.png b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/pickaxe.png
new file mode 100644
index 0000000000..a4250e8149
Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Tools/DiamondPickaxe.rsi/pickaxe.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/base.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/base.png
new file mode 100644
index 0000000000..9c600a1c7e
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/base.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/door-closed.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/door-closed.png
new file mode 100644
index 0000000000..564c48f433
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/door-closed.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/glass.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/glass.png
new file mode 100644
index 0000000000..f1a30de8ae
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/glass.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/lights.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/lights.png
new file mode 100644
index 0000000000..32db2095ed
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/lights.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/meta.json
new file mode 100644
index 0000000000..dbf8d88b8a
--- /dev/null
+++ b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/meta.json
@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from SS13 BlueMoon, Resprited be MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "glass"
+    },
+    {
+      "name": "door-closed"
+    },
+    {
+      "name": "piston"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "lights"
+    },
+    {
+      "name": "piston-push",
+      "delays": [
+        [
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          0.66,
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston-push.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston-push.png
new file mode 100644
index 0000000000..8f13c32b75
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston-push.png differ
diff --git a/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston.png b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston.png
new file mode 100644
index 0000000000..53a54f846c
Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Machines/diamond_crusher.rsi/piston.png differ