From d94ee127be641d8c31d6c7b86659af81724145b5 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 05:32:14 +0500
Subject: [PATCH 01/10] =?UTF-8?q?=D0=9A=D0=B2=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestBoardBoundUserInterface.cs           |  35 ++
 .../QuestInstance/QuestBoardWindow.xaml       |  46 ++
 .../QuestInstance/QuestBoardWindow.xaml.cs    |  49 ++
 .../QuestInstance/QuestBoardComponent.cs      |  12 +
 .../QuestInstancePresetPrototype.cs           |  77 +++
 .../QuestInstance/QuestInstanceSystem.cs      | 527 ++++++++++++++++++
 .../QuestInstance/QuestSignpostComponent.cs   |  17 +
 .../Magnits/QuestInstance/QuestBoardUi.cs     |  57 ++
 .../_Nuclear14/Magnits/quest-instance.ftl     |  36 ++
 .../_Nuclear14/Magnits/quest_entities.yml     | 127 +++++
 .../Magnits/quest_instance_presets.yml        |  80 +++
 11 files changed, 1063 insertions(+)
 create mode 100644 Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
 create mode 100644 Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
 create mode 100644 Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
 create mode 100644 Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
 create mode 100644 Resources/Locale/ru-RU/_Nuclear14/Magnits/quest-instance.ftl
 create mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
 create mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml

diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs b/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
new file mode 100644
index 0000000000..554cf725e4
--- /dev/null
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Magnits.QuestInstance;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Magnits.QuestInstance;
+
+[UsedImplicitly]
+public sealed class QuestBoardBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private QuestBoardWindow? _window;
+
+    public QuestBoardBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<QuestBoardWindow>();
+        _window.OpenCentered();
+
+        _window.OnDifficultySelected += difficulty =>
+        {
+            SendMessage(new QuestBoardSelectDifficultyMessage(difficulty));
+        };
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is QuestBoardBoundUserInterfaceState s)
+            _window?.UpdateState(s);
+    }
+}
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
new file mode 100644
index 0000000000..500c61ec9b
--- /dev/null
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
@@ -0,0 +1,46 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                     MinSize="300 260"
+                     Title="{Loc 'quest-board-title'}">
+    <BoxContainer Orientation="Vertical" Margin="8">
+
+        <!-- Status line -->
+        <Label Name="StatusLabel"
+               Text=""
+               HorizontalAlignment="Center"
+               Margin="0 0 0 6"/>
+
+        <controls:HLine Color="#404040" Thickness="1" Margin="0 0 0 8"/>
+
+        <!-- CREATE — visible when no active instance -->
+        <BoxContainer Name="CreateBox" Orientation="Vertical">
+            <Label Text="{Loc 'quest-board-select-difficulty'}"
+                   HorizontalAlignment="Center"
+                   Margin="0 0 0 6"/>
+            <Button Name="EasyButton"
+                    Text="{Loc 'quest-board-easy'}"
+                    HorizontalExpand="True"
+                    Margin="4 2"/>
+            <Button Name="MediumButton"
+                    Text="{Loc 'quest-board-medium'}"
+                    HorizontalExpand="True"
+                    Margin="4 2"/>
+            <Button Name="HardButton"
+                    Text="{Loc 'quest-board-hard'}"
+                    HorizontalExpand="True"
+                    Margin="4 2"/>
+        </BoxContainer>
+
+        <!-- JOIN — visible when instance already active -->
+        <BoxContainer Name="JoinBox" Orientation="Vertical" Visible="False">
+            <Label Text="{Loc 'quest-board-instance-active'}"
+                   HorizontalAlignment="Center"
+                   Margin="0 0 0 6"/>
+            <Button Name="JoinButton"
+                    Text="{Loc 'quest-board-join'}"
+                    HorizontalExpand="True"
+                    Margin="4 2"/>
+        </BoxContainer>
+
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
new file mode 100644
index 0000000000..e5776acfe2
--- /dev/null
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
@@ -0,0 +1,49 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Magnits.QuestInstance;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Magnits.QuestInstance;
+
+[GenerateTypedNameReferences]
+public sealed partial class QuestBoardWindow : FancyWindow
+{
+    // Fired when the player presses Easy / Medium / Hard or the Join button.
+    public event Action<QuestDifficulty>? OnDifficultySelected;
+
+    public QuestBoardWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        EasyButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
+        MediumButton.OnPressed += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Medium);
+        HardButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Hard);
+        // Join always sends Easy — server ignores difficulty when instance exists.
+        JoinButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
+    }
+
+    /// <summary>Refreshes the window layout to reflect the latest BUI state.</summary>
+    public void UpdateState(QuestBoardBoundUserInterfaceState state)
+    {
+        if (state.HasActiveInstance)
+        {
+            CreateBox.Visible = false;
+            JoinBox.Visible   = true;
+
+            var minutes = state.RemainingSeconds / 60;
+            var seconds = state.RemainingSeconds % 60;
+            StatusLabel.Text = Loc.GetString(
+                "quest-board-status-active",
+                ("players", state.ParticipantCount),
+                ("minutes", minutes),
+                ("seconds", seconds));
+        }
+        else
+        {
+            CreateBox.Visible = true;
+            JoinBox.Visible   = false;
+            StatusLabel.Text  = Loc.GetString("quest-board-status-idle");
+        }
+    }
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs b/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
new file mode 100644
index 0000000000..f7e9a7b5c4
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Magnits.QuestInstance;
+
+/// <summary>
+/// Marks an entity as a Quest Board.
+/// QuestInstanceSystem enforces at most one active instance per board.
+/// Call <c>QuestInstanceSystem.StartOrJoinInstance(boardUid, session, difficulty)</c>
+/// from a UI or interaction handler to create or join an instance.
+/// </summary>
+[RegisterComponent]
+public sealed partial class QuestBoardComponent : Component { }
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
new file mode 100644
index 0000000000..5360e58ae4
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
@@ -0,0 +1,77 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Magnits.QuestInstance;
+
+[Prototype("questInstancePreset")]
+public sealed partial class QuestInstancePresetPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; set; } = default!;
+
+    /// <summary>
+    /// BiomeTemplatePrototype ID to apply to the generated map.
+    /// If mapPaths/optionalMapPath are also set, biome is still applied as a background.
+    /// </summary>
+    [DataField]
+    public string? BiomeTemplateId;
+
+    /// <summary>Seconds the instance lives before force-evacuation and deletion.</summary>
+    [DataField]
+    public int TimeLimitSeconds = 900;
+
+    /// <summary>
+    /// Extra tile-units added outside the grid AABB when computing the barrier ring radius.
+    /// For a fresh biome map (empty grid) the radius is 1 + BarrierPadding.
+    /// </summary>
+    [DataField]
+    public int BarrierPadding = 100;
+
+    /// <summary>
+    /// Hard cap for computed barrier radius to avoid spawning excessive wall entities.
+    /// </summary>
+    [DataField]
+    public int MaxBarrierRadius = 256;
+
+    /// <summary>
+    /// List of pre-built map files (.yml) to pick randomly from on each instance creation.
+    /// Takes priority over <see cref="OptionalMapPath"/>.
+    /// </summary>
+    [DataField]
+    public List<ResPath> MapPaths = new();
+
+    /// <summary>
+    /// Single pre-built map file (.yml). Used when <see cref="MapPaths"/> is empty.
+    /// </summary>
+    [DataField]
+    public ResPath? OptionalMapPath;
+
+    /// <summary>Entity prototype spawned near the entry point as the exit signpost.</summary>
+    [DataField]
+    public string ExitSignpostProto = "QuestSignpost";
+
+    /// <summary>Entity prototype used for each invisible barrier wall tile on the perimeter.</summary>
+    [DataField]
+    public string BarrierProto = "QuestInvisibleWall";
+
+    /// <summary>
+    /// Spawn offset (in tiles) from the loaded grid's right edge.
+    /// Used so players appear near the grid, not directly on top of it.
+    /// </summary>
+    [DataField]
+    public float SpawnDistanceFromGrid = 3f;
+
+    /// <summary>
+    /// Remaining-seconds thresholds at which popup warnings are sent to players.
+    /// </summary>
+    [DataField]
+    public int[] WarningThresholdsSeconds = { 60, 30, 10 };
+
+    /// <summary>
+    /// Seconds after instance creation during which players not in Participants may still join.
+    /// After this window, only returning participants are allowed.
+    /// </summary>
+    [DataField]
+    public int JoinWindowSeconds = 120;
+}
+
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
new file mode 100644
index 0000000000..667611a3eb
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
@@ -0,0 +1,527 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Parallax;
+using Content.Shared.Atmos;
+using Content.Shared.Interaction;
+using Content.Shared.Gravity;
+using Content.Shared.Magnits.QuestInstance;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.Popups;
+using Content.Shared.UserInterface;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.EntitySerialization.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+
+namespace Content.Server.Magnits.QuestInstance;
+
+
+public sealed class QuestInstanceSystem : EntitySystem
+{
+    // One active instance per board entity.
+    private readonly Dictionary<EntityUid, QuestInstance> _activeInstanceByBoard = new();
+    [Dependency] private readonly AtmosphereSystem _atmos = default!;
+    [Dependency] private readonly BiomeSystem _biome = default!;
+    [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<QuestBoardComponent, EntityTerminatingEvent>(OnBoardTerminating);
+        SubscribeLocalEvent<QuestBoardComponent, AfterActivatableUIOpenEvent>(OnBoardUiOpened);
+        SubscribeLocalEvent<QuestBoardComponent, QuestBoardSelectDifficultyMessage>(OnBoardSelectDifficulty);
+        SubscribeLocalEvent<QuestSignpostComponent, InteractHandEvent>(OnSignpostUsed);
+    }
+
+    private static string DifficultyToPresetId(QuestDifficulty difficulty) =>
+        difficulty switch
+        {
+            QuestDifficulty.Easy => "QuestInstanceEasy",
+            QuestDifficulty.Medium => "QuestInstanceMedium",
+            QuestDifficulty.Hard => "QuestInstanceHard",
+            _ => "QuestInstanceEasy"
+        };
+
+    public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, QuestDifficulty difficulty)
+    {
+        if (_activeInstanceByBoard.TryGetValue(boardUid, out var existing))
+        {
+            var curTime = _timing.CurTime;
+            var alreadyParticipant = existing.Participants.Contains(session.UserId);
+
+            if (curTime >= existing.EndAt)
+            {
+                _popup.PopupEntity(
+                    Loc.GetString("quest-instance-expired"),
+                    session.AttachedEntity ?? boardUid,
+                    session);
+                return;
+            }
+
+            if (!alreadyParticipant && curTime > existing.JoinUntil)
+            {
+                _popup.PopupEntity(
+                    Loc.GetString("quest-instance-join-closed", ("seconds", existing.JoinWindowSeconds)),
+                    session.AttachedEntity ?? boardUid,
+                    session);
+                return;
+            }
+
+            // Guard: player already on the instance map.
+            if (alreadyParticipant && session.AttachedEntity is { } attachedEnt)
+            {
+                if (Transform(attachedEnt).MapUid == existing.MapUid)
+                    return;
+            }
+
+            JoinInstance(existing, session);
+            SendBoardState(boardUid);
+            return;
+        }
+
+        var presetId = DifficultyToPresetId(difficulty);
+        if (!_proto.TryIndex<QuestInstancePresetPrototype>(presetId, out var preset))
+        {
+            Log.Error($"QuestInstanceSystem: preset '{presetId}' not found.");
+            return;
+        }
+
+        var instance = CreateInstance(boardUid, preset);
+        if (instance == null)
+            return;
+
+        _activeInstanceByBoard[boardUid] = instance;
+        JoinInstance(instance, session);
+        SendBoardState(boardUid);
+    }
+
+    private QuestInstance? CreateInstance(EntityUid boardUid, QuestInstancePresetPrototype preset)
+    {
+        // Resolve which map file to load, if any.
+        var mapPath = preset.MapPaths.Count > 0
+            ? _random.Pick(preset.MapPaths)
+            : preset.OptionalMapPath;
+
+        // Always create a dedicated map so biome + loaded grid can coexist.
+        var mapUid = _mapSystem.CreateMap(out var mapId, false);
+
+        if (preset.BiomeTemplateId != null && !ApplyBiome(mapUid, preset))
+        {
+            Del(mapUid);
+            return null;
+        }
+
+        EntityUid gridUid;
+
+        if (mapPath != null)
+        {
+            // Load salvage grid into this map.
+            if (!_mapLoader.TryLoadGrid(mapId, mapPath.Value, out var loadedGrid))
+            {
+                Log.Error($"QuestInstanceSystem: failed to load grid '{mapPath}'.");
+                Del(mapUid);
+                return null;
+            }
+
+            gridUid = loadedGrid.Value;
+        }
+        else
+        {
+            // Biome-only instance.
+            if (preset.BiomeTemplateId == null)
+            {
+                Log.Error(
+                    $"QuestInstanceSystem: preset '{preset.ID}' has no MapPaths, OptionalMapPath, or BiomeTemplateId.");
+                Del(mapUid);
+                return null;
+            }
+
+            gridUid = mapUid;
+        }
+
+        ForceGridEnvironment(mapUid, gridUid);
+        _mapSystem.InitializeMap(mapId);
+
+        var spawnCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
+
+        var now = _timing.CurTime;
+        var instance = new QuestInstance
+        {
+            BoardUid = boardUid,
+            MapUid = mapUid,
+            SpawnCoords = spawnCoords,
+            JoinWindowSeconds = preset.JoinWindowSeconds,
+            WarningThresholdsSeconds = preset.WarningThresholdsSeconds,
+            JoinUntil = now + TimeSpan.FromSeconds(preset.JoinWindowSeconds),
+            EndAt = now + TimeSpan.FromSeconds(preset.TimeLimitSeconds)
+        };
+
+        var signpost = Spawn(preset.ExitSignpostProto, spawnCoords);
+        var signpostComp = EnsureComp<QuestSignpostComponent>(signpost);
+        signpostComp.BoardUid = boardUid;
+
+        var barrierRadius = Math.Clamp(
+            ComputeBarrierRadius(gridUid, preset),
+            1,
+            Math.Max(1, preset.MaxBarrierRadius));
+        SpawnSquareBarrier(gridUid, preset, barrierRadius);
+
+        return instance;
+    }
+
+    private void JoinInstance(QuestInstance instance, ICommonSession session)
+    {
+        if (session.AttachedEntity is not { } playerEnt)
+            return;
+
+        var playerXform = Transform(playerEnt);
+
+        // Save latest return point when joining from outside the instance map.
+        if (playerXform.MapUid != instance.MapUid)
+            instance.ReturnCoords[session.UserId] = playerXform.Coordinates;
+
+        instance.Participants.Add(session.UserId);
+
+        _transform.SetCoordinates(playerEnt, instance.SpawnCoords);
+    }
+
+    private bool ExitPlayer(ICommonSession session, QuestInstance instance)
+    {
+        if (session.AttachedEntity is not { } playerEnt)
+            return true;
+
+        if (instance.ReturnCoords.TryGetValue(session.UserId, out var returnCoords))
+        {
+            instance.ReturnCoords.Remove(session.UserId);
+            _transform.SetCoordinates(playerEnt, returnCoords);
+            return true;
+        }
+
+        var fallback = GetBoardFallbackCoordinates(instance.BoardUid);
+        if (fallback == EntityCoordinates.Invalid)
+        {
+            Log.Warning($"QuestInstanceSystem: no ReturnCoords and no valid board fallback for {session.UserId}.");
+            return false;
+        }
+
+        Log.Warning($"QuestInstanceSystem: no ReturnCoords for {session.UserId}, using board fallback.");
+        _transform.SetCoordinates(playerEnt, fallback);
+        return true;
+    }
+
+    private void TryCleanupIfEmpty(EntityUid boardUid, QuestInstance instance)
+    {
+        if (GetPlayersInInstanceMap(instance).Count > 0)
+            return;
+
+        CleanupInstance(boardUid, instance);
+    }
+
+    private void ForceCloseInstance(EntityUid boardUid, QuestInstance instance)
+    {
+        var everyoneEvacuated = true;
+
+        foreach (var session in GetPlayersInInstanceMap(instance))
+            everyoneEvacuated &= ExitPlayer(session, instance);
+
+        if (!everyoneEvacuated)
+        {
+            Log.Warning(
+                $"QuestInstanceSystem: aborting cleanup for board {boardUid} because not all players could be evacuated.");
+            return;
+        }
+
+        CleanupInstance(boardUid, instance);
+    }
+
+    private void CleanupInstance(EntityUid boardUid, QuestInstance instance)
+    {
+        if (!Deleted(instance.MapUid))
+            Del(instance.MapUid);
+
+        _activeInstanceByBoard.Remove(boardUid);
+
+        if (!Deleted(boardUid) && !Terminating(boardUid))
+            SendBoardState(boardUid);
+    }
+
+    public override void Update(float frameTime)
+    {
+        if (_activeInstanceByBoard.Count == 0)
+            return;
+
+        var curTime = _timing.CurTime;
+
+        List<EntityUid>? toClose = null;
+
+        foreach (var (boardUid, instance) in _activeInstanceByBoard)
+        {
+            var remaining = instance.EndAt - curTime;
+            SendWarningPopups(instance, remaining);
+
+            if (remaining <= TimeSpan.Zero)
+            {
+                toClose ??= new();
+                toClose.Add(boardUid);
+            }
+        }
+
+        if (toClose == null)
+            return;
+
+        foreach (var boardUid in toClose)
+            if (_activeInstanceByBoard.TryGetValue(boardUid, out var instance))
+                ForceCloseInstance(boardUid, instance);
+    }
+
+    private bool ApplyBiome(EntityUid mapUid, QuestInstancePresetPrototype preset)
+    {
+        if (preset.BiomeTemplateId == null)
+            return false;
+
+        if (!_proto.TryIndex<BiomeTemplatePrototype>(preset.BiomeTemplateId, out var template))
+        {
+            Log.Error($"QuestInstanceSystem: biome template '{preset.BiomeTemplateId}' not found.");
+            return false;
+        }
+
+        _biome.EnsurePlanet(mapUid, template, _random.Next());
+        return true;
+    }
+
+    private EntityCoordinates ComputeSpawnCoordinates(
+        EntityUid mapUid,
+        EntityUid gridUid,
+        QuestInstancePresetPrototype preset
+    )
+    {
+        if (!TryComp<MapGridComponent>(gridUid, out var gridComp) || gridComp.LocalAABB.IsEmpty())
+            return new(mapUid, new(0.5f, 0.5f));
+
+        var aabb = gridComp.LocalAABB;
+        var offset = MathF.Max(1f, preset.SpawnDistanceFromGrid);
+
+        // Spawn near the loaded grid, but just outside its right edge.
+        var nearGrid = new EntityCoordinates(gridUid, new(aabb.Right + offset, aabb.Center.Y));
+
+        // Prefer map coordinates when map has a biome grid; otherwise keep grid-local coords.
+        if (TryComp<MapGridComponent>(mapUid, out _))
+        {
+            var mapCoords = _transform.ToMapCoordinates(nearGrid);
+            return new(mapUid, mapCoords.Position);
+        }
+
+        return nearGrid;
+    }
+
+    private EntityCoordinates GetBoardFallbackCoordinates(EntityUid boardUid)
+    {
+        if (Deleted(boardUid))
+            return EntityCoordinates.Invalid;
+
+        var boardXform = Transform(boardUid);
+        return boardXform.MapUid == null
+            ? EntityCoordinates.Invalid
+            : boardXform.Coordinates;
+    }
+
+
+    private void ForceGridEnvironment(EntityUid mapUid, EntityUid gridUid)
+    {
+        var mapGravity = EnsureComp<GravityComponent>(mapUid);
+        mapGravity.Enabled = true;
+        mapGravity.Inherent = true;
+        Dirty(mapUid, mapGravity);
+
+        var gridGravity = EnsureComp<GravityComponent>(gridUid);
+        gridGravity.Enabled = true;
+        gridGravity.Inherent = true;
+        Dirty(gridUid, gridGravity);
+
+        EnsureComp<GridAtmosphereComponent>(gridUid);
+
+        var moles = new float[Atmospherics.AdjustedNumberOfGases];
+        moles[(int) Gas.Oxygen] = 21.824779f;
+        moles[(int) Gas.Nitrogen] = 82.10312f;
+
+        _atmos.SetMapAtmosphere(mapUid, false, new GasMixture(moles, Atmospherics.T20C));
+    }
+    private int ComputeBarrierRadius(EntityUid gridUid, QuestInstancePresetPrototype preset)
+    {
+        var padding = Math.Max(0, preset.BarrierPadding);
+
+        if (!TryComp<MapGridComponent>(gridUid, out var grid))
+            return 1 + padding;
+
+        var aabb = grid.LocalAABB;
+        var tileSize = (float) grid.TileSize;
+
+        if (aabb.Width <= tileSize && aabb.Height <= tileSize)
+            return 1 + padding;
+
+        var minX = (int) MathF.Floor(aabb.Left / tileSize);
+        var maxX = (int) MathF.Ceiling(aabb.Right / tileSize) - 1;
+        var minY = (int) MathF.Floor(aabb.Bottom / tileSize);
+        var maxY = (int) MathF.Ceiling(aabb.Top / tileSize) - 1;
+
+        var baseRadius = Math.Max(
+            Math.Max(Math.Abs(minX), Math.Abs(maxX)),
+            Math.Max(Math.Abs(minY), Math.Abs(maxY)));
+
+        if (baseRadius < 1)
+            baseRadius = 1;
+
+        return baseRadius + padding;
+    }
+
+    private void SpawnSquareBarrier(EntityUid gridUid, QuestInstancePresetPrototype preset, int r)
+    {
+        for (var x = -r; x <= r; x++)
+        {
+            Spawn(preset.BarrierProto, new(gridUid, new(x + 0.5f, -r + 0.5f)));
+            Spawn(preset.BarrierProto, new(gridUid, new(x + 0.5f, r + 0.5f)));
+        }
+
+        for (var y = -r + 1; y <= r - 1; y++)
+        {
+            Spawn(preset.BarrierProto, new(gridUid, new(-r + 0.5f, y + 0.5f)));
+            Spawn(preset.BarrierProto, new(gridUid, new(r + 0.5f, y + 0.5f)));
+        }
+    }
+
+    private List<ICommonSession> GetPlayersInInstanceMap(QuestInstance instance)
+    {
+        var result = new List<ICommonSession>();
+
+        foreach (var session in _playerManager.Sessions)
+        {
+            if (session.AttachedEntity is not { } ent)
+                continue;
+
+            if (Transform(ent).MapUid == instance.MapUid)
+                result.Add(session);
+        }
+
+        return result;
+    }
+
+    private void SendWarningPopups(QuestInstance instance, TimeSpan remaining)
+    {
+        List<ICommonSession>? playersInMap = null;
+
+        foreach (var threshold in instance.WarningThresholdsSeconds)
+        {
+            if (remaining.TotalSeconds > threshold)
+                continue;
+
+            if (!instance.SentWarnings.Add(threshold))
+                continue;
+
+            var msg = Loc.GetString("quest-instance-warning", ("seconds", threshold));
+            playersInMap ??= GetPlayersInInstanceMap(instance);
+
+            foreach (var session in playersInMap)
+                if (session.AttachedEntity is { } ent)
+                    _popup.PopupEntity(msg, ent, session, PopupType.LargeCaution);
+        }
+    }
+
+    private void OnSignpostUsed(EntityUid uid, QuestSignpostComponent comp, InteractHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!TryComp<ActorComponent>(args.User, out var actor))
+            return;
+
+        if (!_activeInstanceByBoard.TryGetValue(comp.BoardUid, out var instance))
+            return;
+
+        args.Handled = true;
+
+        ExitPlayer(actor.PlayerSession, instance);
+        TryCleanupIfEmpty(comp.BoardUid, instance);
+        SendBoardState(comp.BoardUid);
+    }
+
+    private void OnBoardTerminating(EntityUid uid, QuestBoardComponent comp, EntityTerminatingEvent args)
+    {
+        if (!_activeInstanceByBoard.TryGetValue(uid, out var instance))
+            return;
+
+        ForceCloseInstance(uid, instance);
+    }
+
+    private void OnBoardUiOpened(EntityUid uid, QuestBoardComponent comp, AfterActivatableUIOpenEvent args) =>
+        SendBoardState(uid);
+
+    private void OnBoardSelectDifficulty(
+        EntityUid uid,
+        QuestBoardComponent comp,
+        QuestBoardSelectDifficultyMessage msg
+    )
+    {
+        if (!TryComp<ActorComponent>(msg.Actor, out var actor))
+            return;
+
+        StartOrJoinInstance(uid, actor.PlayerSession, msg.Difficulty);
+        SendBoardState(uid);
+    }
+
+    private void SendBoardState(EntityUid boardUid)
+    {
+        QuestBoardBoundUserInterfaceState state;
+
+        if (_activeInstanceByBoard.TryGetValue(boardUid, out var instance))
+        {
+            var remaining = instance.EndAt - _timing.CurTime;
+            state = new(
+                true,
+                Math.Max(0, (int) remaining.TotalSeconds),
+                GetPlayersInInstanceMap(instance).Count);
+        }
+        else
+            state = new(false, 0, 0);
+
+        _ui.SetUiState(boardUid, QuestBoardUiKey.Key, state);
+    }
+
+    private sealed class QuestInstance
+    {
+        // All NetUserIds who have ever entered this instance (for rejoin checks).
+        public readonly HashSet<NetUserId> Participants = new();
+
+        // Saved world coordinates to return each player to on exit.
+        public readonly Dictionary<NetUserId, EntityCoordinates> ReturnCoords = new();
+
+        // Which WarningThresholdsSeconds values have already triggered a popup.
+        public readonly HashSet<int> SentWarnings = new();
+        public EntityUid BoardUid;
+        public TimeSpan EndAt;
+        public TimeSpan JoinUntil;
+        public int JoinWindowSeconds;
+        public EntityUid MapUid;
+        public EntityCoordinates SpawnCoords;
+        public int[] WarningThresholdsSeconds = new int[0];
+    }
+}
+
+
+
+
+
diff --git a/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs b/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
new file mode 100644
index 0000000000..84228661fa
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
@@ -0,0 +1,17 @@
+namespace Content.Server.Magnits.QuestInstance;
+
+/// <summary>
+/// Placed at the center of a quest instance (tile 0,0).
+/// When a player interacts with this entity, QuestInstanceSystem teleports them
+/// back to their saved origin and removes them from the instance.
+/// </summary>
+[RegisterComponent]
+public sealed partial class QuestSignpostComponent : Component
+{
+    /// <summary>
+    /// The QuestBoard entity (with <see cref="QuestBoardComponent"/>) that spawned this instance.
+    /// Used to look up the active <c>QuestInstance</c> in QuestInstanceSystem.
+    /// </summary>
+    [DataField]
+    public EntityUid BoardUid;
+}
diff --git a/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs b/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
new file mode 100644
index 0000000000..13ffd98c18
--- /dev/null
+++ b/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
@@ -0,0 +1,57 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Magnits.QuestInstance;
+
+/// <summary>Difficulty tiers for quest instances.</summary>
+[Serializable, NetSerializable]
+public enum QuestDifficulty { Easy, Medium, Hard }
+
+/// <summary>BUI key — one entry per QuestBoard entity.</summary>
+[Serializable, NetSerializable]
+public enum QuestBoardUiKey { Key }
+
+// ──────────────────────────── State ────────────────────────────────────────
+
+/// <summary>
+/// Sent from server to client whenever the board state changes or the UI opens.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class QuestBoardBoundUserInterfaceState : BoundUserInterfaceState
+{
+    /// <summary>True when an instance is currently active for this board.</summary>
+    public bool HasActiveInstance;
+
+    /// <summary>Seconds until force-close. Only meaningful when HasActiveInstance.</summary>
+    public int RemainingSeconds;
+
+    /// <summary>Number of players physically present in the instance.</summary>
+    public int ParticipantCount;
+
+    public QuestBoardBoundUserInterfaceState(
+        bool hasActiveInstance,
+        int remainingSeconds,
+        int participantCount)
+    {
+        HasActiveInstance = hasActiveInstance;
+        RemainingSeconds  = remainingSeconds;
+        ParticipantCount  = participantCount;
+    }
+}
+
+// ──────────────────────────── Messages ─────────────────────────────────────
+
+/// <summary>
+/// Sent from client when the player presses Easy / Medium / Hard
+/// (create a new instance) or the Join button (join existing instance;
+/// Difficulty field is ignored server-side if an instance already exists).
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class QuestBoardSelectDifficultyMessage : BoundUserInterfaceMessage
+{
+    public QuestDifficulty Difficulty;
+
+    public QuestBoardSelectDifficultyMessage(QuestDifficulty difficulty)
+    {
+        Difficulty = difficulty;
+    }
+}
diff --git a/Resources/Locale/ru-RU/_Nuclear14/Magnits/quest-instance.ftl b/Resources/Locale/ru-RU/_Nuclear14/Magnits/quest-instance.ftl
new file mode 100644
index 0000000000..69e850e34a
--- /dev/null
+++ b/Resources/Locale/ru-RU/_Nuclear14/Magnits/quest-instance.ftl
@@ -0,0 +1,36 @@
+## Quest Instance System
+
+# Popup when join window has expired and new player tries to enter
+quest-instance-join-closed = Вход в зону закрыт — окно входа ({ $seconds } сек.) уже истекло.
+
+# Popup when instance reached time limit and is being closed
+quest-instance-expired = Зона уже закрывается. Подождите открытия нового задания.
+
+# Warning popups sent before force-close
+quest-instance-warning = Зона закроется через { $seconds } секунд. Найдите указатель выхода!
+
+## Quest Board BUI (QuestBoardWindow)
+
+quest-board-title = Доска заданий
+
+# Status line at the top of the window
+quest-board-status-idle = Активных заданий нет. Выберите сложность.
+quest-board-status-active =
+    Активная зона • { $players ->
+        [one]   { $players } игрок
+        [few]   { $players } игрока
+        [many]  { $players } игроков
+       *[other] { $players } игроков
+    } • осталось { $minutes }:{ NUMBER($seconds, minimumIntegerDigits: 2) }
+
+# Section header above difficulty buttons
+quest-board-select-difficulty = Выберите сложность:
+
+# Difficulty buttons
+quest-board-easy   = Лёгкое  (15 мин)
+quest-board-medium = Среднее (20 мин)
+quest-board-hard   = Тяжёлое (25 мин)
+
+# Label and button shown when an instance is already active
+quest-board-instance-active = Зона уже открыта — присоединиться?
+quest-board-join = Войти в зону
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
new file mode 100644
index 0000000000..a97f10cc97
--- /dev/null
+++ b/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
@@ -0,0 +1,127 @@
+# Сущности квест-инстанса
+# QuestBoard: ставится на карту, открывает BUI выбора сложности.
+# QuestSignpost: появляется у входа, используется для выхода из инстанса.
+# QuestInvisibleWall: периметр инстанса, невидимая твёрдая стена.
+
+- type: entity
+  id: QuestBoard
+  name: доска заданий
+  description: Объявления о работе и заданиях в округе. Может быть что-то интересное?
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
+    layers:
+    - state: noticeboard
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: Tag
+    tags:
+    - Structure
+  - type: QuestBoard
+  - type: ActivatableUI
+    key: enum.QuestBoardUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.QuestBoardUiKey.Key:
+        type: QuestBoardBoundUserInterface
+
+- type: entity
+  id: QuestSignpost
+  name: указатель выхода
+  description: Светящийся знак. Что-то подсказывает, что нужно идти именно туда.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.20,-0.45,0.20,0.45"
+        density: 20
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
+    layers:
+    - state: noticeboard
+  - type: PointLight
+    radius: 3.0
+    energy: 2.0
+    color: "#00ff88"
+    enabled: true
+  - type: QuestSignpost
+
+- type: entity
+  id: QuestInvisibleWall
+  name: невидимая стена
+  description: Ты не должен это видеть.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        density: 100
+        hard: true
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
new file mode 100644
index 0000000000..a2956ce198
--- /dev/null
+++ b/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
@@ -0,0 +1,80 @@
+# Quest Instance Presets — Easy / Medium / Hard
+# Each preset picks one map at random from its mapPaths list on instance creation.
+# Biome is applied as background when biomeTemplateId is set.
+
+- type: questInstancePreset
+  id: QuestInstanceEasy
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 900          # 15 minutes
+  barrierPadding: 60
+  maxBarrierRadius: 200
+  spawnDistanceFromGrid: 4
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapPaths:
+    - /Maps/Salvage/small-1.yml
+    - /Maps/Salvage/small-2.yml
+    - /Maps/Salvage/small-3.yml
+    - /Maps/Salvage/small-4.yml
+    - /Maps/Salvage/small-a-1.yml
+    - /Maps/Salvage/small-cargo.yml
+    - /Maps/Salvage/small-ai-survey-drone.yml
+    - /Maps/Salvage/small-chapel.yml
+    - /Maps/Salvage/small-chef.yml
+    - /Maps/Salvage/small-party.yml
+    - /Maps/Salvage/small-ship-1.yml
+    - /Maps/Salvage/hauling-shuttle.yml
+    - /Maps/Salvage/cargo-1.yml
+
+- type: questInstancePreset
+  id: QuestInstanceMedium
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 1200         # 20 minutes
+  barrierPadding: 100
+  maxBarrierRadius: 220
+  spawnDistanceFromGrid: 4
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapPaths:
+    - /Maps/Salvage/medium-1.yml
+    - /Maps/Salvage/medium-dock.yml
+    - /Maps/Salvage/medium-library.yml
+    - /Maps/Salvage/medium-crashed-shuttle.yml
+    - /Maps/Salvage/medium-pet-hospital.yml
+    - /Maps/Salvage/medium-ruined-emergency-shuttle.yml
+    - /Maps/Salvage/medium-silent-orchestra.yml
+    - /Maps/Salvage/medium-template.yml
+    - /Maps/Salvage/ruin-cargo-salvage.yml
+    - /Maps/Salvage/wh-salvage.yml
+
+- type: questInstancePreset
+  id: QuestInstanceHard
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 1500         # 25 minutes
+  barrierPadding: 150
+  maxBarrierRadius: 240
+  spawnDistanceFromGrid: 5
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapPaths:
+    - /Maps/Salvage/asteroid-base.yml
+    - /Maps/Salvage/engineering-chunk.yml
+    - /Maps/Salvage/outpost-arm.yml
+    - /Maps/Salvage/security-chunk.yml
+    - /Maps/Salvage/medium-pirate.yml
+    - /Maps/Salvage/medium-vault-1.yml
+    - /Maps/Salvage/meatball.yml
+    - /Maps/Salvage/vegan-meatball.yml
+    - /Maps/Salvage/small-syndicate.yml
+    - /Maps/Salvage/small-tesla.yml
+    - /Maps/Salvage/stationstation.yml
+    - /Maps/Salvage/tick-colony.yml

From 78724fb5446f66b1f598b1d504a3a983e69270c9 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 06:01:53 +0500
Subject: [PATCH 02/10] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestInstance/QuestInstanceSystem.cs      | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
index 667611a3eb..343bbaffe1 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
@@ -5,6 +5,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Gravity;
 using Content.Shared.Magnits.QuestInstance;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Popups;
 using Content.Shared.UserInterface;
@@ -36,6 +38,7 @@ public sealed class QuestInstanceSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
@@ -197,7 +200,7 @@ private void JoinInstance(QuestInstance instance, ICommonSession session)
 
         instance.Participants.Add(session.UserId);
 
-        _transform.SetCoordinates(playerEnt, instance.SpawnCoords);
+        TeleportWithPulledEntity(playerEnt, instance.SpawnCoords);
     }
 
     private bool ExitPlayer(ICommonSession session, QuestInstance instance)
@@ -208,7 +211,7 @@ private bool ExitPlayer(ICommonSession session, QuestInstance instance)
         if (instance.ReturnCoords.TryGetValue(session.UserId, out var returnCoords))
         {
             instance.ReturnCoords.Remove(session.UserId);
-            _transform.SetCoordinates(playerEnt, returnCoords);
+            TeleportWithPulledEntity(playerEnt, returnCoords);
             return true;
         }
 
@@ -220,7 +223,7 @@ private bool ExitPlayer(ICommonSession session, QuestInstance instance)
         }
 
         Log.Warning($"QuestInstanceSystem: no ReturnCoords for {session.UserId}, using board fallback.");
-        _transform.SetCoordinates(playerEnt, fallback);
+        TeleportWithPulledEntity(playerEnt, fallback);
         return true;
     }
 
@@ -329,6 +332,27 @@ QuestInstancePresetPrototype preset
         return nearGrid;
     }
 
+
+    private void TeleportWithPulledEntity(EntityUid user, EntityCoordinates destination)
+    {
+        if (TryComp<PullerComponent>(user, out var puller)
+            && puller.Pulling is { } pulled
+            && TryComp<PullableComponent>(pulled, out var pullable))
+        {
+            _transform.SetCoordinates(pulled, destination);
+            _transform.AttachToGridOrMap(pulled);
+            _transform.SetCoordinates(user, destination);
+            _transform.AttachToGridOrMap(user);
+
+            if (pullable.Puller != user)
+                _pulling.TryStartPull(user, pulled, puller, pullable);
+
+            return;
+        }
+
+        _transform.SetCoordinates(user, destination);
+        _transform.AttachToGridOrMap(user);
+    }
     private EntityCoordinates GetBoardFallbackCoordinates(EntityUid boardUid)
     {
         if (Deleted(boardUid))

From 53977407c7dce10b0fa2784d6780c6dd158d4103 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 08:26:19 +0500
Subject: [PATCH 03/10] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestBoardBoundUserInterface.cs           |   2 +
 .../QuestInstance/QuestBoardWindow.xaml       |  96 ++--
 .../QuestInstance/QuestBoardWindow.xaml.cs    |  24 +-
 .../QuestInstance/QuestBoardComponent.cs      |  51 +-
 .../QuestInstancePresetPrototype.Helpers.cs   |  11 +
 .../QuestInstancePresetPrototype.cs           |  72 +--
 .../QuestInstanceSystem.InstanceFlow.cs       | 357 ++++++++++++
 .../QuestInstanceSystem.Interaction.cs        | 123 +++++
 .../QuestInstanceSystem.MapSetup.cs           | 225 ++++++++
 .../QuestInstance/QuestInstanceSystem.cs      | 508 +-----------------
 .../QuestInstance/QuestSignpostComponent.cs   |   8 +-
 .../Magnits/QuestInstance/QuestBoardUi.cs     |  42 +-
 .../_Nuclear14/Magnits/quest_entities.yml     |   7 +-
 .../Magnits/quest_instance_presets.yml        | 233 ++++++--
 .../Magnits/quest_time_cycle_palettes.yml     |  27 +
 15 files changed, 1117 insertions(+), 669 deletions(-)
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs
 create mode 100644 Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
 create mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml

diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs b/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
index 554cf725e4..66d12ebd0c 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
@@ -2,8 +2,10 @@
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
+
 namespace Content.Client.Magnits.QuestInstance;
 
+
 [UsedImplicitly]
 public sealed class QuestBoardBoundUserInterface : BoundUserInterface
 {
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
index 500c61ec9b..efdf52a6a3 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
@@ -1,46 +1,70 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                     MinSize="300 260"
+                     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                     MinSize="360 300"
                      Title="{Loc 'quest-board-title'}">
-    <BoxContainer Orientation="Vertical" Margin="8">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="8">
 
-        <!-- Status line -->
-        <Label Name="StatusLabel"
-               Text=""
-               HorizontalAlignment="Center"
-               Margin="0 0 0 6"/>
+        <PanelContainer>
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#101723"
+                                  BorderColor="#33537a"
+                                  BorderThickness="1 1 1 1" />
+            </PanelContainer.PanelOverride>
+            <BoxContainer Orientation="Vertical" Margin="8 6">
+                <Label Text="{Loc 'quest-board-title'}"
+                       StyleClasses="LabelHeading"
+                       HorizontalAlignment="Center" />
+                <Label Name="StatusLabel"
+                       Text=""
+                       HorizontalAlignment="Center"
+                       Margin="0 2 0 0" />
+            </BoxContainer>
+        </PanelContainer>
 
-        <controls:HLine Color="#404040" Thickness="1" Margin="0 0 0 8"/>
+        <controls:HLine Color="#3b4f69" Thickness="1" Margin="0 0 0 2" />
 
-        <!-- CREATE — visible when no active instance -->
-        <BoxContainer Name="CreateBox" Orientation="Vertical">
-            <Label Text="{Loc 'quest-board-select-difficulty'}"
-                   HorizontalAlignment="Center"
-                   Margin="0 0 0 6"/>
-            <Button Name="EasyButton"
-                    Text="{Loc 'quest-board-easy'}"
-                    HorizontalExpand="True"
-                    Margin="4 2"/>
-            <Button Name="MediumButton"
-                    Text="{Loc 'quest-board-medium'}"
-                    HorizontalExpand="True"
-                    Margin="4 2"/>
-            <Button Name="HardButton"
-                    Text="{Loc 'quest-board-hard'}"
-                    HorizontalExpand="True"
-                    Margin="4 2"/>
-        </BoxContainer>
+        <PanelContainer Name="CreateBox">
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#141a27"
+                                  BorderColor="#2c3f5a"
+                                  BorderThickness="1 1 1 1" />
+            </PanelContainer.PanelOverride>
+            <BoxContainer Orientation="Vertical" Margin="8" SeparationOverride="4">
+                <Label Text="{Loc 'quest-board-select-difficulty'}"
+                       HorizontalAlignment="Center"
+                       Margin="0 0 0 4" />
+                <Button Name="EasyButton"
+                        Text="{Loc 'quest-board-easy'}"
+                        HorizontalExpand="True"
+                        Margin="2 1" />
+                <Button Name="MediumButton"
+                        Text="{Loc 'quest-board-medium'}"
+                        HorizontalExpand="True"
+                        Margin="2 1" />
+                <Button Name="HardButton"
+                        Text="{Loc 'quest-board-hard'}"
+                        HorizontalExpand="True"
+                        Margin="2 1" />
+            </BoxContainer>
+        </PanelContainer>
 
-        <!-- JOIN — visible when instance already active -->
-        <BoxContainer Name="JoinBox" Orientation="Vertical" Visible="False">
-            <Label Text="{Loc 'quest-board-instance-active'}"
-                   HorizontalAlignment="Center"
-                   Margin="0 0 0 6"/>
-            <Button Name="JoinButton"
-                    Text="{Loc 'quest-board-join'}"
-                    HorizontalExpand="True"
-                    Margin="4 2"/>
-        </BoxContainer>
+        <PanelContainer Name="JoinBox" Visible="False">
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#1a1622"
+                                  BorderColor="#5f4b75"
+                                  BorderThickness="1 1 1 1" />
+            </PanelContainer.PanelOverride>
+            <BoxContainer Orientation="Vertical" Margin="8" SeparationOverride="4">
+                <Label Text="{Loc 'quest-board-instance-active'}"
+                       HorizontalAlignment="Center"
+                       Margin="0 0 0 4" />
+                <Button Name="JoinButton"
+                        Text="{Loc 'quest-board-join'}"
+                        HorizontalExpand="True"
+                        Margin="2 1" />
+            </BoxContainer>
+        </PanelContainer>
 
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
index e5776acfe2..0dc16b34fe 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
+++ b/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
@@ -1,35 +1,34 @@
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Magnits.QuestInstance;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
+
 namespace Content.Client.Magnits.QuestInstance;
 
+
 [GenerateTypedNameReferences]
 public sealed partial class QuestBoardWindow : FancyWindow
 {
-    // Fired when the player presses Easy / Medium / Hard or the Join button.
-    public event Action<QuestDifficulty>? OnDifficultySelected;
-
     public QuestBoardWindow()
     {
         RobustXamlLoader.Load(this);
 
-        EasyButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
+        EasyButton.OnPressed += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
         MediumButton.OnPressed += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Medium);
-        HardButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Hard);
-        // Join always sends Easy — server ignores difficulty when instance exists.
-        JoinButton.OnPressed   += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
+        HardButton.OnPressed += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Hard);
+        JoinButton.OnPressed += _ => OnDifficultySelected?.Invoke(QuestDifficulty.Easy);
     }
 
-    /// <summary>Refreshes the window layout to reflect the latest BUI state.</summary>
+    public event Action<QuestDifficulty>? OnDifficultySelected;
+
     public void UpdateState(QuestBoardBoundUserInterfaceState state)
     {
         if (state.HasActiveInstance)
         {
             CreateBox.Visible = false;
-            JoinBox.Visible   = true;
+            JoinBox.Visible = true;
+            StatusLabel.FontColorOverride = Color.FromHex("#8ce6a2");
 
             var minutes = state.RemainingSeconds / 60;
             var seconds = state.RemainingSeconds % 60;
@@ -42,8 +41,9 @@ public void UpdateState(QuestBoardBoundUserInterfaceState state)
         else
         {
             CreateBox.Visible = true;
-            JoinBox.Visible   = false;
-            StatusLabel.Text  = Loc.GetString("quest-board-status-idle");
+            JoinBox.Visible = false;
+            StatusLabel.FontColorOverride = Color.FromHex("#9fb7d1");
+            StatusLabel.Text = Loc.GetString("quest-board-status-idle");
         }
     }
 }
diff --git a/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs b/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
index f7e9a7b5c4..11cd99fe38 100644
--- a/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
@@ -1,12 +1,47 @@
-using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
 
 namespace Content.Server.Magnits.QuestInstance;
 
-/// <summary>
-/// Marks an entity as a Quest Board.
-/// QuestInstanceSystem enforces at most one active instance per board.
-/// Call <c>QuestInstanceSystem.StartOrJoinInstance(boardUid, session, difficulty)</c>
-/// from a UI or interaction handler to create or join an instance.
-/// </summary>
 [RegisterComponent]
-public sealed partial class QuestBoardComponent : Component { }
+public sealed partial class QuestBoardComponent : Component
+{
+    [DataField]
+    public bool HasActiveInstance;
+
+    [DataField]
+    public HashSet<NetUserId> Participants = new();
+
+    [DataField]
+    public HashSet<EntityUid> PresentPlayers = new();
+
+    [DataField]
+    public Dictionary<EntityUid, EntityCoordinates> ReturnCoords = new();
+
+    [DataField]
+    public HashSet<int> SentWarnings = new();
+
+    [DataField]
+    public List<EntityCoordinates> PendingBarrierCoords = new();
+
+    [DataField]
+    public string BarrierProto = "QuestInvisibleWall";
+
+    [DataField]
+    public TimeSpan EndAt;
+
+    [DataField]
+    public TimeSpan JoinUntil;
+
+    [DataField]
+    public int JoinWindowSeconds;
+
+    [DataField]
+    public EntityUid MapUid = EntityUid.Invalid;
+
+    [DataField]
+    public EntityCoordinates SpawnCoords = EntityCoordinates.Invalid;
+
+    [DataField]
+    public int[] WarningThresholdsSeconds = Array.Empty<int>();
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
new file mode 100644
index 0000000000..93d7077c08
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.Magnits.QuestInstance;
+
+public sealed partial class QuestInstancePresetPrototype
+{
+    public bool HasMapEntries => MapEntries.Count > 0;
+}
+
+public sealed partial class QuestInstanceMapEntry
+{
+    public float EffectiveWeight => MathF.Max(0f, Weight);
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
index 5360e58ae4..4213862cd9 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
@@ -1,4 +1,7 @@
-using Robust.Shared.Prototypes;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.TimeCycle;
+using Content.Shared.Weather;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Magnits.QuestInstance;
@@ -9,69 +12,68 @@ public sealed partial class QuestInstancePresetPrototype : IPrototype
     [IdDataField]
     public string ID { get; set; } = default!;
 
-    /// <summary>
-    /// BiomeTemplatePrototype ID to apply to the generated map.
-    /// If mapPaths/optionalMapPath are also set, biome is still applied as a background.
-    /// </summary>
     [DataField]
-    public string? BiomeTemplateId;
+    public ProtoId<BiomeTemplatePrototype>? BiomeTemplateId;
 
-    /// <summary>Seconds the instance lives before force-evacuation and deletion.</summary>
     [DataField]
     public int TimeLimitSeconds = 900;
 
-    /// <summary>
-    /// Extra tile-units added outside the grid AABB when computing the barrier ring radius.
-    /// For a fresh biome map (empty grid) the radius is 1 + BarrierPadding.
-    /// </summary>
     [DataField]
     public int BarrierPadding = 100;
 
-    /// <summary>
-    /// Hard cap for computed barrier radius to avoid spawning excessive wall entities.
-    /// </summary>
     [DataField]
     public int MaxBarrierRadius = 256;
 
-    /// <summary>
-    /// List of pre-built map files (.yml) to pick randomly from on each instance creation.
-    /// Takes priority over <see cref="OptionalMapPath"/>.
-    /// </summary>
+    [DataField]
+    public List<QuestInstanceMapEntry> MapEntries = new();
+
     [DataField]
     public List<ResPath> MapPaths = new();
 
-    /// <summary>
-    /// Single pre-built map file (.yml). Used when <see cref="MapPaths"/> is empty.
-    /// </summary>
     [DataField]
     public ResPath? OptionalMapPath;
 
-    /// <summary>Entity prototype spawned near the entry point as the exit signpost.</summary>
     [DataField]
     public string ExitSignpostProto = "QuestSignpost";
 
-    /// <summary>Entity prototype used for each invisible barrier wall tile on the perimeter.</summary>
     [DataField]
     public string BarrierProto = "QuestInvisibleWall";
 
-    /// <summary>
-    /// Spawn offset (in tiles) from the loaded grid's right edge.
-    /// Used so players appear near the grid, not directly on top of it.
-    /// </summary>
     [DataField]
     public float SpawnDistanceFromGrid = 3f;
 
-    /// <summary>
-    /// Remaining-seconds thresholds at which popup warnings are sent to players.
-    /// </summary>
     [DataField]
-    public int[] WarningThresholdsSeconds = { 60, 30, 10 };
+    public int[] WarningThresholdsSeconds = [60, 30, 10];
 
-    /// <summary>
-    /// Seconds after instance creation during which players not in Participants may still join.
-    /// After this window, only returning participants are allowed.
-    /// </summary>
     [DataField]
     public int JoinWindowSeconds = 120;
+
+    [DataField]
+    public float AtmosphereTemperatureCelsius = 20f;
+}
+
+[DataDefinition]
+public sealed partial class QuestInstanceMapEntry
+{
+    [DataField(required: true)]
+    public ResPath MapPath = default!;
+
+    [DataField]
+    public float Weight = 1f;
+
+    [DataField]
+    public ProtoId<BiomeTemplatePrototype>? BiomeTemplateId;
+
+    [DataField]
+    public Color? MapLightColor;
+
+    [DataField]
+    public ProtoId<WeatherPrototype>? WeatherPrototypeId;
+
+    [DataField]
+    public ProtoId<TimeCyclePalettePrototype>? TimeCyclePaletteId;
+
+    [DataField]
+    public float? AtmosphereTemperatureCelsius;
 }
 
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
new file mode 100644
index 0000000000..62d1d43355
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
@@ -0,0 +1,357 @@
+using System.Linq;
+using System.Numerics;
+using Content.Shared.Magnits.QuestInstance;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Magnits.QuestInstance;
+
+public sealed partial class QuestInstanceSystem
+{
+    public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, QuestDifficulty difficulty)
+    {
+        if (!TryComp<QuestBoardComponent>(boardUid, out var board))
+            return;
+
+        if (board.HasActiveInstance)
+        {
+            var curTime = _timing.CurTime;
+            var alreadyParticipant = board.Participants.Contains(session.UserId);
+
+            if (curTime >= board.EndAt)
+            {
+                _popup.PopupEntity(
+                    Loc.GetString("quest-instance-expired"),
+                    session.AttachedEntity ?? boardUid,
+                    session);
+                return;
+            }
+
+            if (!alreadyParticipant && curTime > board.JoinUntil)
+            {
+                _popup.PopupEntity(
+                    Loc.GetString("quest-instance-join-closed", ("seconds", board.JoinWindowSeconds)),
+                    session.AttachedEntity ?? boardUid,
+                    session);
+                return;
+            }
+
+            // Guard: player already on the instance map.
+            if (alreadyParticipant && session.AttachedEntity is { } attachedEnt)
+            {
+                if (Transform(attachedEnt).MapUid == board.MapUid)
+                    return;
+            }
+
+            JoinInstance(board, session);
+            SendBoardState(boardUid, board);
+            return;
+        }
+
+        var presetId = DifficultyToPresetId(difficulty);
+        if (!_proto.TryIndex<QuestInstancePresetPrototype>(presetId, out var preset))
+        {
+            Log.Error($"QuestInstanceSystem: preset '{presetId}' not found.");
+            return;
+        }
+
+        if (!CreateInstance(boardUid, board, preset))
+            return;
+
+        JoinInstance(board, session);
+        SendBoardState(boardUid, board);
+    }
+
+    private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, QuestInstancePresetPrototype preset)
+    {
+        ClearInstanceState(board);
+
+        var selectedMapEntry = PickMapEntry(preset);
+
+        ResPath? mapPath;
+        if (selectedMapEntry != null)
+            mapPath = selectedMapEntry.MapPath;
+        else if (preset.MapPaths.Count > 0)
+            mapPath = _random.Pick(preset.MapPaths);
+        else
+            mapPath = preset.OptionalMapPath;
+
+        var biomeTemplateId = selectedMapEntry?.BiomeTemplateId ?? preset.BiomeTemplateId;
+        var atmosphereTemperatureCelsius = selectedMapEntry?.AtmosphereTemperatureCelsius ?? preset.AtmosphereTemperatureCelsius;
+
+        // Always create a dedicated map so biome + loaded grid can coexist.
+        var mapUid = _mapSystem.CreateMap(out var mapId, false);
+
+        // Atmosphere and gravity are enabled immediately to avoid vacuum spikes while content is spawning.
+        ForceMapEnvironment(mapUid);
+        ApplyBreathableMapAtmosphere(mapUid, atmosphereTemperatureCelsius);
+
+        if (biomeTemplateId is { } biomeId && !ApplyBiome(mapUid, biomeId))
+        {
+            _mapSystem.DeleteMap(mapId);
+            return false;
+        }
+
+        EntityUid gridUid;
+
+        if (mapPath != null)
+        {
+            // Load salvage grid into this map.
+            if (!_mapLoader.TryLoadGrid(mapId, mapPath.Value, out var loadedGrid))
+            {
+                Log.Error($"QuestInstanceSystem: failed to load grid '{mapPath}'.");
+                _mapSystem.DeleteMap(mapId);
+                return false;
+            }
+
+            gridUid = loadedGrid.Value;
+        }
+        else
+        {
+            // Biome-only instance.
+            if (biomeTemplateId == null)
+            {
+                Log.Error(
+                    $"QuestInstanceSystem: preset '{preset.ID}' has no MapEntries, MapPaths, OptionalMapPath, or BiomeTemplateId.");
+                _mapSystem.DeleteMap(mapId);
+                return false;
+            }
+
+            gridUid = mapUid;
+        }
+
+        ForceGridEnvironment(gridUid);
+
+        _mapSystem.InitializeMap(mapId);
+
+        // Re-apply atmosphere AFTER map init so tiles loaded from a salvage grid
+        // (saved as vacuum) get overwritten with breathable air + correct temperature.
+        ApplyBreathableMapAtmosphere(mapUid, atmosphereTemperatureCelsius);
+
+        var signpostCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
+        // For biome maps the player spawns slightly away from the signpost (open terrain).
+        // For loaded grids both land at the same AABB center — the offset would push the
+        // player outside the grid into the void.
+        var isBiomeMap = gridUid == mapUid;
+        var playerSpawnCoords = isBiomeMap
+            ? OffsetCoordinates(signpostCoords, new Vector2(1.25f, 0f))
+            : signpostCoords;
+
+        var now = _timing.CurTime;
+        board.HasActiveInstance = true;
+        board.MapUid = mapUid;
+        board.SpawnCoords = playerSpawnCoords;
+        board.JoinWindowSeconds = preset.JoinWindowSeconds;
+        board.WarningThresholdsSeconds = preset.WarningThresholdsSeconds.ToArray();
+        board.JoinUntil = now + TimeSpan.FromSeconds(preset.JoinWindowSeconds);
+        board.EndAt = now + TimeSpan.FromSeconds(preset.TimeLimitSeconds);
+
+        var signpost = Spawn(preset.ExitSignpostProto, signpostCoords);
+        var signpostComp = EnsureComp<QuestSignpostComponent>(signpost);
+        signpostComp.BoardUid = boardUid;
+
+        var barrierRadius = Math.Clamp(
+            ComputeBarrierRadius(gridUid, preset),
+            1,
+            Math.Max(1, preset.MaxBarrierRadius));
+        QueueSquareBarrier(board, gridUid, preset, barrierRadius);
+        ProcessPendingBarrier(board, 16);
+
+        ApplyMapEnvironmentOverrides(mapUid, mapId, selectedMapEntry);
+        return true;
+    }
+
+    private void JoinInstance(QuestBoardComponent board, ICommonSession session)
+    {
+        if (session.AttachedEntity is not { } playerEnt)
+            return;
+
+        var playerXform = Transform(playerEnt);
+
+        // Save latest return point when joining from outside the instance map.
+        if (playerXform.MapUid != board.MapUid)
+            board.ReturnCoords[playerEnt] = playerXform.Coordinates;
+
+        board.Participants.Add(session.UserId);
+        board.PresentPlayers.Add(playerEnt);
+        TeleportWithPulledEntity(playerEnt, board.SpawnCoords);
+    }
+
+    private void ExitPlayer(EntityUid boardUid, ICommonSession session, QuestBoardComponent board)
+    {
+        if (session.AttachedEntity is not { } playerEnt)
+            return;
+
+        ExitEntity(playerEnt, boardUid, board, session.UserId.ToString());
+    }
+
+    private bool ExitEntity(EntityUid playerEnt, EntityUid boardUid, QuestBoardComponent board, string debugLabel)
+    {
+        if (board.ReturnCoords.Remove(playerEnt, out var returnCoords))
+        {
+            TeleportWithPulledEntity(playerEnt, returnCoords);
+            board.PresentPlayers.Remove(playerEnt);
+            return true;
+        }
+
+        var fallback = GetBoardFallbackCoordinates(boardUid);
+        if (fallback == EntityCoordinates.Invalid)
+        {
+            Log.Warning($"QuestInstanceSystem: no ReturnCoords and no valid board fallback for {debugLabel}.");
+            return false;
+        }
+
+        Log.Warning($"QuestInstanceSystem: no ReturnCoords for {debugLabel}, using board fallback.");
+        TeleportWithPulledEntity(playerEnt, fallback);
+        board.PresentPlayers.Remove(playerEnt);
+        return true;
+    }
+
+    private void PruneReturnCoords(QuestBoardComponent board)
+    {
+        List<EntityUid>? stale = null;
+
+        foreach (var (uid, _) in board.ReturnCoords)
+            if (Deleted(uid) || Transform(uid).MapUid != board.MapUid)
+            {
+                stale ??= new();
+                stale.Add(uid);
+            }
+
+        if (stale == null)
+            return;
+
+        foreach (var uid in stale)
+            board.ReturnCoords.Remove(uid);
+    }
+
+    private void PrunePresentPlayers(QuestBoardComponent board)
+    {
+        List<EntityUid>? stale = null;
+
+        foreach (var uid in board.PresentPlayers)
+            if (Deleted(uid) || Transform(uid).MapUid != board.MapUid)
+            {
+                stale ??= new();
+                stale.Add(uid);
+            }
+
+        if (stale == null)
+            return;
+
+        foreach (var uid in stale)
+            board.PresentPlayers.Remove(uid);
+    }
+
+    private void TryCleanupIfEmpty(EntityUid boardUid, QuestBoardComponent board)
+    {
+        PrunePresentPlayers(board);
+        if (board.PresentPlayers.Count > 0)
+            return;
+
+        PruneReturnCoords(board);
+        if (board.ReturnCoords.Count > 0)
+            return;
+
+        CleanupInstance(boardUid, board);
+    }
+
+    private void ForceCloseInstance(EntityUid boardUid, QuestBoardComponent board)
+    {
+        var everyoneEvacuated = true;
+
+        PrunePresentPlayers(board);
+        PruneReturnCoords(board);
+
+        var toEvacuate = new HashSet<EntityUid>(board.ReturnCoords.Keys);
+        toEvacuate.UnionWith(board.PresentPlayers);
+
+        foreach (var uid in toEvacuate)
+            everyoneEvacuated &= ExitEntity(uid, boardUid, board, uid.ToString());
+
+        if (!everyoneEvacuated)
+        {
+            Log.Warning(
+                $"QuestInstanceSystem: aborting cleanup for board {boardUid} because not all players could be evacuated.");
+            return;
+        }
+
+        CleanupInstance(boardUid, board);
+    }
+
+    private void CleanupInstance(EntityUid boardUid, QuestBoardComponent board)
+    {
+        if (!Deleted(board.MapUid))
+        {
+            var mapId = Transform(board.MapUid).MapID;
+            if (mapId != MapId.Nullspace)
+            {
+                // Stop weather before deleting the map so clients receive the
+                // stop-weather network message before the map entity disappears.
+                _weather.SetWeather(mapId, null, null);
+                _mapSystem.DeleteMap(mapId);
+            }
+        }
+
+        ClearInstanceState(board);
+
+        if (!Deleted(boardUid) && !Terminating(boardUid))
+            SendBoardState(boardUid, board);
+    }
+
+    private static void ClearInstanceState(QuestBoardComponent board)
+    {
+        board.HasActiveInstance = false;
+        board.Participants.Clear();
+        board.PresentPlayers.Clear();
+        board.ReturnCoords.Clear();
+        board.SentWarnings.Clear();
+        board.PendingBarrierCoords.Clear();
+
+        board.BarrierProto = "QuestInvisibleWall";
+        board.EndAt = TimeSpan.Zero;
+        board.JoinUntil = TimeSpan.Zero;
+        board.JoinWindowSeconds = 0;
+        board.MapUid = EntityUid.Invalid;
+        board.SpawnCoords = EntityCoordinates.Invalid;
+        board.WarningThresholdsSeconds = Array.Empty<int>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        var curTime = _timing.CurTime;
+        List<EntityUid>? toClose = null;
+
+        var query = EntityQueryEnumerator<QuestBoardComponent>();
+        while (query.MoveNext(out var boardUid, out var board))
+        {
+            if (!board.HasActiveInstance)
+                continue;
+
+            ProcessPendingBarrier(board);
+
+            var remaining = board.EndAt - curTime;
+            SendWarningPopups(board, remaining);
+
+            if (remaining <= TimeSpan.Zero)
+            {
+                toClose ??= new();
+                toClose.Add(boardUid);
+            }
+        }
+
+        if (toClose == null)
+            return;
+
+        foreach (var boardUid in toClose)
+        {
+            if (!TryComp<QuestBoardComponent>(boardUid, out var board) || !board.HasActiveInstance)
+                continue;
+
+            ForceCloseInstance(boardUid, board);
+        }
+    }
+}
+
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs
new file mode 100644
index 0000000000..72bf96b59f
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs
@@ -0,0 +1,123 @@
+using Content.Shared.Interaction;
+using Content.Shared.Magnits.QuestInstance;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Popups;
+using Content.Shared.UserInterface;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+
+
+namespace Content.Server.Magnits.QuestInstance;
+
+public sealed partial class QuestInstanceSystem
+{
+    private void TeleportWithPulledEntity(EntityUid user, EntityCoordinates destination)
+    {
+        if (TryComp<PullerComponent>(user, out var puller)
+            && puller.Pulling is { } pulled
+            && TryComp<PullableComponent>(pulled, out var pullable))
+        {
+            _transform.SetCoordinates(pulled, destination);
+            _transform.AttachToGridOrMap(pulled);
+            _transform.SetCoordinates(user, destination);
+            _transform.AttachToGridOrMap(user);
+
+            if (pullable.Puller != user)
+                _pulling.TryStartPull(user, pulled, puller, pullable);
+
+            return;
+        }
+
+        _transform.SetCoordinates(user, destination);
+        _transform.AttachToGridOrMap(user);
+    }
+
+    private void SendWarningPopups(QuestBoardComponent board, TimeSpan remaining)
+    {
+        PrunePresentPlayers(board);
+        if (board.PresentPlayers.Count == 0)
+            return;
+
+        List<EntityUid>? players = null;
+
+        foreach (var threshold in board.WarningThresholdsSeconds)
+        {
+            if (remaining.TotalSeconds > threshold)
+                continue;
+
+            if (!board.SentWarnings.Add(threshold))
+                continue;
+
+            var msg = Loc.GetString("quest-instance-warning", ("seconds", threshold));
+            players ??= [..board.PresentPlayers,];
+
+            foreach (var uid in players)
+            {
+                if (!TryComp<ActorComponent>(uid, out var actor))
+                    continue;
+
+                _popup.PopupEntity(msg, uid, actor.PlayerSession, PopupType.LargeCaution);
+            }
+        }
+    }
+
+    private void OnSignpostUsed(EntityUid uid, QuestSignpostComponent comp, InteractHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!TryComp<ActorComponent>(args.User, out var actor))
+            return;
+
+        if (!TryComp<QuestBoardComponent>(comp.BoardUid, out var board) || !board.HasActiveInstance)
+            return;
+
+        args.Handled = true;
+
+        ExitPlayer(comp.BoardUid, actor.PlayerSession, board);
+        TryCleanupIfEmpty(comp.BoardUid, board);
+        SendBoardState(comp.BoardUid, board);
+    }
+
+    private void OnBoardTerminating(EntityUid uid, QuestBoardComponent comp, EntityTerminatingEvent args)
+    {
+        if (!comp.HasActiveInstance)
+            return;
+
+        ForceCloseInstance(uid, comp);
+    }
+
+    private void OnBoardUiOpened(EntityUid uid, QuestBoardComponent comp, AfterActivatableUIOpenEvent args) =>
+        SendBoardState(uid, comp);
+
+    private void OnBoardSelectDifficulty(EntityUid uid, QuestBoardComponent comp, QuestBoardSelectDifficultyMessage msg)
+    {
+        if (!TryComp<ActorComponent>(msg.Actor, out var actor))
+            return;
+
+        StartOrJoinInstance(uid, actor.PlayerSession, msg.Difficulty);
+        SendBoardState(uid, comp);
+    }
+
+    private void SendBoardState(EntityUid boardUid, QuestBoardComponent? board = null)
+    {
+        if (!Resolve(boardUid, ref board, false))
+            return;
+
+        QuestBoardBoundUserInterfaceState state;
+
+        if (board.HasActiveInstance)
+        {
+            PrunePresentPlayers(board);
+            var remaining = board.EndAt - _timing.CurTime;
+            state = new(
+                true,
+                Math.Max(0, (int) remaining.TotalSeconds),
+                board.PresentPlayers.Count);
+        }
+        else
+            state = new(false, 0, 0);
+
+        _ui.SetUiState(boardUid, QuestBoardUiKey.Key, state);
+    }
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
new file mode 100644
index 0000000000..2bdbfea4b1
--- /dev/null
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
@@ -0,0 +1,225 @@
+using System.Numerics;
+using Content.Server.Atmos.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Gravity;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.TimeCycle;
+using Content.Shared.Weather;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Magnits.QuestInstance;
+
+public sealed partial class QuestInstanceSystem
+{
+    private QuestInstanceMapEntry? PickMapEntry(QuestInstancePresetPrototype preset)
+    {
+        if (!preset.HasMapEntries)
+            return null;
+
+        var totalWeight = 0f;
+        foreach (var entry in preset.MapEntries)
+            totalWeight += entry.EffectiveWeight;
+
+        if (totalWeight <= 0f)
+        {
+            Log.Warning($"QuestInstanceSystem: preset '{preset.ID}' has mapEntries with non-positive total weight. Using uniform pick.");
+            return _random.Pick(preset.MapEntries);
+        }
+
+        var roll = _random.NextFloat(totalWeight);
+
+        foreach (var entry in preset.MapEntries)
+        {
+            var weight = entry.EffectiveWeight;
+            if (weight <= 0f)
+                continue;
+
+            if (roll < weight)
+                return entry;
+
+            roll -= weight;
+        }
+
+        return preset.MapEntries[^1];
+    }
+
+    private bool ApplyBiome(EntityUid mapUid, ProtoId<BiomeTemplatePrototype> biomeTemplateId)
+    {
+        if (!_proto.TryIndex(biomeTemplateId, out var template))
+        {
+            Log.Error($"QuestInstanceSystem: biome template '{biomeTemplateId}' not found.");
+            return false;
+        }
+
+        _biome.EnsurePlanet(mapUid, template, _random.Next());
+        return true;
+    }
+
+    private void ApplyMapEnvironmentOverrides(EntityUid mapUid, MapId mapId, QuestInstanceMapEntry? mapEntry)
+    {
+        if (mapEntry == null)
+            return;
+
+        if (mapEntry.MapLightColor is { } ambientColor)
+        {
+            var mapLight = EnsureComp<MapLightComponent>(mapUid);
+            mapLight.AmbientLightColor = ambientColor;
+            Dirty(mapUid, mapLight);
+        }
+
+        if (mapEntry.TimeCyclePaletteId is { } paletteId)
+        {
+            EnsureComp<MapLightComponent>(mapUid);
+
+            var cycle = EnsureComp<TimeCycleComponent>(mapUid);
+            cycle.PalettePrototype = paletteId.ToString();
+            cycle.Paused = false;
+            Dirty(mapUid, cycle);
+        }
+
+        if (mapEntry.WeatherPrototypeId is not { } weatherId)
+            return;
+
+        if (!_proto.TryIndex(weatherId, out WeatherPrototype? weather))
+        {
+            Log.Error($"QuestInstanceSystem: weather prototype '{weatherId}' not found.");
+            return;
+        }
+
+        _weather.SetWeather(mapId, weather, null);
+    }
+
+    private EntityCoordinates ComputeSpawnCoordinates(EntityUid mapUid, EntityUid gridUid, QuestInstancePresetPrototype preset)
+    {
+        if (!TryComp<MapGridComponent>(gridUid, out var gridComp) || gridComp.LocalAABB.IsEmpty())
+            return new(mapUid, new(0.5f, 0.5f));
+
+        var aabb = gridComp.LocalAABB;
+
+        // Biome map: gridUid == mapUid (map entity has a grid component).
+        // Spawn just outside the biome grid chunk — the infinite biome has terrain there.
+        if (gridUid == mapUid)
+        {
+            var offset = MathF.Max(1f, preset.SpawnDistanceFromGrid);
+            var nearEdge = new EntityCoordinates(gridUid, new(aabb.Right + offset, aabb.Center.Y));
+            var mapCoords = _transform.ToMapCoordinates(nearEdge);
+            return new(mapUid, mapCoords.Position);
+        }
+
+        // Loaded grid (salvage ship etc.): spawn INSIDE the grid at its AABB center so
+        // the player lands on actual tiles, not in the void.
+        return new EntityCoordinates(gridUid, aabb.Center);
+    }
+
+    private static EntityCoordinates OffsetCoordinates(EntityCoordinates origin, Vector2 offset)
+    {
+        if (origin == EntityCoordinates.Invalid)
+            return origin;
+
+        return new(origin.EntityId, origin.Position + offset);
+    }
+
+    private EntityCoordinates GetBoardFallbackCoordinates(EntityUid boardUid)
+    {
+        if (Deleted(boardUid))
+            return EntityCoordinates.Invalid;
+
+        var boardXform = Transform(boardUid);
+        if (boardXform.MapUid == null)
+            return EntityCoordinates.Invalid;
+
+        // Keep fallback spawn next to the board so players do not clip into its fixture.
+        return new EntityCoordinates(boardUid, new Vector2(1.25f, 0f));
+    }
+
+    private void ForceMapEnvironment(EntityUid mapUid)
+    {
+        var mapGravity = EnsureComp<GravityComponent>(mapUid);
+        mapGravity.Enabled = true;
+        mapGravity.Inherent = true;
+        Dirty(mapUid, mapGravity);
+    }
+
+    private void ForceGridEnvironment(EntityUid gridUid)
+    {
+        var gridGravity = EnsureComp<GravityComponent>(gridUid);
+        gridGravity.Enabled = true;
+        gridGravity.Inherent = true;
+        Dirty(gridUid, gridGravity);
+
+        // Remove any stale GridAtmosphereComponent that may have been loaded from the
+        // grid file (possibly with vacuum tile data), then add a fresh one so it
+        // initialises from the map atmosphere set in ApplyBreathableMapAtmosphere.
+        RemComp<GridAtmosphereComponent>(gridUid);
+        EnsureComp<GridAtmosphereComponent>(gridUid);
+    }
+
+    private void ApplyBreathableMapAtmosphere(EntityUid mapUid, float temperatureCelsius)
+    {
+        var moles = new float[Atmospherics.AdjustedNumberOfGases];
+        moles[(int) Gas.Oxygen] = 21.824779f;
+        moles[(int) Gas.Nitrogen] = 82.10312f;
+
+        var temperatureKelvin = MathF.Max(Atmospherics.TCMB, Atmospherics.T0C + temperatureCelsius);
+        _atmos.SetMapAtmosphere(mapUid, false, new GasMixture(moles, temperatureKelvin));
+    }
+
+    private int ComputeBarrierRadius(EntityUid gridUid, QuestInstancePresetPrototype preset)
+    {
+        var padding = Math.Max(0, preset.BarrierPadding);
+
+        if (!TryComp<MapGridComponent>(gridUid, out var grid))
+            return 1 + padding;
+
+        var aabb = grid.LocalAABB;
+        var tileSize = (float) grid.TileSize;
+
+        if (aabb.Width <= tileSize && aabb.Height <= tileSize)
+            return 1 + padding;
+
+        var minX = (int) MathF.Floor(aabb.Left / tileSize);
+        var maxX = (int) MathF.Ceiling(aabb.Right / tileSize) - 1;
+        var minY = (int) MathF.Floor(aabb.Bottom / tileSize);
+        var maxY = (int) MathF.Ceiling(aabb.Top / tileSize) - 1;
+
+        var baseRadius = Math.Max(
+            Math.Max(Math.Abs(minX), Math.Abs(maxX)),
+            Math.Max(Math.Abs(minY), Math.Abs(maxY)));
+
+        if (baseRadius < 1)
+            baseRadius = 1;
+
+        return baseRadius + padding;
+    }
+
+    private void QueueSquareBarrier(QuestBoardComponent board, EntityUid gridUid, QuestInstancePresetPrototype preset, int r)
+    {
+        board.BarrierProto = preset.BarrierProto;
+
+        for (var x = -r; x <= r; x++)
+        {
+            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(x + 0.5f, -r + 0.5f)));
+            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(x + 0.5f, r + 0.5f)));
+        }
+
+        for (var y = -r + 1; y <= r - 1; y++)
+        {
+            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(-r + 0.5f, y + 0.5f)));
+            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(r + 0.5f, y + 0.5f)));
+        }
+    }
+
+    private void ProcessPendingBarrier(QuestBoardComponent board, int spawnBudget = 16)
+    {
+        for (var i = 0; i < spawnBudget && board.PendingBarrierCoords.Count > 0; i++)
+        {
+            var idx = board.PendingBarrierCoords.Count - 1;
+            var coords = board.PendingBarrierCoords[idx];
+            board.PendingBarrierCoords.RemoveAt(idx);
+            Spawn(board.BarrierProto, coords);
+        }
+    }
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
index 343bbaffe1..d6374f6caa 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
@@ -1,39 +1,25 @@
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Parallax;
-using Content.Shared.Atmos;
+using Content.Server.Weather;
 using Content.Shared.Interaction;
-using Content.Shared.Gravity;
 using Content.Shared.Magnits.QuestInstance;
-using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
-using Content.Shared.Parallax.Biomes;
 using Content.Shared.Popups;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.EntitySerialization.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-
 namespace Content.Server.Magnits.QuestInstance;
 
-
-public sealed class QuestInstanceSystem : EntitySystem
+public sealed partial class QuestInstanceSystem : EntitySystem
 {
-    // One active instance per board entity.
-    private readonly Dictionary<EntityUid, QuestInstance> _activeInstanceByBoard = new();
     [Dependency] private readonly AtmosphereSystem _atmos = default!;
     [Dependency] private readonly BiomeSystem _biome = default!;
     [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -41,6 +27,7 @@ public sealed class QuestInstanceSystem : EntitySystem
     [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly WeatherSystem _weather = default!;
 
     public override void Initialize()
     {
@@ -59,493 +46,4 @@ private static string DifficultyToPresetId(QuestDifficulty difficulty) =>
             QuestDifficulty.Hard => "QuestInstanceHard",
             _ => "QuestInstanceEasy"
         };
-
-    public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, QuestDifficulty difficulty)
-    {
-        if (_activeInstanceByBoard.TryGetValue(boardUid, out var existing))
-        {
-            var curTime = _timing.CurTime;
-            var alreadyParticipant = existing.Participants.Contains(session.UserId);
-
-            if (curTime >= existing.EndAt)
-            {
-                _popup.PopupEntity(
-                    Loc.GetString("quest-instance-expired"),
-                    session.AttachedEntity ?? boardUid,
-                    session);
-                return;
-            }
-
-            if (!alreadyParticipant && curTime > existing.JoinUntil)
-            {
-                _popup.PopupEntity(
-                    Loc.GetString("quest-instance-join-closed", ("seconds", existing.JoinWindowSeconds)),
-                    session.AttachedEntity ?? boardUid,
-                    session);
-                return;
-            }
-
-            // Guard: player already on the instance map.
-            if (alreadyParticipant && session.AttachedEntity is { } attachedEnt)
-            {
-                if (Transform(attachedEnt).MapUid == existing.MapUid)
-                    return;
-            }
-
-            JoinInstance(existing, session);
-            SendBoardState(boardUid);
-            return;
-        }
-
-        var presetId = DifficultyToPresetId(difficulty);
-        if (!_proto.TryIndex<QuestInstancePresetPrototype>(presetId, out var preset))
-        {
-            Log.Error($"QuestInstanceSystem: preset '{presetId}' not found.");
-            return;
-        }
-
-        var instance = CreateInstance(boardUid, preset);
-        if (instance == null)
-            return;
-
-        _activeInstanceByBoard[boardUid] = instance;
-        JoinInstance(instance, session);
-        SendBoardState(boardUid);
-    }
-
-    private QuestInstance? CreateInstance(EntityUid boardUid, QuestInstancePresetPrototype preset)
-    {
-        // Resolve which map file to load, if any.
-        var mapPath = preset.MapPaths.Count > 0
-            ? _random.Pick(preset.MapPaths)
-            : preset.OptionalMapPath;
-
-        // Always create a dedicated map so biome + loaded grid can coexist.
-        var mapUid = _mapSystem.CreateMap(out var mapId, false);
-
-        if (preset.BiomeTemplateId != null && !ApplyBiome(mapUid, preset))
-        {
-            Del(mapUid);
-            return null;
-        }
-
-        EntityUid gridUid;
-
-        if (mapPath != null)
-        {
-            // Load salvage grid into this map.
-            if (!_mapLoader.TryLoadGrid(mapId, mapPath.Value, out var loadedGrid))
-            {
-                Log.Error($"QuestInstanceSystem: failed to load grid '{mapPath}'.");
-                Del(mapUid);
-                return null;
-            }
-
-            gridUid = loadedGrid.Value;
-        }
-        else
-        {
-            // Biome-only instance.
-            if (preset.BiomeTemplateId == null)
-            {
-                Log.Error(
-                    $"QuestInstanceSystem: preset '{preset.ID}' has no MapPaths, OptionalMapPath, or BiomeTemplateId.");
-                Del(mapUid);
-                return null;
-            }
-
-            gridUid = mapUid;
-        }
-
-        ForceGridEnvironment(mapUid, gridUid);
-        _mapSystem.InitializeMap(mapId);
-
-        var spawnCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
-
-        var now = _timing.CurTime;
-        var instance = new QuestInstance
-        {
-            BoardUid = boardUid,
-            MapUid = mapUid,
-            SpawnCoords = spawnCoords,
-            JoinWindowSeconds = preset.JoinWindowSeconds,
-            WarningThresholdsSeconds = preset.WarningThresholdsSeconds,
-            JoinUntil = now + TimeSpan.FromSeconds(preset.JoinWindowSeconds),
-            EndAt = now + TimeSpan.FromSeconds(preset.TimeLimitSeconds)
-        };
-
-        var signpost = Spawn(preset.ExitSignpostProto, spawnCoords);
-        var signpostComp = EnsureComp<QuestSignpostComponent>(signpost);
-        signpostComp.BoardUid = boardUid;
-
-        var barrierRadius = Math.Clamp(
-            ComputeBarrierRadius(gridUid, preset),
-            1,
-            Math.Max(1, preset.MaxBarrierRadius));
-        SpawnSquareBarrier(gridUid, preset, barrierRadius);
-
-        return instance;
-    }
-
-    private void JoinInstance(QuestInstance instance, ICommonSession session)
-    {
-        if (session.AttachedEntity is not { } playerEnt)
-            return;
-
-        var playerXform = Transform(playerEnt);
-
-        // Save latest return point when joining from outside the instance map.
-        if (playerXform.MapUid != instance.MapUid)
-            instance.ReturnCoords[session.UserId] = playerXform.Coordinates;
-
-        instance.Participants.Add(session.UserId);
-
-        TeleportWithPulledEntity(playerEnt, instance.SpawnCoords);
-    }
-
-    private bool ExitPlayer(ICommonSession session, QuestInstance instance)
-    {
-        if (session.AttachedEntity is not { } playerEnt)
-            return true;
-
-        if (instance.ReturnCoords.TryGetValue(session.UserId, out var returnCoords))
-        {
-            instance.ReturnCoords.Remove(session.UserId);
-            TeleportWithPulledEntity(playerEnt, returnCoords);
-            return true;
-        }
-
-        var fallback = GetBoardFallbackCoordinates(instance.BoardUid);
-        if (fallback == EntityCoordinates.Invalid)
-        {
-            Log.Warning($"QuestInstanceSystem: no ReturnCoords and no valid board fallback for {session.UserId}.");
-            return false;
-        }
-
-        Log.Warning($"QuestInstanceSystem: no ReturnCoords for {session.UserId}, using board fallback.");
-        TeleportWithPulledEntity(playerEnt, fallback);
-        return true;
-    }
-
-    private void TryCleanupIfEmpty(EntityUid boardUid, QuestInstance instance)
-    {
-        if (GetPlayersInInstanceMap(instance).Count > 0)
-            return;
-
-        CleanupInstance(boardUid, instance);
-    }
-
-    private void ForceCloseInstance(EntityUid boardUid, QuestInstance instance)
-    {
-        var everyoneEvacuated = true;
-
-        foreach (var session in GetPlayersInInstanceMap(instance))
-            everyoneEvacuated &= ExitPlayer(session, instance);
-
-        if (!everyoneEvacuated)
-        {
-            Log.Warning(
-                $"QuestInstanceSystem: aborting cleanup for board {boardUid} because not all players could be evacuated.");
-            return;
-        }
-
-        CleanupInstance(boardUid, instance);
-    }
-
-    private void CleanupInstance(EntityUid boardUid, QuestInstance instance)
-    {
-        if (!Deleted(instance.MapUid))
-            Del(instance.MapUid);
-
-        _activeInstanceByBoard.Remove(boardUid);
-
-        if (!Deleted(boardUid) && !Terminating(boardUid))
-            SendBoardState(boardUid);
-    }
-
-    public override void Update(float frameTime)
-    {
-        if (_activeInstanceByBoard.Count == 0)
-            return;
-
-        var curTime = _timing.CurTime;
-
-        List<EntityUid>? toClose = null;
-
-        foreach (var (boardUid, instance) in _activeInstanceByBoard)
-        {
-            var remaining = instance.EndAt - curTime;
-            SendWarningPopups(instance, remaining);
-
-            if (remaining <= TimeSpan.Zero)
-            {
-                toClose ??= new();
-                toClose.Add(boardUid);
-            }
-        }
-
-        if (toClose == null)
-            return;
-
-        foreach (var boardUid in toClose)
-            if (_activeInstanceByBoard.TryGetValue(boardUid, out var instance))
-                ForceCloseInstance(boardUid, instance);
-    }
-
-    private bool ApplyBiome(EntityUid mapUid, QuestInstancePresetPrototype preset)
-    {
-        if (preset.BiomeTemplateId == null)
-            return false;
-
-        if (!_proto.TryIndex<BiomeTemplatePrototype>(preset.BiomeTemplateId, out var template))
-        {
-            Log.Error($"QuestInstanceSystem: biome template '{preset.BiomeTemplateId}' not found.");
-            return false;
-        }
-
-        _biome.EnsurePlanet(mapUid, template, _random.Next());
-        return true;
-    }
-
-    private EntityCoordinates ComputeSpawnCoordinates(
-        EntityUid mapUid,
-        EntityUid gridUid,
-        QuestInstancePresetPrototype preset
-    )
-    {
-        if (!TryComp<MapGridComponent>(gridUid, out var gridComp) || gridComp.LocalAABB.IsEmpty())
-            return new(mapUid, new(0.5f, 0.5f));
-
-        var aabb = gridComp.LocalAABB;
-        var offset = MathF.Max(1f, preset.SpawnDistanceFromGrid);
-
-        // Spawn near the loaded grid, but just outside its right edge.
-        var nearGrid = new EntityCoordinates(gridUid, new(aabb.Right + offset, aabb.Center.Y));
-
-        // Prefer map coordinates when map has a biome grid; otherwise keep grid-local coords.
-        if (TryComp<MapGridComponent>(mapUid, out _))
-        {
-            var mapCoords = _transform.ToMapCoordinates(nearGrid);
-            return new(mapUid, mapCoords.Position);
-        }
-
-        return nearGrid;
-    }
-
-
-    private void TeleportWithPulledEntity(EntityUid user, EntityCoordinates destination)
-    {
-        if (TryComp<PullerComponent>(user, out var puller)
-            && puller.Pulling is { } pulled
-            && TryComp<PullableComponent>(pulled, out var pullable))
-        {
-            _transform.SetCoordinates(pulled, destination);
-            _transform.AttachToGridOrMap(pulled);
-            _transform.SetCoordinates(user, destination);
-            _transform.AttachToGridOrMap(user);
-
-            if (pullable.Puller != user)
-                _pulling.TryStartPull(user, pulled, puller, pullable);
-
-            return;
-        }
-
-        _transform.SetCoordinates(user, destination);
-        _transform.AttachToGridOrMap(user);
-    }
-    private EntityCoordinates GetBoardFallbackCoordinates(EntityUid boardUid)
-    {
-        if (Deleted(boardUid))
-            return EntityCoordinates.Invalid;
-
-        var boardXform = Transform(boardUid);
-        return boardXform.MapUid == null
-            ? EntityCoordinates.Invalid
-            : boardXform.Coordinates;
-    }
-
-
-    private void ForceGridEnvironment(EntityUid mapUid, EntityUid gridUid)
-    {
-        var mapGravity = EnsureComp<GravityComponent>(mapUid);
-        mapGravity.Enabled = true;
-        mapGravity.Inherent = true;
-        Dirty(mapUid, mapGravity);
-
-        var gridGravity = EnsureComp<GravityComponent>(gridUid);
-        gridGravity.Enabled = true;
-        gridGravity.Inherent = true;
-        Dirty(gridUid, gridGravity);
-
-        EnsureComp<GridAtmosphereComponent>(gridUid);
-
-        var moles = new float[Atmospherics.AdjustedNumberOfGases];
-        moles[(int) Gas.Oxygen] = 21.824779f;
-        moles[(int) Gas.Nitrogen] = 82.10312f;
-
-        _atmos.SetMapAtmosphere(mapUid, false, new GasMixture(moles, Atmospherics.T20C));
-    }
-    private int ComputeBarrierRadius(EntityUid gridUid, QuestInstancePresetPrototype preset)
-    {
-        var padding = Math.Max(0, preset.BarrierPadding);
-
-        if (!TryComp<MapGridComponent>(gridUid, out var grid))
-            return 1 + padding;
-
-        var aabb = grid.LocalAABB;
-        var tileSize = (float) grid.TileSize;
-
-        if (aabb.Width <= tileSize && aabb.Height <= tileSize)
-            return 1 + padding;
-
-        var minX = (int) MathF.Floor(aabb.Left / tileSize);
-        var maxX = (int) MathF.Ceiling(aabb.Right / tileSize) - 1;
-        var minY = (int) MathF.Floor(aabb.Bottom / tileSize);
-        var maxY = (int) MathF.Ceiling(aabb.Top / tileSize) - 1;
-
-        var baseRadius = Math.Max(
-            Math.Max(Math.Abs(minX), Math.Abs(maxX)),
-            Math.Max(Math.Abs(minY), Math.Abs(maxY)));
-
-        if (baseRadius < 1)
-            baseRadius = 1;
-
-        return baseRadius + padding;
-    }
-
-    private void SpawnSquareBarrier(EntityUid gridUid, QuestInstancePresetPrototype preset, int r)
-    {
-        for (var x = -r; x <= r; x++)
-        {
-            Spawn(preset.BarrierProto, new(gridUid, new(x + 0.5f, -r + 0.5f)));
-            Spawn(preset.BarrierProto, new(gridUid, new(x + 0.5f, r + 0.5f)));
-        }
-
-        for (var y = -r + 1; y <= r - 1; y++)
-        {
-            Spawn(preset.BarrierProto, new(gridUid, new(-r + 0.5f, y + 0.5f)));
-            Spawn(preset.BarrierProto, new(gridUid, new(r + 0.5f, y + 0.5f)));
-        }
-    }
-
-    private List<ICommonSession> GetPlayersInInstanceMap(QuestInstance instance)
-    {
-        var result = new List<ICommonSession>();
-
-        foreach (var session in _playerManager.Sessions)
-        {
-            if (session.AttachedEntity is not { } ent)
-                continue;
-
-            if (Transform(ent).MapUid == instance.MapUid)
-                result.Add(session);
-        }
-
-        return result;
-    }
-
-    private void SendWarningPopups(QuestInstance instance, TimeSpan remaining)
-    {
-        List<ICommonSession>? playersInMap = null;
-
-        foreach (var threshold in instance.WarningThresholdsSeconds)
-        {
-            if (remaining.TotalSeconds > threshold)
-                continue;
-
-            if (!instance.SentWarnings.Add(threshold))
-                continue;
-
-            var msg = Loc.GetString("quest-instance-warning", ("seconds", threshold));
-            playersInMap ??= GetPlayersInInstanceMap(instance);
-
-            foreach (var session in playersInMap)
-                if (session.AttachedEntity is { } ent)
-                    _popup.PopupEntity(msg, ent, session, PopupType.LargeCaution);
-        }
-    }
-
-    private void OnSignpostUsed(EntityUid uid, QuestSignpostComponent comp, InteractHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!TryComp<ActorComponent>(args.User, out var actor))
-            return;
-
-        if (!_activeInstanceByBoard.TryGetValue(comp.BoardUid, out var instance))
-            return;
-
-        args.Handled = true;
-
-        ExitPlayer(actor.PlayerSession, instance);
-        TryCleanupIfEmpty(comp.BoardUid, instance);
-        SendBoardState(comp.BoardUid);
-    }
-
-    private void OnBoardTerminating(EntityUid uid, QuestBoardComponent comp, EntityTerminatingEvent args)
-    {
-        if (!_activeInstanceByBoard.TryGetValue(uid, out var instance))
-            return;
-
-        ForceCloseInstance(uid, instance);
-    }
-
-    private void OnBoardUiOpened(EntityUid uid, QuestBoardComponent comp, AfterActivatableUIOpenEvent args) =>
-        SendBoardState(uid);
-
-    private void OnBoardSelectDifficulty(
-        EntityUid uid,
-        QuestBoardComponent comp,
-        QuestBoardSelectDifficultyMessage msg
-    )
-    {
-        if (!TryComp<ActorComponent>(msg.Actor, out var actor))
-            return;
-
-        StartOrJoinInstance(uid, actor.PlayerSession, msg.Difficulty);
-        SendBoardState(uid);
-    }
-
-    private void SendBoardState(EntityUid boardUid)
-    {
-        QuestBoardBoundUserInterfaceState state;
-
-        if (_activeInstanceByBoard.TryGetValue(boardUid, out var instance))
-        {
-            var remaining = instance.EndAt - _timing.CurTime;
-            state = new(
-                true,
-                Math.Max(0, (int) remaining.TotalSeconds),
-                GetPlayersInInstanceMap(instance).Count);
-        }
-        else
-            state = new(false, 0, 0);
-
-        _ui.SetUiState(boardUid, QuestBoardUiKey.Key, state);
-    }
-
-    private sealed class QuestInstance
-    {
-        // All NetUserIds who have ever entered this instance (for rejoin checks).
-        public readonly HashSet<NetUserId> Participants = new();
-
-        // Saved world coordinates to return each player to on exit.
-        public readonly Dictionary<NetUserId, EntityCoordinates> ReturnCoords = new();
-
-        // Which WarningThresholdsSeconds values have already triggered a popup.
-        public readonly HashSet<int> SentWarnings = new();
-        public EntityUid BoardUid;
-        public TimeSpan EndAt;
-        public TimeSpan JoinUntil;
-        public int JoinWindowSeconds;
-        public EntityUid MapUid;
-        public EntityCoordinates SpawnCoords;
-        public int[] WarningThresholdsSeconds = new int[0];
-    }
 }
-
-
-
-
-
diff --git a/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs b/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
index 84228661fa..47a63ad622 100644
--- a/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
@@ -1,16 +1,14 @@
 namespace Content.Server.Magnits.QuestInstance;
 
 /// <summary>
-/// Placed at the center of a quest instance (tile 0,0).
-/// When a player interacts with this entity, QuestInstanceSystem teleports them
-/// back to their saved origin and removes them from the instance.
+/// Spawned near quest instance entry.
+/// Interacting teleports player back via QuestInstanceSystem.
 /// </summary>
 [RegisterComponent]
 public sealed partial class QuestSignpostComponent : Component
 {
     /// <summary>
-    /// The QuestBoard entity (with <see cref="QuestBoardComponent"/>) that spawned this instance.
-    /// Used to look up the active <c>QuestInstance</c> in QuestInstanceSystem.
+    /// The QuestBoard entity that owns this instance.
     /// </summary>
     [DataField]
     public EntityUid BoardUid;
diff --git a/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs b/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
index 13ffd98c18..c11538203e 100644
--- a/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
+++ b/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
@@ -4,46 +4,46 @@ namespace Content.Shared.Magnits.QuestInstance;
 
 /// <summary>Difficulty tiers for quest instances.</summary>
 [Serializable, NetSerializable]
-public enum QuestDifficulty { Easy, Medium, Hard }
+public enum QuestDifficulty
+{
+    Easy,
+    Medium,
+    Hard,
+}
 
-/// <summary>BUI key — one entry per QuestBoard entity.</summary>
+/// <summary>BUI key for QuestBoard UI.</summary>
 [Serializable, NetSerializable]
-public enum QuestBoardUiKey { Key }
-
-// ──────────────────────────── State ────────────────────────────────────────
+public enum QuestBoardUiKey
+{
+    Key,
+}
 
 /// <summary>
-/// Sent from server to client whenever the board state changes or the UI opens.
+/// Sent from server to client whenever board state changes.
 /// </summary>
 [Serializable, NetSerializable]
 public sealed class QuestBoardBoundUserInterfaceState : BoundUserInterfaceState
 {
-    /// <summary>True when an instance is currently active for this board.</summary>
+    /// <summary>True when an instance is active for this board.</summary>
     public bool HasActiveInstance;
 
-    /// <summary>Seconds until force-close. Only meaningful when HasActiveInstance.</summary>
-    public int RemainingSeconds;
-
     /// <summary>Number of players physically present in the instance.</summary>
     public int ParticipantCount;
 
-    public QuestBoardBoundUserInterfaceState(
-        bool hasActiveInstance,
-        int remainingSeconds,
-        int participantCount)
+    /// <summary>Seconds until force-close. Meaningful only when active.</summary>
+    public int RemainingSeconds;
+
+    public QuestBoardBoundUserInterfaceState(bool hasActiveInstance, int remainingSeconds, int participantCount)
     {
         HasActiveInstance = hasActiveInstance;
-        RemainingSeconds  = remainingSeconds;
-        ParticipantCount  = participantCount;
+        RemainingSeconds = remainingSeconds;
+        ParticipantCount = participantCount;
     }
 }
 
-// ──────────────────────────── Messages ─────────────────────────────────────
-
 /// <summary>
-/// Sent from client when the player presses Easy / Medium / Hard
-/// (create a new instance) or the Join button (join existing instance;
-/// Difficulty field is ignored server-side if an instance already exists).
+/// Sent from client when selecting difficulty or joining an active instance.
+/// Difficulty is ignored by server when an instance is already active.
 /// </summary>
 [Serializable, NetSerializable]
 public sealed class QuestBoardSelectDifficultyMessage : BoundUserInterfaceMessage
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
index a97f10cc97..b5e75dfc0e 100644
--- a/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
+++ b/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
@@ -1,8 +1,3 @@
-# Сущности квест-инстанса
-# QuestBoard: ставится на карту, открывает BUI выбора сложности.
-# QuestSignpost: появляется у входа, используется для выхода из инстанса.
-# QuestInvisibleWall: периметр инстанса, невидимая твёрдая стена.
-
 - type: entity
   id: QuestBoard
   name: доска заданий
@@ -124,4 +119,4 @@
         - FullTileMask
         layer:
         - WallLayer
-
+  - type: Airtight
\ No newline at end of file
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
index a2956ce198..60d3f26a38 100644
--- a/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
+++ b/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
@@ -1,6 +1,17 @@
-# Quest Instance Presets — Easy / Medium / Hard
-# Each preset picks one map at random from its mapPaths list on instance creation.
-# Biome is applied as background when biomeTemplateId is set.
+# Quest Instance Presets - Easy / Medium / Hard
+# mapEntries supports per-map overrides:
+#   mapPath: /Maps/Salvage/example.yml
+#   weight: 3
+#   biomeTemplateId: Wastes
+#   weatherPrototypeId: Rain
+#   atmosphereTemperatureCelsius: 20
+#   timeCyclePaletteId: QuestDay
+#
+# Quest palettes:
+#   Day: QuestDay
+#   Morning: QuestMorning
+#   Dusk: QuestDusk
+#   Night: QuestNight
 
 - type: questInstancePreset
   id: QuestInstanceEasy
@@ -14,20 +25,72 @@
     - 30
     - 10
   joinWindowSeconds: 120
-  mapPaths:
-    - /Maps/Salvage/small-1.yml
-    - /Maps/Salvage/small-2.yml
-    - /Maps/Salvage/small-3.yml
-    - /Maps/Salvage/small-4.yml
-    - /Maps/Salvage/small-a-1.yml
-    - /Maps/Salvage/small-cargo.yml
-    - /Maps/Salvage/small-ai-survey-drone.yml
-    - /Maps/Salvage/small-chapel.yml
-    - /Maps/Salvage/small-chef.yml
-    - /Maps/Salvage/small-party.yml
-    - /Maps/Salvage/small-ship-1.yml
-    - /Maps/Salvage/hauling-shuttle.yml
-    - /Maps/Salvage/cargo-1.yml
+  mapEntries:
+    - mapPath: /Maps/Salvage/small-1.yml
+      weight: 8
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-2.yml
+      weight: 6
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-3.yml
+      weight: 5
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-4.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-a-1.yml
+      weight: 5
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-cargo.yml
+      weight: 4
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-ai-survey-drone.yml
+      weight: 3
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-chapel.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-chef.yml
+      weight: 3
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-party.yml
+      weight: 2
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-ship-1.yml
+      weight: 5
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/hauling-shuttle.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/cargo-1.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDay
 
 - type: questInstancePreset
   id: QuestInstanceMedium
@@ -41,17 +104,57 @@
     - 30
     - 10
   joinWindowSeconds: 120
-  mapPaths:
-    - /Maps/Salvage/medium-1.yml
-    - /Maps/Salvage/medium-dock.yml
-    - /Maps/Salvage/medium-library.yml
-    - /Maps/Salvage/medium-crashed-shuttle.yml
-    - /Maps/Salvage/medium-pet-hospital.yml
-    - /Maps/Salvage/medium-ruined-emergency-shuttle.yml
-    - /Maps/Salvage/medium-silent-orchestra.yml
-    - /Maps/Salvage/medium-template.yml
-    - /Maps/Salvage/ruin-cargo-salvage.yml
-    - /Maps/Salvage/wh-salvage.yml
+  mapEntries:
+    - mapPath: /Maps/Salvage/medium-1.yml
+      weight: 6
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/medium-dock.yml
+      weight: 5
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-library.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-crashed-shuttle.yml
+      weight: 4
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/medium-pet-hospital.yml
+      weight: 3
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-silent-orchestra.yml
+      weight: 3
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-template.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/ruin-cargo-salvage.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/wh-salvage.yml
+      weight: 2
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestDusk
 
 - type: questInstancePreset
   id: QuestInstanceHard
@@ -65,16 +168,64 @@
     - 30
     - 10
   joinWindowSeconds: 120
-  mapPaths:
-    - /Maps/Salvage/asteroid-base.yml
-    - /Maps/Salvage/engineering-chunk.yml
-    - /Maps/Salvage/outpost-arm.yml
-    - /Maps/Salvage/security-chunk.yml
-    - /Maps/Salvage/medium-pirate.yml
-    - /Maps/Salvage/medium-vault-1.yml
-    - /Maps/Salvage/meatball.yml
-    - /Maps/Salvage/vegan-meatball.yml
-    - /Maps/Salvage/small-syndicate.yml
-    - /Maps/Salvage/small-tesla.yml
-    - /Maps/Salvage/stationstation.yml
-    - /Maps/Salvage/tick-colony.yml
+  mapEntries:
+    - mapPath: /Maps/Salvage/asteroid-base.yml
+      weight: 5
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/engineering-chunk.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/outpost-arm.yml
+      weight: 4
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/security-chunk.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-pirate.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-vault-1.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/meatball.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/vegan-meatball.yml
+      weight: 2
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-syndicate.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-tesla.yml
+      weight: 2
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/stationstation.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/tick-colony.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDusk
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml
new file mode 100644
index 0000000000..8b3f72360d
--- /dev/null
+++ b/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml
@@ -0,0 +1,27 @@
+# Quest-specific static palettes.
+# Use these IDs in questInstancePreset.mapEntries.timeCyclePaletteId:
+#   QuestDay, QuestMorning, QuestDusk, QuestNight
+
+- type: timeCyclePalette
+  id: QuestDay
+  timeEntries:
+    0: "#D8B059"
+    24: "#D8B059"
+
+- type: timeCyclePalette
+  id: QuestMorning
+  timeEntries:
+    0: "#A88F73"
+    24: "#A88F73"
+
+- type: timeCyclePalette
+  id: QuestDusk
+  timeEntries:
+    0: "#8A6A45"
+    24: "#8A6A45"
+
+- type: timeCyclePalette
+  id: QuestNight
+  timeEntries:
+    0: "#2B3143"
+    24: "#2B3143"

From df22aae9a6d24395fd7b61e197c1a4484e8dd77c Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 09:02:11 +0500
Subject: [PATCH 04/10] =?UTF-8?q?=D0=A4=D0=B8=D0=BD=D0=B8=D1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weather/WeatherAudioCleanupSystem.cs      | 149 ++++++++++++++++++
 .../QuestInstanceSystem.InstanceFlow.cs       |  23 ++-
 .../QuestInstanceSystem.MapSetup.cs           |  42 ++---
 3 files changed, 181 insertions(+), 33 deletions(-)
 create mode 100644 Content.Client/Weather/WeatherAudioCleanupSystem.cs

diff --git a/Content.Client/Weather/WeatherAudioCleanupSystem.cs b/Content.Client/Weather/WeatherAudioCleanupSystem.cs
new file mode 100644
index 0000000000..6c44b144ca
--- /dev/null
+++ b/Content.Client/Weather/WeatherAudioCleanupSystem.cs
@@ -0,0 +1,149 @@
+using Content.Shared.Weather;
+using Robust.Client.Audio;
+using Robust.Client.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
+
+namespace Content.Client.Weather;
+
+public sealed class WeatherAudioCleanupSystem : EntitySystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    private readonly HashSet<string> _weatherAudioFiles = new();
+    private EntityUid? _localEntity;
+    private EntityUid? _localMap;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        BuildWeatherAudioFileCache();
+
+        SubscribeLocalEvent<WeatherComponent, ComponentShutdown>(OnWeatherShutdown);
+        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnLocalPlayerAttached);
+        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnLocalPlayerDetached);
+        SubscribeLocalEvent<EntParentChangedMessage>(OnParentChanged);
+
+        _localEntity = _player.LocalEntity;
+        _localMap = _localEntity is { } uid ? Transform(uid).MapUid : null;
+        CleanupWeatherAudioForCurrentMap(_localMap);
+    }
+
+    private void OnLocalPlayerAttached(LocalPlayerAttachedEvent args)
+    {
+        _localEntity = args.Entity;
+        _localMap = Transform(args.Entity).MapUid;
+        CleanupWeatherAudioForCurrentMap(_localMap);
+    }
+
+    private void OnLocalPlayerDetached(LocalPlayerDetachedEvent args)
+    {
+        _localEntity = null;
+        _localMap = null;
+        CleanupWeatherAudioForCurrentMap(null);
+    }
+
+    private void OnParentChanged(ref EntParentChangedMessage args)
+    {
+        if (_localEntity is not { } local || args.Entity != local)
+            return;
+
+        if (args.Transform.MapUid == _localMap)
+            return;
+
+        _localMap = args.Transform.MapUid;
+        CleanupWeatherAudioForCurrentMap(_localMap);
+    }
+
+    private void OnWeatherShutdown(EntityUid uid, WeatherComponent component, ComponentShutdown args)
+    {
+        StopAllStreams(component);
+        StopStrayWeatherAudioEntities();
+    }
+
+    private void CleanupWeatherAudioForCurrentMap(EntityUid? currentMap)
+    {
+        var query = EntityQueryEnumerator<WeatherComponent, TransformComponent>();
+        while (query.MoveNext(out _, out var weather, out var xform))
+        {
+            if (currentMap != null && xform.MapUid == currentMap)
+                continue;
+
+            StopAllStreams(weather);
+        }
+
+        StopStrayWeatherAudioEntities();
+    }
+
+    private void StopAllStreams(WeatherComponent component)
+    {
+        foreach (var data in component.Weather.Values)
+        {
+            if (data.Stream is not { } streamUid)
+                continue;
+
+            if (TryComp(streamUid, out AudioComponent? streamAudio))
+                _audio.SetState(streamUid, AudioState.Stopped, true, streamAudio);
+
+            data.Stream = _audio.Stop(streamUid);
+        }
+    }
+
+    private void StopStrayWeatherAudioEntities()
+    {
+        var referencedStreams = new HashSet<EntityUid>();
+
+        var weatherQuery = EntityQueryEnumerator<WeatherComponent>();
+        while (weatherQuery.MoveNext(out _, out var weather))
+            foreach (var data in weather.Weather.Values)
+                if (data.Stream is { } streamUid)
+                    referencedStreams.Add(streamUid);
+
+        var audioQuery = EntityQueryEnumerator<AudioComponent>();
+        while (audioQuery.MoveNext(out var uid, out var audio))
+        {
+            if (!_weatherAudioFiles.Contains(NormalizeAudioPath(audio.FileName)))
+                continue;
+
+            if (referencedStreams.Contains(uid))
+                continue;
+
+            _audio.SetState(uid, AudioState.Stopped, true, audio);
+            _audio.Stop(uid, audio);
+        }
+    }
+
+    private void BuildWeatherAudioFileCache()
+    {
+        _weatherAudioFiles.Clear();
+
+        foreach (var weather in _proto.EnumeratePrototypes<WeatherPrototype>())
+        {
+            if (weather.Sound is null)
+                continue;
+
+            switch (weather.Sound)
+            {
+                case SoundPathSpecifier path when path.Path != default:
+                    _weatherAudioFiles.Add(NormalizeAudioPath(path.Path.ToString()));
+                    break;
+
+                case SoundCollectionSpecifier collection when collection.Collection is { } collectionId
+                    && _proto.TryIndex(collectionId, out SoundCollectionPrototype? soundCollection):
+                    foreach (var file in soundCollection.PickFiles)
+                        _weatherAudioFiles.Add(NormalizeAudioPath(file.ToString()));
+                    break;
+            }
+        }
+    }
+
+    private static string NormalizeAudioPath(string path)
+    {
+        return path.ToLowerInvariant();
+    }
+}
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
index 62d1d43355..47ed5b98db 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Shared.Magnits.QuestInstance;
+using Content.Shared.Weather;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -123,21 +124,17 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
         }
 
         ForceGridEnvironment(gridUid);
+        ForceGridBreathableAtmosphere(gridUid, atmosphereTemperatureCelsius);
 
         _mapSystem.InitializeMap(mapId);
 
-        // Re-apply atmosphere AFTER map init so tiles loaded from a salvage grid
-        // (saved as vacuum) get overwritten with breathable air + correct temperature.
+        // Re-apply atmosphere AFTER map init so map-atmos tiles keep the selected profile,
+        // then normalize loaded grid tile mixtures to prevent decompression spikes.
         ApplyBreathableMapAtmosphere(mapUid, atmosphereTemperatureCelsius);
+        ForceGridBreathableAtmosphere(gridUid, atmosphereTemperatureCelsius);
 
         var signpostCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
-        // For biome maps the player spawns slightly away from the signpost (open terrain).
-        // For loaded grids both land at the same AABB center — the offset would push the
-        // player outside the grid into the void.
-        var isBiomeMap = gridUid == mapUid;
-        var playerSpawnCoords = isBiomeMap
-            ? OffsetCoordinates(signpostCoords, new Vector2(1.25f, 0f))
-            : signpostCoords;
+        var playerSpawnCoords = OffsetCoordinates(signpostCoords, new Vector2(1.25f, 0f));
 
         var now = _timing.CurTime;
         board.HasActiveInstance = true;
@@ -288,9 +285,11 @@ private void CleanupInstance(EntityUid boardUid, QuestBoardComponent board)
             var mapId = Transform(board.MapUid).MapID;
             if (mapId != MapId.Nullspace)
             {
-                // Stop weather before deleting the map so clients receive the
-                // stop-weather network message before the map entity disappears.
-                _weather.SetWeather(mapId, null, null);
+                if (TryComp<WeatherComponent>(board.MapUid, out var weatherComp))
+                {
+                    weatherComp.Weather.Clear();
+                    Dirty(board.MapUid, weatherComp);
+                }
                 _mapSystem.DeleteMap(mapId);
             }
         }
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
index 2bdbfea4b1..2a560cc667 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
+++ b/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Gravity;
 using Content.Shared.Parallax.Biomes;
@@ -98,20 +97,10 @@ private EntityCoordinates ComputeSpawnCoordinates(EntityUid mapUid, EntityUid gr
             return new(mapUid, new(0.5f, 0.5f));
 
         var aabb = gridComp.LocalAABB;
-
-        // Biome map: gridUid == mapUid (map entity has a grid component).
-        // Spawn just outside the biome grid chunk — the infinite biome has terrain there.
-        if (gridUid == mapUid)
-        {
-            var offset = MathF.Max(1f, preset.SpawnDistanceFromGrid);
-            var nearEdge = new EntityCoordinates(gridUid, new(aabb.Right + offset, aabb.Center.Y));
-            var mapCoords = _transform.ToMapCoordinates(nearEdge);
-            return new(mapUid, mapCoords.Position);
-        }
-
-        // Loaded grid (salvage ship etc.): spawn INSIDE the grid at its AABB center so
-        // the player lands on actual tiles, not in the void.
-        return new EntityCoordinates(gridUid, aabb.Center);
+        var offset = MathF.Max(1f, preset.SpawnDistanceFromGrid);
+        var nearEdge = new EntityCoordinates(gridUid, new(aabb.Right + offset, aabb.Center.Y));
+        var mapCoords = _transform.ToMapCoordinates(nearEdge);
+        return new(mapUid, mapCoords.Position);
     }
 
     private static EntityCoordinates OffsetCoordinates(EntityCoordinates origin, Vector2 offset)
@@ -149,12 +138,6 @@ private void ForceGridEnvironment(EntityUid gridUid)
         gridGravity.Enabled = true;
         gridGravity.Inherent = true;
         Dirty(gridUid, gridGravity);
-
-        // Remove any stale GridAtmosphereComponent that may have been loaded from the
-        // grid file (possibly with vacuum tile data), then add a fresh one so it
-        // initialises from the map atmosphere set in ApplyBreathableMapAtmosphere.
-        RemComp<GridAtmosphereComponent>(gridUid);
-        EnsureComp<GridAtmosphereComponent>(gridUid);
     }
 
     private void ApplyBreathableMapAtmosphere(EntityUid mapUid, float temperatureCelsius)
@@ -167,6 +150,22 @@ private void ApplyBreathableMapAtmosphere(EntityUid mapUid, float temperatureCel
         _atmos.SetMapAtmosphere(mapUid, false, new GasMixture(moles, temperatureKelvin));
     }
 
+    private void ForceGridBreathableAtmosphere(EntityUid gridUid, float temperatureCelsius)
+    {
+        var temperatureKelvin = MathF.Max(Atmospherics.TCMB, Atmospherics.T0C + temperatureCelsius);
+
+        foreach (var mixture in _atmos.GetAllMixtures(gridUid, true))
+        {
+            if (mixture.Immutable)
+                continue;
+
+            mixture.Clear();
+            mixture.SetMoles(Gas.Oxygen, 21.824779f);
+            mixture.SetMoles(Gas.Nitrogen, 82.10312f);
+            mixture.Temperature = temperatureKelvin;
+        }
+    }
+
     private int ComputeBarrierRadius(EntityUid gridUid, QuestInstancePresetPrototype preset)
     {
         var padding = Math.Max(0, preset.BarrierPadding);
@@ -223,3 +222,4 @@ private void ProcessPendingBarrier(QuestBoardComponent board, int spawnBudget =
         }
     }
 }
+

From 3d978aeb78d3646166014d73da1b96fb180a08e3 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 09:24:45 +0500
Subject: [PATCH 05/10] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B8=D1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestBoardBoundUserInterface.cs           |   5 +-
 .../QuestInstance/QuestBoardWindow.xaml       |  51 ++--
 .../QuestInstance/QuestBoardWindow.xaml.cs    |  12 +-
 .../QuestInstance/QuestSignpostComponent.cs   |  15 --
 .../QuestInstance/QuestBoardComponent.cs      |   3 +-
 .../QuestInstancePresetPrototype.Helpers.cs   |   2 +-
 .../QuestInstancePresetPrototype.cs           |   3 +-
 .../QuestInstanceSystem.InstanceFlow.cs       |  22 +-
 .../QuestInstanceSystem.Interaction.cs        |   7 +-
 .../QuestInstanceSystem.MapSetup.cs           |  34 ++-
 .../QuestInstance/QuestInstanceSystem.cs      |   8 +-
 .../QuestInstance/QuestSignpostComponent.cs   |   8 +
 .../QuestInstance/QuestBoardUi.cs             |  22 +-
 .../_Nuclear14/Magnits/quest_entities.yml     | 122 ---------
 .../Magnits/quest_instance_presets.yml        | 231 ------------------
 .../Magnits/quest_time_cycle_palettes.yml     |  27 --
 16 files changed, 110 insertions(+), 462 deletions(-)
 rename Content.Client/{Magnits => _Forge}/QuestInstance/QuestBoardBoundUserInterface.cs (89%)
 rename Content.Client/{Magnits => _Forge}/QuestInstance/QuestBoardWindow.xaml (59%)
 rename Content.Client/{Magnits => _Forge}/QuestInstance/QuestBoardWindow.xaml.cs (83%)
 delete mode 100644 Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestBoardComponent.cs (95%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstancePresetPrototype.Helpers.cs (82%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstancePresetPrototype.cs (97%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstanceSystem.InstanceFlow.cs (95%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstanceSystem.Interaction.cs (94%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstanceSystem.MapSetup.cs (85%)
 rename Content.Server/{Magnits => _Forge}/QuestInstance/QuestInstanceSystem.cs (95%)
 create mode 100644 Content.Server/_Forge/QuestInstance/QuestSignpostComponent.cs
 rename Content.Shared/{Magnits => _Forge}/QuestInstance/QuestBoardUi.cs (74%)
 delete mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
 delete mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
 delete mode 100644 Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml

diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs b/Content.Client/_Forge/QuestInstance/QuestBoardBoundUserInterface.cs
similarity index 89%
rename from Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
rename to Content.Client/_Forge/QuestInstance/QuestBoardBoundUserInterface.cs
index 66d12ebd0c..976f82fc6f 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardBoundUserInterface.cs
+++ b/Content.Client/_Forge/QuestInstance/QuestBoardBoundUserInterface.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Magnits.QuestInstance;
+using Content.Shared._Forge.QuestInstance;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
 
-namespace Content.Client.Magnits.QuestInstance;
+namespace Content.Client._Forge.QuestInstance;
 
 
 [UsedImplicitly]
@@ -35,3 +35,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(s);
     }
 }
+
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml b/Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml
similarity index 59%
rename from Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
rename to Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml
index efdf52a6a3..dab9f5c8c9 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml
+++ b/Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml
@@ -1,70 +1,81 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                      xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                     MinSize="360 300"
+                     MinSize="380 320"
                      Title="{Loc 'quest-board-title'}">
-    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="8">
+    <BoxContainer Orientation="Vertical" Margin="12" SeparationOverride="10">
 
         <PanelContainer>
             <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#101723"
-                                  BorderColor="#33537a"
+                <gfx:StyleBoxFlat BackgroundColor="#1a140d"
+                                  BorderColor="#a88b5e"
                                   BorderThickness="1 1 1 1" />
             </PanelContainer.PanelOverride>
-            <BoxContainer Orientation="Vertical" Margin="8 6">
+            <BoxContainer Orientation="Vertical" Margin="10 8">
                 <Label Text="{Loc 'quest-board-title'}"
-                       StyleClasses="LabelHeading"
+                       StyleClasses="LabelHeading" FontColorOverride="#e3c88f"
                        HorizontalAlignment="Center" />
                 <Label Name="StatusLabel"
                        Text=""
                        HorizontalAlignment="Center"
-                       Margin="0 2 0 0" />
+                       Margin="0 4 0 0" />
             </BoxContainer>
         </PanelContainer>
 
-        <controls:HLine Color="#3b4f69" Thickness="1" Margin="0 0 0 2" />
+        <controls:HLine Color="#6f5636" Thickness="1" Margin="0 0 0 2" />
 
         <PanelContainer Name="CreateBox">
             <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#141a27"
-                                  BorderColor="#2c3f5a"
+                <gfx:StyleBoxFlat BackgroundColor="#17120d"
+                                  BorderColor="#8f6a33"
                                   BorderThickness="1 1 1 1" />
             </PanelContainer.PanelOverride>
-            <BoxContainer Orientation="Vertical" Margin="8" SeparationOverride="4">
+            <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="6">
                 <Label Text="{Loc 'quest-board-select-difficulty'}"
+                       StyleClasses="StatusFieldTitle"
                        HorizontalAlignment="Center"
-                       Margin="0 0 0 4" />
+                       Margin="0 0 0 6" />
                 <Button Name="EasyButton"
                         Text="{Loc 'quest-board-easy'}"
+                        StyleClasses="Caution"
                         HorizontalExpand="True"
-                        Margin="2 1" />
+                        Margin="0 1"
+                        MinSize="0 30" />
                 <Button Name="MediumButton"
                         Text="{Loc 'quest-board-medium'}"
+                        StyleClasses="Caution"
                         HorizontalExpand="True"
-                        Margin="2 1" />
+                        Margin="0 1"
+                        MinSize="0 30" />
                 <Button Name="HardButton"
                         Text="{Loc 'quest-board-hard'}"
+                        StyleClasses="Caution"
                         HorizontalExpand="True"
-                        Margin="2 1" />
+                        Margin="0 1"
+                        MinSize="0 30" />
             </BoxContainer>
         </PanelContainer>
 
         <PanelContainer Name="JoinBox" Visible="False">
             <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#1a1622"
-                                  BorderColor="#5f4b75"
+                <gfx:StyleBoxFlat BackgroundColor="#18120e"
+                                  BorderColor="#a88b5e"
                                   BorderThickness="1 1 1 1" />
             </PanelContainer.PanelOverride>
-            <BoxContainer Orientation="Vertical" Margin="8" SeparationOverride="4">
+            <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="6">
                 <Label Text="{Loc 'quest-board-instance-active'}"
+                       StyleClasses="StatusFieldTitle"
                        HorizontalAlignment="Center"
-                       Margin="0 0 0 4" />
+                       Margin="0 0 0 6" />
                 <Button Name="JoinButton"
                         Text="{Loc 'quest-board-join'}"
+                        StyleClasses="Caution"
                         HorizontalExpand="True"
-                        Margin="2 1" />
+                        Margin="0 1"
+                        MinSize="0 30" />
             </BoxContainer>
         </PanelContainer>
 
     </BoxContainer>
 </controls:FancyWindow>
+
diff --git a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs b/Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml.cs
similarity index 83%
rename from Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
rename to Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml.cs
index 0dc16b34fe..0359107983 100644
--- a/Content.Client/Magnits/QuestInstance/QuestBoardWindow.xaml.cs
+++ b/Content.Client/_Forge/QuestInstance/QuestBoardWindow.xaml.cs
@@ -1,10 +1,10 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Magnits.QuestInstance;
+using Content.Client.UserInterface.Controls;
+using Content.Shared._Forge.QuestInstance;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
 
-namespace Content.Client.Magnits.QuestInstance;
+namespace Content.Client._Forge.QuestInstance;
 
 
 [GenerateTypedNameReferences]
@@ -28,7 +28,7 @@ public void UpdateState(QuestBoardBoundUserInterfaceState state)
         {
             CreateBox.Visible = false;
             JoinBox.Visible = true;
-            StatusLabel.FontColorOverride = Color.FromHex("#8ce6a2");
+            StatusLabel.FontColorOverride = Color.FromHex("#ead2a2");
 
             var minutes = state.RemainingSeconds / 60;
             var seconds = state.RemainingSeconds % 60;
@@ -42,8 +42,10 @@ public void UpdateState(QuestBoardBoundUserInterfaceState state)
         {
             CreateBox.Visible = true;
             JoinBox.Visible = false;
-            StatusLabel.FontColorOverride = Color.FromHex("#9fb7d1");
+            StatusLabel.FontColorOverride = Color.FromHex("#c7ae81");
             StatusLabel.Text = Loc.GetString("quest-board-status-idle");
         }
     }
 }
+
+
diff --git a/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs b/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
deleted file mode 100644
index 47a63ad622..0000000000
--- a/Content.Server/Magnits/QuestInstance/QuestSignpostComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Content.Server.Magnits.QuestInstance;
-
-/// <summary>
-/// Spawned near quest instance entry.
-/// Interacting teleports player back via QuestInstanceSystem.
-/// </summary>
-[RegisterComponent]
-public sealed partial class QuestSignpostComponent : Component
-{
-    /// <summary>
-    /// The QuestBoard entity that owns this instance.
-    /// </summary>
-    [DataField]
-    public EntityUid BoardUid;
-}
diff --git a/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs b/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
similarity index 95%
rename from Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
rename to Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
index 11cd99fe38..984adb4320 100644
--- a/Content.Server/Magnits/QuestInstance/QuestBoardComponent.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
@@ -1,7 +1,8 @@
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 
-namespace Content.Server.Magnits.QuestInstance;
+
+namespace Content.Server._Forge.QuestInstance;
 
 [RegisterComponent]
 public sealed partial class QuestBoardComponent : Component
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs b/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
similarity index 82%
rename from Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
index 93d7077c08..bed4c69b8f 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Magnits.QuestInstance;
+namespace Content.Server._Forge.QuestInstance;
 
 public sealed partial class QuestInstancePresetPrototype
 {
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
similarity index 97%
rename from Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
index 4213862cd9..c1f14b99d3 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstancePresetPrototype.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
@@ -4,7 +4,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Magnits.QuestInstance;
+
+namespace Content.Server._Forge.QuestInstance;
 
 [Prototype("questInstancePreset")]
 public sealed partial class QuestInstancePresetPrototype : IPrototype
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
similarity index 95%
rename from Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
index 47ed5b98db..66f0463456 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
@@ -1,13 +1,14 @@
 using System.Linq;
-using System.Numerics;
-using Content.Shared.Magnits.QuestInstance;
+using Content.Shared._Forge.QuestInstance;
 using Content.Shared.Weather;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Magnits.QuestInstance;
+
+namespace Content.Server._Forge.QuestInstance;
+
 
 public sealed partial class QuestInstanceSystem
 {
@@ -24,7 +25,7 @@ public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, Ques
             if (curTime >= board.EndAt)
             {
                 _popup.PopupEntity(
-                    Loc.GetString("quest-instance-expired"),
+                    Robust.Shared.Localization.Loc.GetString("quest-instance-expired"),
                     session.AttachedEntity ?? boardUid,
                     session);
                 return;
@@ -33,7 +34,9 @@ public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, Ques
             if (!alreadyParticipant && curTime > board.JoinUntil)
             {
                 _popup.PopupEntity(
-                    Loc.GetString("quest-instance-join-closed", ("seconds", board.JoinWindowSeconds)),
+                    Robust.Shared.Localization.Loc.GetString(
+                        "quest-instance-join-closed",
+                        ("seconds", board.JoinWindowSeconds)),
                     session.AttachedEntity ?? boardUid,
                     session);
                 return;
@@ -80,7 +83,8 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
             mapPath = preset.OptionalMapPath;
 
         var biomeTemplateId = selectedMapEntry?.BiomeTemplateId ?? preset.BiomeTemplateId;
-        var atmosphereTemperatureCelsius = selectedMapEntry?.AtmosphereTemperatureCelsius ?? preset.AtmosphereTemperatureCelsius;
+        var atmosphereTemperatureCelsius =
+            selectedMapEntry?.AtmosphereTemperatureCelsius ?? preset.AtmosphereTemperatureCelsius;
 
         // Always create a dedicated map so biome + loaded grid can coexist.
         var mapUid = _mapSystem.CreateMap(out var mapId, false);
@@ -134,7 +138,7 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
         ForceGridBreathableAtmosphere(gridUid, atmosphereTemperatureCelsius);
 
         var signpostCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
-        var playerSpawnCoords = OffsetCoordinates(signpostCoords, new Vector2(1.25f, 0f));
+        var playerSpawnCoords = OffsetCoordinates(signpostCoords, new(1.25f, 0f));
 
         var now = _timing.CurTime;
         board.HasActiveInstance = true;
@@ -154,7 +158,7 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
             1,
             Math.Max(1, preset.MaxBarrierRadius));
         QueueSquareBarrier(board, gridUid, preset, barrierRadius);
-        ProcessPendingBarrier(board, 16);
+        ProcessPendingBarrier(board);
 
         ApplyMapEnvironmentOverrides(mapUid, mapId, selectedMapEntry);
         return true;
@@ -290,6 +294,7 @@ private void CleanupInstance(EntityUid boardUid, QuestBoardComponent board)
                     weatherComp.Weather.Clear();
                     Dirty(board.MapUid, weatherComp);
                 }
+
                 _mapSystem.DeleteMap(mapId);
             }
         }
@@ -353,4 +358,3 @@ public override void Update(float frameTime)
         }
     }
 }
-
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
similarity index 94%
rename from Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
index 72bf96b59f..65f8e5ccdf 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.Interaction.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
@@ -1,5 +1,5 @@
+using Content.Shared._Forge.QuestInstance;
 using Content.Shared.Interaction;
-using Content.Shared.Magnits.QuestInstance;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Popups;
 using Content.Shared.UserInterface;
@@ -7,7 +7,8 @@
 using Robust.Shared.Player;
 
 
-namespace Content.Server.Magnits.QuestInstance;
+namespace Content.Server._Forge.QuestInstance;
+
 
 public sealed partial class QuestInstanceSystem
 {
@@ -48,7 +49,7 @@ private void SendWarningPopups(QuestBoardComponent board, TimeSpan remaining)
             if (!board.SentWarnings.Add(threshold))
                 continue;
 
-            var msg = Loc.GetString("quest-instance-warning", ("seconds", threshold));
+            var msg = Robust.Shared.Localization.Loc.GetString("quest-instance-warning", ("seconds", threshold));
             players ??= [..board.PresentPlayers,];
 
             foreach (var uid in players)
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
similarity index 85%
rename from Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
index 2a560cc667..d64727d327 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.MapSetup.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
@@ -9,7 +9,9 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Magnits.QuestInstance;
+
+namespace Content.Server._Forge.QuestInstance;
+
 
 public sealed partial class QuestInstanceSystem
 {
@@ -24,7 +26,8 @@ public sealed partial class QuestInstanceSystem
 
         if (totalWeight <= 0f)
         {
-            Log.Warning($"QuestInstanceSystem: preset '{preset.ID}' has mapEntries with non-positive total weight. Using uniform pick.");
+            Log.Warning(
+                $"QuestInstanceSystem: preset '{preset.ID}' has mapEntries with non-positive total weight. Using uniform pick.");
             return _random.Pick(preset.MapEntries);
         }
 
@@ -91,7 +94,11 @@ private void ApplyMapEnvironmentOverrides(EntityUid mapUid, MapId mapId, QuestIn
         _weather.SetWeather(mapId, weather, null);
     }
 
-    private EntityCoordinates ComputeSpawnCoordinates(EntityUid mapUid, EntityUid gridUid, QuestInstancePresetPrototype preset)
+    private EntityCoordinates ComputeSpawnCoordinates(
+        EntityUid mapUid,
+        EntityUid gridUid,
+        QuestInstancePresetPrototype preset
+    )
     {
         if (!TryComp<MapGridComponent>(gridUid, out var gridComp) || gridComp.LocalAABB.IsEmpty())
             return new(mapUid, new(0.5f, 0.5f));
@@ -120,8 +127,7 @@ private EntityCoordinates GetBoardFallbackCoordinates(EntityUid boardUid)
         if (boardXform.MapUid == null)
             return EntityCoordinates.Invalid;
 
-        // Keep fallback spawn next to the board so players do not clip into its fixture.
-        return new EntityCoordinates(boardUid, new Vector2(1.25f, 0f));
+        return new(boardUid, new(1.25f, 0f));
     }
 
     private void ForceMapEnvironment(EntityUid mapUid)
@@ -147,7 +153,7 @@ private void ApplyBreathableMapAtmosphere(EntityUid mapUid, float temperatureCel
         moles[(int) Gas.Nitrogen] = 82.10312f;
 
         var temperatureKelvin = MathF.Max(Atmospherics.TCMB, Atmospherics.T0C + temperatureCelsius);
-        _atmos.SetMapAtmosphere(mapUid, false, new GasMixture(moles, temperatureKelvin));
+        _atmos.SetMapAtmosphere(mapUid, false, new(moles, temperatureKelvin));
     }
 
     private void ForceGridBreathableAtmosphere(EntityUid gridUid, float temperatureCelsius)
@@ -194,20 +200,25 @@ private int ComputeBarrierRadius(EntityUid gridUid, QuestInstancePresetPrototype
         return baseRadius + padding;
     }
 
-    private void QueueSquareBarrier(QuestBoardComponent board, EntityUid gridUid, QuestInstancePresetPrototype preset, int r)
+    private void QueueSquareBarrier(
+        QuestBoardComponent board,
+        EntityUid gridUid,
+        QuestInstancePresetPrototype preset,
+        int r
+    )
     {
         board.BarrierProto = preset.BarrierProto;
 
         for (var x = -r; x <= r; x++)
         {
-            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(x + 0.5f, -r + 0.5f)));
-            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(x + 0.5f, r + 0.5f)));
+            board.PendingBarrierCoords.Add(new(gridUid, new(x + 0.5f, -r + 0.5f)));
+            board.PendingBarrierCoords.Add(new(gridUid, new(x + 0.5f, r + 0.5f)));
         }
 
         for (var y = -r + 1; y <= r - 1; y++)
         {
-            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(-r + 0.5f, y + 0.5f)));
-            board.PendingBarrierCoords.Add(new EntityCoordinates(gridUid, new Vector2(r + 0.5f, y + 0.5f)));
+            board.PendingBarrierCoords.Add(new(gridUid, new(-r + 0.5f, y + 0.5f)));
+            board.PendingBarrierCoords.Add(new(gridUid, new(r + 0.5f, y + 0.5f)));
         }
     }
 
@@ -222,4 +233,3 @@ private void ProcessPendingBarrier(QuestBoardComponent board, int spawnBudget =
         }
     }
 }
-
diff --git a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.cs
similarity index 95%
rename from Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
rename to Content.Server/_Forge/QuestInstance/QuestInstanceSystem.cs
index d6374f6caa..08e503ae2f 100644
--- a/Content.Server/Magnits/QuestInstance/QuestInstanceSystem.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Parallax;
 using Content.Server.Weather;
+using Content.Shared._Forge.QuestInstance;
 using Content.Shared.Interaction;
-using Content.Shared.Magnits.QuestInstance;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Popups;
 using Content.Shared.UserInterface;
@@ -12,7 +12,9 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Magnits.QuestInstance;
+
+namespace Content.Server._Forge.QuestInstance;
+
 
 public sealed partial class QuestInstanceSystem : EntitySystem
 {
@@ -22,9 +24,9 @@ public sealed partial class QuestInstanceSystem : EntitySystem
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly WeatherSystem _weather = default!;
diff --git a/Content.Server/_Forge/QuestInstance/QuestSignpostComponent.cs b/Content.Server/_Forge/QuestInstance/QuestSignpostComponent.cs
new file mode 100644
index 0000000000..8bddc9c3c3
--- /dev/null
+++ b/Content.Server/_Forge/QuestInstance/QuestSignpostComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server._Forge.QuestInstance;
+
+[RegisterComponent]
+public sealed partial class QuestSignpostComponent : Component
+{
+    [DataField]
+    public EntityUid BoardUid;
+}
diff --git a/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs b/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
similarity index 74%
rename from Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
rename to Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
index c11538203e..13fc0b375e 100644
--- a/Content.Shared/Magnits/QuestInstance/QuestBoardUi.cs
+++ b/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
@@ -1,27 +1,29 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Magnits.QuestInstance;
+
+namespace Content.Shared._Forge.QuestInstance;
+
 
 /// <summary>Difficulty tiers for quest instances.</summary>
-[Serializable, NetSerializable]
+[Serializable, NetSerializable,]
 public enum QuestDifficulty
 {
     Easy,
     Medium,
-    Hard,
+    Hard
 }
 
 /// <summary>BUI key for QuestBoard UI.</summary>
-[Serializable, NetSerializable]
+[Serializable, NetSerializable,]
 public enum QuestBoardUiKey
 {
-    Key,
+    Key
 }
 
 /// <summary>
-/// Sent from server to client whenever board state changes.
+///     Sent from server to client whenever board state changes.
 /// </summary>
-[Serializable, NetSerializable]
+[Serializable, NetSerializable,]
 public sealed class QuestBoardBoundUserInterfaceState : BoundUserInterfaceState
 {
     /// <summary>True when an instance is active for this board.</summary>
@@ -42,10 +44,10 @@ public QuestBoardBoundUserInterfaceState(bool hasActiveInstance, int remainingSe
 }
 
 /// <summary>
-/// Sent from client when selecting difficulty or joining an active instance.
-/// Difficulty is ignored by server when an instance is already active.
+///     Sent from client when selecting difficulty or joining an active instance.
+///     Difficulty is ignored by server when an instance is already active.
 /// </summary>
-[Serializable, NetSerializable]
+[Serializable, NetSerializable,]
 public sealed class QuestBoardSelectDifficultyMessage : BoundUserInterfaceMessage
 {
     public QuestDifficulty Difficulty;
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
deleted file mode 100644
index b5e75dfc0e..0000000000
--- a/Resources/Prototypes/_Nuclear14/Magnits/quest_entities.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-- type: entity
-  id: QuestBoard
-  name: доска заданий
-  description: Объявления о работе и заданиях в округе. Может быть что-то интересное?
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-        density: 60
-        mask:
-        - MachineMask
-        layer:
-        - MidImpassable
-        - LowImpassable
-  - type: Sprite
-    drawdepth: Overdoors
-    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
-    layers:
-    - state: noticeboard
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 2
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-  - type: Tag
-    tags:
-    - Structure
-  - type: QuestBoard
-  - type: ActivatableUI
-    key: enum.QuestBoardUiKey.Key
-  - type: UserInterface
-    interfaces:
-      enum.QuestBoardUiKey.Key:
-        type: QuestBoardBoundUserInterface
-
-- type: entity
-  id: QuestSignpost
-  name: указатель выхода
-  description: Светящийся знак. Что-то подсказывает, что нужно идти именно туда.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Transform
-    anchored: true
-    noRot: true
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.20,-0.45,0.20,0.45"
-        density: 20
-        mask:
-        - MachineMask
-        layer:
-        - MidImpassable
-  - type: Sprite
-    drawdepth: Overdoors
-    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
-    layers:
-    - state: noticeboard
-  - type: PointLight
-    radius: 3.0
-    energy: 2.0
-    color: "#00ff88"
-    enabled: true
-  - type: QuestSignpost
-
-- type: entity
-  id: QuestInvisibleWall
-  name: невидимая стена
-  description: Ты не должен это видеть.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: true
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        density: 100
-        hard: true
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-  - type: Airtight
\ No newline at end of file
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
deleted file mode 100644
index 60d3f26a38..0000000000
--- a/Resources/Prototypes/_Nuclear14/Magnits/quest_instance_presets.yml
+++ /dev/null
@@ -1,231 +0,0 @@
-# Quest Instance Presets - Easy / Medium / Hard
-# mapEntries supports per-map overrides:
-#   mapPath: /Maps/Salvage/example.yml
-#   weight: 3
-#   biomeTemplateId: Wastes
-#   weatherPrototypeId: Rain
-#   atmosphereTemperatureCelsius: 20
-#   timeCyclePaletteId: QuestDay
-#
-# Quest palettes:
-#   Day: QuestDay
-#   Morning: QuestMorning
-#   Dusk: QuestDusk
-#   Night: QuestNight
-
-- type: questInstancePreset
-  id: QuestInstanceEasy
-  biomeTemplateId: Wastes
-  timeLimitSeconds: 900          # 15 minutes
-  barrierPadding: 60
-  maxBarrierRadius: 200
-  spawnDistanceFromGrid: 4
-  warningThresholdsSeconds:
-    - 60
-    - 30
-    - 10
-  joinWindowSeconds: 120
-  mapEntries:
-    - mapPath: /Maps/Salvage/small-1.yml
-      weight: 8
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/small-2.yml
-      weight: 6
-      weatherPrototypeId: SnowfallHeavyExtreme
-      atmosphereTemperatureCelsius: -24
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/small-3.yml
-      weight: 5
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/small-4.yml
-      weight: 4
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/small-a-1.yml
-      weight: 5
-      weatherPrototypeId: NCRadioactiveParticles
-      atmosphereTemperatureCelsius: 34
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/small-cargo.yml
-      weight: 4
-      weatherPrototypeId: NCRadioactiveRain
-      atmosphereTemperatureCelsius: 30
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/small-ai-survey-drone.yml
-      weight: 3
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/small-chapel.yml
-      weight: 4
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/small-chef.yml
-      weight: 3
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/small-party.yml
-      weight: 2
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/small-ship-1.yml
-      weight: 5
-      weatherPrototypeId: SnowfallHeavyExtreme
-      atmosphereTemperatureCelsius: -24
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/hauling-shuttle.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveStorm
-      atmosphereTemperatureCelsius: 38
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/cargo-1.yml
-      weight: 4
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestDay
-
-- type: questInstancePreset
-  id: QuestInstanceMedium
-  biomeTemplateId: Wastes
-  timeLimitSeconds: 1200         # 20 minutes
-  barrierPadding: 100
-  maxBarrierRadius: 220
-  spawnDistanceFromGrid: 4
-  warningThresholdsSeconds:
-    - 60
-    - 30
-    - 10
-  joinWindowSeconds: 120
-  mapEntries:
-    - mapPath: /Maps/Salvage/medium-1.yml
-      weight: 6
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/medium-dock.yml
-      weight: 5
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/medium-library.yml
-      weight: 4
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/medium-crashed-shuttle.yml
-      weight: 4
-      weatherPrototypeId: NCRadioactiveRain
-      atmosphereTemperatureCelsius: 30
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/medium-pet-hospital.yml
-      weight: 3
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveParticles
-      atmosphereTemperatureCelsius: 34
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/medium-silent-orchestra.yml
-      weight: 3
-      weatherPrototypeId: SnowfallHeavyExtreme
-      atmosphereTemperatureCelsius: -24
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/medium-template.yml
-      weight: 2
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/ruin-cargo-salvage.yml
-      weight: 4
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/wh-salvage.yml
-      weight: 2
-      weatherPrototypeId: NCRadioactiveStorm
-      atmosphereTemperatureCelsius: 38
-      timeCyclePaletteId: QuestDusk
-
-- type: questInstancePreset
-  id: QuestInstanceHard
-  biomeTemplateId: Wastes
-  timeLimitSeconds: 1500         # 25 minutes
-  barrierPadding: 150
-  maxBarrierRadius: 240
-  spawnDistanceFromGrid: 5
-  warningThresholdsSeconds:
-    - 60
-    - 30
-    - 10
-  joinWindowSeconds: 120
-  mapEntries:
-    - mapPath: /Maps/Salvage/asteroid-base.yml
-      weight: 5
-      weatherPrototypeId: SnowfallHeavyExtreme
-      atmosphereTemperatureCelsius: -24
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/engineering-chunk.yml
-      weight: 4
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/outpost-arm.yml
-      weight: 4
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/security-chunk.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveRain
-      atmosphereTemperatureCelsius: 30
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/medium-pirate.yml
-      weight: 4
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/medium-vault-1.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveParticles
-      atmosphereTemperatureCelsius: 34
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/meatball.yml
-      weight: 2
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/vegan-meatball.yml
-      weight: 2
-      weatherPrototypeId: Rain
-      atmosphereTemperatureCelsius: 12
-      timeCyclePaletteId: QuestDusk
-    - mapPath: /Maps/Salvage/small-syndicate.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveStorm
-      atmosphereTemperatureCelsius: 38
-      timeCyclePaletteId: QuestNight
-    - mapPath: /Maps/Salvage/small-tesla.yml
-      weight: 2
-      weatherPrototypeId: Storm
-      atmosphereTemperatureCelsius: 6
-      timeCyclePaletteId: QuestDay
-    - mapPath: /Maps/Salvage/stationstation.yml
-      weight: 2
-      weatherPrototypeId: Default
-      atmosphereTemperatureCelsius: 20
-      timeCyclePaletteId: QuestMorning
-    - mapPath: /Maps/Salvage/tick-colony.yml
-      weight: 3
-      weatherPrototypeId: NCRadioactiveRain
-      atmosphereTemperatureCelsius: 30
-      timeCyclePaletteId: QuestDusk
diff --git a/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml b/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml
deleted file mode 100644
index 8b3f72360d..0000000000
--- a/Resources/Prototypes/_Nuclear14/Magnits/quest_time_cycle_palettes.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Quest-specific static palettes.
-# Use these IDs in questInstancePreset.mapEntries.timeCyclePaletteId:
-#   QuestDay, QuestMorning, QuestDusk, QuestNight
-
-- type: timeCyclePalette
-  id: QuestDay
-  timeEntries:
-    0: "#D8B059"
-    24: "#D8B059"
-
-- type: timeCyclePalette
-  id: QuestMorning
-  timeEntries:
-    0: "#A88F73"
-    24: "#A88F73"
-
-- type: timeCyclePalette
-  id: QuestDusk
-  timeEntries:
-    0: "#8A6A45"
-    24: "#8A6A45"
-
-- type: timeCyclePalette
-  id: QuestNight
-  timeEntries:
-    0: "#2B3143"
-    24: "#2B3143"

From 71e671dae3738372d839f53c3bfd93c4ac21b883 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 09:25:36 +0500
Subject: [PATCH 06/10] =?UTF-8?q?=D0=A4=D0=B8=D0=BD=D0=B8=D1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_Forge/Quest/quest_entities.yml           | 122 +++++++++
 .../_Forge/Quest/quest_instance_presets.yml   | 231 ++++++++++++++++++
 .../Quest/quest_time_cycle_palettes.yml       |  27 ++
 3 files changed, 380 insertions(+)
 create mode 100644 Resources/Prototypes/_Forge/Quest/quest_entities.yml
 create mode 100644 Resources/Prototypes/_Forge/Quest/quest_instance_presets.yml
 create mode 100644 Resources/Prototypes/_Forge/Quest/quest_time_cycle_palettes.yml

diff --git a/Resources/Prototypes/_Forge/Quest/quest_entities.yml b/Resources/Prototypes/_Forge/Quest/quest_entities.yml
new file mode 100644
index 0000000000..b5e75dfc0e
--- /dev/null
+++ b/Resources/Prototypes/_Forge/Quest/quest_entities.yml
@@ -0,0 +1,122 @@
+- type: entity
+  id: QuestBoard
+  name: доска заданий
+  description: Объявления о работе и заданиях в округе. Может быть что-то интересное?
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
+    layers:
+    - state: noticeboard
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+  - type: Tag
+    tags:
+    - Structure
+  - type: QuestBoard
+  - type: ActivatableUI
+    key: enum.QuestBoardUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.QuestBoardUiKey.Key:
+        type: QuestBoardBoundUserInterface
+
+- type: entity
+  id: QuestSignpost
+  name: указатель выхода
+  description: Светящийся знак. Что-то подсказывает, что нужно идти именно туда.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.20,-0.45,0.20,0.45"
+        density: 20
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi
+    layers:
+    - state: noticeboard
+  - type: PointLight
+    radius: 3.0
+    energy: 2.0
+    color: "#00ff88"
+    enabled: true
+  - type: QuestSignpost
+
+- type: entity
+  id: QuestInvisibleWall
+  name: невидимая стена
+  description: Ты не должен это видеть.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        density: 100
+        hard: true
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+  - type: Airtight
\ No newline at end of file
diff --git a/Resources/Prototypes/_Forge/Quest/quest_instance_presets.yml b/Resources/Prototypes/_Forge/Quest/quest_instance_presets.yml
new file mode 100644
index 0000000000..60d3f26a38
--- /dev/null
+++ b/Resources/Prototypes/_Forge/Quest/quest_instance_presets.yml
@@ -0,0 +1,231 @@
+# Quest Instance Presets - Easy / Medium / Hard
+# mapEntries supports per-map overrides:
+#   mapPath: /Maps/Salvage/example.yml
+#   weight: 3
+#   biomeTemplateId: Wastes
+#   weatherPrototypeId: Rain
+#   atmosphereTemperatureCelsius: 20
+#   timeCyclePaletteId: QuestDay
+#
+# Quest palettes:
+#   Day: QuestDay
+#   Morning: QuestMorning
+#   Dusk: QuestDusk
+#   Night: QuestNight
+
+- type: questInstancePreset
+  id: QuestInstanceEasy
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 900          # 15 minutes
+  barrierPadding: 60
+  maxBarrierRadius: 200
+  spawnDistanceFromGrid: 4
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapEntries:
+    - mapPath: /Maps/Salvage/small-1.yml
+      weight: 8
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-2.yml
+      weight: 6
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-3.yml
+      weight: 5
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-4.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-a-1.yml
+      weight: 5
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-cargo.yml
+      weight: 4
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-ai-survey-drone.yml
+      weight: 3
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-chapel.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-chef.yml
+      weight: 3
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/small-party.yml
+      weight: 2
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/small-ship-1.yml
+      weight: 5
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/hauling-shuttle.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/cargo-1.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDay
+
+- type: questInstancePreset
+  id: QuestInstanceMedium
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 1200         # 20 minutes
+  barrierPadding: 100
+  maxBarrierRadius: 220
+  spawnDistanceFromGrid: 4
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapEntries:
+    - mapPath: /Maps/Salvage/medium-1.yml
+      weight: 6
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/medium-dock.yml
+      weight: 5
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-library.yml
+      weight: 4
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-crashed-shuttle.yml
+      weight: 4
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/medium-pet-hospital.yml
+      weight: 3
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-silent-orchestra.yml
+      weight: 3
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-template.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/ruin-cargo-salvage.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/wh-salvage.yml
+      weight: 2
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestDusk
+
+- type: questInstancePreset
+  id: QuestInstanceHard
+  biomeTemplateId: Wastes
+  timeLimitSeconds: 1500         # 25 minutes
+  barrierPadding: 150
+  maxBarrierRadius: 240
+  spawnDistanceFromGrid: 5
+  warningThresholdsSeconds:
+    - 60
+    - 30
+    - 10
+  joinWindowSeconds: 120
+  mapEntries:
+    - mapPath: /Maps/Salvage/asteroid-base.yml
+      weight: 5
+      weatherPrototypeId: SnowfallHeavyExtreme
+      atmosphereTemperatureCelsius: -24
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/engineering-chunk.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/outpost-arm.yml
+      weight: 4
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/security-chunk.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/medium-pirate.yml
+      weight: 4
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/medium-vault-1.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveParticles
+      atmosphereTemperatureCelsius: 34
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/meatball.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/vegan-meatball.yml
+      weight: 2
+      weatherPrototypeId: Rain
+      atmosphereTemperatureCelsius: 12
+      timeCyclePaletteId: QuestDusk
+    - mapPath: /Maps/Salvage/small-syndicate.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveStorm
+      atmosphereTemperatureCelsius: 38
+      timeCyclePaletteId: QuestNight
+    - mapPath: /Maps/Salvage/small-tesla.yml
+      weight: 2
+      weatherPrototypeId: Storm
+      atmosphereTemperatureCelsius: 6
+      timeCyclePaletteId: QuestDay
+    - mapPath: /Maps/Salvage/stationstation.yml
+      weight: 2
+      weatherPrototypeId: Default
+      atmosphereTemperatureCelsius: 20
+      timeCyclePaletteId: QuestMorning
+    - mapPath: /Maps/Salvage/tick-colony.yml
+      weight: 3
+      weatherPrototypeId: NCRadioactiveRain
+      atmosphereTemperatureCelsius: 30
+      timeCyclePaletteId: QuestDusk
diff --git a/Resources/Prototypes/_Forge/Quest/quest_time_cycle_palettes.yml b/Resources/Prototypes/_Forge/Quest/quest_time_cycle_palettes.yml
new file mode 100644
index 0000000000..8b3f72360d
--- /dev/null
+++ b/Resources/Prototypes/_Forge/Quest/quest_time_cycle_palettes.yml
@@ -0,0 +1,27 @@
+# Quest-specific static palettes.
+# Use these IDs in questInstancePreset.mapEntries.timeCyclePaletteId:
+#   QuestDay, QuestMorning, QuestDusk, QuestNight
+
+- type: timeCyclePalette
+  id: QuestDay
+  timeEntries:
+    0: "#D8B059"
+    24: "#D8B059"
+
+- type: timeCyclePalette
+  id: QuestMorning
+  timeEntries:
+    0: "#A88F73"
+    24: "#A88F73"
+
+- type: timeCyclePalette
+  id: QuestDusk
+  timeEntries:
+    0: "#8A6A45"
+    24: "#8A6A45"
+
+- type: timeCyclePalette
+  id: QuestNight
+  timeEntries:
+    0: "#2B3143"
+    24: "#2B3143"

From 34bd702012d82f0a23ed42af10f6b2c46d890d27 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 10:36:58 +0500
Subject: [PATCH 07/10] =?UTF-8?q?=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weather/WeatherAudioCleanupSystem.cs      | 149 ------------------
 .../Weather/WeatherAudioCleanupSystem.cs      |  79 ++++++++++
 .../QuestInstance/QuestBoardComponent.cs      |   2 +
 .../QuestInstancePresetPrototype.Helpers.cs   |  11 --
 .../QuestInstanceSystem.InstanceFlow.cs       |  25 ++-
 .../QuestInstanceSystem.Interaction.cs        |   1 -
 .../QuestInstanceSystem.MapSetup.cs           |   5 +
 .../_Forge/QuestInstance/QuestBoardUi.cs      |   3 +
 .../QuestInstancePresetPrototype.cs           |  13 +-
 9 files changed, 115 insertions(+), 173 deletions(-)
 delete mode 100644 Content.Client/Weather/WeatherAudioCleanupSystem.cs
 create mode 100644 Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
 delete mode 100644 Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
 rename {Content.Server => Content.Shared}/_Forge/QuestInstance/QuestInstancePresetPrototype.cs (83%)

diff --git a/Content.Client/Weather/WeatherAudioCleanupSystem.cs b/Content.Client/Weather/WeatherAudioCleanupSystem.cs
deleted file mode 100644
index 6c44b144ca..0000000000
--- a/Content.Client/Weather/WeatherAudioCleanupSystem.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using Content.Shared.Weather;
-using Robust.Client.Audio;
-using Robust.Client.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Player;
-
-namespace Content.Client.Weather;
-
-public sealed class WeatherAudioCleanupSystem : EntitySystem
-{
-    [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-
-    private readonly HashSet<string> _weatherAudioFiles = new();
-    private EntityUid? _localEntity;
-    private EntityUid? _localMap;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        BuildWeatherAudioFileCache();
-
-        SubscribeLocalEvent<WeatherComponent, ComponentShutdown>(OnWeatherShutdown);
-        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnLocalPlayerAttached);
-        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnLocalPlayerDetached);
-        SubscribeLocalEvent<EntParentChangedMessage>(OnParentChanged);
-
-        _localEntity = _player.LocalEntity;
-        _localMap = _localEntity is { } uid ? Transform(uid).MapUid : null;
-        CleanupWeatherAudioForCurrentMap(_localMap);
-    }
-
-    private void OnLocalPlayerAttached(LocalPlayerAttachedEvent args)
-    {
-        _localEntity = args.Entity;
-        _localMap = Transform(args.Entity).MapUid;
-        CleanupWeatherAudioForCurrentMap(_localMap);
-    }
-
-    private void OnLocalPlayerDetached(LocalPlayerDetachedEvent args)
-    {
-        _localEntity = null;
-        _localMap = null;
-        CleanupWeatherAudioForCurrentMap(null);
-    }
-
-    private void OnParentChanged(ref EntParentChangedMessage args)
-    {
-        if (_localEntity is not { } local || args.Entity != local)
-            return;
-
-        if (args.Transform.MapUid == _localMap)
-            return;
-
-        _localMap = args.Transform.MapUid;
-        CleanupWeatherAudioForCurrentMap(_localMap);
-    }
-
-    private void OnWeatherShutdown(EntityUid uid, WeatherComponent component, ComponentShutdown args)
-    {
-        StopAllStreams(component);
-        StopStrayWeatherAudioEntities();
-    }
-
-    private void CleanupWeatherAudioForCurrentMap(EntityUid? currentMap)
-    {
-        var query = EntityQueryEnumerator<WeatherComponent, TransformComponent>();
-        while (query.MoveNext(out _, out var weather, out var xform))
-        {
-            if (currentMap != null && xform.MapUid == currentMap)
-                continue;
-
-            StopAllStreams(weather);
-        }
-
-        StopStrayWeatherAudioEntities();
-    }
-
-    private void StopAllStreams(WeatherComponent component)
-    {
-        foreach (var data in component.Weather.Values)
-        {
-            if (data.Stream is not { } streamUid)
-                continue;
-
-            if (TryComp(streamUid, out AudioComponent? streamAudio))
-                _audio.SetState(streamUid, AudioState.Stopped, true, streamAudio);
-
-            data.Stream = _audio.Stop(streamUid);
-        }
-    }
-
-    private void StopStrayWeatherAudioEntities()
-    {
-        var referencedStreams = new HashSet<EntityUid>();
-
-        var weatherQuery = EntityQueryEnumerator<WeatherComponent>();
-        while (weatherQuery.MoveNext(out _, out var weather))
-            foreach (var data in weather.Weather.Values)
-                if (data.Stream is { } streamUid)
-                    referencedStreams.Add(streamUid);
-
-        var audioQuery = EntityQueryEnumerator<AudioComponent>();
-        while (audioQuery.MoveNext(out var uid, out var audio))
-        {
-            if (!_weatherAudioFiles.Contains(NormalizeAudioPath(audio.FileName)))
-                continue;
-
-            if (referencedStreams.Contains(uid))
-                continue;
-
-            _audio.SetState(uid, AudioState.Stopped, true, audio);
-            _audio.Stop(uid, audio);
-        }
-    }
-
-    private void BuildWeatherAudioFileCache()
-    {
-        _weatherAudioFiles.Clear();
-
-        foreach (var weather in _proto.EnumeratePrototypes<WeatherPrototype>())
-        {
-            if (weather.Sound is null)
-                continue;
-
-            switch (weather.Sound)
-            {
-                case SoundPathSpecifier path when path.Path != default:
-                    _weatherAudioFiles.Add(NormalizeAudioPath(path.Path.ToString()));
-                    break;
-
-                case SoundCollectionSpecifier collection when collection.Collection is { } collectionId
-                    && _proto.TryIndex(collectionId, out SoundCollectionPrototype? soundCollection):
-                    foreach (var file in soundCollection.PickFiles)
-                        _weatherAudioFiles.Add(NormalizeAudioPath(file.ToString()));
-                    break;
-            }
-        }
-    }
-
-    private static string NormalizeAudioPath(string path)
-    {
-        return path.ToLowerInvariant();
-    }
-}
diff --git a/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs b/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
new file mode 100644
index 0000000000..2d9c4ea9e3
--- /dev/null
+++ b/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
@@ -0,0 +1,79 @@
+using Content.Shared._Forge.QuestInstance;
+using Content.Shared.Weather;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+
+namespace Content.Client.Weather;
+
+public sealed class WeatherAudioCleanupSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    private EntityUid? _currentMap;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<WeatherComponent, ComponentShutdown>(OnWeatherShutdown);
+
+        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnLocalPlayerAttached);
+        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnLocalPlayerDetached);
+        SubscribeLocalEvent<WeatherAudioListenerComponent, EntParentChangedMessage>(OnPlayerParentChanged);
+    }
+
+    private void OnLocalPlayerAttached(LocalPlayerAttachedEvent args)
+    {
+        EnsureComp<WeatherAudioListenerComponent>(args.Entity);
+
+        _currentMap = Transform(args.Entity).MapUid;
+        CleanupWeatherAudioForCurrentMap(_currentMap);
+    }
+
+    private void OnLocalPlayerDetached(LocalPlayerDetachedEvent args)
+    {
+        RemComp<WeatherAudioListenerComponent>(args.Entity);
+
+        _currentMap = null;
+        CleanupWeatherAudioForCurrentMap(null);
+    }
+
+    private void OnPlayerParentChanged(EntityUid uid, WeatherAudioListenerComponent comp, ref EntParentChangedMessage args)
+    {
+        var newMap = args.Transform.MapUid;
+        if (newMap == _currentMap)
+            return;
+
+        _currentMap = newMap;
+        CleanupWeatherAudioForCurrentMap(_currentMap);
+    }
+
+    private void OnWeatherShutdown(EntityUid uid, WeatherComponent component, ComponentShutdown args)
+    {
+        StopAllStreams(component);
+    }
+
+    private void CleanupWeatherAudioForCurrentMap(EntityUid? currentMap)
+    {
+        var query = EntityQueryEnumerator<WeatherComponent, TransformComponent>();
+        while (query.MoveNext(out _, out var weather, out var xform))
+        {
+            if (currentMap != null && xform.MapUid == currentMap)
+                continue;
+
+            StopAllStreams(weather);
+        }
+    }
+
+    private void StopAllStreams(WeatherComponent component)
+    {
+        foreach (var data in component.Weather.Values)
+        {
+            if (data.Stream is not { } streamUid)
+                continue;
+
+            _audio.Stop(streamUid);
+            data.Stream = null;
+        }
+    }
+}
diff --git a/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs b/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
index 984adb4320..37ea021881 100644
--- a/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestBoardComponent.cs
@@ -37,6 +37,8 @@ public sealed partial class QuestBoardComponent : Component
     [DataField]
     public int JoinWindowSeconds;
 
+    public TimeSpan NextMaintenanceAt;
+
     [DataField]
     public EntityUid MapUid = EntityUid.Invalid;
 
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs b/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
deleted file mode 100644
index bed4c69b8f..0000000000
--- a/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.Helpers.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server._Forge.QuestInstance;
-
-public sealed partial class QuestInstancePresetPrototype
-{
-    public bool HasMapEntries => MapEntries.Count > 0;
-}
-
-public sealed partial class QuestInstanceMapEntry
-{
-    public float EffectiveWeight => MathF.Max(0f, Weight);
-}
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
index 66f0463456..a13fca8926 100644
--- a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
@@ -50,7 +50,6 @@ public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, Ques
             }
 
             JoinInstance(board, session);
-            SendBoardState(boardUid, board);
             return;
         }
 
@@ -65,7 +64,6 @@ public void StartOrJoinInstance(EntityUid boardUid, ICommonSession session, Ques
             return;
 
         JoinInstance(board, session);
-        SendBoardState(boardUid, board);
     }
 
     private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, QuestInstancePresetPrototype preset)
@@ -132,10 +130,8 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
 
         _mapSystem.InitializeMap(mapId);
 
-        // Re-apply atmosphere AFTER map init so map-atmos tiles keep the selected profile,
-        // then normalize loaded grid tile mixtures to prevent decompression spikes.
+        // Re-apply map atmosphere after init so map-atmos tiles keep the selected profile.
         ApplyBreathableMapAtmosphere(mapUid, atmosphereTemperatureCelsius);
-        ForceGridBreathableAtmosphere(gridUid, atmosphereTemperatureCelsius);
 
         var signpostCoords = ComputeSpawnCoordinates(mapUid, gridUid, preset);
         var playerSpawnCoords = OffsetCoordinates(signpostCoords, new(1.25f, 0f));
@@ -148,6 +144,7 @@ private bool CreateInstance(EntityUid boardUid, QuestBoardComponent board, Quest
         board.WarningThresholdsSeconds = preset.WarningThresholdsSeconds.ToArray();
         board.JoinUntil = now + TimeSpan.FromSeconds(preset.JoinWindowSeconds);
         board.EndAt = now + TimeSpan.FromSeconds(preset.TimeLimitSeconds);
+        board.NextMaintenanceAt = now;
 
         var signpost = Spawn(preset.ExitSignpostProto, signpostCoords);
         var signpostComp = EnsureComp<QuestSignpostComponent>(signpost);
@@ -318,6 +315,7 @@ private static void ClearInstanceState(QuestBoardComponent board)
         board.EndAt = TimeSpan.Zero;
         board.JoinUntil = TimeSpan.Zero;
         board.JoinWindowSeconds = 0;
+        board.NextMaintenanceAt = TimeSpan.Zero;
         board.MapUid = EntityUid.Invalid;
         board.SpawnCoords = EntityCoordinates.Invalid;
         board.WarningThresholdsSeconds = Array.Empty<int>();
@@ -334,10 +332,23 @@ public override void Update(float frameTime)
             if (!board.HasActiveInstance)
                 continue;
 
-            ProcessPendingBarrier(board);
+            if (board.PendingBarrierCoords.Count > 0)
+                ProcessPendingBarrier(board);
+
+            if (curTime >= board.NextMaintenanceAt)
+            {
+                board.NextMaintenanceAt = curTime + TimeSpan.FromSeconds(1);
+                PrunePresentPlayers(board);
+                PruneReturnCoords(board);
+            }
 
             var remaining = board.EndAt - curTime;
-            SendWarningPopups(board, remaining);
+
+            if (board.PresentPlayers.Count > 0 &&
+                board.WarningThresholdsSeconds.Length > board.SentWarnings.Count)
+            {
+                SendWarningPopups(board, remaining);
+            }
 
             if (remaining <= TimeSpan.Zero)
             {
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
index 65f8e5ccdf..80b53342e4 100644
--- a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.Interaction.cs
@@ -35,7 +35,6 @@ private void TeleportWithPulledEntity(EntityUid user, EntityCoordinates destinat
 
     private void SendWarningPopups(QuestBoardComponent board, TimeSpan remaining)
     {
-        PrunePresentPlayers(board);
         if (board.PresentPlayers.Count == 0)
             return;
 
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
index d64727d327..714c92967b 100644
--- a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.MapSetup.cs
@@ -1,3 +1,4 @@
+using Content.Shared._Forge.QuestInstance;
 using System.Numerics;
 using Content.Shared.Atmos;
 using Content.Shared.Gravity;
@@ -209,6 +210,10 @@ int r
     {
         board.BarrierProto = preset.BarrierProto;
 
+        var required = Math.Max(0, 8 * r);
+        if (board.PendingBarrierCoords.Capacity < required)
+            board.PendingBarrierCoords.Capacity = required;
+
         for (var x = -r; x <= r; x++)
         {
             board.PendingBarrierCoords.Add(new(gridUid, new(x + 0.5f, -r + 0.5f)));
diff --git a/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs b/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
index 13fc0b375e..5ce72a3707 100644
--- a/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
+++ b/Content.Shared/_Forge/QuestInstance/QuestBoardUi.cs
@@ -57,3 +57,6 @@ public QuestBoardSelectDifficultyMessage(QuestDifficulty difficulty)
         Difficulty = difficulty;
     }
 }
+
+[RegisterComponent]
+public sealed partial class WeatherAudioListenerComponent : Component { }
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
similarity index 83%
rename from Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
rename to Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
index c1f14b99d3..d3215ad03f 100644
--- a/Content.Server/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
+++ b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
@@ -1,14 +1,14 @@
-using Content.Shared.Parallax.Biomes;
+using Content.Shared.Parallax.Biomes;
 using Content.Shared.TimeCycle;
 using Content.Shared.Weather;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 
-namespace Content.Server._Forge.QuestInstance;
+namespace Content.Shared._Forge.QuestInstance;
 
 [Prototype("questInstancePreset")]
-public sealed partial class QuestInstancePresetPrototype : IPrototype
+public sealed class QuestInstancePresetPrototype : IPrototype
 {
     [IdDataField]
     public string ID { get; set; } = default!;
@@ -51,10 +51,12 @@ public sealed partial class QuestInstancePresetPrototype : IPrototype
 
     [DataField]
     public float AtmosphereTemperatureCelsius = 20f;
+
+    public bool HasMapEntries => MapEntries.Count > 0;
 }
 
 [DataDefinition]
-public sealed partial class QuestInstanceMapEntry
+public sealed class QuestInstanceMapEntry
 {
     [DataField(required: true)]
     public ResPath MapPath = default!;
@@ -76,5 +78,6 @@ public sealed partial class QuestInstanceMapEntry
 
     [DataField]
     public float? AtmosphereTemperatureCelsius;
-}
 
+    public float EffectiveWeight => MathF.Max(0f, Weight);
+}
\ No newline at end of file

From 57e82c6a4967138fbc8361a6a982e5007b5fd848 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 10:39:33 +0500
Subject: [PATCH 08/10] =?UTF-8?q?=D0=9C=D0=B0=D0=BB=D1=8B=D0=B9=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_Forge/QuestInstance/QuestInstancePresetPrototype.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
index d3215ad03f..7d3d178678 100644
--- a/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
+++ b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
@@ -8,7 +8,7 @@
 namespace Content.Shared._Forge.QuestInstance;
 
 [Prototype("questInstancePreset")]
-public sealed class QuestInstancePresetPrototype : IPrototype
+public sealed partial class QuestInstancePresetPrototype : IPrototype
 {
     [IdDataField]
     public string ID { get; set; } = default!;
@@ -80,4 +80,4 @@ public sealed class QuestInstanceMapEntry
     public float? AtmosphereTemperatureCelsius;
 
     public float EffectiveWeight => MathF.Max(0f, Weight);
-}
\ No newline at end of file
+}

From 4f7bfc1379997a7e12d34919b6045e309462d929 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 10:40:16 +0500
Subject: [PATCH 09/10] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D0=BD=D1=8C=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA=D0=B8=D0=B9=20=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D1=81...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_Forge/QuestInstance/QuestInstancePresetPrototype.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
index 7d3d178678..768fc33238 100644
--- a/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
+++ b/Content.Shared/_Forge/QuestInstance/QuestInstancePresetPrototype.cs
@@ -56,7 +56,7 @@ public sealed partial class QuestInstancePresetPrototype : IPrototype
 }
 
 [DataDefinition]
-public sealed class QuestInstanceMapEntry
+public sealed partial class QuestInstanceMapEntry
 {
     [DataField(required: true)]
     public ResPath MapPath = default!;

From f4f51b8b472a2a4a2db22f915883f3e5ca6e3759 Mon Sep 17 00:00:00 2001
From: CattyLucky <mpalhozaev@gmail.com>
Date: Fri, 6 Mar 2026 11:06:49 +0500
Subject: [PATCH 10/10] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B7=D0=B2=D1=83=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weather/WeatherAudioCleanupSystem.cs      | 61 ++++++++++---------
 .../QuestInstanceSystem.InstanceFlow.cs       | 23 +++++--
 .../QuestInstanceWeatherAudioCleanupEvent.cs  |  9 +++
 3 files changed, 61 insertions(+), 32 deletions(-)
 create mode 100644 Content.Shared/_Forge/QuestInstance/QuestInstanceWeatherAudioCleanupEvent.cs

diff --git a/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs b/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
index 2d9c4ea9e3..3c70a31b4f 100644
--- a/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
+++ b/Content.Client/_Forge/Weather/WeatherAudioCleanupSystem.cs
@@ -1,51 +1,39 @@
-using Content.Shared._Forge.QuestInstance;
+using Content.Shared._Forge.QuestInstance;
 using Content.Shared.Weather;
+using Robust.Client.Player;
+using Robust.Shared.Audio.Components;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 
 namespace Content.Client.Weather;
 
 public sealed class WeatherAudioCleanupSystem : EntitySystem
 {
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-    private EntityUid? _currentMap;
+    [Dependency] private readonly IPlayerManager _player = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<WeatherComponent, ComponentShutdown>(OnWeatherShutdown);
-
-        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnLocalPlayerAttached);
-        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnLocalPlayerDetached);
-        SubscribeLocalEvent<WeatherAudioListenerComponent, EntParentChangedMessage>(OnPlayerParentChanged);
+        SubscribeNetworkEvent<QuestInstanceWeatherAudioCleanupEvent>(OnQuestInstanceWeatherCleanup);
     }
 
-    private void OnLocalPlayerAttached(LocalPlayerAttachedEvent args)
+    private void OnQuestInstanceWeatherCleanup(QuestInstanceWeatherAudioCleanupEvent ev)
     {
-        EnsureComp<WeatherAudioListenerComponent>(args.Entity);
-
-        _currentMap = Transform(args.Entity).MapUid;
-        CleanupWeatherAudioForCurrentMap(_currentMap);
+        var keepMapUid = ResolveKeepMapUid(ev.KeepMapUid);
+        CleanupWeatherAudio(keepMapUid);
     }
 
-    private void OnLocalPlayerDetached(LocalPlayerDetachedEvent args)
+    private EntityUid? ResolveKeepMapUid(NetEntity? keepMapNetUid)
     {
-        RemComp<WeatherAudioListenerComponent>(args.Entity);
-
-        _currentMap = null;
-        CleanupWeatherAudioForCurrentMap(null);
-    }
+        if (keepMapNetUid is { } keepNet && TryGetEntity(keepNet, out var keepMapUid) && !Deleted(keepMapUid))
+            return keepMapUid;
 
-    private void OnPlayerParentChanged(EntityUid uid, WeatherAudioListenerComponent comp, ref EntParentChangedMessage args)
-    {
-        var newMap = args.Transform.MapUid;
-        if (newMap == _currentMap)
-            return;
+        if (_player.LocalEntity is { } playerUid && !Deleted(playerUid))
+            return Transform(playerUid).MapUid;
 
-        _currentMap = newMap;
-        CleanupWeatherAudioForCurrentMap(_currentMap);
+        return null;
     }
 
     private void OnWeatherShutdown(EntityUid uid, WeatherComponent component, ComponentShutdown args)
@@ -53,18 +41,32 @@ private void OnWeatherShutdown(EntityUid uid, WeatherComponent component, Compon
         StopAllStreams(component);
     }
 
-    private void CleanupWeatherAudioForCurrentMap(EntityUid? currentMap)
+    private void CleanupWeatherAudio(EntityUid? keepMapUid)
     {
         var query = EntityQueryEnumerator<WeatherComponent, TransformComponent>();
         while (query.MoveNext(out _, out var weather, out var xform))
         {
-            if (currentMap != null && xform.MapUid == currentMap)
+            if (!HasActiveStreams(weather))
+                continue;
+
+            if (keepMapUid != null && xform.MapUid == keepMapUid)
                 continue;
 
             StopAllStreams(weather);
         }
     }
 
+    private static bool HasActiveStreams(WeatherComponent component)
+    {
+        foreach (var data in component.Weather.Values)
+        {
+            if (data.Stream != null)
+                return true;
+        }
+
+        return false;
+    }
+
     private void StopAllStreams(WeatherComponent component)
     {
         foreach (var data in component.Weather.Values)
@@ -72,6 +74,9 @@ private void StopAllStreams(WeatherComponent component)
             if (data.Stream is not { } streamUid)
                 continue;
 
+            if (TryComp(streamUid, out AudioComponent? audioComp))
+                _audio.SetState(streamUid, AudioState.Stopped, true, audioComp);
+
             _audio.Stop(streamUid);
             data.Stream = null;
         }
diff --git a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
index a13fca8926..61852b9293 100644
--- a/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
+++ b/Content.Server/_Forge/QuestInstance/QuestInstanceSystem.InstanceFlow.cs
@@ -175,6 +175,8 @@ private void JoinInstance(QuestBoardComponent board, ICommonSession session)
         board.Participants.Add(session.UserId);
         board.PresentPlayers.Add(playerEnt);
         TeleportWithPulledEntity(playerEnt, board.SpawnCoords);
+
+        RaiseNetworkEvent(new QuestInstanceWeatherAudioCleanupEvent(GetNetEntity(board.MapUid)), session);
     }
 
     private void ExitPlayer(EntityUid boardUid, ICommonSession session, QuestBoardComponent board)
@@ -182,7 +184,12 @@ private void ExitPlayer(EntityUid boardUid, ICommonSession session, QuestBoardCo
         if (session.AttachedEntity is not { } playerEnt)
             return;
 
-        ExitEntity(playerEnt, boardUid, board, session.UserId.ToString());
+        if (!ExitEntity(playerEnt, boardUid, board, session.UserId.ToString()))
+            return;
+
+        var keepMapUid = Deleted(playerEnt) ? null : Transform(playerEnt).MapUid;
+        NetEntity? keepMapNetUid = keepMapUid != null ? GetNetEntity(keepMapUid.Value) : null;
+        RaiseNetworkEvent(new QuestInstanceWeatherAudioCleanupEvent(keepMapNetUid), session);
     }
 
     private bool ExitEntity(EntityUid playerEnt, EntityUid boardUid, QuestBoardComponent board, string debugLabel)
@@ -267,7 +274,17 @@ private void ForceCloseInstance(EntityUid boardUid, QuestBoardComponent board)
         toEvacuate.UnionWith(board.PresentPlayers);
 
         foreach (var uid in toEvacuate)
-            everyoneEvacuated &= ExitEntity(uid, boardUid, board, uid.ToString());
+        {
+            var evacuated = ExitEntity(uid, boardUid, board, uid.ToString());
+            everyoneEvacuated &= evacuated;
+
+            if (evacuated && TryComp<ActorComponent>(uid, out var actor))
+            {
+                var keepMapUid = Deleted(uid) ? null : Transform(uid).MapUid;
+                NetEntity? keepMapNetUid = keepMapUid != null ? GetNetEntity(keepMapUid.Value) : null;
+                RaiseNetworkEvent(new QuestInstanceWeatherAudioCleanupEvent(keepMapNetUid), actor.PlayerSession);
+            }
+        }
 
         if (!everyoneEvacuated)
         {
@@ -346,9 +363,7 @@ public override void Update(float frameTime)
 
             if (board.PresentPlayers.Count > 0 &&
                 board.WarningThresholdsSeconds.Length > board.SentWarnings.Count)
-            {
                 SendWarningPopups(board, remaining);
-            }
 
             if (remaining <= TimeSpan.Zero)
             {
diff --git a/Content.Shared/_Forge/QuestInstance/QuestInstanceWeatherAudioCleanupEvent.cs b/Content.Shared/_Forge/QuestInstance/QuestInstanceWeatherAudioCleanupEvent.cs
new file mode 100644
index 0000000000..c49305c222
--- /dev/null
+++ b/Content.Shared/_Forge/QuestInstance/QuestInstanceWeatherAudioCleanupEvent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Forge.QuestInstance;
+
+[Serializable, NetSerializable]
+public sealed class QuestInstanceWeatherAudioCleanupEvent(NetEntity? keepMapUid) : EntityEventArgs
+{
+    public readonly NetEntity? KeepMapUid = keepMapUid;
+}