фиксы тестов

2024-01-29 01:02:37 +07:00
parent 6e198dc038
commit b4dd3b0555
139 changed files with 1129 additions and 3837 deletions
--- a/Content.Client/Chat/Managers/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -6,6 +6,7 @@ using Content.Shared._White.Cult;
 using Robust.Client.Console;
 using Robust.Client.Player;
 using Robust.Shared.Utility;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Client.Chat.Managers
 {
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -36,6 +36,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Client.UserInterface.Systems.Chat;

--- a/Content.Client/_White/Cult/CultHudOverlay.cs
+++ b/Content.Client/_White/Cult/CultHudOverlay.cs
@@ -4,6 +4,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Utility;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Client._White.Cult;

--- a/Content.Client/_White/Cult/ShowCultHudSystem.cs
+++ b/Content.Client/_White/Cult/ShowCultHudSystem.cs
@@ -2,6 +2,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Client._White.Cult;

--- a/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs
+++ b/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Client._White.UserInterface.Radial;
-using Content.Shared._White.Cult.Runes.Components;
 using Content.Shared._White.Cult.UI;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
+using ConstructShellComponent = Content.Shared._White.Cult.Components.ConstructShellComponent;

 namespace Content.Client._White.Cult.UI.ConstructSelector;

--- a/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs
+++ b/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs
@@ -5,6 +5,7 @@ using Content.Shared._White.Cult.Components;
 using Robust.Client.Utility;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Client._White.Cult.UI.SpellSelector;

--- a/Content.Client/_White/Radials/RadialUIController.cs
+++ b/Content.Client/_White/Radials/RadialUIController.cs
@@ -36,7 +36,11 @@ public sealed class RadialUIController : UIController, IOnStateEntered<GameplayS
    public void OnStateExited(GameplayState state)
    {
        //_context.OnContextClosed -= Close;
-        _radialSystem.OnRadialsResponse -= HandleVerbsResponse;
+        if (_radialSystem != null)
+        {
+            _radialSystem.OnRadialsResponse -= HandleVerbsResponse;
+        }
+
        Close();
    }

--- a/Content.Server/Chat/Commands/CultCommand.cs
+++ b/Content.Server/Chat/Commands/CultCommand.cs
@@ -3,6 +3,7 @@ using Content.Shared.Administration;
 using Content.Shared._White.Cult;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server.Chat.Commands
 {
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -38,6 +38,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server.Chat.Systems;

--- a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
+++ b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
@@ -31,7 +31,7 @@ public sealed class BodyEmotesSystem : EntitySystem
            return;

        var cat = args.Emote.Category;
-        if (cat.HasFlag(EmoteCategory.Gesture))
+        if (cat.HasFlag(EmoteCategory.Hands))
        {
            args.Handled = TryEmoteHands(uid, args.Emote, component);
        }
--- a/Content.Server/Worldgen/Systems/BlueprintPlacerSystem.cs
+++ b/Content.Server/Worldgen/Systems/BlueprintPlacerSystem.cs
@@ -27,7 +27,12 @@ public sealed class BlueprintPlacerSystem : EntitySystem
            Rotation = xform.LocalRotation,
        };

-        _mapLoader.TryLoad(xform.MapID, component.Blueprint.ToString(), out var root, options);
+        if (component.Blueprint.CanonPath is null)
+        {
+            return;
+        }
+
+        _mapLoader.TryLoad(xform.MapID, component.Blueprint.CanonPath, out var root, options);

        if (root is null)
            return;
--- a/Content.Server/_White/Animations/EmoteAnimationSystem.cs
+++ b/Content.Server/_White/Animations/EmoteAnimationSystem.cs
@@ -21,7 +21,7 @@ public sealed class EmoteAnimationSystem : EntitySystem

    private void OnEmote(EntityUid uid, EmoteAnimationComponent component, ref EmoteEvent args)
    {
-        if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Gesture))
+        if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Hands))
            return;

        PlayEmoteAnimation(uid, component, args.Emote.ID);
--- a/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs
+++ b/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs
@@ -78,7 +78,8 @@ namespace Content.Server._White.AspectsSystem.Base

            if (aspect is { Description: not null, IsHidden: false })
            {
-                _chatSystem.DispatchGlobalAnnouncement(aspect.Description, playSound: false, colorOverride: Color.Aquamarine);
+                _chatSystem.DispatchGlobalAnnouncement(aspect.Description, playSound: false,
+                    colorOverride: Color.Aquamarine);
            }

            _audio.PlayGlobal(aspect.StartAudio, Filter.Broadcast(), true);
@@ -88,7 +89,11 @@ namespace Content.Server._White.AspectsSystem.Base
        /// <summary>
        /// Called when an aspect is started.
        /// </summary>
-        protected override void Started(EntityUid uid, T component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+        protected override void Started(
+            EntityUid uid,
+            T component,
+            GameRuleComponent gameRule,
+            GameRuleStartedEvent args)
        {
            base.Started(uid, component, gameRule, args);

@@ -112,13 +117,14 @@ namespace Content.Server._White.AspectsSystem.Base

            if (aspect is { Name: not null, IsHidden: false })
            {
-                _chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}", playSound: false, colorOverride: Color.Aquamarine);
+                _chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}", playSound: false,
+                    colorOverride: Color.Aquamarine);
            }

            _audio.PlayGlobal(aspect.EndAudio, Filter.Broadcast(), true);
        }

-        #region Helpers
+#region Helpers

        /// <summary>
        /// Forces this aspect to end prematurely.
@@ -130,13 +136,19 @@ namespace Content.Server._White.AspectsSystem.Base
            GameTicker.EndGameRule(uid, component);
        }

-        protected bool TryGetRandomStation([NotNullWhen(true)] out EntityUid? station, Func<EntityUid, bool>? filter = null)
+        protected bool TryGetRandomStation(
+            [NotNullWhen(true)] out EntityUid? station,
+            Func<EntityUid, bool>? filter = null)
        {
            var stations = new ValueList<EntityUid>();

            if (filter == null)
            {
-                stations.EnsureCapacity(Count<StationEventEligibleComponent>());
+                var stationCount = Count<StationEventEligibleComponent>();
+                if (stationCount > 0)
+                {
+                    stations.EnsureCapacity(stationCount);
+                }
            }

            filter ??= _ => true;
@@ -160,7 +172,8 @@ namespace Content.Server._White.AspectsSystem.Base
            return true;
        }

-        protected bool TryGetStationGrids([NotNullWhen(true)] out EntityUid? targetStation,
+        protected bool TryGetStationGrids(
+            [NotNullWhen(true)] out EntityUid? targetStation,
            [NotNullWhen(true)] out HashSet<EntityUid>? grids)
        {
            if (!TryGetRandomStation(out targetStation))
@@ -175,7 +188,11 @@ namespace Content.Server._White.AspectsSystem.Base
            return grids.Count > 0;
        }

-        protected bool TryFindRandomTile(out Vector2i tile, [NotNullWhen(true)] out EntityUid? targetStation, out EntityUid targetGrid, out EntityCoordinates targetCoords)
+        protected bool TryFindRandomTile(
+            out Vector2i tile,
+            [NotNullWhen(true)] out EntityUid? targetStation,
+            out EntityUid targetGrid,
+            out EntityCoordinates targetCoords)
        {
            tile = default;

@@ -219,6 +236,7 @@ namespace Content.Server._White.AspectsSystem.Base
                {
                    if (!physQuery.TryGetComponent(ent, out var body))
                        continue;
+
                    if (body.BodyType != BodyType.Static ||
                        !body.Hard ||
                        (body.CollisionLayer & (int) CollisionGroup.Impassable) == 0)
@@ -239,8 +257,6 @@ namespace Content.Server._White.AspectsSystem.Base
            return found;
        }

-
-        #endregion
-
+#endregion
    }
 }
--- a/Content.Server/_White/Cult/ConstructComponent.cs
+++ b/Content.Server/_White/Cult/ConstructComponent.cs
@@ -1,8 +1,10 @@
-namespace Content.Server._White.Cult;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._White.Cult;

 [RegisterComponent]
 public sealed partial class ConstructComponent : Component
 {
    [DataField("actions")]
-    public List<string> Actions = new();
+    public List<EntProtoId> Actions = new();
 }
--- a/Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
+++ b/Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
@@ -11,6 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.GameRule;

--- a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
+++ b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
@@ -32,6 +32,7 @@ using Robust.Shared.Utility;
 using Content.Shared._White;
 using Content.Shared.Mind;
 using Robust.Shared.Audio.Systems;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.GameRule;

--- a/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
+++ b/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
@@ -8,6 +8,7 @@ using Content.Shared._White.Cult;
 using Content.Shared._White.Cult.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
 using Timer = Robust.Shared.Timing.Timer;

 namespace Content.Server._White.Cult.HolyWater;
--- a/Content.Server/_White/Cult/Items/Systems/BloodBoilProjectileSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/BloodBoilProjectileSystem.cs
@@ -3,6 +3,7 @@ using Content.Server._White.Cult.TimedProduction;
 using Content.Shared._White.Cult;
 using Content.Shared._White.Cult.Pylon;
 using Robust.Shared.Physics.Events;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Items.Systems;

--- a/Content.Server/_White/Cult/Items/Systems/CultRobeModifierSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/CultRobeModifierSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared._White.Cult;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Items.Systems;

--- a/Content.Server/_White/Cult/Items/Systems/ReturnItemOnThrowSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/ReturnItemOnThrowSystem.cs
@@ -4,6 +4,7 @@ using Content.Server._White.Cult.Items.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Throwing;
 using Content.Shared._White.Cult;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Items.Systems;

--- a/Content.Server/_White/Cult/Items/Systems/ShuttleCurseSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/ShuttleCurseSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared._White.Cult;
 using Robust.Shared.Timing;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Items.Systems;

--- a/Content.Server/_White/Cult/Items/Systems/TorchCultistsProviderSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/TorchCultistsProviderSystem.cs
@@ -18,6 +18,7 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Items.Systems;

--- a/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs
+++ b/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs
@@ -12,6 +12,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
 using Timer = Robust.Shared.Timing.Timer;

 namespace Content.Server._White.Cult.Items.Systems;
--- a/Content.Server/_White/Cult/Pylon/PylonSystem.cs
+++ b/Content.Server/_White/Cult/Pylon/PylonSystem.cs
@@ -20,6 +20,7 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Pylon;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Actions.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Actions.cs
@@ -20,6 +20,7 @@ using Content.Shared._White.Cult.Actions;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Barrier.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Barrier.cs
@@ -3,6 +3,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Stealth.Components;
 using Content.Shared._White.Cult;
 using Robust.Server.GameObjects;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Buff.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Buff.cs
@@ -7,6 +7,7 @@ using Content.Shared.Maps;
 using Content.Shared._White.Cult;
 using Content.Shared._White.Cult.Components;
 using Robust.Shared.Map;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Constructs.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Constructs.cs
@@ -1,13 +1,10 @@
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
-using Content.Shared._White.Cult.Runes.Components;
 using Content.Shared._White.Cult.UI;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using ConstructShellComponent = Content.Shared._White.Cult.Components.ConstructShellComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs
@@ -1,7 +1,5 @@
-using System.Linq;
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Maps;
 using Content.Server.Popups;
 using Content.Server._White.Cult.GameRule;
 using Content.Server._White.IncorporealSystem;
@@ -25,6 +23,7 @@ public partial class CultSystem
    [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;

    public void InitializeConstructsAbilities()
    {
@@ -39,17 +38,22 @@ public partial class CultSystem

        SubscribeLocalEvent<JuggernautCreateWallActionEvent>(OnJuggernautCreateWall);

+        SubscribeLocalEvent<ConstructComponent, MapInitEvent>(OnMapInit);
        SubscribeLocalEvent<ConstructComponent, ComponentInit>(OnConstructInit);
        SubscribeLocalEvent<ConstructComponent, ComponentRemove>(OnConstructComponentRemoved);
    }

+    private void OnMapInit(EntityUid uid, ConstructComponent component, MapInitEvent args)
+    {
+        var comp = EnsureComp<ActionsContainerComponent>(uid);
+        foreach (var id in component.Actions)
+        {
+            _actionContainer.AddAction(uid, id, comp);
+        }
+    }
+
    private void OnConstructInit(EntityUid uid, ConstructComponent component, ComponentInit args)
    {
-        foreach (var action in component.Actions)
-        {
-            _actionsSystem.AddAction(uid, action, uid);
-        }
-
        var query = EntityQueryEnumerator<CultRuleComponent, GameRuleComponent>();

        while (query.MoveNext(out var ruleEnt, out var cultRuleComponent, out _))
--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
@@ -40,6 +40,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.SoulShard.cs
+++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.SoulShard.cs
@@ -9,6 +9,7 @@ using Content.Shared.Mobs.Components;
 using Content.Shared.Roles;
 using Content.Shared._White.Cult;
 using Content.Shared._White.Cult.Items;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Runes.Systems;

--- a/Content.Server/_White/Cult/Structures/CultStructureCraftSystem.cs
+++ b/Content.Server/_White/Cult/Structures/CultStructureCraftSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared._White.Cult;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Player;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Structures;

--- a/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs
+++ b/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Humanoid;
 using Content.Shared.Stunnable;
 using Content.Shared._White.Cult;
 using Robust.Shared.Physics.Systems;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.Structures;

--- a/Content.Server/_White/Cult/TimedProduction/CultistFactorySystem.cs
+++ b/Content.Server/_White/Cult/TimedProduction/CultistFactorySystem.cs
@@ -11,6 +11,7 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;

 namespace Content.Server._White.Cult.TimedProduction;

--- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
+++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
@@ -85,7 +85,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo

        if (_recruitment.GetEventSpawners(ERTRecruitmentRuleComponent.EventName).Count() < component.MinPlayer)
        {
-            _logger.Error("Not enough spawners!");
+            _logger.Debug("Not enough spawners!");

            DeclineERT(component.TargetStation.Value);
            return;
--- a/Content.Server/_White/Mood/MoodSystem.cs
+++ b/Content.Server/_White/Mood/MoodSystem.cs
@@ -10,7 +10,6 @@ using Content.Shared.Movement.Systems;
 using Content.Shared._White.Mood;
 using Content.Shared._White.Overlays;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Timer = Robust.Shared.Timing.Timer;
@@ -56,7 +55,8 @@ public sealed class MoodSystem : EntitySystem

    private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshMovementSpeedModifiersEvent args)
    {
-        if (component.CurrentMoodThreshold is > MoodThreshold.VeryBad and < MoodThreshold.VeryGood or MoodThreshold.Dead)
+        if (component.CurrentMoodThreshold is > MoodThreshold.VeryBad and < MoodThreshold.VeryGood
+            or MoodThreshold.Dead)
            return;

        if (_jetpack.IsUserFlying(uid))
@@ -65,8 +65,8 @@ public sealed class MoodSystem : EntitySystem
        var modifier = GetMovementThreshold(component.CurrentMoodThreshold) switch
        {
            -1 => component.SlowdownSpeedModifier,
-            1 => component.IncreaseSpeedModifier,
-            _ => 1
+            1  => component.IncreaseSpeedModifier,
+            _  => 1
        };

        args.ModifySpeed(modifier, modifier);
@@ -100,7 +100,9 @@ public sealed class MoodSystem : EntitySystem
                    if (!component.MoodChangeValues.TryGetValue(oldPrototype.MoodChange, out var oldValue))
                        return;

-                    amount += (oldPrototype.PositiveEffect ? -oldValue : oldValue) + (prototype.PositiveEffect ? value : -value);
+                    amount += (oldPrototype.PositiveEffect ? -oldValue : oldValue) +
+                        (prototype.PositiveEffect ? value : -value);
+
                    component.CategorisedEffects[prototype.Category] = prototype.ID;
                }
            }
@@ -111,7 +113,10 @@ public sealed class MoodSystem : EntitySystem
            }

            if (prototype.Timeout != 0)
-                Timer.Spawn(TimeSpan.FromMinutes(prototype.Timeout), () => RemoveTimedOutEffect(uid, prototype.ID, prototype.Category));
+            {
+                Timer.Spawn(TimeSpan.FromMinutes(prototype.Timeout),
+                    () => RemoveTimedOutEffect(uid, prototype.ID, prototype.Category));
+            }
        }
        //Apply uncategorised effect
        else
@@ -150,10 +155,13 @@ public sealed class MoodSystem : EntitySystem
        {
            if (!comp.CategorisedEffects.TryGetValue(category, out var currentProtoId))
                return;
+
            if (currentProtoId != prototypeId)
                return;
+
            if (!_prototypeManager.TryIndex<MoodEffectPrototype>(currentProtoId, out var currentProto))
                return;
+
            if (!comp.MoodChangeValues.TryGetValue(currentProto.MoodChange, out var value))
                return;

@@ -202,15 +210,28 @@ public sealed class MoodSystem : EntitySystem

    private void OnInit(EntityUid uid, MoodComponent component, ComponentInit args)
    {
-        _mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold);
-        if (critThreshold != null)
-            component.CritThresholdBeforeModify = critThreshold.Value;
+        if (!TryComp(uid, out MobThresholdsComponent? thresholdsComponent))
+        {
+            return;
+        }
+
+        if (!_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold, thresholdsComponent))
+        {
+            return;
+        }
+
+        component.CritThresholdBeforeModify = critThreshold.Value;

        var amount = component.MoodThresholds[MoodThreshold.Neutral];
        SetMood(uid, amount, component, refresh: true);
    }

-    public void SetMood(EntityUid uid, float amount, MoodComponent? component = null, bool force = false, bool refresh = false)
+    public void SetMood(
+        EntityUid uid,
+        float amount,
+        MoodComponent? component = null,
+        bool force = false,
+        bool refresh = false)
    {
        if (!Resolve(uid, ref component))
            return;
@@ -298,9 +319,9 @@ public sealed class MoodSystem : EntitySystem

        var newKey = modifier switch
        {
-            1 => FixedPoint2.New(key.Value.Float() * component.IncreaseCritThreshold),
+            1  => FixedPoint2.New(key.Value.Float() * component.IncreaseCritThreshold),
            -1 => FixedPoint2.New(key.Value.Float() * component.DecreaseCritThreshold),
-            _ => component.CritThresholdBeforeModify
+            _  => component.CritThresholdBeforeModify
        };

        component.CritThresholdBeforeModify = key.Value;
@@ -330,12 +351,12 @@ public sealed class MoodSystem : EntitySystem
        return threshold switch
        {
            >= MoodThreshold.VeryGood => 1,
-            <= MoodThreshold.VeryBad => -1,
-            _ => 0
+            <= MoodThreshold.VeryBad  => -1,
+            _                         => 0
        };
    }

-    #region HealthStatusCheck
+#region HealthStatusCheck

    private void OnDamageChange(EntityUid uid, MoodComponent component, DamageChangedEvent args)
    {
@@ -356,7 +377,7 @@ public sealed class MoodSystem : EntitySystem
        RaiseLocalEvent(uid, ev);
    }

-    #endregion
+#endregion
 }

 [UsedImplicitly]
@@ -380,7 +401,7 @@ public sealed partial class ShowMoodEffects : IAlertClick

        var msgStart = Loc.GetString("mood-show-effects-start");
        chatManager.ChatMessageToOne(ChatChannel.Emotes, msgStart, msgStart, EntityUid.Invalid, false,
-            actorComp.PlayerSession.ConnectedClient);
+            actorComp.PlayerSession.Channel);

        foreach (var (_, protoId) in comp.CategorisedEffects)
        {
@@ -413,6 +434,6 @@ public sealed partial class ShowMoodEffects : IAlertClick
        var msg = $"[font size=10][color={color}]{proto.Description}[/color][/font]";

        chatManager.ChatMessageToOne(ChatChannel.Emotes, msg, msg, EntityUid.Invalid, false,
-            comp.PlayerSession.ConnectedClient);
+            comp.PlayerSession.Channel);
    }
 }
--- a/Content.Server/_White/Other/RandomHumanSystem/RandomHumanSystem.cs
+++ b/Content.Server/_White/Other/RandomHumanSystem/RandomHumanSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.IdentityManagement;
 using Content.Server.PDA;
 using Content.Server.Roles;
 using Content.Shared.Access.Components;
+using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.Mind.Components;
 using Content.Shared.NukeOps;
@@ -31,9 +32,14 @@ public sealed class RandomHumanSystem : EntitySystem

    private void OnInit(EntityUid uid, RandomHumanComponent component, ComponentInit args)
    {
+        if (!TryComp(uid, out HumanoidAppearanceComponent? humanoidAppearanceComponent))
+        {
+            return;
+        }
+
        var newProfile = HumanoidCharacterProfile.RandomWithSpecies();

-        _humanoid.LoadProfile(uid, newProfile);
+        _humanoid.LoadProfile(uid, newProfile, humanoidAppearanceComponent);

        if (HasComp<NukeOperativeComponent>(uid))
            return;
@@ -43,7 +49,8 @@ public sealed class RandomHumanSystem : EntitySystem
        if (!_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid))
            return;

-        if (!EntityManager.TryGetComponent(idUid, out PdaComponent? pdaComponent) || !TryComp<IdCardComponent>(pdaComponent.ContainedId, out var card))
+        if (!EntityManager.TryGetComponent(idUid, out PdaComponent? pdaComponent) ||
+            !TryComp<IdCardComponent>(pdaComponent.ContainedId, out var card))
            return;

        var cardId = pdaComponent.ContainedId.Value;
--- a/Content.Server/_White/TTS/TTSComponent.cs
+++ b/Content.Server/_White/TTS/TTSComponent.cs
@@ -15,5 +15,5 @@ public sealed partial class TTSComponent : Component
    /// </summary>
    [ViewVariables(VVAccess.ReadWrite)]
    [DataField("voice", customTypeSerializer:typeof(PrototypeIdSerializer<TTSVoicePrototype>))]
-    public string VoicePrototypeId { get; set; } = string.Empty;
+    public string VoicePrototypeId { get; set; } = "Eugene";
 }
--- a/Content.Shared/Chat/Prototypes/EmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
@@ -57,6 +57,6 @@ public enum EmoteCategory : byte
 {
    Invalid = 0,
    Vocal = 1 << 0,
-    Gesture = 1 << 1, // White Dream EDIT
+    Hands = 1 << 1,
    General = byte.MaxValue
 }
--- a/Content.Shared/_White/Cult/Actions/CultActions.cs
+++ b/Content.Shared/_White/Cult/Actions/CultActions.cs
@@ -6,21 +6,34 @@ public sealed partial class CultTwistedConstructionActionEvent : EntityTargetAct
 {
 }

-public sealed partial class CultSummonDaggerActionEvent : InstantActionEvent { }
+public sealed partial class CultSummonDaggerActionEvent : InstantActionEvent
+{
+}

-public sealed partial class CultStunTargetActionEvent : EntityTargetActionEvent { }
+public sealed partial class CultStunTargetActionEvent : EntityTargetActionEvent
+{
+}

-public sealed partial class CultTeleportTargetActionEvent : EntityTargetActionEvent {}
+public sealed partial class CultTeleportTargetActionEvent : EntityTargetActionEvent
+{
+}

-public sealed partial class CultElectromagneticPulseTargetActionEvent : EntityTargetActionEvent {}
+public sealed partial class CultElectromagneticPulseTargetActionEvent : EntityTargetActionEvent
+{
+}

-public sealed partial class CultShadowShacklesTargetActionEvent : EntityTargetActionEvent {}
-
-public sealed partial class CultSummonCombatEquipmentTargetActionEvent : EntityTargetActionEvent {}
-
-public sealed partial class CultConcealPresenceWorldActionEvent : WorldTargetActionEvent {}
-
-public sealed partial class CultBloodRitesInstantActionEvent : InstantActionEvent {}
+public sealed partial class CultShadowShacklesTargetActionEvent : EntityTargetActionEvent
+{
+}

+public sealed partial class CultSummonCombatEquipmentTargetActionEvent : EntityTargetActionEvent
+{
+}

+public sealed partial class CultConcealPresenceWorldActionEvent : WorldTargetActionEvent
+{
+}

+public sealed partial class CultBloodRitesInstantActionEvent : InstantActionEvent
+{
+}
--- a/Content.Shared/_White/Cult/Components/ConstructShellComponent.cs
+++ b/Content.Shared/_White/Cult/Components/ConstructShellComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;

-namespace Content.Shared._White.Cult.Runes.Components;
+namespace Content.Shared._White.Cult.Components;

 [RegisterComponent]
 public sealed partial class ConstructShellComponent : Component
--- a/Content.Shared/_White/Cult/Components/CultistComponent.cs
+++ b/Content.Shared/_White/Cult/Components/CultistComponent.cs
@@ -1,11 +1,8 @@
 using System.Threading;
-using Content.Shared._White.Cult.Actions;
-using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Utility;

-namespace Content.Shared._White.Cult;
+namespace Content.Shared._White.Cult.Components;

 /// <summary>
 /// This is used for tagging a mob as a cultist.
--- a/Content.Shared/_White/Cult/Systems/CultItemSystem.cs
+++ b/Content.Shared/_White/Cult/Systems/CultItemSystem.cs
@@ -19,7 +19,7 @@ public sealed class CultItemSystem : EntitySystem

    private void OnHandPickUp(EntityUid uid, CultItemComponent component, GettingPickedUpAttemptEvent args)
    {
-        if (HasComp<CultistComponent>(args.User) || HasComp<GhostComponent>(args.User))
+        if (HasComp<Components.CultistComponent>(args.User) || HasComp<GhostComponent>(args.User))
            return;

        args.Cancel();
--- a/Content.Shared/_White/Cult/Systems/CultistSystem.cs
+++ b/Content.Shared/_White/Cult/Systems/CultistSystem.cs
@@ -9,16 +9,16 @@ public sealed class CultistSystem : EntitySystem
    {
        base.Initialize();

-        SubscribeLocalEvent<CultistComponent, ComponentStartup>(OnInit);
-        SubscribeLocalEvent<CultistComponent, ComponentShutdown>(OnRemove);
+        SubscribeLocalEvent<Components.CultistComponent, ComponentStartup>(OnInit);
+        SubscribeLocalEvent<Components.CultistComponent, ComponentShutdown>(OnRemove);
    }

-    private void OnInit(EntityUid uid, CultistComponent component, ComponentStartup args)
+    private void OnInit(EntityUid uid, Components.CultistComponent component, ComponentStartup args)
    {
        RaiseLocalEvent(new EventCultistComponentState(true));
    }

-    private void OnRemove(EntityUid uid, CultistComponent component, ComponentShutdown args)
+    private void OnRemove(EntityUid uid, Components.CultistComponent component, ComponentShutdown args)
    {
        RaiseLocalEvent(new EventCultistComponentState(false));
    }
--- a/Content.Shared/_White/Economy/ATMComponent.cs
+++ b/Content.Shared/_White/Economy/ATMComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared._White.Economy;
 public sealed partial class ATMComponent : Component
 {
    [DataField("idCardSlot")]
-    public ItemSlot CardSlot = default!;
+    public ItemSlot CardSlot = new ();

    [DataField("currencyType")]
    public string CurrencyType = "SpaceCash";
--- a/Content.Shared/_White/Economy/BankCardComponent.cs
+++ b/Content.Shared/_White/Economy/BankCardComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared._White.Economy;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class BankCardComponent : Component
 {
-    [DataField]
+    [ViewVariables(VVAccess.ReadOnly)]
    public int? AccountId;

    [DataField("startingBalance")]
--- a/Content.Shared/_White/WhiteCVars.cs
+++ b/Content.Shared/_White/WhiteCVars.cs
@@ -308,7 +308,7 @@ public sealed class WhiteCVars
        CVarDef.Create("aspects.enabled", true, CVar.SERVERONLY);

    public static readonly CVarDef<double> AspectChance =
-        CVarDef.Create("aspects.chance", 0.33, CVar.SERVERONLY);
+        CVarDef.Create("aspects.chance", 0.33d, CVar.SERVERONLY);

    /*
     * Damage
--- a/Content.Tools/test/0C.yml
+++ b/Content.Tools/test/0C.yml
@@ -3,7 +3,7 @@ meta:
  postmapinit: false
 tilemap:
  0: Space
-  1: FloorAsteroidCoarseSand0
+  1: FloorAsteroidSand
  2: FloorAsteroidCoarseSand1
  3: FloorAsteroidCoarseSand2
  4: FloorAsteroidCoarseSandDug
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -79,3 +79,4 @@ research-technology-honk-mech = H.O.N.K. Mech
 research-technology-advanced-spray = Advanced Spray
 research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
 research-technology-quantum-fiber-weaving = Quantum Fiber Weaving
+research-technology-night-vision = Night Vision Device
--- a/Resources/Locale/en-US/wires/wire-names.ftl
+++ b/Resources/Locale/en-US/wires/wire-names.ftl
@@ -38,6 +38,7 @@ wires-board-name-windoor = Windoor Control
 wires-board-name-mech = Mech
 wires-board-name-fatextractor = FatExtractor
 wires-board-name-flatpacker = Flatpacker
+wires-board-name-criminal-record-server = Criminal Record Server

 # names that get displayed in the wire hacking hud & admin logs.

--- a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
@@ -6,10 +6,24 @@ guidebook-reagent-effect-description =
        [0] .
       *[other] { " " }когда { $conditions }.
    }
+
 guidebook-reagent-name = [bold][color={ $color }]{ CAPITALIZE($name) }[/color][/bold]
 guidebook-reagent-recipes-header = Рецепт
 guidebook-reagent-recipes-reagent-display = [bold]{ $reagent }[/bold] \[{ $ratio }\]
-guidebook-reagent-recipes-mix = Микс
+guidebook-reagent-sources-header = Источники
+guidebook-reagent-sources-ent-wrapper = [bold]{$name}[/bold] \[1\]
+guidebook-reagent-sources-gas-wrapper = [bold]{$name} (газ)[/bold] \[1\]
 guidebook-reagent-effects-header = Эффекты
 guidebook-reagent-effects-metabolism-group-rate = [bold]{ $group }[/bold] [color=gray]({ $rate } единиц в секунду)[/color]
-guidebook-reagent-physical-description = Кажется { $description }.
+guidebook-reagent-physical-description = [italic]Кажется {$description}.[/italic]
+guidebook-reagent-recipes-mix-info = {$minTemp ->
+    [0] {$hasMax ->
+            [true] {CAPITALIZE($verb)} ниже {NATURALFIXED($maxTemp, 2)}K
+            *[false] {CAPITALIZE($verb)}
+        }
+    *[other] {CAPITALIZE($verb)} {$hasMax ->
+            [true] между {NATURALFIXED($minTemp, 2)}K и {NATURALFIXED($maxTemp, 2)}K
+            *[false] выше {NATURALFIXED($minTemp, 2)}K
+        }
+}
+
--- a/Resources/Locale/ru-RU/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -61,3 +61,4 @@ research-technology-meat-manipulation = Манипуляции с мясом
 research-technology-honk-mech = Меха Х.О.Н.К.
 research-technology-advanced-spray = Продвинутый спрей
 research-technology-bluespace-cargo-transport = Блюспейс грузовые перевозки
+research-technology-night-vision = Прибор Ночного Видения
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
@@ -10,10 +10,10 @@ ent-ClothingHeadHelmetCult = шлем культа
 ent-ClothingHeadHelmetEVA = шлем EVA
    .desc = Стандартный шлем, предназначенный для внестанционной деятельности.
    .suffix = { "" }
-ent-ClothingHeadHelmetHelmet = каска
+ent-ClothingHeadHelmetBasic = каска
    .desc = Обычная каска.
    .suffix = { "" }
-ent-ClothingHeadHelmetHelmetOld = каска
+ent-ClothingHeadHelmetBasicOld = каска
    .desc = Обычный старая каска.
    .suffix = { "" }
 ent-ClothingHeadHelmetRiot = легкий противоударный шлем
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl
@@ -7,12 +7,3 @@ ent-MachineParticleAcceleratorFuelChamberCircuitboard = топливная ка
 ent-MachineParticleAcceleratorPowerBoxCircuitboard = блок питания УЧ
    .desc = { ent-BaseMachineCircuitboard.desc }
    .suffix = { "" }
-ent-MachineParticleAcceleratorEmitterLeftCircuitboard = левый эмиттер УЧ
-    .desc = { ent-BaseMachineCircuitboard.desc }
-    .suffix = { "" }
-ent-MachineParticleAcceleratorEmitterCenterCircuitboard = центральный эмиттер УЧ
-    .desc = { ent-BaseMachineCircuitboard.desc }
-    .suffix = { "" }
-ent-MachineParticleAcceleratorEmitterRightCircuitboard = правый эмиттер УЧ
-    .desc = { ent-BaseMachineCircuitboard.desc }
-    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -73,18 +73,12 @@ ent-SubstationMachineCircuitboard = подстанция (машинная пл
 ent-DawInstrumentMachineCircuitboard = цифровая звуковая рабочая станция (машинная плата)
    .desc = { ent-BaseMachineCircuitboard.desc }
    .suffix = { "" }
-ent-GeneratorPlasmaMachineCircuitboard = генератор (плазма) (машинная плата)
-    .desc = { ent-BaseMachineCircuitboard.desc }
-    .suffix = { "" }
 ent-ThrusterMachineCircuitboard = ракетный двигатель (машинная плата)
    .desc = { ent-BaseMachineCircuitboard.desc }
    .suffix = { "" }
 ent-GyroscopeMachineCircuitboard = гироскоп (машинная плата)
    .desc = { ent-BaseMachineCircuitboard.desc }
    .suffix = { "" }
-ent-GeneratorUraniumMachineCircuitboard = генератор (уран) (машинная плата)
-    .desc = { ent-BaseMachineCircuitboard.desc }
-    .suffix = { "" }
 ent-ReagentGrinderMachineCircuitboard = измельчитель реагентов (машинная плата)
    .desc = Печатная плата измельчителя реагентов.
    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl
@@ -13,7 +13,7 @@ ent-WindoorBarKitchenLocked = { ent-Windoor }
 ent-WindoorHydroponicsLocked = { ent-Windoor }
    .suffix = Гидропоника, Закрыто
    .desc = { ent-Windoor.desc }
-ent-WindoorMedicalLocked = { ent-WindoorSecure }
+ent-WindoorSecureMedicalLocked = { ent-WindoorSecure }
    .suffix = Медицинский, Закрыто
    .desc = { ent-WindoorSecure.desc }
 ent-WindoorScienceLocked = { ent-WindoorSecure }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl
@@ -10,12 +10,6 @@ ent-BaseGeneratorWallmountFrame = каркас настенного генера
 ent-GeneratorBasic = { ent-BaseGenerator }
    .suffix = Базовый, 3кВт
    .desc = { ent-BaseGenerator.desc }
-ent-GeneratorPlasma = { ent-BaseGenerator }
-    .suffix = Плазма, 5кВт
-    .desc = { ent-BaseGenerator.desc }
-ent-GeneratorUranium = { ent-BaseGenerator }
-    .suffix = Уран, 15кВт
-    .desc = { ent-BaseGenerator.desc }
 ent-GeneratorWallmountBasic = { ent-BaseGeneratorWallmount }
    .suffix = Базовый, 3кВт
    .desc = { ent-BaseGeneratorWallmount.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/pa/emitter.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/pa/emitter.ftl
@@ -1,18 +1 @@
-ent-ParticleAcceleratorEmitterLeft = сдерживающий эмиттер УЧ (Л)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним.
-    .suffix = { "" }
-ent-ParticleAcceleratorEmitterCenter = сдерживающий эмиттер УЧ (Ц)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним.
-    .suffix = { "" }
-ent-ParticleAcceleratorEmitterRight = сдерживающий эмиттер УЧ (П)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним.
-    .suffix = { "" }
-ent-ParticleAcceleratorEmitterLeftUnfinished = сдерживающий эмиттер УЧ (Л)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним. Выглядит незаконченным.
-    .suffix = Незаконченный, Левый
-ent-ParticleAcceleratorEmitterCenterUnfinished = сдерживающий эмиттер УЧ (Ц)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним. Выглядит незаконченным.
-    .suffix = Незаконченный
-ent-ParticleAcceleratorEmitterRightUnfinished = сдерживающий эмиттер УЧ (П)
-    .desc = Запускает Альфа-частицы, не стоит стоять перед ним. Выглядит незаконченным.
-    .suffix = Незаконченный, Правый
+
--- a/Resources/Maps/ERT/ERTShuttle.yml
+++ b/Resources/Maps/ERT/ERTShuttle.yml
@@ -59,9 +59,9 @@ entities:
    - type: SpreaderGrid
    - type: Shuttle
    - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
        path: /Audio/Effects/alert.ogg
-      type: Gravity
    - chunkCollection:
        version: 2
        nodes:
@@ -1740,8 +1740,6 @@ entities:
    - pos: -0.5,16.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1093
    components:
    - pos: -0.5,17.5
@@ -1767,8 +1765,6 @@ entities:
    - pos: 7.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1098
    components:
    - pos: 6.5,11.5
@@ -1814,8 +1810,6 @@ entities:
    - pos: 5.5,15.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1107
    components:
    - pos: 2.5,12.5
@@ -1836,8 +1830,6 @@ entities:
    - pos: -6.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1111
    components:
    - pos: -5.5,11.5
@@ -1898,29 +1890,21 @@ entities:
    - pos: -4.5,15.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1123
    components:
    - pos: -4.5,16.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1124
    components:
    - pos: 5.5,16.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1125
    components:
    - pos: -2.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1126
    components:
    - pos: -3.5,-3.5
@@ -1931,15 +1915,11 @@ entities:
    - pos: -4.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1128
    components:
    - pos: -5.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1129
    components:
    - pos: -6.5,-3.5
@@ -1950,29 +1930,21 @@ entities:
    - pos: -5.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1131
    components:
    - pos: -5.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1132
    components:
    - pos: -3.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1133
    components:
    - pos: -3.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1134
    components:
    - pos: -3.5,-6.5
@@ -1983,8 +1955,6 @@ entities:
    - pos: 3.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1136
    components:
    - pos: 4.5,-3.5
@@ -1995,15 +1965,11 @@ entities:
    - pos: 5.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1138
    components:
    - pos: 6.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1139
    components:
    - pos: 7.5,-3.5
@@ -2014,15 +1980,11 @@ entities:
    - pos: 4.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1141
    components:
    - pos: 4.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1142
    components:
    - pos: 4.5,-6.5
@@ -2033,22 +1995,16 @@ entities:
    - pos: 6.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1144
    components:
    - pos: 6.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1145
    components:
    - pos: 4.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1146
    components:
    - pos: 4.5,8.5
@@ -2104,8 +2060,6 @@ entities:
    - pos: 2.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1157
    components:
    - pos: 1.5,6.5
@@ -2231,29 +2185,21 @@ entities:
    - pos: 8.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1182
    components:
    - pos: 9.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1183
    components:
    - pos: -8.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1184
    components:
    - pos: -7.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1185
    components:
    - pos: 0.5,-0.5
@@ -2294,15 +2240,11 @@ entities:
    - pos: 0.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1193
    components:
    - pos: 0.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1194
    components:
    - pos: -0.5,-2.5
@@ -2318,8 +2260,6 @@ entities:
    - pos: -4.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1197
    components:
    - pos: -4.5,8.5
@@ -2390,127 +2330,91 @@ entities:
    - pos: -8.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1457
    components:
    - pos: -8.5,-2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1458
    components:
    - pos: -8.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1459
    components:
    - pos: -7.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1460
    components:
    - pos: -7.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1461
    components:
    - pos: -4.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1462
    components:
    - pos: -5.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1463
    components:
    - pos: -4.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1464
    components:
    - pos: -3.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1474
    components:
    - pos: 5.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1475
    components:
    - pos: 5.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1476
    components:
    - pos: 4.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1477
    components:
    - pos: 6.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1478
    components:
    - pos: 8.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1479
    components:
    - pos: 8.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1480
    components:
    - pos: 9.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1481
    components:
    - pos: 9.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1482
    components:
    - pos: -7.5,7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1483
    components:
    - pos: 7.5,7.5
@@ -2521,22 +2425,16 @@ entities:
    - pos: 8.5,7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1485
    components:
    - pos: -5.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1486
    components:
    - pos: 6.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: CableHV
  entities:
  - uid: 307
@@ -2579,8 +2477,6 @@ entities:
    - pos: -3.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 359
    components:
    - pos: -2.5,-4.5
@@ -2616,15 +2512,11 @@ entities:
    - pos: 0.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 366
    components:
    - pos: 0.5,-8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 367
    components:
    - pos: 0.5,-4.5
@@ -2695,15 +2587,11 @@ entities:
    - pos: -7.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 381
    components:
    - pos: -8.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 382
    components:
    - pos: 1.5,0.5
@@ -2744,15 +2632,11 @@ entities:
    - pos: 8.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 390
    components:
    - pos: 9.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 391
    components:
    - pos: 0.5,1.5
@@ -2823,22 +2707,16 @@ entities:
    - pos: -8.5,4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 410
    components:
    - pos: -8.5,5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 411
    components:
    - pos: -8.5,3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 412
    components:
    - pos: 1.5,7.5
@@ -2864,8 +2742,6 @@ entities:
    - pos: 3.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 417
    components:
    - pos: 4.5,6.5
@@ -2876,22 +2752,16 @@ entities:
    - pos: 5.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 419
    components:
    - pos: 6.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 420
    components:
    - pos: 7.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 421
    components:
    - pos: 8.5,5.5
@@ -2902,22 +2772,16 @@ entities:
    - pos: 9.5,5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 423
    components:
    - pos: 9.5,4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 424
    components:
    - pos: 9.5,3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 425
    components:
    - pos: -4.5,5.5
@@ -2943,8 +2807,6 @@ entities:
    - pos: -4.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1069
    components:
    - pos: 0.5,8.5
@@ -3010,22 +2872,16 @@ entities:
    - pos: 0.5,20.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1082
    components:
    - pos: -0.5,20.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1083
    components:
    - pos: 1.5,20.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1084
    components:
    - pos: 1.5,18.5
@@ -3041,15 +2897,11 @@ entities:
    - pos: 3.5,18.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1087
    components:
    - pos: 2.5,19.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1088
    components:
    - pos: -0.5,18.5
@@ -3065,15 +2917,11 @@ entities:
    - pos: -2.5,18.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1091
    components:
    - pos: -1.5,19.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: CableMV
  entities:
  - uid: 278
@@ -3081,15 +2929,11 @@ entities:
    - pos: -3.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 315
    components:
    - pos: -2.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 316
    components:
    - pos: -2.5,-4.5
@@ -3140,8 +2984,6 @@ entities:
    - pos: 3.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 326
    components:
    - pos: 0.5,-4.5
@@ -3217,8 +3059,6 @@ entities:
    - pos: 2.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 344
    components:
    - pos: -0.5,7.5
@@ -3254,8 +3094,6 @@ entities:
    - pos: -4.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 351
    components:
    - pos: 2.5,7.5
@@ -3281,8 +3119,6 @@ entities:
    - pos: 4.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1045
    components:
    - pos: 0.5,8.5
@@ -3333,15 +3169,11 @@ entities:
    - pos: -0.5,16.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1055
    components:
    - pos: -6.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1056
    components:
    - pos: -5.5,11.5
@@ -3407,29 +3239,21 @@ entities:
    - pos: 7.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1447
    components:
    - pos: -4.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1448
    components:
    - pos: -4.5,-4.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1449
    components:
    - pos: -4.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1450
    components:
    - pos: -4.5,-6.5
@@ -3440,15 +3264,11 @@ entities:
    - pos: -4.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1452
    components:
    - pos: -5.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1453
    components:
    - pos: -6.5,-3.5
@@ -3464,29 +3284,21 @@ entities:
    - pos: -8.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1467
    components:
    - pos: 4.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1468
    components:
    - pos: 5.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1469
    components:
    - pos: 6.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1470
    components:
    - pos: 7.5,-5.5
@@ -3497,8 +3309,6 @@ entities:
    - pos: 8.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1472
    components:
    - pos: 5.5,-6.5
@@ -3509,8 +3319,6 @@ entities:
    - pos: 5.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: CableTerminal
  entities:
  - uid: 510
@@ -4060,7 +3868,6 @@ entities:
      type: ContainerContainer
    - canCollide: False
      type: Physics
-    - type: ItemCooldown
    - type: InsideEntityStorage
  - uid: 474
    components:
@@ -4110,7 +3917,6 @@ entities:
      type: ContainerContainer
    - canCollide: False
      type: Physics
-    - type: ItemCooldown
    - type: InsideEntityStorage
 - proto: ClothingHeadHelmetEVALarge
  entities:
@@ -5386,8 +5192,6 @@ entities:
      pos: 6.5,-3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 706
    components:
    - rot: 1.5707963267948966 rad
@@ -5505,8 +5309,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 693
    components:
    - rot: 1.5707963267948966 rad
@@ -5531,8 +5333,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 697
    components:
    - rot: 1.5707963267948966 rad
@@ -5541,8 +5341,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 699
    components:
    - rot: 1.5707963267948966 rad
@@ -5551,8 +5349,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 700
    components:
    - rot: 1.5707963267948966 rad
@@ -5601,8 +5397,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 746
    components:
    - rot: 1.5707963267948966 rad
@@ -5611,8 +5405,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 747
    components:
    - rot: 1.5707963267948966 rad
@@ -5918,8 +5710,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 796
    components:
    - rot: 1.5707963267948966 rad
@@ -5928,8 +5718,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 797
    components:
    - rot: 1.5707963267948966 rad
@@ -5986,8 +5774,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 804
    components:
    - rot: 1.5707963267948966 rad
@@ -5996,8 +5782,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 805
    components:
    - rot: 1.5707963267948966 rad
@@ -6043,8 +5827,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 812
    components:
    - rot: -1.5707963267948966 rad
@@ -6093,8 +5875,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 818
    components:
    - rot: -1.5707963267948966 rad
@@ -6237,8 +6017,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 838
    components:
    - rot: -1.5707963267948966 rad
@@ -6279,8 +6057,6 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 843
    components:
    - rot: 3.141592653589793 rad
@@ -6297,8 +6073,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 845
    components:
    - rot: 3.141592653589793 rad
@@ -6355,8 +6129,6 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 852
    components:
    - rot: 3.141592653589793 rad
@@ -6413,32 +6185,24 @@ entities:
      type: Transform
    - color: '#073DF0FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 885
    components:
    - rot: 1.5707963267948966 rad
      pos: 4.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 886
    components:
    - rot: 1.5707963267948966 rad
      pos: 5.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 887
    components:
    - rot: 1.5707963267948966 rad
      pos: 6.5,-5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: GasPipeTJunction
  entities:
  - uid: 705
@@ -6447,24 +6211,18 @@ entities:
      pos: 0.5,-7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 711
    components:
    - rot: 1.5707963267948966 rad
      pos: -7.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 717
    components:
    - rot: -1.5707963267948966 rad
      pos: 8.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 826
    components:
    - rot: 1.5707963267948966 rad
@@ -6779,7 +6537,7 @@ entities:
      type: Transform
    - color: '#F00707FF'
      type: AtmosPipeColor
- proto: GeneratorUranium
+- proto: PortableGeneratorSuperPacman
  entities:
  - uid: 286
    components:
--- a/Resources/Maps/ERT/ERTStation.yml
+++ b/Resources/Maps/ERT/ERTStation.yml
@@ -2671,15 +2671,11 @@ entities:
    - pos: 3.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 221
    components:
    - pos: 4.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 222
    components:
    - pos: 4.5,1.5
@@ -3065,15 +3061,11 @@ entities:
    - pos: -7.5,8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 299
    components:
    - pos: -7.5,7.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 300
    components:
    - pos: -7.5,6.5
@@ -3124,8 +3116,6 @@ entities:
    - pos: -7.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 310
    components:
    - pos: -7.5,1.5
@@ -3146,8 +3136,6 @@ entities:
    - pos: -5.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 314
    components:
    - pos: -4.5,2.5
@@ -3158,8 +3146,6 @@ entities:
    - pos: -3.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 316
    components:
    - pos: -6.5,0.5
@@ -3170,8 +3156,6 @@ entities:
    - pos: -5.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 318
    components:
    - pos: -4.5,0.5
@@ -3192,15 +3176,11 @@ entities:
    - pos: -6.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 322
    components:
    - pos: -5.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 323
    components:
    - pos: -4.5,6.5
@@ -3211,15 +3191,11 @@ entities:
    - pos: -3.5,6.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 325
    components:
    - pos: -6.5,8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 326
    components:
    - pos: -5.5,8.5
@@ -3240,8 +3216,6 @@ entities:
    - pos: -8.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 330
    components:
    - pos: -8.5,4.5
@@ -3257,8 +3231,6 @@ entities:
    - pos: -8.5,8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 333
    components:
    - pos: -9.5,4.5
@@ -3289,8 +3261,6 @@ entities:
    - pos: -11.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 339
    components:
    - pos: -11.5,5.5
@@ -3446,8 +3416,6 @@ entities:
    - pos: -8.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 370
    components:
    - pos: -8.5,13.5
@@ -3478,22 +3446,16 @@ entities:
    - pos: -11.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 376
    components:
    - pos: -12.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 377
    components:
    - pos: -13.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 378
    components:
    - pos: -10.5,10.5
@@ -3529,36 +3491,26 @@ entities:
    - pos: -15.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 385
    components:
    - pos: -16.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 386
    components:
    - pos: -16.5,8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 387
    components:
    - pos: -16.5,10.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 388
    components:
    - pos: -17.5,9.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 389
    components:
    - pos: -10.5,8.5
@@ -3589,15 +3541,11 @@ entities:
    - pos: -12.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 395
    components:
    - pos: -12.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 396
    components:
    - pos: 5.5,14.5
@@ -3608,8 +3556,6 @@ entities:
    - pos: -6.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 398
    components:
    - pos: -7.5,12.5
@@ -3825,43 +3771,31 @@ entities:
    - pos: 3.5,22.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 441
    components:
    - pos: 4.5,22.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 442
    components:
    - pos: 3.5,20.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 443
    components:
    - pos: 4.5,20.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 444
    components:
    - pos: 3.5,18.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 445
    components:
    - pos: 4.5,18.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 446
    components:
    - pos: 3.5,16.5
@@ -3872,15 +3806,11 @@ entities:
    - pos: 4.5,16.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 448
    components:
    - pos: -7.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 449
    components:
    - pos: -10.5,11.5
@@ -3971,8 +3901,6 @@ entities:
    - pos: -22.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 467
    components:
    - pos: -22.5,1.5
@@ -4008,29 +3936,21 @@ entities:
    - pos: -18.5,5.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 474
    components:
    - pos: -18.5,3.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 475
    components:
    - pos: -18.5,2.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 476
    components:
    - pos: -18.5,1.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 477
    components:
    - pos: -16.5,5.5
@@ -4061,8 +3981,6 @@ entities:
    - pos: 9.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 483
    components:
    - pos: 10.5,14.5
@@ -4268,22 +4186,16 @@ entities:
    - pos: -16.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 524
    components:
    - pos: -16.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 525
    components:
    - pos: -16.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: CableApcStack
  entities:
  - uid: 526
@@ -4303,64 +4215,46 @@ entities:
    - pos: -11.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 529
    components:
    - pos: -12.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 530
    components:
    - pos: -13.5,11.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 531
    components:
    - pos: -13.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 532
    components:
    - pos: -12.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 533
    components:
    - pos: -11.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 534
    components:
    - pos: -12.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 535
    components:
    - pos: -13.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 536
    components:
    - pos: -11.5,12.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 537
    components:
    - pos: -10.5,11.5
@@ -4551,8 +4445,6 @@ entities:
    - pos: 4.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 575
    components:
    - pos: 4.5,-0.5
@@ -4592,8 +4484,6 @@ entities:
    - pos: -8.5,14.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 582
    components:
    - pos: -8.5,9.5
@@ -4619,15 +4509,11 @@ entities:
    - pos: 4.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 587
    components:
    - pos: 3.5,0.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
 - proto: CableMVStack
  entities:
  - uid: 588
@@ -7896,8 +7782,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 948
    components:
    - rot: 1.5707963267948966 rad
@@ -7906,8 +7790,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 949
    components:
    - rot: -1.5707963267948966 rad
@@ -8042,8 +7924,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 966
    components:
    - rot: 1.5707963267948966 rad
@@ -8052,8 +7932,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 967
    components:
    - rot: 1.5707963267948966 rad
@@ -8131,8 +8009,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 977
    components:
    - rot: 3.141592653589793 rad
@@ -8218,8 +8094,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 988
    components:
    - rot: 3.141592653589793 rad
@@ -8252,8 +8126,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 992
    components:
    - rot: 3.141592653589793 rad
@@ -8262,8 +8134,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 993
    components:
    - rot: 1.5707963267948966 rad
@@ -8288,8 +8158,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 996
    components:
    - rot: 1.5707963267948966 rad
@@ -8378,8 +8246,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1007
    components:
    - rot: 3.141592653589793 rad
@@ -8651,8 +8517,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1041
    components:
    - pos: 2.5,15.5
@@ -8732,8 +8596,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1052
    components:
    - rot: 3.141592653589793 rad
@@ -8771,8 +8633,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1057
    components:
    - pos: 0.5,1.5
@@ -8878,8 +8738,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1071
    components:
    - pos: -17.5,1.5
@@ -8991,8 +8849,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1085
    components:
    - rot: 1.5707963267948966 rad
@@ -9033,8 +8889,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1090
    components:
    - rot: 1.5707963267948966 rad
@@ -9072,8 +8926,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1095
    components:
    - pos: -22.5,1.5
@@ -9179,8 +9031,6 @@ entities:
      pos: -18.5,8.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1109
    components:
    - rot: -1.5707963267948966 rad
@@ -9189,8 +9039,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1110
    components:
    - rot: -1.5707963267948966 rad
@@ -9199,8 +9047,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1111
    components:
    - rot: -1.5707963267948966 rad
@@ -9209,8 +9055,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1112
    components:
    - rot: 1.5707963267948966 rad
@@ -9235,8 +9079,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1115
    components:
    - rot: 3.141592653589793 rad
@@ -9245,8 +9087,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1116
    components:
    - rot: -1.5707963267948966 rad
@@ -9255,8 +9095,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1117
    components:
    - rot: -1.5707963267948966 rad
@@ -9393,8 +9231,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1134
    components:
    - rot: 1.5707963267948966 rad
@@ -9427,8 +9263,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1138
    components:
    - rot: 3.141592653589793 rad
@@ -9573,8 +9407,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1156
    components:
    - rot: -1.5707963267948966 rad
@@ -9590,8 +9422,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1158
    components:
    - rot: -1.5707963267948966 rad
@@ -9607,8 +9437,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1160
    components:
    - rot: -1.5707963267948966 rad
@@ -9617,8 +9445,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1161
    components:
    - rot: -1.5707963267948966 rad
@@ -9634,8 +9460,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1163
    components:
    - pos: -12.5,1.5
@@ -9685,8 +9509,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1170
    components:
    - rot: 1.5707963267948966 rad
@@ -9741,8 +9563,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1177
    components:
    - rot: 3.141592653589793 rad
@@ -9780,8 +9600,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1182
    components:
    - rot: 1.5707963267948966 rad
@@ -9814,8 +9632,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1186
    components:
    - rot: -1.5707963267948966 rad
@@ -9824,8 +9640,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1187
    components:
    - rot: 3.141592653589793 rad
@@ -9955,8 +9769,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1205
    components:
    - rot: -1.5707963267948966 rad
@@ -9965,8 +9777,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1206
    components:
    - rot: -1.5707963267948966 rad
@@ -9975,8 +9785,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1207
    components:
    - rot: 1.5707963267948966 rad
@@ -9993,8 +9801,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1209
    components:
    - rot: 1.5707963267948966 rad
@@ -10003,8 +9809,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1210
    components:
    - pos: -0.5,17.5
@@ -10020,8 +9824,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1212
    components:
    - rot: -1.5707963267948966 rad
@@ -10030,8 +9832,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1213
    components:
    - rot: -1.5707963267948966 rad
@@ -10054,8 +9854,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1216
    components:
    - pos: 3.5,19.5
@@ -10070,8 +9868,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1218
    components:
    - pos: 3.5,21.5
@@ -10086,8 +9882,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1220
    components:
    - rot: 3.141592653589793 rad
@@ -10144,8 +9938,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1227
    components:
    - rot: 1.5707963267948966 rad
@@ -10161,8 +9953,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1229
    components:
    - pos: 2.5,1.5
@@ -10238,8 +10028,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1239
    components:
    - rot: 1.5707963267948966 rad
@@ -10264,8 +10052,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1242
    components:
    - rot: 1.5707963267948966 rad
@@ -10282,8 +10068,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1244
    components:
    - rot: 1.5707963267948966 rad
@@ -10300,8 +10084,6 @@ entities:
      type: Transform
    - color: '#0000FFFF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1246
    components:
    - pos: 12.5,4.5
@@ -10384,8 +10166,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1257
    components:
    - rot: -1.5707963267948966 rad
@@ -10859,8 +10639,6 @@ entities:
      type: Transform
    - color: '#FF0000FF'
      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
  - uid: 1319
    components:
    - rot: -1.5707963267948966 rad
@@ -10875,8 +10653,6 @@ entities:
      pos: -18.5,13.5
      parent: 1
      type: Transform
-    - enabled: True
-      type: AmbientSound
  - uid: 1321
    components:
    - rot: -1.5707963267948966 rad
@@ -11688,7 +11464,7 @@ entities:
      type: AmbientSound
    - color: '#FF0000FF'
      type: AtmosPipeColor
- proto: GeneratorUranium
+- proto: PortableGeneratorSuperPacman
  entities:
  - uid: 1403
    components:
@@ -13970,14 +13746,12 @@ entities:
  entities:
  - uid: 1658
    components:
-    - rot: -1.5707963267948966 rad
-      pos: -17.5,-0.5
+    - pos: -17.5,-0.5
      parent: 1
      type: Transform
  - uid: 1659
    components:
-    - rot: -1.5707963267948966 rad
-      pos: -15.5,-0.5
+    - pos: -15.5,-0.5
      parent: 1
      type: Transform
 - proto: OxygenCanister
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -14,7 +14,7 @@
    sprite: Objects/Misc/fire_extinguisher.rsi
    state: fire_extinguisher_closed
  product: CrateEmergencyFire
-  cost: 1500
+  cost: 1600
  category: Emergency
  group: market

@@ -44,7 +44,7 @@
    sprite: Structures/Wallmounts/signs.rsi
    state: radiation
  product: CrateEmergencyRadiation
-  cost: 1000
+  cost: 1100
  category: Emergency
  group: market

--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -174,7 +174,7 @@
    sprite: Structures/Storage/Crates/toybox.rsi
    state: crate_icon
  product: CrateFunToyBox
-  cost: 900
+  cost: 1000
  category: Fun
  group: market

--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,7 +4,7 @@
    sprite: Clothing/OuterClothing/Armor/security.rsi
    state: icon
  product: CrateSecurityArmor
-  cost: 700
+  cost: 750
  category: Security
  group: market

--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -12,7 +12,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockBoozeFilled
-  cost: 5000
+  cost: 6000
  category: Service
  group: market

@@ -33,7 +33,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockClothesFilled
-  cost: 6285
+  cost: 10500
  category: Service
  group: market

@@ -54,7 +54,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockCondimentStationFilled
-  cost: 300
+  cost: 400
  category: Service
  group: market

--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -93,7 +93,7 @@
    - type: StorageFill
      contents:
        - id: SurveillanceBodyCamera
-          amount: 5
+          amount: 3
    - type: Sprite
      layers:
        - state: box_security
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml
@@ -136,7 +136,7 @@
        - ClothingOuterArmorBulletproof
        - FlashlightSeclite
        - ClothingHandsGlovesColorBlack
-        - ClothingHeadHelmetHelmet
+        - ClothingHeadHelmetBasic
        - Handcuffs
        - Zipties
        - ClothingBeltSecurityWebbing
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml
@@ -15,6 +15,7 @@
    - type: Clothing
      sprite: Objects/Specific/Security/body-camera.rsi
      quickEquip: false
+      equippedPrefix: off
      slots:
        - neck
    - type: ToggleableLightVisuals
@@ -29,6 +30,7 @@
    - type: Item
      heldPrefix: off
      sprite: Objects/Specific/Security/body-camera.rsi
+      size: Small
    - type: Appearance
    - type: GenericVisualizer
      visuals:
@@ -40,7 +42,7 @@
    - type: WirelessNetworkConnection
      range: 300
    - type: ActiveListener
-      range: 5
+      range: 10
    - type: SurveillanceCameraMicrophone
      blacklist:
        components:
@@ -52,6 +54,7 @@
      receiveFrequencyId: SurveillanceCameraSecurity
      transmitFrequencyId: SurveillanceCamera
    - type: SurveillanceCamera
+      networkSet: True
      setupAvailableNetworks:
        - SurveillanceCameraSecurity
    - type: PowerCellSlot
@@ -63,7 +66,6 @@
      slots:
        cell_slot:
          name: power-cell-slot-component-slot-name-default
-          startingItem: PowerCellMedium
    - type: UserInterface
      interfaces:
        - key: enum.SurveillanceCameraSetupUiKey.Camera
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
@@ -6,6 +6,7 @@
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi
+    state: icon
  - type: Item
    size: Small
    sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -280,6 +280,9 @@
    receiveFrequencyId: SmartLight
  - type: WirelessNetworkConnection
    range: 200
+  - type: DeviceLinkSource
+    ports:
+    - LightStatus
  - type: Appearance
  - type: PoweredLightVisuals
  - type: DeviceLinkSink
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -675,7 +675,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          BZCanisterBroken:
@@ -724,7 +724,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          PluoxiumCanisterBroken:
@@ -774,7 +774,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          HydrogenCanisterBroken:
@@ -825,7 +825,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          NitriumCanisterBroken:
@@ -883,7 +883,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          HealiumCanisterBroken:
@@ -941,7 +941,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          HyperNobliumCanisterBroken:
@@ -999,7 +999,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          ProtoNitrateCanisterBroken:
@@ -1057,7 +1057,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          ZaukerCanisterBroken:
@@ -1115,7 +1115,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          HalonCanisterBroken:
@@ -1173,7 +1173,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          HeliumCanisterBroken:
@@ -1231,7 +1231,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          AntiNobliumCanisterBroken:
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -90,7 +90,7 @@
        acts: ["Destruction"]
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak

 - type: entity
  id: Crematorium
@@ -180,4 +180,4 @@
        acts: ["Destruction"]
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -29,7 +29,7 @@
              acts: [ "Destruction" ]
            - !type:PlaySoundBehavior
              sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
    - type: UseDelay
      delay: 0.2 # prevent light-toggling auto-clickers.
 # WD edit start
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -208,13 +208,13 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:ChangeConstructionNodeBehavior
        node: girder
      - !type:DoActsBehavior
        acts: ["Destruction"]
    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
+      collection: MetalBreak
  - type: IconSmooth
    key: walls
    base: cult
@@ -549,7 +549,7 @@
            min: 1
            max: 2 # WD edit end
    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
+      collection: MetalBreak
  - type: IconSmooth
    key: walls
    base: reinf_over
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -146,13 +146,13 @@
    - type: MapGrid
    - type: BlobFloorPlanBuilder
      floorTileset:
-        - FloorAsteroidCoarseSand0
+        - FloorAsteroidSand
      blobDrawProb: 0.5
      radius: 6
      floorPlacements: 16
    - type: SimpleFloorPlanPopulator
      entries:
-        FloorAsteroidCoarseSand0:
+        FloorAsteroidSand:
          - id: AsteroidRockMining
    - type: IFF
      flags: HideLabel
--- a/Resources/Prototypes/Entities/World/MapsPlacer/init.yml
+++ b/Resources/Prototypes/Entities/World/MapsPlacer/init.yml
--- a/Resources/Prototypes/Maps/Pools/White.yml
+++ b/Resources/Prototypes/Maps/Pools/White.yml
@@ -1,8 +1,8 @@
- type: gameMapPool
-  id: WhiteMapPool
-  maps:
-    - WhiteBagel
-    - WhiteBox
-    - WhiteKettle
-    - WhiteMeta
-    - WonderBox
+#- type: gameMapPool
+#  id: WhiteMapPool
+#  maps:
+#    - WhiteBagel
+#    - WhiteBox
+#    - WhiteKettle
+#    - WhiteMeta
+#    - WonderBox
--- a/Resources/Prototypes/Objectives/cultObjectives.yml
+++ b/Resources/Prototypes/Objectives/cultObjectives.yml
@@ -8,6 +8,6 @@
      difficulty: 1.5
      issuer: Cult
      icon:
-        sprite: /White/Cult/interface.rsi
+        sprite: White/Cult/interface.rsi
        state: icon
    - type: KillCultistTargetCondition
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -0,0 +1,222 @@
+# vocal emotes
+- type: emote
+  id: Scream
+  category: Vocal
+  buttonText: Кричать
+  chatMessages: [ кричит, орет, вопит, рявкает ]
+  chatTriggers:
+  - кричит
+  - закричал
+  - закричала
+  - орет
+  - заорал
+  - заорала
+  - визжит
+  - завизжал
+  - завизжала
+  - взвизгнул
+  - взвизгнула
+  - рявкает
+  - рявкнул
+  - рявкнула
+  - вопит
+  allowMenu: true
+
+- type: emote
+  id: Laugh
+  category: Vocal
+  buttonText: Смеяться
+  chatMessages: [ смеется, ржет, усмехается, хохочет, гогочет ]
+  chatTriggers:
+  - смеется
+  - просмеялся
+  - засмеялся
+  - засмеялась
+  - хихикает
+  - хихикнул
+  - хихикнула
+  - хихикает
+  - ржет
+  - усмехается
+  - усмехнулась
+  - усмехнулся
+  - хохочет
+  - гогочет
+  allowMenu: true
+
+- type: emote
+  id: Honk
+  category: Vocal
+  chatMessages: [ хонкает ]
+
+- type: emote
+  id: Sigh
+  category: Vocal
+  buttonText: Вздохнуть
+  chatMessages: [ вздыхает ]
+  chatTriggers:
+  - вздыхает
+  - вздохнула
+  - вздохнул
+  - вздохнуло
+  allowMenu: true
+
+- type: emote
+  id: Whistle
+  category: Vocal
+  buttonText: Свистнуть
+  chatMessages: [ свистит ]
+  chatTriggers:
+  - свистнул
+  - свистнула
+  - свистнуло
+  allowMenu: true
+
+- type: emote
+  id: Crying
+  category: Vocal
+  buttonText: Плакать
+  chatMessages: [ плакать ]
+  chatTriggers:
+  - плачет
+  - заплакал
+  - заплакала
+  - заплакало
+  - рыдает
+  - хнычет
+  allowMenu: true
+
+- type: emote
+  id: Squish
+  category: Vocal
+  chatMessages: [ хлюпает ]
+  chatTriggers:
+  - хлюпать
+  - хлюпает
+
+- type: emote
+  id: Chitter
+  category: Vocal
+  chatMessages: [ тарахтит ]
+  chatTriggers:
+  - щебечет
+  - щебечет.
+  - щебечет!
+  - тарахтит
+  - тарахтит.
+  - тарахтит!
+
+- type: emote
+  id: Squeak
+  category: Vocal
+  chatMessages: [сквикает]
+  chatTriggers:
+  - сквик
+  - сквик.
+  - сквикает
+  - сквикает.
+
+- type: emote
+  id: Click
+  category: Vocal
+  chatMessages: [щёлкает]
+  chatTriggers:
+  - щелк
+  - щёлкает
+  - щелкает
+  - щёлк
+
+# hand emotes
+- type: emote
+  id: Clap
+  category: Hands
+  buttonText: Хлопать
+  chatMessages: [ хлопает ]
+  chatTriggers:
+  - хлопает
+  - хлопает!
+  - захлопала
+  - захлопала!
+  - захлопал
+  - захлопал!
+  - похлопал
+  - похлопал!
+  allowMenu: true
+
+- type: emote
+  id: Snap
+  category: Hands
+  buttonText: Щелкать пальцами
+  chatMessages: [ щелкает пальцами ] # snaps <{THEIR($ent)}> fingers?
+  chatTriggers:
+  - щелкает пальцами
+  - щелкнул пальцами
+  - щелкнула пальцами
+  - щелкунл пальцами
+  - щелкунла пальцами
+  allowMenu: true
+
+- type: emote
+  id: Salute
+  category: Hands
+  buttonText: Отдать честь
+  chatMessages: [ отдает честь ]
+  chatTriggers:
+  - салютует
+  - отдаёт честь
+  allowMenu: true
+
+- type: emote
+  id: WaveHand
+  category: Hands
+  buttonText: Махать рукой
+  chatMessages: [машет рукой]
+  allowMenu: true
+
+- type: emote
+  id: Nod
+  category: Hands
+  buttonText: Кивать
+  chatMessages: [кивает]
+  allowMenu: true
+
+- type: emote
+  id: ShakeHead
+  category: Hands
+  buttonText: Покачать головой
+  chatMessages: [качает головой]
+  allowMenu: true
+
+- type: emote
+  id: Frown
+  category: Hands
+  buttonText: Хмуриться
+  chatMessages: [хмурится]
+  allowMenu: true
+
+- type: emote
+  id: Smile
+  category: Hands
+  buttonText: Улыбаться
+  chatMessages: [улыбается]
+  allowMenu: true
+
+- type: emote
+  id: Sniff
+  category: Hands
+  buttonText: Принюхиваться
+  chatMessages: [принюхивается]
+  allowMenu: true
+
+- type: emote
+  id: LickLips
+  category: Hands
+  buttonText: Облизываться
+  chatMessages: [облизывается]
+  allowMenu: true
+
+- type: emote
+  id: DefaultDeathgasp
+  chatMessages: [ "emote-deathgasp" ]
+  chatTriggers:
+  - задыхается
--- a/Resources/Prototypes/White/Actions/emotes.yml
+++ b/Resources/Prototypes/White/Actions/emotes.yml
@@ -1,7 +1,7 @@
 # Using EmoteAnimation from IC action chat
 - type: emote
  id: EmoteFlip
-  category: Gesture
+  category: Hands
  buttonText: Сальто
  chatMessages: [делает сальто]
  chatTriggers:
@@ -17,7 +17,7 @@

 - type: emote
  id: EmoteJump
-  category: Gesture
+  category: Hands
  buttonText: Прыгнуть
  chatMessages: [прыгает]
  chatTriggers:
@@ -31,7 +31,7 @@

 - type: emote
  id: EmoteTurn
-  category: Gesture
+  category: Hands
  buttonText: Танцевать
  chatMessages: [танцует]
  chatTriggers:
--- a/Resources/Prototypes/White/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/White/Damage/modifier_sets.yml
@@ -0,0 +1,5 @@
+- type: damageModifierSet
+  id: Felinid
+  coefficients:
+    Blunt: 1.1
+    Slash: 1.1
--- a/Resources/Prototypes/White/Economy/card.yml
+++ b/Resources/Prototypes/White/Economy/card.yml
@@ -8,6 +8,7 @@
    - type: Sprite
      sprite: White/Misc/cards.rsi
      scale: 0.8, 0.8
+      state: budgetcard

 - type: entity
  parent: BaseDepartmentBudgetCard
--- a/Resources/Prototypes/White/Emotes/harpy_emotes.yml
+++ b/Resources/Prototypes/White/Emotes/harpy_emotes.yml
@@ -87,21 +87,6 @@
    - beeping.
    - beeped.

- type: emote
-  id: Click
-  category: Vocal
-  chatMessages: [щёлкает]
-  chatTriggers:
-    - щелк
-    - щёлкает
-    - щелкает
-    - щёлк
-    - clicks.
-    - click.
-    - click!
-    - clicking.
-    - clicked.
-
 - type: emote
  id: Caw
  category: Vocal
@@ -146,42 +131,3 @@
    - издает рёв
    - издает рёв.

- type: emote
-  id: Chitter
-  category: Vocal
-  chatMessages: [тарахтит]
-  chatTriggers:
-    - щебечет
-    - щебечет.
-    - щебечет!
-    - тарахтит
-    - тарахтит.
-    - тарахтит!
-    - chitter
-    - chitter.
-    - chitter!
-    - chitters
-    - chitters.
-    - chitters!
-    - chittered
-    - chittered.
-    - chittered!
-
- type: emote
-  id: Squeak
-  category: Vocal
-  chatMessages: [сквикает]
-  chatTriggers:
-    - сквик
-    - сквик.
-    - сквикает
-    - сквикает.
-    - squeak
-    - squeak.
-    - squeak!
-    - squeaks
-    - squeaks.
-    - squeaks!
-    - squeaked
-    - squeaked.
-    - squeaked!
--- a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml
@@ -54,6 +54,9 @@
    slots:
      cell_slot:
        name: power-cell-slot-component-slot-name-default
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}
  - type: Snatcherprod
  - type: Construction
    deconstructionTarget: null
--- a/Resources/Prototypes/White/Entities/Structures/Machines/criminal_records_server.yml
+++ b/Resources/Prototypes/White/Entities/Structures/Machines/criminal_records_server.yml
@@ -49,7 +49,7 @@
    board: CriminalRecordsServerCircuitboard
  - type: WiresPanel
  - type: Wires
-    boardName: "CriminalRecordsServer"
+    boardName: wires-board-name-criminal-record-server
    layoutId: CriminalRecordsServer
  - type: Transform
    anchored: true
--- a/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml
+++ b/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml
@@ -19,7 +19,7 @@
      sound:
        path: /Audio/White/Supermatter/calm.ogg
    - type: Physics
-      bodyType: Dynamic
+      bodyType: Static
    - type: Speech
      speechSounds: Pai
    - type: Fixtures
--- a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml
+++ b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml
@@ -56,8 +56,7 @@
  - type: MeleeSound
    soundGroups:
      Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
  - type: Construction
    graph: ComputerWall
    node: computer
@@ -129,7 +128,7 @@
      behaviors:
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
      - !type:SpawnEntitiesBehavior
        spawn:
          SheetSteel1:
@@ -193,7 +192,7 @@
    interfaces:
    - key: enum.SalvageConsoleUiKey.Expedition
      type: SalvageExpeditionConsoleBoundUserInterface
-  - type: Construction
+  - type: Computer
    board: SalvageConsoleWallMountCircuitboard
  - type: PointLight
    radius: 1.5
--- a/Resources/Prototypes/White/Fluff/centurion.yml
+++ b/Resources/Prototypes/White/Fluff/centurion.yml
@@ -247,7 +247,7 @@
  id: SecLoadoutCenturion
  entity: ClothingOuterHardsuitSecurityCenturion
  sponsorOnly: true
-  whitelistJobs: [SecurityOfficer, Warden, SecurityCadet, Detective, SeniorOfficer]
+  whitelistJobs: [Warden, SecurityCadet, SecurityOfficer, Detective]

 - type: loadout
  id: SalvageLoadoutCenturion
--- a/Resources/Prototypes/White/Fluff/serbwo.yml
+++ b/Resources/Prototypes/White/Fluff/serbwo.yml
@@ -218,7 +218,7 @@
  id: ScuffLoadoutSW
  entity: ClothingOuterScufSuitFluff
  sponsorOnly: true
-  whitelistJobs: [ SeniorSalvageSpecialist, SeniorEngineer, SeniorPhysician, SeniorResearcher, Detective ]
+  whitelistJobs: [ Detective ]

 - type: loadout
  id: CapLoadoutSO
--- a/Resources/Prototypes/White/Fluff/sponsor.yml
+++ b/Resources/Prototypes/White/Fluff/sponsor.yml
@@ -3,7 +3,7 @@
  id: SuitGlamorousLoadout
  entity: ClothingOuterSuitGlamorous
  sponsorOnly: true
-  blacklistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Warden, Detective, SeniorOfficer, SecurityOfficer, Quartermaster]
+  blacklistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Warden, Detective, SecurityOfficer, Quartermaster]

 - type: loadout
  id: ClothingOuterHardsuitEVAGLAMOURsLoadout
@@ -15,13 +15,13 @@
  id: GammaUniformLoadout
  entity: ClothingUniformJumpsuitGamma
  sponsorOnly: true
-  whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective, SeniorOfficer]
+  whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective]

 - type: loadout
  id: GammaBeretLoadout
  entity: ClothingHeadHatBeretGamma
  sponsorOnly: true
-  whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective, SeniorOfficer]
+  whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective]

 - type: loadout
  id: ChaplanSchemaLoadout
@@ -117,11 +117,6 @@
  entity: BibleNya
  sponsorOnly: true

- type: loadout # WHITEGPT HUETA ДЛЯ КЛОУНОВ И ВЫШЕ
-  id: WhiteGPTLoadout
-  entity: PersonalNeuralAI
-  sponsorOnly: true
-
 # Warete
 - type: loadout
  id: WareteJumpskirtLoadout
@@ -405,13 +400,13 @@
  id: Egoruch17Mask
  entity: EgoruchClothingMaskHoly
  sponsorOnly: true
-  whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, SeniorEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, SeniorResearcher, Scientist, ResearchAssistant ]
+  whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, Scientist, ResearchAssistant ]

 - type: loadout
  id: Egoruch17Mantle
  entity: EgoruchClothingOuterMantle
  sponsorOnly: true
-  whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, SeniorEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, SeniorResearcher, Scientist, ResearchAssistant ]
+  whitelistJobs: [ AtmosphericTechnician, ChiefEngineer, StationEngineer, TechnicalAssistant, Chaplain, ResearchDirector, Scientist, ResearchAssistant ]

 # g13
 - type: loadout
--- a/Resources/Prototypes/White/Recipes/lathe_recipes.yml
+++ b/Resources/Prototypes/White/Recipes/lathe_recipes.yml
@@ -3,7 +3,7 @@
  result: OxygenTank
  completetime: 3
  materials:
-    Steel: 500
+    Steel: 700

 - type: latheRecipe
  id: PlasmaTank
--- a/Resources/Prototypes/White/Research/experimental.yml
+++ b/Resources/Prototypes/White/Research/experimental.yml
@@ -1,7 +1,7 @@
 # Night Vision Tech
 - type: technology
  id: NightVisionTech
-  name: Технологии ночного видиния
+  name: research-technology-night-vision
  icon:
    sprite: White/Clothing/Head/nightvision.rsi
    state: icon
--- a/Resources/Prototypes/White/Structures/Machines/atm.yml
+++ b/Resources/Prototypes/White/Structures/Machines/atm.yml
@@ -25,6 +25,7 @@
      shader: unshaded
  - type: ATM
    idCardSlot:
+      name: id-card-slot
      ejectSound: /Audio/Machines/id_swipe.ogg
      insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
      ejectOnBreak: true
@@ -35,7 +36,7 @@
  - type: ItemSlots
  - type: ContainerContainer
    containers:
-      IdCardSlot: !type:ContainerSlot
+      card-slot: !type:ContainerSlot
  - type: Appearance
  - type: AmbientOnPowered
  - type: AmbientSound
--- a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
@@ -112,7 +112,7 @@
        acts: [ "Destruction" ]
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
  - type: Appearance
  - type: CultCraftStructureVisuals
  - type: CultistFactory
@@ -171,7 +171,7 @@
        acts: [ "Destruction" ]
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
  - type: Appearance
  - type: CultCraftStructureVisuals
  - type: CultistFactory
@@ -229,7 +229,7 @@
        acts: [ "Destruction" ]
      - !type:PlaySoundBehavior
        sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
  - type: Appearance
  - type: CultCraftStructureVisuals
  - type: CultistFactory
--- a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml
@@ -46,7 +46,7 @@
                  max: 5
            - !type:PlaySoundBehavior
              sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
            - !type:DoActsBehavior
              acts: [ "Destruction" ]
    - type: PointLight
--- a/Resources/Prototypes/_White/Entities/Cult/constructs.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
@@ -41,6 +41,10 @@
      thresholds:
        0: Alive
        60: Dead
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
    - type: MobState
      allowedStates:
        - Alive
@@ -77,7 +81,8 @@
      baseWalkSpeed: 2
      baseSprintSpeed: 2
    - type: Construct
-      actions: [InstantActionJuggernautCreateWall]
+      actions:
+      - InstantActionJuggernautCreateWall
    - type: MeleeWeapon
      hidden: true
      angle: 30
@@ -190,6 +195,7 @@
    - type: Sprite
      sprite: White/Cult/Entities/construct_cult.rsi
      state: construct_cult
+    - type: ItemSlots
    - type: ConstructShell
      shardSlot:
        ejectOnBreak: true
--- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml
@@ -7,8 +7,7 @@
  - type: MeleeSound
    soundGroups:
      Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
  - type: InteractionOutline
  - type: Sprite
    sprite: /Textures/White/Cult/Structures/cult_airlock.rsi
--- a/Resources/Prototypes/_White/narsie.yml
+++ b/Resources/Prototypes/_White/narsie.yml
@@ -7,7 +7,7 @@
      - map: [ "enum.NarsieLayer.Default" ]
        state: narsie_spawn_anim
        sprite: White/Cult/narsie.rsi
-    drawdepth: 100
+    drawdepth: Overdoors
    shader: unshaded
    scale: 0.6, 0.6
  - type: RandomWalk
--- a/Resources/Prototypes/emotes.yml
+++ b/Resources/Prototypes/emotes.yml
@@ -1,134 +0,0 @@
- type: emote
-  id: Scream
-  category: Vocal
-  buttonText: Кричать
-  chatMessages: [кричит, орет, вопит, рявкает]
-  chatTriggers:
-    - кричит
-    - закричал
-    - закричала
-    - орет
-    - заорал
-    - заорала
-    - визжит
-    - завизжал
-    - завизжала
-    - взвизгнул
-    - взвизгнула
-    - рявкает
-    - рявкнул
-    - рявкнула
-    - вопит
-  allowMenu: true
-
- type: emote
-  id: Laugh
-  category: Vocal
-  buttonText: Смеяться
-  chatMessages: [смеется, ржет, усмехается, хохочет, гогочет]
-  chatTriggers:
-    - смеется
-    - просмеялся
-    - засмеялся
-    - засмеялась
-    - хихикает
-    - хихикнул
-    - хихикнула
-    - хихикает
-    - ржет
-    - усмехается
-    - усмехнулась
-    - усмехнулся
-    - хохочет
-    - гогочет
-  allowMenu: true
-
- type: emote
-  id: Clap
-  category: Gesture
-  buttonText: Хлопать
-  chatMessages: [хлопает]
-  chatTriggers:
-    - хлопает
-    - захлопала
-    - захлопал
-    - похлопал
-  allowMenu: true
-
- type: emote
-  id: Snap
-  category: Gesture
-  buttonText: Щелкать пальцами
-  chatMessages: [щелкает пальцами]
-  chatTriggers:
-    - щелкает пальцами
-    - щелкнул пальцами
-    - щелкнула пальцами
-    - щелкунл пальцами
-    - щелкунла пальцами
-  allowMenu: true
-
- type: emote
-  id: WaveHand
-  category: Gesture
-  buttonText: Махать рукой
-  chatMessages: [машет рукой]
-  allowMenu: true
-
- type: emote
-  id: Nod
-  category: Gesture
-  buttonText: Кивать
-  chatMessages: [кивает]
-  allowMenu: true
-
- type: emote
-  id: ShakeHead
-  category: Gesture
-  buttonText: Покачать головой
-  chatMessages: [качает головой]
-  allowMenu: true
-
- type: emote
-  id: Frown
-  category: Gesture
-  buttonText: Хмуриться
-  chatMessages: [хмурится]
-  allowMenu: true
-
- type: emote
-  id: Smile
-  category: Gesture
-  buttonText: Улыбаться
-  chatMessages: [улыбается]
-  allowMenu: true
-
- type: emote
-  id: Sniff
-  category: Gesture
-  buttonText: Принюхиваться
-  chatMessages: [принюхивается]
-  allowMenu: true
-
- type: emote
-  id: LickLips
-  category: Gesture
-  buttonText: Облизываться
-  chatMessages: [облизывается]
-  allowMenu: true
- type: emote
-
-  id: Sigh
-  category: Vocal
-  chatMessages: [вздыхает]
-
- type: emote
-  id: Whistle
-  category: Vocal
-  chatMessages: [свистит]
-
- type: emote
-  id: Crying
-  category: Vocal
-  chatMessages: [плачет]
-
--- a/Resources/Prototypes/fonts.yml
+++ b/Resources/Prototypes/fonts.yml
@@ -46,10 +46,6 @@
  id: ComicSansMS
  path: /Fonts/ComicSans/ComicSansMS.ttf

- type: font
-  id: SmallFont
-  path: /Fonts/SmallFonts/SmallFont.ttf
-
 - type: font
  id: Bedstead
  path: /Fonts/Bedstead/Bedstead.otf
--- a/Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
@@ -9,7 +9,7 @@
 <GuideEntityEmbed Entity="Thruster"/>
 <GuideEntityEmbed Entity="ComputerShuttle"/>
 <GuideEntityEmbed Entity="SubstationBasic"/>
-<GuideEntityEmbed Entity="GeneratorPlasma"/>
+<GuideEntityEmbed Entity="PortableGeneratorPacman"/>
 </Box>
 <Box>
 <GuideEntityEmbed Entity="CableHVStack"/>
--- a/Show More
+++ b/Show More