diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
index 19b359e78a..4f73a9ba80 100644
--- 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
 {
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 714fa43185..0f1fbcea60 100644
--- 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;
 
diff --git a/Content.Client/_White/Cult/CultHudOverlay.cs b/Content.Client/_White/Cult/CultHudOverlay.cs
index ec3b2b83a3..0011924186 100644
--- 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;
 
diff --git a/Content.Client/_White/Cult/ShowCultHudSystem.cs b/Content.Client/_White/Cult/ShowCultHudSystem.cs
index c4f2178203..4b4b54dd33 100644
--- 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;
 
diff --git a/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs b/Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs
index d0540b9b1c..8442f9b2d2 100644
--- 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;
 
diff --git a/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs b/Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs
index 3c9f7fb825..7099b80690 100644
--- 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;
 
diff --git a/Content.Client/_White/Radials/RadialUIController.cs b/Content.Client/_White/Radials/RadialUIController.cs
index fb22fe3614..a3775723d9 100644
--- 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();
     }
 
diff --git a/Content.Server/Chat/Commands/CultCommand.cs b/Content.Server/Chat/Commands/CultCommand.cs
index d76c5ae211..d10fc376ee 100644
--- 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
 {
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 941781dcfe..50cded7c05 100644
--- 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;
 
diff --git a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
index 9b0890d47c..594eb0ec6d 100644
--- 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);
         }
diff --git a/Content.Server/Worldgen/Systems/BlueprintPlacerSystem.cs b/Content.Server/Worldgen/Systems/BlueprintPlacerSystem.cs
index 12b160c79d..ac975254a0 100644
--- 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;
diff --git a/Content.Server/_White/Animations/EmoteAnimationSystem.cs b/Content.Server/_White/Animations/EmoteAnimationSystem.cs
index 2ef5b042fe..346ed118e9 100644
--- 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);
diff --git a/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs b/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs
index 32116c0023..6888aa3d22 100644
--- 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
     }
 }
diff --git a/Content.Server/_White/Cult/ConstructComponent.cs b/Content.Server/_White/Cult/ConstructComponent.cs
index 6d38576088..2f056dd460 100644
--- 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();
 }
diff --git a/Content.Server/_White/Cult/GameRule/CultRuleComponent.cs b/Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
index 22cc6cf646..51b002a099 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
index 699b1ef4da..26c3caf36a 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs b/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
index 9bfcdc1394..66952b32ac 100644
--- 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;
diff --git a/Content.Server/_White/Cult/Items/Systems/BloodBoilProjectileSystem.cs b/Content.Server/_White/Cult/Items/Systems/BloodBoilProjectileSystem.cs
index ebabe37e3f..f67c35f928 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Items/Systems/CultRobeModifierSystem.cs b/Content.Server/_White/Cult/Items/Systems/CultRobeModifierSystem.cs
index 5ac8be45e1..fc48667e93 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Items/Systems/ReturnItemOnThrowSystem.cs b/Content.Server/_White/Cult/Items/Systems/ReturnItemOnThrowSystem.cs
index bfa966996b..12bf61e5d4 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Items/Systems/ShuttleCurseSystem.cs b/Content.Server/_White/Cult/Items/Systems/ShuttleCurseSystem.cs
index 5f1895172a..d244ccc7b0 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Items/Systems/TorchCultistsProviderSystem.cs b/Content.Server/_White/Cult/Items/Systems/TorchCultistsProviderSystem.cs
index 9add07105f..755076f69c 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs b/Content.Server/_White/Cult/Items/Systems/VoidTeleportSystem.cs
index ff132bfa77..75a5a33d7b 100644
--- 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;
diff --git a/Content.Server/_White/Cult/Pylon/PylonSystem.cs b/Content.Server/_White/Cult/Pylon/PylonSystem.cs
index e432ff755a..dc070a6231 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Actions.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Actions.cs
index ca8dab333d..672a1713e6 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Barrier.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Barrier.cs
index cd8f649b4d..0ed8507f50 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Buff.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Buff.cs
index 0efa128197..b1da1654bb 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Constructs.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Constructs.cs
index e35443d951..e4aabd2734 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs
index d9944d04d6..ec624f11e1 100644
--- 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 _))
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
index a4980344f5..145e52b800 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.SoulShard.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.SoulShard.cs
index d33ed49a54..9c07544331 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Structures/CultStructureCraftSystem.cs b/Content.Server/_White/Cult/Structures/CultStructureCraftSystem.cs
index 3068a2d371..8ac6c0b98d 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs b/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs
index 1c5659b13a..3ef8e1ad91 100644
--- 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;
 
diff --git a/Content.Server/_White/Cult/TimedProduction/CultistFactorySystem.cs b/Content.Server/_White/Cult/TimedProduction/CultistFactorySystem.cs
index 9e92a4dcbe..52729f4d94 100644
--- 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;
 
diff --git a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
index 7bfd5e2cd0..52a9f6f6af 100644
--- 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;
diff --git a/Content.Server/_White/Mood/MoodSystem.cs b/Content.Server/_White/Mood/MoodSystem.cs
index e557fc35e2..afc97e9664 100644
--- 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);
     }
 }
diff --git a/Content.Server/_White/Other/RandomHumanSystem/RandomHumanSystem.cs b/Content.Server/_White/Other/RandomHumanSystem/RandomHumanSystem.cs
index bbb2802e16..3f4018e7bb 100644
--- 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;
diff --git a/Content.Server/_White/TTS/TTSComponent.cs b/Content.Server/_White/TTS/TTSComponent.cs
index 84f818bb9a..01f0dbeafd 100644
--- 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";
 }
diff --git a/Content.Shared/Chat/Prototypes/EmotePrototype.cs b/Content.Shared/Chat/Prototypes/EmotePrototype.cs
index c5aaa8d513..f19c7d26cd 100644
--- 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
 }
diff --git a/Content.Shared/_White/Cult/Actions/CultActions.cs b/Content.Shared/_White/Cult/Actions/CultActions.cs
index b651f06567..92104a70b7 100644
--- 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
+{
+}
diff --git a/Content.Shared/_White/Cult/Components/ConstructShellComponent.cs b/Content.Shared/_White/Cult/Components/ConstructShellComponent.cs
index dba5ae7e62..db7a7f2ed7 100644
--- 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
diff --git a/Content.Shared/_White/Cult/Components/CultistComponent.cs b/Content.Shared/_White/Cult/Components/CultistComponent.cs
index 3169aa3dd8..b0e806c00f 100644
--- 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.
diff --git a/Content.Shared/_White/Cult/Systems/CultItemSystem.cs b/Content.Shared/_White/Cult/Systems/CultItemSystem.cs
index 78975c92a5..c2f44f3713 100644
--- 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();
diff --git a/Content.Shared/_White/Cult/Systems/CultistSystem.cs b/Content.Shared/_White/Cult/Systems/CultistSystem.cs
index 5edfc37880..57dc4661cf 100644
--- 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));
     }
diff --git a/Content.Shared/_White/Economy/ATMComponent.cs b/Content.Shared/_White/Economy/ATMComponent.cs
index ca1e3460ba..6ff8459ceb 100644
--- 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";
diff --git a/Content.Shared/_White/Economy/BankCardComponent.cs b/Content.Shared/_White/Economy/BankCardComponent.cs
index 9c21c31f1f..4be65e84bb 100644
--- 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")]
diff --git a/Content.Shared/_White/WhiteCVars.cs b/Content.Shared/_White/WhiteCVars.cs
index 0acae28453..6d41fd267e 100644
--- 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
diff --git a/Content.Tools/test/0C.yml b/Content.Tools/test/0C.yml
index 94e69fbd5c..fcf7077b8b 100644
--- 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
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 411ce429ab..f6a77c29cc 100644
--- 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
diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl
index 8b760ca60f..73f1b7da9e 100644
--- 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.
 
diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
index 6b6fb9c80c..0b4e0eb4ec 100644
--- 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
+        }
+}
+
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
index a06dbbf891..33fae1e12c 100644
--- 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 = Прибор Ночного Видения
diff --git 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
index 4345654a51..08d0f8a3f4 100644
--- 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 = легкий противоударный шлем
diff --git 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
index 9846b808f9..a0b0033a9c 100644
--- 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 = { "" }
diff --git 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
index 40ba840752..ea25fb078a 100644
--- 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 = { "" }
diff --git 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
index c8e189d575..81b645cd9d 100644
--- 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 }
diff --git 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
index 5434609e7f..eb11ee71c8 100644
--- 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 }
diff --git 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
index 27bfe8b0c6..8b13789179 100644
--- 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 = Незаконченный, Правый
+
diff --git a/Resources/Maps/ERT/ERTShuttle.yml b/Resources/Maps/ERT/ERTShuttle.yml
index a6973189e8..c4eed62ddb 100644
--- 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:
diff --git a/Resources/Maps/ERT/ERTStation.yml b/Resources/Maps/ERT/ERTStation.yml
index 7bf4b58701..3e031f7ca1 100644
--- 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
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2777f859a0..cc37a49e42 100644
--- 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
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 3dd05ec3a7..059185b5ff 100644
--- 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
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 10fa382a3c..f3121395d9 100644
--- 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
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 3b4f6cd316..f2e71e43c8 100644
--- 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
 
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
index 95666d73bc..553df26d79 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml
index 734b927299..364cdf3057 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml
index 65b71eed02..0b2aa254c6 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
index 846634fc98..971abba2bf 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 397ae09541..5f24ddd968 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 4c87d3abff..9248866e02 100644
--- 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:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index cdbc5bd6ca..d1e0478880 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 528b79e0a9..574b3eaabd 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 02a59fde31..d6c78b5ec3 100644
--- 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
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 439e5ca9b0..ed838e4297 100644
--- 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
diff --git a/Resources/Prototypes/Entities/World/MapsPlacer/init.yml b/Resources/Prototypes/Entities/World/MapsPlacer/init.yml
index f86540b068..63334285dc 100644
--- a/Resources/Prototypes/Entities/World/MapsPlacer/init.yml
+++ b/Resources/Prototypes/Entities/World/MapsPlacer/init.yml
@@ -1,599 +1,589 @@
-- type: entity
-  id: D1
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/abductor.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D2
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/asteroid.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D4
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D5
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict2.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D6
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict3.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D7
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict4.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D8
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict5.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D10
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict7.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D11
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/derelict8.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D14
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/dj_station.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D15
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/dobivalka.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D16
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/junk.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D17
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/mining_station.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D18
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/musorka.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D19
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/shuttle.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D20
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/shuttle2.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D21
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/shuttle3.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D22
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/space_hospital.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D23
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/stolovka.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D24
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/stolovka2.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D25
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/small-ship-1.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D26
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/small-ai-survey-drone.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D27
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/small-1.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D28
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/small-2.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D29
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/small-3.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D30
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/medium-pirate.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D31
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D32
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /Maps/Salvage/medium-library.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D33
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/1.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D34
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/2.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D35
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/3.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D36
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/4.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D37
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/5.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D38
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/6.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D39
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/7.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D40
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/8.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D41
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/9.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D42
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/10.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D43
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/11.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D44
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/12.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D45
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/13.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D46
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/14.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D47
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/15.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D48
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/16.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D49
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/17.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D50
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/18.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D51
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/19.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D52
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/20.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D53
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/21.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D55
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/23.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D56
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/24.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D57
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/25.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D58
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/26.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D59
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/27.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D60
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/28.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D61
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/29.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D62
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/30.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D63
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/31.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D64
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/32.yml
-      components:
-        - type: IFF
-          flags: HideLabel
-
-- type: entity
-  id: D65
-  noSpawn: true
-  components:
-    - type: BlueprintPlacer
-      blueprint: /WhiteMaps/D/33.yml
-      components:
-        - type: IFF
-          flags: HideLabel
+#- type: entity
+#  id: D1
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/abductor.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D2
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/asteroid.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D4
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D5
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict2.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D6
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict3.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D7
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict4.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D8
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict5.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D10
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict7.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D11
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/derelict8.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D14
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/dj_station.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D15
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/dobivalka.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D16
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/junk.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D17
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/mining_station.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D18
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/musorka.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D19
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/shuttle.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D20
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/shuttle2.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D21
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/shuttle3.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D22
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/space_hospital.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D23
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/stolovka.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D24
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/stolovka2.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D25
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/small-ship-1.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D26
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/small-ai-survey-drone.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D27
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/small-1.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D28
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/small-2.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D29
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/small-3.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D30
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/medium-pirate.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D31
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D32
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /Maps/Salvage/medium-library.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D33
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/1.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D34
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/2.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D35
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/3.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D36
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/4.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D37
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/5.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D38
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/6.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D39
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/7.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D40
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/8.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D41
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/9.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D43
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/11.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D44
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/12.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D45
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/13.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D46
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/14.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D47
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/15.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D48
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/16.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D49
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/17.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D50
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/18.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D51
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/19.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D52
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/20.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D53
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/21.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D55
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/23.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D56
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/24.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D57
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/25.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D58
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/26.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D59
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/27.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D60
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/28.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D61
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/29.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D62
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/30.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D63
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/31.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D64
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/32.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
+#
+#- type: entity
+#  id: D65
+#  noSpawn: true
+#  components:
+#    - type: BlueprintPlacer
+#      blueprint: /WhiteMaps/D/33.yml
+#      components:
+#        - type: IFF
+#          flags: HideLabel
diff --git a/Resources/Prototypes/Maps/Pools/White.yml b/Resources/Prototypes/Maps/Pools/White.yml
index f87b36637a..197fe768db 100644
--- 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
diff --git a/Resources/Prototypes/Objectives/cultObjectives.yml b/Resources/Prototypes/Objectives/cultObjectives.yml
index e31d1965d8..1d12634612 100644
--- 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
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
new file mode 100644
index 0000000000..2f2af08d54
--- /dev/null
+++ 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:
+  - задыхается
diff --git a/Resources/Prototypes/White/Actions/emotes.yml b/Resources/Prototypes/White/Actions/emotes.yml
index 2141500500..7b3c1e3f6e 100644
--- 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:
diff --git a/Resources/Prototypes/White/Damage/modifier_sets.yml b/Resources/Prototypes/White/Damage/modifier_sets.yml
new file mode 100644
index 0000000000..14fc2dc38f
--- /dev/null
+++ b/Resources/Prototypes/White/Damage/modifier_sets.yml
@@ -0,0 +1,5 @@
+- type: damageModifierSet
+  id: Felinid
+  coefficients:
+    Blunt: 1.1
+    Slash: 1.1
diff --git a/Resources/Prototypes/White/Economy/card.yml b/Resources/Prototypes/White/Economy/card.yml
index 3e0f6813bd..bc836bde9f 100644
--- 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
diff --git a/Resources/Prototypes/White/Emotes/harpy_emotes.yml b/Resources/Prototypes/White/Emotes/harpy_emotes.yml
index 934c7b8133..6ae63d9d55 100644
--- 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!
diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml
index b9202492a4..5a970dd701 100644
--- 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
diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/criminal_records_server.yml b/Resources/Prototypes/White/Entities/Structures/Machines/criminal_records_server.yml
index f80d3ee0ff..522bfa017d 100644
--- 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
diff --git a/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml b/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml
index cfb3e99417..31cb9948a8 100644
--- 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
diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml
index 5f598b19cd..26e50e6564 100644
--- 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
diff --git a/Resources/Prototypes/White/Fluff/centurion.yml b/Resources/Prototypes/White/Fluff/centurion.yml
index 59e4becda1..ed9985a6dd 100644
--- 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
diff --git a/Resources/Prototypes/White/Fluff/serbwo.yml b/Resources/Prototypes/White/Fluff/serbwo.yml
index a6e324168b..f29a836e74 100644
--- 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
diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml
index c953b8dff2..6afd0806e7 100644
--- 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
diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/White/Recipes/lathe_recipes.yml
index 1680f0e9fe..cb7124a2bd 100644
--- 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
diff --git a/Resources/Prototypes/White/Research/experimental.yml b/Resources/Prototypes/White/Research/experimental.yml
index db354cce5f..4ed13340fb 100644
--- 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
diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/White/Structures/Machines/atm.yml
index 97dc0c479c..0c83671e71 100644
--- 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
diff --git a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
index a1782eee81..c4f1f47faf 100644
--- 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
diff --git a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml
index 95684a4934..7bafba4f94 100644
--- 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
diff --git a/Resources/Prototypes/_White/Entities/Cult/constructs.yml b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
index 18742e5717..e3793c1cc4 100644
--- 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
diff --git a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml
index 753a9d39da..c28c71133b 100644
--- 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
diff --git a/Resources/Prototypes/_White/narsie.yml b/Resources/Prototypes/_White/narsie.yml
index 050227eb65..f25956f309 100644
--- 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
diff --git a/Resources/Prototypes/emotes.yml b/Resources/Prototypes/emotes.yml
deleted file mode 100644
index 21bf93e464..0000000000
--- a/Resources/Prototypes/emotes.yml
+++ /dev/null
@@ -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: [плачет]
-
diff --git a/Resources/Prototypes/fonts.yml b/Resources/Prototypes/fonts.yml
index 333f7bd8aa..e1806bca40 100644
--- 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
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml b/Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
index 6ac8f67623..e5b5c9ae72 100644
--- 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"/>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
index 9adde40d35..33e4664433 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
@@ -51,9 +51,9 @@
 </Box>
 
 <Box>
-<GuideEntityEmbed Entity="ParticleAcceleratorEmitterLeft" Caption="Emitter L"/>
-<GuideEntityEmbed Entity="ParticleAcceleratorEmitterCenter" Caption="Emitter C"/>
-<GuideEntityEmbed Entity="ParticleAcceleratorEmitterRight" Caption="Emitter R"/>
+  <GuideEntityEmbed Entity="ParticleAcceleratorEmitterStarboard" Caption="Starboard Emitter"/>
+  <GuideEntityEmbed Entity="ParticleAcceleratorEmitterFore" Caption="Fore Emitter"/>
+  <GuideEntityEmbed Entity="ParticleAcceleratorEmitterPort" Caption="Port Emitter"/>
 </Box>
 
 Ускоритель частиц (УЧ) представляет собой многослойную конструкцию, которая запускает ускоренные частицы из своих излучателей. Его излучатели всегда должны быть обращены к генератору гравитационной сингулярности.
diff --git a/Resources/WhiteMaps/D/1.yml b/Resources/WhiteMaps/D/1.yml
index da4869af28..d061952be7 100644
--- a/Resources/WhiteMaps/D/1.yml
+++ b/Resources/WhiteMaps/D/1.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   94: Lattice
 entities:
 - proto: ""
diff --git a/Resources/WhiteMaps/D/10.yml b/Resources/WhiteMaps/D/10.yml
deleted file mode 100644
index c6b22d0311..0000000000
--- a/Resources/WhiteMaps/D/10.yml
+++ /dev/null
@@ -1,441 +0,0 @@
-meta:
-  format: 5
-  postmapinit: false
-tilemap:
-  0: Space
-  69: FloorSteel
-  94: Lattice
-  95: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - pos: 13.339504,-1.4361249
-      parent: invalid
-      type: Transform
-    - chunks:
-        0,0:
-          ind: 0,0
-          tiles: XwAAAF4AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABFAAAAXwAAAEUAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAARQAAAEUAAABFAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAF4AAABfAAAARQAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAABFAAAAXgAAAF8AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAAXgAAAEUAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF4AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABeAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-      type: MapGrid
-    - type: Broadphase
-    - angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - nextUpdate: 131.0333041
-      type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#DE3A3A96'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            0: 1,1
-            1: 1,2
-            2: 0,3
-            3: -1,3
-            4: -2,3
-      type: DecalGrid
-    - version: 2
-      data:
-        tiles:
-          0,0:
-            0: 6001
-          0,1:
-            0: 1
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-      type: GridAtmosphere
-    - type: GasTileOverlay
-    - type: RadiationGridResistance
-- proto: CableApcExtension
-  entities:
-  - uid: 38
-    components:
-    - pos: 3.5,0.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 39
-    components:
-    - pos: 2.5,0.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 40
-    components:
-    - pos: 2.5,1.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 41
-    components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 42
-    components:
-    - pos: 2.5,3.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 43
-    components:
-    - pos: 2.5,4.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 44
-    components:
-    - pos: 2.5,5.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 45
-    components:
-    - pos: 2.5,6.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 46
-    components:
-    - pos: 1.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 47
-    components:
-    - pos: 0.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 48
-    components:
-    - pos: -0.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 49
-    components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-- proto: CableApcStack1
-  entities:
-  - uid: 35
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.89814,3.283545
-      parent: 1
-      type: Transform
-    - nextSound: 314.1082534
-      type: EmitSoundOnCollide
-  - uid: 36
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.6381397,6.028545
-      parent: 1
-      type: Transform
-    - nextSound: 315.7770418
-      type: EmitSoundOnCollide
-  - uid: 37
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5581398,3.823545
-      parent: 1
-      type: Transform
-    - nextSound: 317.41063
-      type: EmitSoundOnCollide
-- proto: CableHV
-  entities:
-  - uid: 23
-    components:
-    - pos: 2.5,0.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 25
-    components:
-    - pos: 2.5,1.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 26
-    components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 27
-    components:
-    - pos: 2.5,3.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 28
-    components:
-    - pos: 2.5,4.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 29
-    components:
-    - pos: 1.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 30
-    components:
-    - pos: 0.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 31
-    components:
-    - pos: -0.5,4.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 32
-    components:
-    - pos: 2.5,5.5
-      parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 33
-    components:
-    - pos: 2.5,6.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 34
-    components:
-    - pos: 2.5,7.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-- proto: GrilleBroken
-  entities:
-  - uid: 13
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 15
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 16
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 18
-    components:
-    - pos: 0.5,8.5
-      parent: 1
-      type: Transform
-- proto: ReinforcedGirder
-  entities:
-  - uid: 9
-    components:
-    - pos: 4.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 14
-    components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
-- proto: SheetSteel1
-  entities:
-  - uid: 20
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 3.6093426,-2.298963
-      parent: 1
-      type: Transform
-    - nextSound: 275.7919387
-      type: EmitSoundOnCollide
-  - uid: 21
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.8993435,-0.47646284
-      parent: 1
-      type: Transform
-    - nextSound: 276.3426467
-      type: EmitSoundOnCollide
-  - uid: 22
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5068436,9.190214
-      parent: 1
-      type: Transform
-    - nextSound: 277.7282035
-      type: EmitSoundOnCollide
-  - uid: 24
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -1.4622707,5.230214
-      parent: 1
-      type: Transform
-    - nextSound: 279.2972429
-      type: EmitSoundOnCollide
-- proto: SignDirectionalHop
-  entities:
-  - uid: 19
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,6.5
-      parent: 1
-      type: Transform
-- proto: SignDirectionalSec
-  entities:
-  - uid: 17
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-      type: Transform
-- proto: WallReinforced
-  entities:
-  - uid: 2
-    components:
-    - pos: 4.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 3
-    components:
-    - pos: 0.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 4
-    components:
-    - pos: 0.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 5
-    components:
-    - pos: 0.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 6
-    components:
-    - pos: 0.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 7
-    components:
-    - pos: -0.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 8
-    components:
-    - pos: 4.5,3.5
-      parent: 1
-      type: Transform
-  - uid: 10
-    components:
-    - pos: 0.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 11
-    components:
-    - pos: -0.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 12
-    components:
-    - pos: -1.5,6.5
-      parent: 1
-      type: Transform
-...
diff --git a/Resources/WhiteMaps/D/14.yml b/Resources/WhiteMaps/D/14.yml
index d3f6beb031..bd2b2f80fa 100644
--- a/Resources/WhiteMaps/D/14.yml
+++ b/Resources/WhiteMaps/D/14.yml
@@ -315,7 +315,7 @@ entities:
     - pos: 4.5,-2.5
       parent: 1
       type: Transform
-- proto: WindoorMedicalLocked
+- proto: WindoorSecureMedicalLocked
   entities:
   - uid: 29
     components:
diff --git a/Resources/WhiteMaps/D/17.yml b/Resources/WhiteMaps/D/17.yml
index f3a0a54c72..dc7dd14591 100644
--- a/Resources/WhiteMaps/D/17.yml
+++ b/Resources/WhiteMaps/D/17.yml
@@ -119,8 +119,6 @@ entities:
     - pos: 3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 146.0101673
       type: EmitSoundOnCollide
 - proto: GasPipeStraight
@@ -131,8 +129,6 @@ entities:
       pos: 2.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 175.970036
       type: EmitSoundOnCollide
   - uid: 31
@@ -141,8 +137,6 @@ entities:
       pos: 2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 176.5894146
       type: EmitSoundOnCollide
   - uid: 32
@@ -151,8 +145,6 @@ entities:
       pos: 3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 183.302466
       type: EmitSoundOnCollide
   - uid: 33
@@ -161,8 +153,6 @@ entities:
       pos: 3.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 183.302466
       type: EmitSoundOnCollide
   - uid: 34
@@ -171,8 +161,6 @@ entities:
       pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 185.3862263
       type: EmitSoundOnCollide
   - uid: 35
@@ -181,8 +169,6 @@ entities:
       pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 185.3862263
       type: EmitSoundOnCollide
   - uid: 36
@@ -191,8 +177,6 @@ entities:
       pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 185.3862263
       type: EmitSoundOnCollide
 - proto: GasPipeTJunction
@@ -203,8 +187,6 @@ entities:
       pos: 3.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 169.2024365
       type: EmitSoundOnCollide
   - uid: 29
@@ -213,8 +195,6 @@ entities:
       pos: 3.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 172.2857082
       type: EmitSoundOnCollide
 - proto: GasVentScrubber
diff --git a/Resources/WhiteMaps/D/18.yml b/Resources/WhiteMaps/D/18.yml
index 4429d96cd4..8fecf23654 100644
--- a/Resources/WhiteMaps/D/18.yml
+++ b/Resources/WhiteMaps/D/18.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
 entities:
 - proto: ""
   entities:
diff --git a/Resources/WhiteMaps/D/2.yml b/Resources/WhiteMaps/D/2.yml
index cda954546b..2f283abb7b 100644
--- a/Resources/WhiteMaps/D/2.yml
+++ b/Resources/WhiteMaps/D/2.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
   94: Lattice
 entities:
diff --git a/Resources/WhiteMaps/D/21.yml b/Resources/WhiteMaps/D/21.yml
index 8922e034ed..033aeb537f 100644
--- a/Resources/WhiteMaps/D/21.yml
+++ b/Resources/WhiteMaps/D/21.yml
@@ -159,8 +159,6 @@ entities:
     - pos: -0.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 193
@@ -168,8 +166,6 @@ entities:
     - pos: -1.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 194
@@ -387,8 +383,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 225
@@ -466,8 +460,6 @@ entities:
     - pos: 2.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 236
@@ -475,8 +467,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 237
@@ -491,8 +481,6 @@ entities:
     - pos: 4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 239
@@ -500,8 +488,6 @@ entities:
     - pos: -1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 240
@@ -516,8 +502,6 @@ entities:
     - pos: -1.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 242
@@ -525,8 +509,6 @@ entities:
     - pos: -1.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 243
@@ -562,8 +544,6 @@ entities:
     - pos: -1.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 248
@@ -571,8 +551,6 @@ entities:
     - pos: -1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 249
@@ -580,8 +558,6 @@ entities:
     - pos: -2.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 250
@@ -589,8 +565,6 @@ entities:
     - pos: -1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 251
@@ -598,8 +572,6 @@ entities:
     - pos: 2.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 252
@@ -607,8 +579,6 @@ entities:
     - pos: 2.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 253
@@ -616,8 +586,6 @@ entities:
     - pos: 6.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 254
@@ -625,8 +593,6 @@ entities:
     - pos: 6.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 353
@@ -634,8 +600,6 @@ entities:
     - pos: 3.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 354
@@ -729,8 +693,6 @@ entities:
     - pos: 0.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 149
@@ -738,8 +700,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 150
@@ -768,8 +728,6 @@ entities:
     - pos: 2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 154
@@ -805,8 +763,6 @@ entities:
     - pos: 0.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -858,8 +814,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 164
@@ -867,8 +821,6 @@ entities:
     - pos: 0.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 165
@@ -911,8 +863,6 @@ entities:
     - pos: -1.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 171
@@ -934,8 +884,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 174
@@ -957,8 +905,6 @@ entities:
     - pos: 0.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 177
@@ -966,8 +912,6 @@ entities:
     - pos: 1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 178
@@ -982,8 +926,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 180
@@ -991,8 +933,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 181
@@ -1014,8 +954,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 184
@@ -1030,8 +968,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 187
@@ -1039,8 +975,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 188
@@ -1076,8 +1010,6 @@ entities:
     - pos: -6.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: ChairOfficeDark
diff --git a/Resources/WhiteMaps/D/25.yml b/Resources/WhiteMaps/D/25.yml
index 09ff45f8fd..41952c9205 100644
--- a/Resources/WhiteMaps/D/25.yml
+++ b/Resources/WhiteMaps/D/25.yml
@@ -150,8 +150,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 136
@@ -194,8 +192,6 @@ entities:
     - pos: 4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 142
@@ -280,8 +276,6 @@ entities:
     - pos: 5.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -291,8 +285,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 147
@@ -335,8 +327,6 @@ entities:
     - pos: 4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 153
@@ -421,8 +411,6 @@ entities:
     - pos: 5.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: Chair
diff --git a/Resources/WhiteMaps/D/26.yml b/Resources/WhiteMaps/D/26.yml
index 73ae435a7b..793e1c00ef 100644
--- a/Resources/WhiteMaps/D/26.yml
+++ b/Resources/WhiteMaps/D/26.yml
@@ -442,8 +442,6 @@ entities:
     - pos: 0.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 918.3258061
       type: EmitSoundOnCollide
   - uid: 30
@@ -451,8 +449,6 @@ entities:
     - pos: -1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 921.5788935
       type: EmitSoundOnCollide
 - proto: GasPort
@@ -615,7 +611,6 @@ entities:
       type: Transform
     - state: True
       type: SignalSwitch
-    - type: ItemCooldown
 - proto: SpawnMobCarp
   entities:
   - uid: 6
diff --git a/Resources/WhiteMaps/D/27.yml b/Resources/WhiteMaps/D/27.yml
index cce0bb2c0b..4eeba5853a 100644
--- a/Resources/WhiteMaps/D/27.yml
+++ b/Resources/WhiteMaps/D/27.yml
@@ -150,8 +150,6 @@ entities:
     - pos: 4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 141
@@ -159,8 +157,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 142
@@ -168,8 +164,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 143
@@ -177,8 +171,6 @@ entities:
     - pos: -1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 144
@@ -193,8 +185,6 @@ entities:
     - pos: -1.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 146
@@ -202,8 +192,6 @@ entities:
     - pos: -1.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 147
@@ -211,8 +199,6 @@ entities:
     - pos: -1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 148
@@ -227,8 +213,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 150
@@ -236,8 +220,6 @@ entities:
     - pos: -3.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 151
@@ -245,8 +227,6 @@ entities:
     - pos: -3.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 152
@@ -254,8 +234,6 @@ entities:
     - pos: -4.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 153
@@ -263,8 +241,6 @@ entities:
     - pos: 0.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 154
@@ -272,8 +248,6 @@ entities:
     - pos: 0.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 155
@@ -281,8 +255,6 @@ entities:
     - pos: 0.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 156
@@ -290,8 +262,6 @@ entities:
     - pos: 0.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 157
@@ -299,8 +269,6 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 158
@@ -308,8 +276,6 @@ entities:
     - pos: 0.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 159
@@ -380,8 +346,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 169
@@ -389,8 +353,6 @@ entities:
     - pos: 4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 170
@@ -398,8 +360,6 @@ entities:
     - pos: 4.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 171
@@ -407,8 +367,6 @@ entities:
     - pos: 4.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 172
@@ -416,8 +374,6 @@ entities:
     - pos: 0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHV
@@ -427,8 +383,6 @@ entities:
     - pos: 7.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 93
@@ -436,8 +390,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 101
@@ -445,8 +397,6 @@ entities:
     - pos: 7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 102
@@ -454,8 +404,6 @@ entities:
     - pos: 7.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 103
@@ -463,8 +411,6 @@ entities:
     - pos: 7.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 105
@@ -472,8 +418,6 @@ entities:
     - pos: 7.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 106
@@ -481,8 +425,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 107
@@ -490,8 +432,6 @@ entities:
     - pos: 7.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 108
@@ -499,8 +439,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 109
@@ -508,8 +446,6 @@ entities:
     - pos: 7.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 110
@@ -517,8 +453,6 @@ entities:
     - pos: 7.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 111
@@ -526,8 +460,6 @@ entities:
     - pos: 8.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 112
@@ -535,8 +467,6 @@ entities:
     - pos: 9.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 113
@@ -544,8 +474,6 @@ entities:
     - pos: 11.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 114
@@ -553,8 +481,6 @@ entities:
     - pos: 12.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 115
@@ -562,8 +488,6 @@ entities:
     - pos: 13.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 116
@@ -620,8 +544,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 124
@@ -636,8 +558,6 @@ entities:
     - pos: -1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 126
@@ -645,8 +565,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 127
@@ -654,8 +572,6 @@ entities:
     - pos: -3.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -665,8 +581,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 104
@@ -674,8 +588,6 @@ entities:
     - pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 128
@@ -683,8 +595,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 129
@@ -692,8 +602,6 @@ entities:
     - pos: -3.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 130
@@ -701,8 +609,6 @@ entities:
     - pos: -4.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 131
@@ -710,8 +616,6 @@ entities:
     - pos: -1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 132
@@ -726,8 +630,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 134
@@ -770,8 +672,6 @@ entities:
     - pos: 2.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 140
@@ -779,8 +679,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: ClothingHandsGlovesColorYellow
diff --git a/Resources/WhiteMaps/D/28.yml b/Resources/WhiteMaps/D/28.yml
index e66438121d..f499d9a78a 100644
--- a/Resources/WhiteMaps/D/28.yml
+++ b/Resources/WhiteMaps/D/28.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
   71: FloorSteelDiagonalMini
   73: FloorSteelHerringbone
@@ -925,8 +925,6 @@ entities:
     - pos: 6.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 233
@@ -1067,8 +1065,6 @@ entities:
     - pos: 4.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 253
@@ -1076,8 +1072,6 @@ entities:
     - pos: 4.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 254
@@ -1085,8 +1079,6 @@ entities:
     - pos: 4.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 255
@@ -1157,8 +1149,6 @@ entities:
     - pos: 1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 265
@@ -1180,8 +1170,6 @@ entities:
     - pos: 1.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 268
@@ -1233,8 +1221,6 @@ entities:
     - pos: 6.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 275
@@ -1256,8 +1242,6 @@ entities:
     - pos: 4.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 278
@@ -1265,8 +1249,6 @@ entities:
     - pos: 4.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 279
@@ -1274,8 +1256,6 @@ entities:
     - pos: 4.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 280
@@ -1318,8 +1298,6 @@ entities:
     - pos: 1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 286
@@ -1356,7 +1334,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: ClothingHeadHelmetHelmet
+- proto: ClothingHeadHelmetBasic
   entities:
   - uid: 315
     components:
diff --git a/Resources/WhiteMaps/D/29.yml b/Resources/WhiteMaps/D/29.yml
index d8d6de2647..cb6a2192aa 100644
--- a/Resources/WhiteMaps/D/29.yml
+++ b/Resources/WhiteMaps/D/29.yml
@@ -408,8 +408,6 @@ entities:
     - pos: -1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 73
@@ -480,8 +478,6 @@ entities:
     - pos: -3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 104
@@ -489,8 +485,6 @@ entities:
     - pos: 2.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 111
@@ -498,8 +492,6 @@ entities:
     - pos: 4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 118
diff --git a/Resources/WhiteMaps/D/3.yml b/Resources/WhiteMaps/D/3.yml
index 996e8c8b04..f66e0a6529 100644
--- a/Resources/WhiteMaps/D/3.yml
+++ b/Resources/WhiteMaps/D/3.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
 entities:
 - proto: ""
diff --git a/Resources/WhiteMaps/D/30.yml b/Resources/WhiteMaps/D/30.yml
index 12587df01f..8f19db5b64 100644
--- a/Resources/WhiteMaps/D/30.yml
+++ b/Resources/WhiteMaps/D/30.yml
@@ -183,8 +183,6 @@ entities:
     - pos: -1.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 63
@@ -318,8 +316,6 @@ entities:
     - pos: 2.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 82
@@ -390,8 +386,6 @@ entities:
     - pos: 0.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 130
@@ -399,8 +393,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 131
@@ -408,8 +400,6 @@ entities:
     - pos: 2.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 132
@@ -417,8 +407,6 @@ entities:
     - pos: 3.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -428,8 +416,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 50
@@ -500,8 +486,6 @@ entities:
     - pos: -1.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 111
@@ -509,8 +493,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 113
@@ -518,8 +500,6 @@ entities:
     - pos: 0.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CannabisSeeds
diff --git a/Resources/WhiteMaps/D/31.yml b/Resources/WhiteMaps/D/31.yml
index 2a8299a2ad..5f1620ec28 100644
--- a/Resources/WhiteMaps/D/31.yml
+++ b/Resources/WhiteMaps/D/31.yml
@@ -469,8 +469,6 @@ entities:
     - pos: -0.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 124
@@ -478,8 +476,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 196
@@ -613,8 +609,6 @@ entities:
     - pos: -4.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 215
@@ -657,8 +651,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 234
@@ -666,8 +658,6 @@ entities:
     - pos: 0.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 235
@@ -689,8 +679,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 238
@@ -698,8 +686,6 @@ entities:
     - pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 239
@@ -707,8 +693,6 @@ entities:
     - pos: -1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 240
@@ -716,8 +700,6 @@ entities:
     - pos: -3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 241
@@ -732,8 +714,6 @@ entities:
     - pos: -5.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 243
@@ -741,8 +721,6 @@ entities:
     - pos: -6.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 244
@@ -778,8 +756,6 @@ entities:
     - pos: -9.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 249
@@ -787,8 +763,6 @@ entities:
     - pos: -10.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 250
@@ -796,8 +770,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 251
@@ -812,8 +784,6 @@ entities:
     - pos: 4.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 253
@@ -821,8 +791,6 @@ entities:
     - pos: 6.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 254
@@ -830,8 +798,6 @@ entities:
     - pos: 8.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 255
@@ -839,8 +805,6 @@ entities:
     - pos: 14.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 256
@@ -848,8 +812,6 @@ entities:
     - pos: 9.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 257
@@ -864,8 +826,6 @@ entities:
     - pos: 13.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 259
@@ -873,8 +833,6 @@ entities:
     - pos: 15.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 261
@@ -889,8 +847,6 @@ entities:
     - pos: 6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 263
@@ -898,8 +854,6 @@ entities:
     - pos: 8.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 264
@@ -921,8 +875,6 @@ entities:
     - pos: 5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 267
@@ -930,8 +882,6 @@ entities:
     - pos: 4.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHV
@@ -941,8 +891,6 @@ entities:
     - pos: -11.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 121
@@ -957,8 +905,6 @@ entities:
     - pos: -10.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 126
@@ -966,8 +912,6 @@ entities:
     - pos: -9.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 127
@@ -982,8 +926,6 @@ entities:
     - pos: -6.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 129
@@ -998,8 +940,6 @@ entities:
     - pos: -5.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 131
@@ -1007,8 +947,6 @@ entities:
     - pos: -3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 132
@@ -1016,8 +954,6 @@ entities:
     - pos: -2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 133
@@ -1025,8 +961,6 @@ entities:
     - pos: -1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 134
@@ -1034,8 +968,6 @@ entities:
     - pos: -0.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 135
@@ -1043,8 +975,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 136
@@ -1052,8 +982,6 @@ entities:
     - pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 137
@@ -1061,8 +989,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 138
@@ -1077,8 +1003,6 @@ entities:
     - pos: 4.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 140
@@ -1086,8 +1010,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 141
@@ -1095,8 +1017,6 @@ entities:
     - pos: 8.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 142
@@ -1104,8 +1024,6 @@ entities:
     - pos: 9.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 143
@@ -1120,8 +1038,6 @@ entities:
     - pos: 11.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 145
@@ -1157,8 +1073,6 @@ entities:
     - pos: -4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 150
@@ -1278,8 +1192,6 @@ entities:
     - pos: -2.5,15.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 167
@@ -1287,8 +1199,6 @@ entities:
     - pos: -2.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -1298,8 +1208,6 @@ entities:
     - pos: -0.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 117
@@ -1307,8 +1215,6 @@ entities:
     - pos: -7.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 118
@@ -1316,8 +1222,6 @@ entities:
     - pos: -2.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 169
@@ -1409,8 +1313,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 182
@@ -1460,8 +1362,6 @@ entities:
     - pos: 3.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 189
@@ -1469,8 +1369,6 @@ entities:
     - pos: 5.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 190
@@ -1492,8 +1390,6 @@ entities:
     - pos: 6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 193
@@ -1508,8 +1404,6 @@ entities:
     - pos: 8.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 195
@@ -1517,8 +1411,6 @@ entities:
     - pos: -2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 220
@@ -1540,8 +1432,6 @@ entities:
     - pos: -6.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 223
@@ -1549,8 +1439,6 @@ entities:
     - pos: -5.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 224
@@ -1565,8 +1453,6 @@ entities:
     - pos: -3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 226
@@ -1574,8 +1460,6 @@ entities:
     - pos: -1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 228
@@ -1597,8 +1481,6 @@ entities:
     - pos: 0.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 231
@@ -1613,8 +1495,6 @@ entities:
     - pos: -9.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: Catwalk
diff --git a/Resources/WhiteMaps/D/32.yml b/Resources/WhiteMaps/D/32.yml
index 75d7ccdbac..122edba4c7 100644
--- a/Resources/WhiteMaps/D/32.yml
+++ b/Resources/WhiteMaps/D/32.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
 entities:
 - proto: ""
@@ -2652,7 +2652,6 @@ entities:
       type: ContainerContainer
     - nextSound: 1056.454018
       type: EmitSoundOnCollide
-    - type: ItemCooldown
 - proto: ClothingOuterHardsuitSalvage
   entities:
   - uid: 45
diff --git a/Resources/WhiteMaps/D/33.yml b/Resources/WhiteMaps/D/33.yml
index 73dc64280c..66dca6f3fe 100644
--- a/Resources/WhiteMaps/D/33.yml
+++ b/Resources/WhiteMaps/D/33.yml
@@ -415,8 +415,6 @@ entities:
     - pos: -7.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 73
@@ -431,8 +429,6 @@ entities:
     - pos: -9.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 75
@@ -538,8 +534,6 @@ entities:
     - pos: -7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 90
@@ -668,8 +662,6 @@ entities:
     - pos: -9.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -679,8 +671,6 @@ entities:
     - pos: -7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 61
@@ -688,8 +678,6 @@ entities:
     - pos: -9.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 63
@@ -753,8 +741,6 @@ entities:
     - pos: -7.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: ChairPilotSeat
@@ -878,7 +864,7 @@ entities:
     - pos: -8.5,12.5
       parent: 1
       type: Transform
-- proto: GeneratorUranium
+- proto: PortableGeneratorSuperPacman
   entities:
   - uid: 57
     components:
diff --git a/Resources/WhiteMaps/D/4.yml b/Resources/WhiteMaps/D/4.yml
index a00112873f..9fa4648ef6 100644
--- a/Resources/WhiteMaps/D/4.yml
+++ b/Resources/WhiteMaps/D/4.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
 entities:
 - proto: ""
diff --git a/Resources/WhiteMaps/D/6.yml b/Resources/WhiteMaps/D/6.yml
index a4e27de26c..3bd1d1f853 100644
--- a/Resources/WhiteMaps/D/6.yml
+++ b/Resources/WhiteMaps/D/6.yml
@@ -150,8 +150,6 @@ entities:
     - pos: 8.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 87
@@ -208,8 +206,6 @@ entities:
     - pos: 5.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 95
@@ -224,8 +220,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 97
@@ -233,8 +227,6 @@ entities:
     - pos: 8.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 98
@@ -242,8 +234,6 @@ entities:
     - pos: 9.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 99
@@ -258,8 +248,6 @@ entities:
     - pos: 11.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 101
@@ -295,8 +283,6 @@ entities:
     - pos: 5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 106
@@ -325,8 +311,6 @@ entities:
     - pos: 6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 110
@@ -334,8 +318,6 @@ entities:
     - pos: 7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 111
@@ -357,8 +339,6 @@ entities:
     - pos: 11.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 114
@@ -366,8 +346,6 @@ entities:
     - pos: 12.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableApcStack1
@@ -393,8 +371,6 @@ entities:
     - pos: 9.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 115
@@ -416,8 +392,6 @@ entities:
     - pos: 6.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 118
@@ -432,8 +406,6 @@ entities:
     - pos: 5.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 120
@@ -448,8 +420,6 @@ entities:
     - pos: 5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 122
@@ -823,7 +793,7 @@ entities:
     - pos: 6.5,7.5
       parent: 1
       type: Transform
-- proto: WindoorMedicalLocked
+- proto: WindoorSecureMedicalLocked
   entities:
   - uid: 38
     components:
diff --git a/Resources/WhiteMaps/D/8.yml b/Resources/WhiteMaps/D/8.yml
index 7d793e1003..0fc644647c 100644
--- a/Resources/WhiteMaps/D/8.yml
+++ b/Resources/WhiteMaps/D/8.yml
@@ -111,8 +111,6 @@ entities:
     - pos: 7.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 35
@@ -120,8 +118,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 36
@@ -129,8 +125,6 @@ entities:
     - pos: 7.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 37
@@ -138,8 +132,6 @@ entities:
     - pos: 7.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 38
@@ -147,8 +139,6 @@ entities:
     - pos: 7.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 39
@@ -156,8 +146,6 @@ entities:
     - pos: 7.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 40
@@ -165,8 +153,6 @@ entities:
     - pos: 5.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 41
@@ -174,8 +160,6 @@ entities:
     - pos: 5.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 42
@@ -183,8 +167,6 @@ entities:
     - pos: 5.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 43
@@ -192,8 +174,6 @@ entities:
     - pos: 5.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 44
@@ -201,8 +181,6 @@ entities:
     - pos: 5.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 45
@@ -210,8 +188,6 @@ entities:
     - pos: 5.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 46
@@ -219,8 +195,6 @@ entities:
     - pos: 5.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 47
@@ -228,8 +202,6 @@ entities:
     - pos: 5.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 48
@@ -237,8 +209,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 49
@@ -246,8 +216,6 @@ entities:
     - pos: 5.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 50
@@ -255,8 +223,6 @@ entities:
     - pos: 5.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 51
@@ -264,8 +230,6 @@ entities:
     - pos: 5.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 52
@@ -273,8 +237,6 @@ entities:
     - pos: 5.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 53
@@ -282,8 +244,6 @@ entities:
     - pos: 5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 54
@@ -291,8 +251,6 @@ entities:
     - pos: 7.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 55
@@ -300,8 +258,6 @@ entities:
     - pos: 7.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 56
@@ -309,8 +265,6 @@ entities:
     - pos: 7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 57
@@ -318,8 +272,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 58
@@ -327,8 +279,6 @@ entities:
     - pos: 7.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 59
@@ -336,8 +286,6 @@ entities:
     - pos: 7.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 60
@@ -345,8 +293,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 61
@@ -354,8 +300,6 @@ entities:
     - pos: 4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 62
@@ -363,8 +307,6 @@ entities:
     - pos: 6.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 63
@@ -372,8 +314,6 @@ entities:
     - pos: 3.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 64
@@ -381,8 +321,6 @@ entities:
     - pos: 2.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 65
@@ -390,8 +328,6 @@ entities:
     - pos: 1.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 66
@@ -399,8 +335,6 @@ entities:
     - pos: 1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 67
@@ -408,8 +342,6 @@ entities:
     - pos: 1.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 68
@@ -417,8 +349,6 @@ entities:
     - pos: 1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 69
@@ -426,8 +356,6 @@ entities:
     - pos: 1.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 70
@@ -435,8 +363,6 @@ entities:
     - pos: 1.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 71
@@ -444,8 +370,6 @@ entities:
     - pos: 1.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 72
@@ -453,8 +377,6 @@ entities:
     - pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 73
@@ -462,8 +384,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 74
@@ -471,8 +391,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 75
@@ -480,8 +398,6 @@ entities:
     - pos: 1.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 76
@@ -489,8 +405,6 @@ entities:
     - pos: 3.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 77
@@ -498,8 +412,6 @@ entities:
     - pos: 3.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 78
@@ -507,8 +419,6 @@ entities:
     - pos: 3.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 79
@@ -516,8 +426,6 @@ entities:
     - pos: 3.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 80
@@ -525,8 +433,6 @@ entities:
     - pos: 3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 81
@@ -534,8 +440,6 @@ entities:
     - pos: 3.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 82
@@ -543,8 +447,6 @@ entities:
     - pos: 8.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 83
@@ -552,8 +454,6 @@ entities:
     - pos: 9.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHVStack
@@ -614,7 +514,6 @@ entities:
       type: ContainerContainer
     - nextSound: 156.8098369
       type: EmitSoundOnCollide
-    - type: ItemCooldown
 - proto: GrilleBroken
   entities:
   - uid: 103
diff --git a/Resources/WhiteMaps/D/abductor.yml b/Resources/WhiteMaps/D/abductor.yml
index 494f158464..2449c42ab2 100644
--- a/Resources/WhiteMaps/D/abductor.yml
+++ b/Resources/WhiteMaps/D/abductor.yml
@@ -227,8 +227,6 @@ entities:
     - pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 84
@@ -257,8 +255,6 @@ entities:
     - pos: -2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 88
@@ -266,8 +262,6 @@ entities:
     - pos: -2.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 89
@@ -275,8 +269,6 @@ entities:
     - pos: -2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 90
@@ -305,8 +297,6 @@ entities:
     - pos: 5.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 94
@@ -314,8 +304,6 @@ entities:
     - pos: 5.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 95
@@ -323,8 +311,6 @@ entities:
     - pos: 5.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 96
@@ -390,8 +376,6 @@ entities:
     - pos: 1.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 53
@@ -399,8 +383,6 @@ entities:
     - pos: 0.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 54
@@ -408,8 +390,6 @@ entities:
     - pos: 2.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 55
@@ -417,8 +397,6 @@ entities:
     - pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 58
@@ -426,8 +404,6 @@ entities:
     - pos: 2.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 59
@@ -435,8 +411,6 @@ entities:
     - pos: 1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 60
@@ -444,8 +418,6 @@ entities:
     - pos: 0.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 61
@@ -497,8 +469,6 @@ entities:
     - pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 69
@@ -671,8 +641,7 @@ entities:
   entities:
   - uid: 104
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
+    - pos: 1.5,-0.5
       parent: 1
       type: Transform
 - proto: Poweredlight
diff --git a/Resources/WhiteMaps/D/asteroid.yml b/Resources/WhiteMaps/D/asteroid.yml
index 7323623142..62324ea306 100644
--- a/Resources/WhiteMaps/D/asteroid.yml
+++ b/Resources/WhiteMaps/D/asteroid.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   15: FloorBlueCircuit
   44: FloorGreenCircuit
   58: FloorReinforced
diff --git a/Resources/WhiteMaps/D/derelict.yml b/Resources/WhiteMaps/D/derelict.yml
index 4a31254749..89641a95ea 100644
--- a/Resources/WhiteMaps/D/derelict.yml
+++ b/Resources/WhiteMaps/D/derelict.yml
@@ -489,8 +489,6 @@ entities:
     - pos: 2.5,44.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 565
@@ -526,8 +524,6 @@ entities:
     - pos: 0.5,41.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 570
@@ -591,8 +587,6 @@ entities:
     - pos: 0.5,53.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 579
@@ -600,8 +594,6 @@ entities:
     - pos: 0.5,54.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 580
@@ -623,8 +615,6 @@ entities:
     - pos: 0.5,57.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 583
@@ -632,8 +622,6 @@ entities:
     - pos: -0.5,46.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 584
@@ -641,8 +629,6 @@ entities:
     - pos: -1.5,46.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 585
@@ -650,8 +636,6 @@ entities:
     - pos: -2.5,46.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 586
@@ -666,8 +650,6 @@ entities:
     - pos: 2.5,46.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 588
@@ -675,8 +657,6 @@ entities:
     - pos: 3.5,46.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 589
@@ -698,8 +678,6 @@ entities:
     - pos: -4.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 592
@@ -707,8 +685,6 @@ entities:
     - pos: -4.5,31.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 593
@@ -716,8 +692,6 @@ entities:
     - pos: -4.5,32.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 594
@@ -725,8 +699,6 @@ entities:
     - pos: -4.5,33.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 595
@@ -734,8 +706,6 @@ entities:
     - pos: -4.5,34.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 596
@@ -764,8 +734,6 @@ entities:
     - pos: -0.5,28.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 600
@@ -822,8 +790,6 @@ entities:
     - pos: -0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 608
@@ -831,8 +797,6 @@ entities:
     - pos: 0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 609
@@ -896,8 +860,6 @@ entities:
     - pos: 5.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 618
@@ -905,8 +867,6 @@ entities:
     - pos: 5.5,31.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 619
@@ -914,8 +874,6 @@ entities:
     - pos: 5.5,32.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 620
@@ -923,8 +881,6 @@ entities:
     - pos: 5.5,33.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 621
@@ -960,8 +916,6 @@ entities:
     - pos: 2.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 626
@@ -969,8 +923,6 @@ entities:
     - pos: 2.5,29.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 627
@@ -985,8 +937,6 @@ entities:
     - pos: -0.5,37.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 629
@@ -994,8 +944,6 @@ entities:
     - pos: -0.5,38.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 630
@@ -1017,8 +965,6 @@ entities:
     - pos: 3.5,21.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 635
@@ -1047,8 +993,6 @@ entities:
     - pos: -0.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 639
@@ -1056,8 +1000,6 @@ entities:
     - pos: -1.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 640
@@ -1079,8 +1021,6 @@ entities:
     - pos: 0.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 643
@@ -1130,8 +1070,6 @@ entities:
     - pos: -1.5,18.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 650
@@ -1139,8 +1077,6 @@ entities:
     - pos: -0.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 651
@@ -1148,8 +1084,6 @@ entities:
     - pos: 0.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 652
@@ -1178,8 +1112,6 @@ entities:
     - pos: 0.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 656
@@ -1187,8 +1119,6 @@ entities:
     - pos: 0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 657
@@ -1224,8 +1154,6 @@ entities:
     - pos: -2.5,17.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 662
@@ -1233,8 +1161,6 @@ entities:
     - pos: -2.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 665
@@ -1242,8 +1168,6 @@ entities:
     - pos: -2.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 666
@@ -1265,8 +1189,6 @@ entities:
     - pos: 2.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 670
@@ -1274,8 +1196,6 @@ entities:
     - pos: 3.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 671
@@ -1325,8 +1245,6 @@ entities:
     - pos: 8.5,19.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 679
@@ -1334,8 +1252,6 @@ entities:
     - pos: 11.5,19.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 680
@@ -1385,8 +1301,6 @@ entities:
     - pos: -3.5,20.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 688
@@ -1443,8 +1357,6 @@ entities:
     - pos: 3.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 696
@@ -1452,8 +1364,6 @@ entities:
     - pos: 2.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 697
@@ -1461,8 +1371,6 @@ entities:
     - pos: 1.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 698
@@ -1470,8 +1378,6 @@ entities:
     - pos: 0.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 699
@@ -1479,8 +1385,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 700
@@ -1488,8 +1392,6 @@ entities:
     - pos: -0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 701
@@ -1497,8 +1399,6 @@ entities:
     - pos: -1.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 702
@@ -1506,8 +1406,6 @@ entities:
     - pos: -2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 703
@@ -1515,8 +1413,6 @@ entities:
     - pos: -3.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 704
@@ -1524,8 +1420,6 @@ entities:
     - pos: 0.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 705
@@ -1533,8 +1427,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 706
@@ -1542,8 +1434,6 @@ entities:
     - pos: 0.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 707
@@ -1551,8 +1441,6 @@ entities:
     - pos: 0.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 708
@@ -1602,8 +1490,6 @@ entities:
     - pos: 1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 715
@@ -1611,8 +1497,6 @@ entities:
     - pos: 2.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 716
@@ -1627,8 +1511,6 @@ entities:
     - pos: 4.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 718
@@ -1636,8 +1518,6 @@ entities:
     - pos: 5.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 719
@@ -1652,8 +1532,6 @@ entities:
     - pos: -5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 721
@@ -1661,8 +1539,6 @@ entities:
     - pos: -6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 722
@@ -1670,8 +1546,6 @@ entities:
     - pos: 5.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 723
@@ -1679,8 +1553,6 @@ entities:
     - pos: 6.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 724
@@ -1688,8 +1560,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 725
@@ -1697,8 +1567,6 @@ entities:
     - pos: 7.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 728
@@ -1706,8 +1574,6 @@ entities:
     - pos: 1.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 729
@@ -1715,8 +1581,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 732
@@ -1724,8 +1588,6 @@ entities:
     - pos: -0.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 733
@@ -1733,8 +1595,6 @@ entities:
     - pos: -1.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 734
@@ -1742,8 +1602,6 @@ entities:
     - pos: -2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 735
@@ -1751,8 +1609,6 @@ entities:
     - pos: -3.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 736
@@ -1767,8 +1623,6 @@ entities:
     - pos: -8.5,17.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 738
@@ -1776,8 +1630,6 @@ entities:
     - pos: -8.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 739
@@ -1785,8 +1637,6 @@ entities:
     - pos: -9.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 740
@@ -1794,8 +1644,6 @@ entities:
     - pos: -7.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 741
@@ -1810,8 +1658,6 @@ entities:
     - pos: -8.5,21.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 743
@@ -1819,8 +1665,6 @@ entities:
     - pos: -9.5,22.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 746
@@ -1828,8 +1672,6 @@ entities:
     - pos: 9.5,21.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 747
@@ -1837,8 +1679,6 @@ entities:
     - pos: 9.5,22.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 748
@@ -1846,8 +1686,6 @@ entities:
     - pos: 10.5,22.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 749
@@ -1855,8 +1693,6 @@ entities:
     - pos: 8.5,22.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 750
@@ -1864,8 +1700,6 @@ entities:
     - pos: 9.5,20.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 751
@@ -1873,8 +1707,6 @@ entities:
     - pos: 9.5,17.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 752
@@ -1882,8 +1714,6 @@ entities:
     - pos: 9.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 753
@@ -1891,8 +1721,6 @@ entities:
     - pos: 8.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 754
@@ -1914,8 +1742,6 @@ entities:
     - pos: 6.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 757
@@ -1923,8 +1749,6 @@ entities:
     - pos: 7.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 758
@@ -1932,8 +1756,6 @@ entities:
     - pos: 7.5,23.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 759
@@ -1948,8 +1770,6 @@ entities:
     - pos: -5.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 761
@@ -1957,8 +1777,6 @@ entities:
     - pos: -6.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 763
@@ -1966,8 +1784,6 @@ entities:
     - pos: -0.5,42.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 764
@@ -1975,8 +1791,6 @@ entities:
     - pos: -1.5,42.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 765
@@ -1984,8 +1798,6 @@ entities:
     - pos: -2.5,42.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 766
@@ -1993,8 +1805,6 @@ entities:
     - pos: -2.5,43.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 767
@@ -2002,8 +1812,6 @@ entities:
     - pos: -2.5,41.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 768
@@ -2018,8 +1826,6 @@ entities:
     - pos: 2.5,42.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 770
@@ -2027,8 +1833,6 @@ entities:
     - pos: 3.5,43.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 771
@@ -2036,8 +1840,6 @@ entities:
     - pos: 3.5,42.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 772
@@ -2045,8 +1847,6 @@ entities:
     - pos: 3.5,41.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 773
@@ -2054,8 +1854,6 @@ entities:
     - pos: -0.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 774
@@ -2063,8 +1861,6 @@ entities:
     - pos: -1.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 775
@@ -2072,8 +1868,6 @@ entities:
     - pos: -2.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 776
@@ -2081,8 +1875,6 @@ entities:
     - pos: -2.5,49.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 777
@@ -2090,8 +1882,6 @@ entities:
     - pos: 1.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 778
@@ -2099,8 +1889,6 @@ entities:
     - pos: 2.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 779
@@ -2108,8 +1896,6 @@ entities:
     - pos: 3.5,50.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 780
@@ -2117,8 +1903,6 @@ entities:
     - pos: 3.5,49.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 807
@@ -2126,8 +1910,6 @@ entities:
     - pos: -7.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 808
@@ -2135,8 +1917,6 @@ entities:
     - pos: -7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 809
@@ -2144,8 +1924,6 @@ entities:
     - pos: -7.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 810
@@ -2153,8 +1931,6 @@ entities:
     - pos: 8.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 811
@@ -2162,8 +1938,6 @@ entities:
     - pos: 8.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 812
@@ -2171,8 +1945,6 @@ entities:
     - pos: 8.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHV
@@ -2182,8 +1954,6 @@ entities:
     - pos: -5.5,34.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 337
@@ -2191,8 +1961,6 @@ entities:
     - pos: -5.5,33.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 338
@@ -2200,8 +1968,6 @@ entities:
     - pos: -5.5,32.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 339
@@ -2209,8 +1975,6 @@ entities:
     - pos: -5.5,31.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 340
@@ -2218,8 +1982,6 @@ entities:
     - pos: -5.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 341
@@ -2227,8 +1989,6 @@ entities:
     - pos: 6.5,34.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 342
@@ -2236,8 +1996,6 @@ entities:
     - pos: 6.5,33.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 343
@@ -2245,8 +2003,6 @@ entities:
     - pos: 6.5,32.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 344
@@ -2254,8 +2010,6 @@ entities:
     - pos: 6.5,31.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 345
@@ -2263,8 +2017,6 @@ entities:
     - pos: 6.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 346
@@ -2272,8 +2024,6 @@ entities:
     - pos: 7.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 347
@@ -2281,8 +2031,6 @@ entities:
     - pos: 7.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 348
@@ -2290,8 +2038,6 @@ entities:
     - pos: 7.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 349
@@ -2299,8 +2045,6 @@ entities:
     - pos: 7.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 350
@@ -2308,8 +2052,6 @@ entities:
     - pos: 7.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 351
@@ -2317,8 +2059,6 @@ entities:
     - pos: -6.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 352
@@ -2326,8 +2066,6 @@ entities:
     - pos: -6.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 353
@@ -2335,8 +2073,6 @@ entities:
     - pos: -6.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 354
@@ -2344,8 +2080,6 @@ entities:
     - pos: -6.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 355
@@ -2353,8 +2087,6 @@ entities:
     - pos: -6.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 359
@@ -2362,8 +2094,6 @@ entities:
     - pos: 6.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 360
@@ -2469,8 +2199,6 @@ entities:
     - pos: -4.5,19.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 376
@@ -2513,8 +2241,6 @@ entities:
     - pos: -5.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 382
@@ -2557,8 +2283,6 @@ entities:
     - pos: 0.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 388
@@ -2566,8 +2290,6 @@ entities:
     - pos: 0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 389
@@ -2575,8 +2297,6 @@ entities:
     - pos: 0.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 390
@@ -2584,8 +2304,6 @@ entities:
     - pos: 0.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 391
@@ -2600,8 +2318,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 393
@@ -2609,8 +2325,6 @@ entities:
     - pos: 1.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 394
@@ -2618,8 +2332,6 @@ entities:
     - pos: 2.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 395
@@ -2627,8 +2339,6 @@ entities:
     - pos: 2.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 396
@@ -2636,8 +2346,6 @@ entities:
     - pos: 2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 397
@@ -2645,8 +2353,6 @@ entities:
     - pos: 2.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 398
@@ -2654,8 +2360,6 @@ entities:
     - pos: 1.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 399
@@ -2663,8 +2367,6 @@ entities:
     - pos: 1.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 402
@@ -2672,8 +2374,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 403
@@ -2681,8 +2381,6 @@ entities:
     - pos: -0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 404
@@ -2690,8 +2388,6 @@ entities:
     - pos: -1.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 405
@@ -2699,8 +2395,6 @@ entities:
     - pos: -2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 406
@@ -2708,8 +2402,6 @@ entities:
     - pos: -3.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 407
@@ -2724,8 +2416,6 @@ entities:
     - pos: -4.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 428
@@ -2747,8 +2437,6 @@ entities:
     - pos: 5.5,30.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 431
@@ -2777,8 +2465,6 @@ entities:
     - pos: 3.5,28.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 435
@@ -2821,8 +2507,6 @@ entities:
     - pos: -0.5,28.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 441
@@ -2851,8 +2535,6 @@ entities:
     - pos: -0.5,27.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 447
@@ -2860,8 +2542,6 @@ entities:
     - pos: -0.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 448
@@ -2939,8 +2619,6 @@ entities:
     - pos: -0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 871
@@ -2948,8 +2626,6 @@ entities:
     - pos: -0.5,37.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 872
@@ -2957,8 +2633,6 @@ entities:
     - pos: -0.5,38.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 873
@@ -3003,8 +2677,6 @@ entities:
     - pos: 2.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 517
@@ -3012,8 +2684,6 @@ entities:
     - pos: 1.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 518
@@ -3021,8 +2691,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 519
@@ -3037,8 +2705,6 @@ entities:
     - pos: 2.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 521
@@ -3046,8 +2712,6 @@ entities:
     - pos: 3.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 522
@@ -3055,8 +2719,6 @@ entities:
     - pos: 0.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 523
@@ -3064,8 +2726,6 @@ entities:
     - pos: 0.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 524
@@ -3073,8 +2733,6 @@ entities:
     - pos: 0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 525
@@ -3082,8 +2740,6 @@ entities:
     - pos: 0.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 526
@@ -3147,8 +2803,6 @@ entities:
     - pos: -1.5,18.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 535
@@ -3184,8 +2838,6 @@ entities:
     - pos: -0.5,27.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 543
@@ -3193,8 +2845,6 @@ entities:
     - pos: -0.5,28.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 544
@@ -3251,8 +2901,6 @@ entities:
     - pos: -0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 552
@@ -3260,8 +2908,6 @@ entities:
     - pos: 0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 553
@@ -3283,8 +2929,6 @@ entities:
     - pos: 0.5,39.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 556
@@ -3292,8 +2936,6 @@ entities:
     - pos: 0.5,40.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 557
@@ -3301,8 +2943,6 @@ entities:
     - pos: 0.5,41.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 558
@@ -3338,8 +2978,6 @@ entities:
     - pos: 2.5,44.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableTerminal
@@ -3645,8 +3283,6 @@ entities:
       pos: 0.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 4999.1116232
       type: EmitSoundOnCollide
   - uid: 799
@@ -3655,8 +3291,6 @@ entities:
       pos: 6.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2303.2995636
       type: EmitSoundOnCollide
   - uid: 857
@@ -3691,8 +3325,6 @@ entities:
       pos: 0.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5002.0643761
       type: EmitSoundOnCollide
   - uid: 540
@@ -3701,8 +3333,6 @@ entities:
       pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5000.0782566
       type: EmitSoundOnCollide
   - uid: 541
@@ -3711,8 +3341,6 @@ entities:
       pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5006.7740336
       type: EmitSoundOnCollide
   - uid: 663
@@ -3761,8 +3389,6 @@ entities:
       pos: 5.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2302.0479487
       type: EmitSoundOnCollide
   - uid: 800
@@ -3771,8 +3397,6 @@ entities:
       pos: 4.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2304.4819692
       type: EmitSoundOnCollide
   - uid: 801
@@ -3781,8 +3405,6 @@ entities:
       pos: 6.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2305.7452808
       type: EmitSoundOnCollide
   - uid: 846
@@ -3791,8 +3413,6 @@ entities:
       pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2862.5036026
       type: EmitSoundOnCollide
   - uid: 847
@@ -3801,8 +3421,6 @@ entities:
       pos: 1.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2860.1290426
       type: EmitSoundOnCollide
   - uid: 902
@@ -3867,8 +3485,6 @@ entities:
       pos: 8.5,19.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5016.2038834
       type: EmitSoundOnCollide
   - uid: 915
@@ -3877,8 +3493,6 @@ entities:
       pos: -4.5,19.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5017.9404468
       type: EmitSoundOnCollide
   - uid: 916
@@ -3919,8 +3533,6 @@ entities:
       pos: -0.5,36.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5022.1388956
       type: EmitSoundOnCollide
   - uid: 921
@@ -3929,8 +3541,6 @@ entities:
       pos: -0.5,37.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5022.4021943
       type: EmitSoundOnCollide
   - uid: 922
@@ -3947,8 +3557,6 @@ entities:
       pos: 0.5,41.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5024.9029441
       type: EmitSoundOnCollide
   - uid: 924
@@ -4078,8 +3686,6 @@ entities:
     - pos: 2.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 2858.5702793
       type: EmitSoundOnCollide
   - uid: 856
@@ -4103,8 +3709,6 @@ entities:
       pos: -0.5,24.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 5036.8565338
       type: EmitSoundOnCollide
   - uid: 939
@@ -4170,7 +3774,7 @@ entities:
       type: Transform
     - nextSound: 3080.7093393
       type: EmitSoundOnCollide
-- proto: GeneratorUraniumMachineCircuitboard
+- proto: PortableGeneratorSuperPacmanMachineCircuitboard
   entities:
   - uid: 863
     components:
diff --git a/Resources/WhiteMaps/D/derelict2.yml b/Resources/WhiteMaps/D/derelict2.yml
index b8a5b4a032..30a2491386 100644
--- a/Resources/WhiteMaps/D/derelict2.yml
+++ b/Resources/WhiteMaps/D/derelict2.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
   12: FloorBar
   20: FloorCaveDrought
@@ -2663,8 +2663,6 @@ entities:
     - pos: -6.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 346
@@ -2672,8 +2670,6 @@ entities:
     - pos: 14.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 347
@@ -2681,8 +2677,6 @@ entities:
     - pos: 15.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 348
@@ -2774,8 +2768,6 @@ entities:
     - pos: 17.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 361
@@ -2811,8 +2803,6 @@ entities:
     - pos: 12.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 366
@@ -2820,8 +2810,6 @@ entities:
     - pos: 12.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 367
@@ -2829,8 +2817,6 @@ entities:
     - pos: 12.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 368
@@ -2838,8 +2824,6 @@ entities:
     - pos: 12.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 369
@@ -2847,8 +2831,6 @@ entities:
     - pos: 12.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 370
@@ -2856,8 +2838,6 @@ entities:
     - pos: 12.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 371
@@ -2865,8 +2845,6 @@ entities:
     - pos: 12.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 372
@@ -2874,8 +2852,6 @@ entities:
     - pos: 12.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 373
@@ -2883,8 +2859,6 @@ entities:
     - pos: 13.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 374
@@ -2892,8 +2866,6 @@ entities:
     - pos: 14.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 375
@@ -2901,8 +2873,6 @@ entities:
     - pos: 15.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 376
@@ -2910,8 +2880,6 @@ entities:
     - pos: 16.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 377
@@ -2919,8 +2887,6 @@ entities:
     - pos: 17.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 378
@@ -2928,8 +2894,6 @@ entities:
     - pos: 18.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 379
@@ -2937,8 +2901,6 @@ entities:
     - pos: 19.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 380
@@ -2946,8 +2908,6 @@ entities:
     - pos: 19.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 381
@@ -2955,8 +2915,6 @@ entities:
     - pos: 19.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 382
@@ -2964,8 +2922,6 @@ entities:
     - pos: 19.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 383
@@ -2973,8 +2929,6 @@ entities:
     - pos: 18.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 384
@@ -2982,8 +2936,6 @@ entities:
     - pos: 18.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 385
@@ -2991,8 +2943,6 @@ entities:
     - pos: 18.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 386
@@ -3000,8 +2950,6 @@ entities:
     - pos: 17.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 387
@@ -3009,8 +2957,6 @@ entities:
     - pos: 16.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 388
@@ -3018,8 +2964,6 @@ entities:
     - pos: 15.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 389
@@ -3027,8 +2971,6 @@ entities:
     - pos: 14.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 390
@@ -3036,8 +2978,6 @@ entities:
     - pos: 14.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 391
@@ -3045,8 +2985,6 @@ entities:
     - pos: 14.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 392
@@ -3054,8 +2992,6 @@ entities:
     - pos: 14.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 393
@@ -3063,8 +2999,6 @@ entities:
     - pos: 13.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 394
@@ -3072,8 +3006,6 @@ entities:
     - pos: 12.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 438
@@ -3081,8 +3013,6 @@ entities:
     - pos: 15.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 500
@@ -3090,8 +3020,6 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 501
@@ -3099,8 +3027,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 502
@@ -3108,8 +3034,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 503
@@ -3117,8 +3041,6 @@ entities:
     - pos: 3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 504
@@ -3126,8 +3048,6 @@ entities:
     - pos: 2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 505
@@ -3135,8 +3055,6 @@ entities:
     - pos: 1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 506
@@ -3144,8 +3062,6 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 507
@@ -3153,8 +3069,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 508
@@ -3162,8 +3076,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 509
@@ -3171,8 +3083,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 510
@@ -3180,8 +3090,6 @@ entities:
     - pos: -2.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 511
@@ -3189,8 +3097,6 @@ entities:
     - pos: -2.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 512
@@ -3198,8 +3104,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 513
@@ -3207,8 +3111,6 @@ entities:
     - pos: -2.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 514
@@ -3216,8 +3118,6 @@ entities:
     - pos: -2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 515
@@ -3225,8 +3125,6 @@ entities:
     - pos: -2.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 516
@@ -3234,8 +3132,6 @@ entities:
     - pos: -2.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 517
@@ -3243,8 +3139,6 @@ entities:
     - pos: -2.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 518
@@ -3252,8 +3146,6 @@ entities:
     - pos: -2.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 519
@@ -3261,8 +3153,6 @@ entities:
     - pos: -2.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 520
@@ -3270,8 +3160,6 @@ entities:
     - pos: -2.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 521
@@ -3279,8 +3167,6 @@ entities:
     - pos: -1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 522
@@ -3288,8 +3174,6 @@ entities:
     - pos: -0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 523
@@ -3297,8 +3181,6 @@ entities:
     - pos: 0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 524
@@ -3306,8 +3188,6 @@ entities:
     - pos: 1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 525
@@ -3315,8 +3195,6 @@ entities:
     - pos: 2.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 526
@@ -3324,8 +3202,6 @@ entities:
     - pos: 3.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 527
@@ -3333,8 +3209,6 @@ entities:
     - pos: 4.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 528
@@ -3342,8 +3216,6 @@ entities:
     - pos: 5.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 529
@@ -3351,8 +3223,6 @@ entities:
     - pos: 6.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 530
@@ -3360,8 +3230,6 @@ entities:
     - pos: 7.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 531
@@ -3369,8 +3237,6 @@ entities:
     - pos: 8.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 532
@@ -3378,8 +3244,6 @@ entities:
     - pos: 9.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 533
@@ -3387,8 +3251,6 @@ entities:
     - pos: 10.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 534
@@ -3396,8 +3258,6 @@ entities:
     - pos: 11.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 535
@@ -3405,8 +3265,6 @@ entities:
     - pos: 11.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 536
@@ -3414,8 +3272,6 @@ entities:
     - pos: 11.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 545
@@ -3423,8 +3279,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 546
@@ -3432,8 +3286,6 @@ entities:
     - pos: 8.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 547
@@ -3441,8 +3293,6 @@ entities:
     - pos: 9.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 548
@@ -3499,8 +3349,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 609
@@ -3550,8 +3398,6 @@ entities:
     - pos: 4.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 616
@@ -3580,8 +3426,6 @@ entities:
     - pos: -0.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 620
@@ -3603,8 +3447,6 @@ entities:
     - pos: -3.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 623
@@ -3633,8 +3475,6 @@ entities:
     - pos: -3.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 627
@@ -3642,8 +3482,6 @@ entities:
     - pos: -1.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 628
@@ -3651,8 +3489,6 @@ entities:
     - pos: -1.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 629
@@ -3660,8 +3496,6 @@ entities:
     - pos: -1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 687
@@ -3669,8 +3503,6 @@ entities:
     - pos: -6.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 689
@@ -3678,8 +3510,6 @@ entities:
     - pos: -6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 720
@@ -3687,8 +3517,6 @@ entities:
     - pos: -6.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 721
@@ -3696,8 +3524,6 @@ entities:
     - pos: -6.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 722
@@ -3705,8 +3531,6 @@ entities:
     - pos: -6.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 723
@@ -3714,8 +3538,6 @@ entities:
     - pos: -6.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 724
@@ -3723,8 +3545,6 @@ entities:
     - pos: -6.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 725
@@ -3732,8 +3552,6 @@ entities:
     - pos: -6.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 726
@@ -3741,8 +3559,6 @@ entities:
     - pos: -6.5,15.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 868
@@ -3785,8 +3601,6 @@ entities:
     - pos: -4.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 919
@@ -3906,8 +3720,6 @@ entities:
     - pos: -6.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1025
@@ -3985,8 +3797,6 @@ entities:
     - pos: -2.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1296
@@ -4064,8 +3874,6 @@ entities:
     - pos: 8.5,14.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1307
@@ -4087,8 +3895,6 @@ entities:
     - pos: 13.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1310
@@ -4103,8 +3909,6 @@ entities:
     - pos: -8.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1312
@@ -4196,8 +4000,6 @@ entities:
     - pos: -9.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1325
@@ -4233,8 +4035,6 @@ entities:
     - pos: -11.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1330
@@ -4298,8 +4098,6 @@ entities:
     - pos: -7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1357
@@ -4307,8 +4105,6 @@ entities:
     - pos: -8.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1358
@@ -4316,8 +4112,6 @@ entities:
     - pos: -9.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1359
@@ -4325,8 +4119,6 @@ entities:
     - pos: -10.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1360
@@ -4334,8 +4126,6 @@ entities:
     - pos: -11.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1361
@@ -4343,8 +4133,6 @@ entities:
     - pos: -11.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1362
@@ -4352,8 +4140,6 @@ entities:
     - pos: -11.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1363
@@ -4361,8 +4147,6 @@ entities:
     - pos: -8.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1364
@@ -4370,8 +4154,6 @@ entities:
     - pos: -8.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1365
@@ -4379,8 +4161,6 @@ entities:
     - pos: -9.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1366
@@ -4388,8 +4168,6 @@ entities:
     - pos: -10.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1367
@@ -4397,8 +4175,6 @@ entities:
     - pos: -11.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1368
@@ -4406,8 +4182,6 @@ entities:
     - pos: -11.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1369
@@ -4415,8 +4189,6 @@ entities:
     - pos: -11.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1370
@@ -4424,8 +4196,6 @@ entities:
     - pos: -11.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1371
@@ -4433,8 +4203,6 @@ entities:
     - pos: -11.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1372
@@ -4442,8 +4210,6 @@ entities:
     - pos: -12.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1373
@@ -4451,8 +4217,6 @@ entities:
     - pos: -13.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1374
@@ -4460,8 +4224,6 @@ entities:
     - pos: -14.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1375
@@ -4469,8 +4231,6 @@ entities:
     - pos: -15.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1376
@@ -4478,8 +4238,6 @@ entities:
     - pos: -15.5,-7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1377
@@ -4487,8 +4245,6 @@ entities:
     - pos: -15.5,-8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1378
@@ -4496,8 +4252,6 @@ entities:
     - pos: -15.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1379
@@ -4505,8 +4259,6 @@ entities:
     - pos: -14.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1380
@@ -4514,8 +4266,6 @@ entities:
     - pos: -13.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1381
@@ -4523,8 +4273,6 @@ entities:
     - pos: -12.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1382
@@ -4532,8 +4280,6 @@ entities:
     - pos: -11.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1383
@@ -4541,8 +4287,6 @@ entities:
     - pos: -11.5,-10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1384
@@ -4550,8 +4294,6 @@ entities:
     - pos: -11.5,-11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1385
@@ -4559,8 +4301,6 @@ entities:
     - pos: -10.5,-11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1386
@@ -4568,8 +4308,6 @@ entities:
     - pos: -9.5,-11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1387
@@ -4577,8 +4315,6 @@ entities:
     - pos: -8.5,-11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1388
@@ -4586,8 +4322,6 @@ entities:
     - pos: -7.5,-11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1389
@@ -4595,8 +4329,6 @@ entities:
     - pos: -7.5,-10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1390
@@ -4604,8 +4336,6 @@ entities:
     - pos: -7.5,-9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1391
@@ -4613,8 +4343,6 @@ entities:
     - pos: -7.5,-8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1392
@@ -4622,8 +4350,6 @@ entities:
     - pos: -7.5,-7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1393
@@ -4631,8 +4357,6 @@ entities:
     - pos: -7.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1394
@@ -4640,8 +4364,6 @@ entities:
     - pos: -7.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1395
@@ -4649,8 +4371,6 @@ entities:
     - pos: -7.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHV
@@ -4660,8 +4380,6 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 149
@@ -4669,8 +4387,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 150
@@ -4678,8 +4394,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 151
@@ -4687,8 +4401,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 152
@@ -4696,8 +4408,6 @@ entities:
     - pos: -2.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 153
@@ -4705,8 +4415,6 @@ entities:
     - pos: -2.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 154
@@ -4714,8 +4422,6 @@ entities:
     - pos: -2.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 155
@@ -4723,8 +4429,6 @@ entities:
     - pos: -2.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 156
@@ -4732,8 +4436,6 @@ entities:
     - pos: -2.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 157
@@ -4741,8 +4443,6 @@ entities:
     - pos: -2.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 158
@@ -4750,8 +4450,6 @@ entities:
     - pos: -2.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 159
@@ -4759,8 +4457,6 @@ entities:
     - pos: -2.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 160
@@ -4768,8 +4464,6 @@ entities:
     - pos: -2.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 161
@@ -4777,8 +4471,6 @@ entities:
     - pos: -2.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 162
@@ -4786,8 +4478,6 @@ entities:
     - pos: -2.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 163
@@ -4795,8 +4485,6 @@ entities:
     - pos: -1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 164
@@ -4804,8 +4492,6 @@ entities:
     - pos: -0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 165
@@ -4813,8 +4499,6 @@ entities:
     - pos: 0.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 166
@@ -4822,8 +4506,6 @@ entities:
     - pos: 1.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 167
@@ -4831,8 +4513,6 @@ entities:
     - pos: 2.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 168
@@ -4840,8 +4520,6 @@ entities:
     - pos: 3.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 169
@@ -4849,8 +4527,6 @@ entities:
     - pos: 4.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 170
@@ -4858,8 +4534,6 @@ entities:
     - pos: 5.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 171
@@ -4867,8 +4541,6 @@ entities:
     - pos: 6.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 172
@@ -4876,8 +4548,6 @@ entities:
     - pos: 7.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 173
@@ -4885,8 +4555,6 @@ entities:
     - pos: 8.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 174
@@ -4894,8 +4562,6 @@ entities:
     - pos: 9.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 175
@@ -4903,8 +4569,6 @@ entities:
     - pos: 10.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 176
@@ -4912,8 +4576,6 @@ entities:
     - pos: 11.5,12.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 177
@@ -4921,8 +4583,6 @@ entities:
     - pos: 11.5,11.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 178
@@ -4930,8 +4590,6 @@ entities:
     - pos: 11.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 341
@@ -4939,8 +4597,6 @@ entities:
     - pos: 15.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 342
@@ -4948,8 +4604,6 @@ entities:
     - pos: 15.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 343
@@ -4957,8 +4611,6 @@ entities:
     - pos: 15.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1060
@@ -4966,8 +4618,6 @@ entities:
     - pos: 13.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1061
@@ -4982,8 +4632,6 @@ entities:
     - pos: 11.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1075
@@ -4991,8 +4639,6 @@ entities:
     - pos: 17.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1076
@@ -5000,8 +4646,6 @@ entities:
     - pos: 16.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1090
@@ -5009,8 +4653,6 @@ entities:
     - pos: 12.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1091
@@ -5018,8 +4660,6 @@ entities:
     - pos: 15.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1105
@@ -5027,8 +4667,6 @@ entities:
     - pos: 11.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1106
@@ -5036,8 +4674,6 @@ entities:
     - pos: 14.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1109
@@ -5059,8 +4695,6 @@ entities:
     - pos: 17.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1123
@@ -5068,8 +4702,6 @@ entities:
     - pos: 17.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1124
@@ -5077,8 +4709,6 @@ entities:
     - pos: 18.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1125
@@ -5095,8 +4725,6 @@ entities:
     - pos: 15.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 345
@@ -5104,8 +4732,6 @@ entities:
     - pos: 14.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 462
@@ -5134,8 +4760,6 @@ entities:
     - pos: 12.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 466
@@ -5143,8 +4767,6 @@ entities:
     - pos: 12.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 467
@@ -5152,8 +4774,6 @@ entities:
     - pos: 12.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 468
@@ -5161,8 +4781,6 @@ entities:
     - pos: 12.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 469
@@ -5170,8 +4788,6 @@ entities:
     - pos: 13.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 470
@@ -5179,8 +4795,6 @@ entities:
     - pos: 14.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 471
@@ -5188,8 +4802,6 @@ entities:
     - pos: 15.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 472
@@ -5197,8 +4809,6 @@ entities:
     - pos: 16.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 473
@@ -5206,8 +4816,6 @@ entities:
     - pos: 17.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 474
@@ -5215,8 +4823,6 @@ entities:
     - pos: 18.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 475
@@ -5224,8 +4830,6 @@ entities:
     - pos: 19.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 476
@@ -5233,8 +4837,6 @@ entities:
     - pos: 19.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 477
@@ -5242,8 +4844,6 @@ entities:
     - pos: 19.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 478
@@ -5251,8 +4851,6 @@ entities:
     - pos: 19.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 479
@@ -5260,8 +4858,6 @@ entities:
     - pos: 18.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 480
@@ -5269,8 +4865,6 @@ entities:
     - pos: 18.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 481
@@ -5278,8 +4872,6 @@ entities:
     - pos: 18.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 482
@@ -5287,8 +4879,6 @@ entities:
     - pos: 17.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 483
@@ -5296,8 +4886,6 @@ entities:
     - pos: 16.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 484
@@ -5305,8 +4893,6 @@ entities:
     - pos: 15.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 485
@@ -5314,8 +4900,6 @@ entities:
     - pos: 14.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 486
@@ -5323,8 +4907,6 @@ entities:
     - pos: 14.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 487
@@ -5332,8 +4914,6 @@ entities:
     - pos: 14.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 488
@@ -5341,8 +4921,6 @@ entities:
     - pos: 14.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 489
@@ -5350,8 +4928,6 @@ entities:
     - pos: 13.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 490
@@ -5359,8 +4935,6 @@ entities:
     - pos: 12.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 491
@@ -5368,8 +4942,6 @@ entities:
     - pos: 11.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 492
@@ -5391,8 +4963,6 @@ entities:
     - pos: 10.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 495
@@ -5428,8 +4998,6 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 600
@@ -5451,8 +5019,6 @@ entities:
     - pos: 3.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 603
@@ -5488,8 +5054,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 690
@@ -5497,8 +5061,6 @@ entities:
     - pos: -7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 691
@@ -5506,8 +5068,6 @@ entities:
     - pos: -6.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 692
@@ -5613,8 +5173,6 @@ entities:
     - pos: -6.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1024
@@ -5622,8 +5180,6 @@ entities:
     - pos: -6.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 1107
@@ -6797,7 +6353,7 @@ entities:
       type: Transform
     - nextSound: 3109.9082131
       type: EmitSoundOnCollide
-- proto: GeneratorUranium
+- proto: PortableGeneratorSuperPacman
   entities:
   - uid: 322
     components:
@@ -7276,8 +6832,7 @@ entities:
   entities:
   - uid: 563
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-4.5
+    - pos: 5.5,-4.5
       parent: 1
       type: Transform
 - proto: OrganHumanHeart
diff --git a/Resources/WhiteMaps/D/derelict4.yml b/Resources/WhiteMaps/D/derelict4.yml
index 4483d2ce01..c64980a257 100644
--- a/Resources/WhiteMaps/D/derelict4.yml
+++ b/Resources/WhiteMaps/D/derelict4.yml
@@ -115,8 +115,6 @@ entities:
     - pos: 1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 40
@@ -201,8 +199,6 @@ entities:
     - pos: -0.5,10.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 52
@@ -217,8 +213,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 54
@@ -240,8 +234,6 @@ entities:
     - pos: 3.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 57
@@ -256,8 +248,6 @@ entities:
     - pos: 5.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 120
@@ -281,8 +271,6 @@ entities:
     - pos: 1.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 60
@@ -332,8 +320,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 67
@@ -355,8 +341,6 @@ entities:
     - pos: 3.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 70
@@ -371,8 +355,6 @@ entities:
     - pos: 5.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: ChairOfficeLight
@@ -620,7 +602,6 @@ entities:
         Pressed:
         - 77
       type: DeviceLinkSource
-    - type: ItemCooldown
 - proto: SpaceTickSpawner
   entities:
   - uid: 112
diff --git a/Resources/WhiteMaps/D/derelict5.yml b/Resources/WhiteMaps/D/derelict5.yml
index 5f42d612d8..2e469c7bf8 100644
--- a/Resources/WhiteMaps/D/derelict5.yml
+++ b/Resources/WhiteMaps/D/derelict5.yml
@@ -168,8 +168,6 @@ entities:
     - pos: 5.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 66
@@ -233,8 +231,6 @@ entities:
     - pos: 3.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 75
@@ -291,8 +287,6 @@ entities:
     - pos: 6.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 83
@@ -449,8 +443,6 @@ entities:
     - pos: 6.5,16.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 214
@@ -458,8 +450,6 @@ entities:
     - pos: 6.5,15.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -469,8 +459,6 @@ entities:
     - pos: 6.5,15.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 216
@@ -492,8 +480,6 @@ entities:
     - pos: 5.5,13.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: ChairOfficeDark
@@ -575,8 +561,6 @@ entities:
     - pos: 7.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 438.3511488
       type: EmitSoundOnCollide
   - uid: 109
@@ -584,8 +568,6 @@ entities:
     - pos: 9.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 438.8363862
       type: EmitSoundOnCollide
   - uid: 110
@@ -593,8 +575,6 @@ entities:
     - pos: 7.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 439.6551039
       type: EmitSoundOnCollide
   - uid: 111
@@ -602,8 +582,6 @@ entities:
     - pos: 9.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 440.2557886
       type: EmitSoundOnCollide
 - proto: GasPort
diff --git a/Resources/WhiteMaps/D/derelict7.yml b/Resources/WhiteMaps/D/derelict7.yml
index 6eb343aa44..c3385c738e 100644
--- a/Resources/WhiteMaps/D/derelict7.yml
+++ b/Resources/WhiteMaps/D/derelict7.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
   23: FloorDark
   72: FloorSteelDirty
diff --git a/Resources/WhiteMaps/D/derelict8.yml b/Resources/WhiteMaps/D/derelict8.yml
index 55341408e9..1647e56bbe 100644
--- a/Resources/WhiteMaps/D/derelict8.yml
+++ b/Resources/WhiteMaps/D/derelict8.yml
@@ -167,8 +167,6 @@ entities:
     - pos: -7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 138
@@ -176,8 +174,6 @@ entities:
     - pos: -6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 139
@@ -185,8 +181,6 @@ entities:
     - pos: -8.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 140
@@ -194,8 +188,6 @@ entities:
     - pos: -5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 141
@@ -203,8 +195,6 @@ entities:
     - pos: -4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 142
@@ -212,8 +202,6 @@ entities:
     - pos: -4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 143
@@ -221,8 +209,6 @@ entities:
     - pos: -4.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 144
@@ -230,8 +216,6 @@ entities:
     - pos: -4.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 145
@@ -239,8 +223,6 @@ entities:
     - pos: -4.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 146
@@ -248,8 +230,6 @@ entities:
     - pos: -4.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 147
@@ -257,8 +237,6 @@ entities:
     - pos: -4.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 148
@@ -266,8 +244,6 @@ entities:
     - pos: -4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 149
@@ -275,8 +251,6 @@ entities:
     - pos: -4.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 153
@@ -284,8 +258,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 154
@@ -293,8 +265,6 @@ entities:
     - pos: -3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 155
@@ -302,8 +272,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 156
@@ -311,8 +279,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 157
@@ -320,8 +286,6 @@ entities:
     - pos: 0.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 158
@@ -329,8 +293,6 @@ entities:
     - pos: 0.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 159
@@ -338,8 +300,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 160
@@ -347,8 +307,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 161
@@ -356,8 +314,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 162
@@ -365,8 +321,6 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 163
@@ -374,8 +328,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 164
@@ -383,8 +335,6 @@ entities:
     - pos: 7.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 165
@@ -392,8 +342,6 @@ entities:
     - pos: 13.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 166
@@ -401,8 +349,6 @@ entities:
     - pos: 13.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 167
@@ -410,8 +356,6 @@ entities:
     - pos: 13.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 168
@@ -419,8 +363,6 @@ entities:
     - pos: 7.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 169
@@ -428,8 +370,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableHV
@@ -439,8 +379,6 @@ entities:
     - pos: -4.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 79
@@ -448,8 +386,6 @@ entities:
     - pos: -4.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 85
@@ -457,8 +393,6 @@ entities:
     - pos: -4.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 86
@@ -466,8 +400,6 @@ entities:
     - pos: -3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 87
@@ -475,8 +407,6 @@ entities:
     - pos: -4.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 88
@@ -484,8 +414,6 @@ entities:
     - pos: -4.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 89
@@ -493,8 +421,6 @@ entities:
     - pos: -4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 90
@@ -502,8 +428,6 @@ entities:
     - pos: -4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 91
@@ -511,8 +435,6 @@ entities:
     - pos: -4.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 92
@@ -520,8 +442,6 @@ entities:
     - pos: -4.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 93
@@ -529,8 +449,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 94
@@ -538,8 +456,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 95
@@ -547,8 +463,6 @@ entities:
     - pos: -6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 96
@@ -556,8 +470,6 @@ entities:
     - pos: -5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 97
@@ -565,8 +477,6 @@ entities:
     - pos: 0.5,4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 98
@@ -574,8 +484,6 @@ entities:
     - pos: 0.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 99
@@ -583,8 +491,6 @@ entities:
     - pos: 0.5,7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 100
@@ -592,8 +498,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 101
@@ -601,8 +505,6 @@ entities:
     - pos: 0.5,8.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 102
@@ -610,8 +512,6 @@ entities:
     - pos: 0.5,9.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 103
@@ -619,8 +519,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 104
@@ -628,8 +526,6 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 105
@@ -637,8 +533,6 @@ entities:
     - pos: 7.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 106
@@ -646,8 +540,6 @@ entities:
     - pos: 7.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 107
@@ -655,8 +547,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 108
@@ -664,8 +554,6 @@ entities:
     - pos: 7.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 109
@@ -673,8 +561,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 110
@@ -682,8 +568,6 @@ entities:
     - pos: 9.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 111
@@ -691,8 +575,6 @@ entities:
     - pos: 7.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 112
@@ -700,8 +582,6 @@ entities:
     - pos: 7.5,3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 113
@@ -709,8 +589,6 @@ entities:
     - pos: 8.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 114
@@ -718,8 +596,6 @@ entities:
     - pos: 9.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 115
@@ -727,8 +603,6 @@ entities:
     - pos: 10.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 116
@@ -736,8 +610,6 @@ entities:
     - pos: 5.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 117
@@ -745,8 +617,6 @@ entities:
     - pos: 4.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 118
@@ -754,8 +624,6 @@ entities:
     - pos: 3.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 119
@@ -763,8 +631,6 @@ entities:
     - pos: -2.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 120
@@ -772,8 +638,6 @@ entities:
     - pos: -0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 121
@@ -781,8 +645,6 @@ entities:
     - pos: -1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 122
@@ -790,8 +652,6 @@ entities:
     - pos: 0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 124
@@ -799,8 +659,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 125
@@ -808,8 +666,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 126
@@ -817,8 +673,6 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -828,8 +682,6 @@ entities:
     - pos: -8.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 128
@@ -837,8 +689,6 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 129
@@ -846,8 +696,6 @@ entities:
     - pos: -0.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 130
@@ -855,8 +703,6 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 131
@@ -864,8 +710,6 @@ entities:
     - pos: -2.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 132
@@ -873,8 +717,6 @@ entities:
     - pos: -3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 133
@@ -882,8 +724,6 @@ entities:
     - pos: -4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 134
@@ -891,8 +731,6 @@ entities:
     - pos: -5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 135
@@ -900,8 +738,6 @@ entities:
     - pos: -6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 136
@@ -909,8 +745,6 @@ entities:
     - pos: -7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 170
@@ -918,8 +752,6 @@ entities:
     - pos: 3.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 171
@@ -927,8 +759,6 @@ entities:
     - pos: 4.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 172
@@ -936,8 +766,6 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 173
@@ -945,8 +773,6 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 174
@@ -954,8 +780,6 @@ entities:
     - pos: 7.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 175
@@ -963,8 +787,6 @@ entities:
     - pos: 7.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 176
@@ -972,8 +794,6 @@ entities:
     - pos: 7.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 177
@@ -981,8 +801,6 @@ entities:
     - pos: 10.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 178
@@ -990,8 +808,6 @@ entities:
     - pos: 11.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 179
@@ -999,8 +815,6 @@ entities:
     - pos: 9.5,6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 180
@@ -1008,8 +822,6 @@ entities:
     - pos: 13.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 181
@@ -1017,8 +829,6 @@ entities:
     - pos: 13.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 182
@@ -1026,8 +836,6 @@ entities:
     - pos: 13.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 183
@@ -1035,8 +843,6 @@ entities:
     - pos: -7.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 184
@@ -1044,8 +850,6 @@ entities:
     - pos: -0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 185
@@ -1053,8 +857,6 @@ entities:
     - pos: -1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 186
@@ -1062,8 +864,6 @@ entities:
     - pos: 0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 187
@@ -1071,8 +871,6 @@ entities:
     - pos: -8.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 188
@@ -1080,8 +878,6 @@ entities:
     - pos: -6.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 189
@@ -1089,8 +885,6 @@ entities:
     - pos: -4.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CrateMedicalSurgery
@@ -1111,7 +905,7 @@ entities:
       type: MeleeWeapon
     - nextSound: 888.1683213
       type: EmitSoundOnCollide
-- proto: GeneratorPlasma
+- proto: PortableGeneratorPacman
   entities:
   - uid: 67
     components:
diff --git a/Resources/WhiteMaps/D/dj_station.yml b/Resources/WhiteMaps/D/dj_station.yml
index 2e2a18f1c4..2fc71692df 100644
--- a/Resources/WhiteMaps/D/dj_station.yml
+++ b/Resources/WhiteMaps/D/dj_station.yml
@@ -182,8 +182,6 @@ entities:
     - pos: -11.5,-2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 250
@@ -191,8 +189,6 @@ entities:
     - pos: 14.5,-0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 251
@@ -200,8 +196,6 @@ entities:
     - pos: 12.5,-0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 252
@@ -209,8 +203,6 @@ entities:
     - pos: -13.5,-2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 253
@@ -218,8 +210,6 @@ entities:
     - pos: 14.5,-1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 254
@@ -227,8 +217,6 @@ entities:
     - pos: 12.5,0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 255
@@ -236,8 +224,6 @@ entities:
     - pos: 12.5,1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 256
@@ -245,8 +231,6 @@ entities:
     - pos: 12.5,2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 257
@@ -254,8 +238,6 @@ entities:
     - pos: 12.5,-1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 258
@@ -263,8 +245,6 @@ entities:
     - pos: 12.5,-2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 259
@@ -272,8 +252,6 @@ entities:
     - pos: -12.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 260
@@ -281,8 +259,6 @@ entities:
     - pos: -12.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 261
@@ -290,8 +266,6 @@ entities:
     - pos: -12.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 262
@@ -299,8 +273,6 @@ entities:
     - pos: -11.5,-1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 263
@@ -308,8 +280,6 @@ entities:
     - pos: 14.5,-2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 264
@@ -317,8 +287,6 @@ entities:
     - pos: -13.5,-1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 265
@@ -326,8 +294,6 @@ entities:
     - pos: -11.5,-0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 266
@@ -335,8 +301,6 @@ entities:
     - pos: 12.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 267
@@ -344,8 +308,6 @@ entities:
     - pos: -13.5,-0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 268
@@ -353,8 +315,6 @@ entities:
     - pos: 12.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 269
@@ -362,8 +322,6 @@ entities:
     - pos: -11.5,0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 270
@@ -371,8 +329,6 @@ entities:
     - pos: -11.5,1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 271
@@ -380,8 +336,6 @@ entities:
     - pos: -11.5,2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 272
@@ -389,8 +343,6 @@ entities:
     - pos: -11.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 273
@@ -398,8 +350,6 @@ entities:
     - pos: -13.5,0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 274
@@ -407,8 +357,6 @@ entities:
     - pos: -13.5,1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 275
@@ -416,8 +364,6 @@ entities:
     - pos: -13.5,2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 276
@@ -425,8 +371,6 @@ entities:
     - pos: -13.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 277
@@ -434,8 +378,6 @@ entities:
     - pos: 14.5,0.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 278
@@ -443,8 +385,6 @@ entities:
     - pos: 14.5,1.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 279
@@ -452,8 +392,6 @@ entities:
     - pos: 14.5,2.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 280
@@ -461,8 +399,6 @@ entities:
     - pos: 14.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 281
@@ -470,8 +406,6 @@ entities:
     - pos: 5.5,8.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 282
@@ -479,8 +413,6 @@ entities:
     - pos: 13.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 283
@@ -488,8 +420,6 @@ entities:
     - pos: 13.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 284
@@ -497,8 +427,6 @@ entities:
     - pos: 13.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 285
@@ -506,8 +434,6 @@ entities:
     - pos: 11.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 286
@@ -515,8 +441,6 @@ entities:
     - pos: 10.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 287
@@ -524,8 +448,6 @@ entities:
     - pos: 9.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 288
@@ -533,8 +455,6 @@ entities:
     - pos: 8.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 289
@@ -542,8 +462,6 @@ entities:
     - pos: 7.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 290
@@ -551,8 +469,6 @@ entities:
     - pos: 6.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 291
@@ -560,8 +476,6 @@ entities:
     - pos: 5.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 292
@@ -569,8 +483,6 @@ entities:
     - pos: 5.5,6.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 293
@@ -578,8 +490,6 @@ entities:
     - pos: 4.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 294
@@ -587,8 +497,6 @@ entities:
     - pos: -11.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 295
@@ -596,8 +504,6 @@ entities:
     - pos: -10.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 296
@@ -605,8 +511,6 @@ entities:
     - pos: -9.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 297
@@ -614,8 +518,6 @@ entities:
     - pos: -8.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 298
@@ -623,8 +525,6 @@ entities:
     - pos: -7.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 299
@@ -632,8 +532,6 @@ entities:
     - pos: -6.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 300
@@ -641,8 +539,6 @@ entities:
     - pos: -5.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 301
@@ -650,8 +546,6 @@ entities:
     - pos: -4.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 302
@@ -659,8 +553,6 @@ entities:
     - pos: -3.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 303
@@ -668,8 +560,6 @@ entities:
     - pos: -4.5,6.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 304
@@ -677,8 +567,6 @@ entities:
     - pos: -4.5,7.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 305
@@ -686,8 +574,6 @@ entities:
     - pos: -4.5,8.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 306
@@ -695,8 +581,6 @@ entities:
     - pos: -4.5,9.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 307
@@ -704,8 +588,6 @@ entities:
     - pos: -4.5,10.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 308
@@ -713,8 +595,6 @@ entities:
     - pos: -4.5,11.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 309
@@ -722,8 +602,6 @@ entities:
     - pos: -4.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 310
@@ -731,8 +609,6 @@ entities:
     - pos: -4.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 311
@@ -740,8 +616,6 @@ entities:
     - pos: 5.5,7.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 312
@@ -749,8 +623,6 @@ entities:
     - pos: 5.5,9.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 313
@@ -758,8 +630,6 @@ entities:
     - pos: 5.5,10.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 314
@@ -767,8 +637,6 @@ entities:
     - pos: 5.5,11.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 315
@@ -776,8 +644,6 @@ entities:
     - pos: 5.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 316
@@ -785,8 +651,6 @@ entities:
     - pos: 5.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 317
@@ -794,8 +658,6 @@ entities:
     - pos: 3.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 318
@@ -803,8 +665,6 @@ entities:
     - pos: 3.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 319
@@ -812,8 +672,6 @@ entities:
     - pos: 2.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 320
@@ -821,8 +679,6 @@ entities:
     - pos: 1.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 321
@@ -830,8 +686,6 @@ entities:
     - pos: 3.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 322
@@ -839,8 +693,6 @@ entities:
     - pos: 2.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 323
@@ -848,8 +700,6 @@ entities:
     - pos: 1.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 324
@@ -857,8 +707,6 @@ entities:
     - pos: 0.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 325
@@ -866,8 +714,6 @@ entities:
     - pos: -0.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 326
@@ -875,8 +721,6 @@ entities:
     - pos: -1.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 327
@@ -884,8 +728,6 @@ entities:
     - pos: -2.5,12.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 328
@@ -893,8 +735,6 @@ entities:
     - pos: -0.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 329
@@ -902,8 +742,6 @@ entities:
     - pos: -1.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 330
@@ -911,8 +749,6 @@ entities:
     - pos: -2.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 331
@@ -920,8 +756,6 @@ entities:
     - pos: -2.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 332
@@ -929,8 +763,6 @@ entities:
     - pos: -3.5,13.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 333
@@ -938,8 +770,6 @@ entities:
     - pos: 0.5,14.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 334
@@ -947,8 +777,6 @@ entities:
     - pos: 0.5,15.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 335
@@ -956,8 +784,6 @@ entities:
     - pos: -2.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 336
@@ -965,8 +791,6 @@ entities:
     - pos: -1.5,5.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 337
@@ -974,8 +798,6 @@ entities:
     - pos: -1.5,6.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 338
@@ -983,8 +805,6 @@ entities:
     - pos: -0.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 348
@@ -992,8 +812,6 @@ entities:
     - pos: -1.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 349
@@ -1002,8 +820,6 @@ entities:
       pos: -21.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CableMV
@@ -1013,8 +829,6 @@ entities:
     - pos: -0.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 342
@@ -1029,8 +843,6 @@ entities:
     - pos: 0.5,3.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 344
@@ -1038,8 +850,6 @@ entities:
     - pos: 0.5,4.5
       parent: 2
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 345
diff --git a/Resources/WhiteMaps/D/dobivalka.yml b/Resources/WhiteMaps/D/dobivalka.yml
index 6f232a6fd7..b97d37be2e 100644
--- a/Resources/WhiteMaps/D/dobivalka.yml
+++ b/Resources/WhiteMaps/D/dobivalka.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   68: FloorSteel
   71: FloorSteelDirty
   93: Lattice
@@ -436,8 +436,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 30
@@ -445,8 +443,6 @@ entities:
     - pos: 1.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 31
@@ -454,8 +450,6 @@ entities:
     - pos: 1.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 44
@@ -463,8 +457,6 @@ entities:
     - pos: -0.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 46
@@ -493,8 +485,6 @@ entities:
     - pos: 0.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 74
@@ -502,8 +492,6 @@ entities:
     - pos: 3.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 75
@@ -511,8 +499,6 @@ entities:
     - pos: 1.5,1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 76
@@ -520,8 +506,6 @@ entities:
     - pos: 1.5,2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 89
@@ -529,8 +513,6 @@ entities:
     - pos: 4.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 92
@@ -538,8 +520,6 @@ entities:
     - pos: 0.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 93
@@ -547,8 +527,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 94
@@ -570,8 +548,6 @@ entities:
     - pos: 3.5,-5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 97
@@ -579,8 +555,6 @@ entities:
     - pos: 3.5,-6.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 98
@@ -588,8 +562,6 @@ entities:
     - pos: 3.5,-7.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 99
@@ -597,8 +569,6 @@ entities:
     - pos: 3.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: Catwalk
diff --git a/Resources/WhiteMaps/D/mining_station.yml b/Resources/WhiteMaps/D/mining_station.yml
index 52605a844d..1877e9f357 100644
--- a/Resources/WhiteMaps/D/mining_station.yml
+++ b/Resources/WhiteMaps/D/mining_station.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   10: FloorAsteroidSand
   68: FloorSteel
   71: FloorSteelDirty
@@ -548,8 +548,6 @@ entities:
     - pos: 2.5,5.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: CigaretteSpent
diff --git a/Resources/WhiteMaps/D/musorka.yml b/Resources/WhiteMaps/D/musorka.yml
index abd278c78a..f697302b9a 100644
--- a/Resources/WhiteMaps/D/musorka.yml
+++ b/Resources/WhiteMaps/D/musorka.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   68: FloorSteel
   71: FloorSteelDirty
   93: Lattice
@@ -1085,8 +1085,6 @@ entities:
     - pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 210
@@ -1101,8 +1099,6 @@ entities:
     - pos: 2.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 212
@@ -1110,8 +1106,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 225
@@ -1119,8 +1113,6 @@ entities:
     - pos: 6.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 226
@@ -1149,8 +1141,6 @@ entities:
     - pos: 3.5,-4.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
 - proto: Catwalk
@@ -1307,8 +1297,6 @@ entities:
       pos: 1.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 1290.3621632
       type: EmitSoundOnCollide
   - uid: 146
@@ -1327,8 +1315,6 @@ entities:
       pos: 2.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 1378.9669987
       type: EmitSoundOnCollide
   - uid: 241
@@ -1336,8 +1322,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - nextSound: 1377.0344677
       type: EmitSoundOnCollide
 - proto: GasPipeStraight
diff --git a/Resources/WhiteMaps/D/shuttle.yml b/Resources/WhiteMaps/D/shuttle.yml
index 7a5649570e..b877c15310 100644
--- a/Resources/WhiteMaps/D/shuttle.yml
+++ b/Resources/WhiteMaps/D/shuttle.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   65: FloorShuttleWhite
   94: Plating
 entities:
@@ -821,8 +821,6 @@ entities:
     - pos: 5.5,0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 168
@@ -858,8 +856,6 @@ entities:
     - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 173
@@ -874,8 +870,6 @@ entities:
     - pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 175
@@ -904,8 +898,6 @@ entities:
     - pos: 8.5,-0.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 179
@@ -913,8 +905,6 @@ entities:
     - pos: 8.5,-3.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 180
diff --git a/Resources/WhiteMaps/D/shuttle2.yml b/Resources/WhiteMaps/D/shuttle2.yml
index c2d3635272..9bafc5d9c7 100644
--- a/Resources/WhiteMaps/D/shuttle2.yml
+++ b/Resources/WhiteMaps/D/shuttle2.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   78: FloorTechMaint
   81: FloorWhite
   93: Lattice
@@ -841,8 +841,6 @@ entities:
     - pos: 5.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 205
@@ -850,8 +848,6 @@ entities:
     - pos: 6.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 206
@@ -859,8 +855,6 @@ entities:
     - pos: 6.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 207
@@ -884,8 +878,6 @@ entities:
     - pos: 5.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 201
@@ -893,8 +885,6 @@ entities:
     - pos: 6.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 202
@@ -1082,8 +1072,7 @@ entities:
   entities:
   - uid: 45
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+    - pos: 2.5,-0.5
       parent: 1
       type: Transform
 - proto: PartRodMetal1
diff --git a/Resources/WhiteMaps/D/shuttle3.yml b/Resources/WhiteMaps/D/shuttle3.yml
index d8f2078098..bb7d9cf6db 100644
--- a/Resources/WhiteMaps/D/shuttle3.yml
+++ b/Resources/WhiteMaps/D/shuttle3.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   5: FloorAsteroidCoarseSandDug
   80: FloorTechMaint3
   93: Lattice
@@ -763,7 +763,7 @@ entities:
       type: Transform
     - nextSound: 565.1570556
       type: EmitSoundOnCollide
-- proto: GeneratorPlasma
+- proto: PortableGeneratorPacman
   entities:
   - uid: 5
     components:
diff --git a/Resources/WhiteMaps/D/space_hospital.yml b/Resources/WhiteMaps/D/space_hospital.yml
index 96607992a2..317f9a6739 100644
--- a/Resources/WhiteMaps/D/space_hospital.yml
+++ b/Resources/WhiteMaps/D/space_hospital.yml
@@ -462,8 +462,7 @@ entities:
   entities:
   - uid: 104
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,9.5
+    - pos: -2.5,9.5
       parent: 1
       type: Transform
 - proto: Pen
@@ -1288,7 +1287,7 @@ entities:
       pos: 5.5,6.5
       parent: 1
       type: Transform
-- proto: WindoorMedicalLocked
+- proto: WindoorSecureMedicalLocked
   entities:
   - uid: 67
     components:
diff --git a/Resources/WhiteMaps/D/stolovka.yml b/Resources/WhiteMaps/D/stolovka.yml
index 8e4262dd46..38d5704750 100644
--- a/Resources/WhiteMaps/D/stolovka.yml
+++ b/Resources/WhiteMaps/D/stolovka.yml
@@ -3,7 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  4: FloorAsteroidCoarseSand0
+  4: FloorAsteroidSand
   11: FloorAsteroidTile
   68: FloorSteel
   71: FloorSteelDirty
diff --git a/Resources/WhiteMaps/D/stolovka2.yml b/Resources/WhiteMaps/D/stolovka2.yml
index bea06eb873..fdafef64f6 100644
--- a/Resources/WhiteMaps/D/stolovka2.yml
+++ b/Resources/WhiteMaps/D/stolovka2.yml
@@ -157,8 +157,6 @@ entities:
     - pos: 1.5,-2.5
       parent: 1
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 57