какашечки

2025-08-18 01:15:59 +03:00 · 2025-08-18 01:15:59 +03:00 · 82b6d63652
commit 82b6d63652
parent 5d19dfa77c
22 changed files with 9925 additions and 4097 deletions
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@ -161,7 +161,7 @@ namespace Content.Server.Mapping
                _mappingSystem.ToggleAutosave(mapId, toLoad ?? "NEWMAP");

            shell.ExecuteCommand($"tp 0 0 {mapId}");
-            shell.RemoteExecuteCommand("mappingclientsidesetup");
+            //shell.RemoteExecuteCommand("mappingclientsidesetup"); ДА ИДИ ТЫ НАХУЙ
            DebugTools.Assert(_mapSystem.IsPaused(mapId));

            if (args.Length != 2)
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@ -160,7 +160,7 @@ public sealed partial class DockingSystem
    /// <summary>
    /// Gets all docking configs between the 2 grids.
    /// </summary>
-    private List<DockingConfig> GetDockingConfigs(
+    public List<DockingConfig> GetDockingConfigs( // Sunrise-Edit
        EntityUid shuttleUid,
        EntityUid targetGrid,
        List<Entity<DockingComponent>> shuttleDocks,
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@ -345,6 +345,55 @@ public sealed partial class ShuttleSystem
        }
    }

+    // Sunrise-Start
+    public void FTLToDockСonfig(
+        EntityUid shuttleUid,
+        ShuttleComponent component,
+        EntityUid target,
+        DockingConfig config,
+        float? startupTime = null,
+        float? hyperspaceTime = null,
+        string? priorityTag = null,
+        bool ignored = false,
+        bool deletedTrash = false)
+    {
+        if (!TrySetupFTL(shuttleUid, component, out var hyperspace))
+            return;
+
+        startupTime ??= DefaultStartupTime;
+        hyperspaceTime ??= DefaultTravelTime;
+
+        hyperspace.StartupTime = startupTime.Value;
+        hyperspace.TravelTime = hyperspaceTime.Value;
+        hyperspace.StateTime = StartEndTime.FromStartDuration(
+            _gameTiming.CurTime,
+            TimeSpan.FromSeconds(hyperspace.StartupTime));
+        hyperspace.PriorityTag = priorityTag;
+        hyperspace.Ignored = ignored; // Sunrise-Edit
+        hyperspace.DeleteTrash = deletedTrash; // Sunrise-Edit
+
+        _console.RefreshShuttleConsoles(shuttleUid);
+
+        // Valid dock for now time so just use that as the target.
+        if (config != null)
+        {
+            hyperspace.TargetCoordinates = config.Coordinates;
+            hyperspace.TargetAngle = config.Angle;
+        }
+        else if (TryGetFTLProximity(shuttleUid, new EntityCoordinates(target, Vector2.Zero), out var coords, out var targAngle))
+        {
+            hyperspace.TargetCoordinates = coords;
+            hyperspace.TargetAngle = targAngle;
+        }
+        else
+        {
+            // FTL back to its own position.
+            hyperspace.TargetCoordinates = Transform(shuttleUid).Coordinates;
+            Log.Error($"Unable to FTL grid {ToPrettyString(shuttleUid)} to target properly?");
+        }
+    }
+    // Sunrise-End
+
    private bool TrySetupFTL(EntityUid uid, ShuttleComponent shuttle, [NotNullWhen(true)] out FTLComponent? component)
    {
        component = null;
--- a/Content.Server/_Sunrise/GridDock/GridDockSystem.cs
+++ b/Content.Server/_Sunrise/GridDock/GridDockSystem.cs
@ -1,8 +1,8 @@
-using System.Numerics;
-using Content.Server._Sunrise.RoundStartFtl;
+using System.Linq;
+using System.Numerics;
+using Content.Server.Shuttles;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Server.Station.Systems;
 using Content.Shared.Station.Components;
@ -15,6 +15,7 @@ public sealed class GridDockSystem : EntitySystem
    [Dependency] private readonly MapLoaderSystem _loader = default!;
    [Dependency] private readonly ShuttleSystem _shuttles = default!;
    [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly DockingSystem _dockSystem = default!;

    public override void Initialize()
    {
@ -23,19 +24,11 @@ public sealed class GridDockSystem : EntitySystem

    private void OnStationPostInit(EntityUid uid, SpawnGridAndDockToStationComponent component, StationPostInitEvent args)
    {
-        if (component.GridPath is null)
+        if (component.Grids.Count == 0)
            return;

        var ftlMap = _shuttles.EnsureFTLMap();
        var xformMap = Transform(ftlMap);
-        if (!_loader.TryLoadGrid(xformMap.MapID,
-                component.GridPath.Value,
-                out var rootUid,
-                offset: new Vector2(500, 500)))
-            return;
-
-        if (!TryComp<ShuttleComponent>(rootUid.Value.Owner, out var shuttleComp))
-            return;

        if (!TryComp<StationDataComponent>(uid, out var stationData))
            return;
@ -48,13 +41,73 @@ public sealed class GridDockSystem : EntitySystem
            return;
        }

-        _shuttles.FTLToDock(
-            rootUid.Value.Owner,
-            shuttleComp,
-            target.Value,
-            5f,
-            5f,
-            priorityTag: component.PriorityTag,
-            ignored: true);
+        var baseOffset = new Vector2(500, 500);
+        var offsetStep = new Vector2(100, 100);
+        var usedGridDocks = new HashSet<EntityUid>();
+        var currentOffset = baseOffset;
+        foreach (var entry in component.Grids)
+        {
+            if (!_loader.TryLoadGrid(xformMap.MapID,
+                    entry.GridPath,
+                    out var rootUid,
+                    offset: currentOffset))
+            {
+                currentOffset += offsetStep;
+                continue;
+            }
+
+            if (!TryComp<ShuttleComponent>(rootUid.Value.Owner, out var shuttleComp))
+            {
+                currentOffset += offsetStep;
+                continue;
+            }
+
+            var gridDocks = _dockSystem.GetDocks(target.Value);
+            var shuttleDocks = _dockSystem.GetDocks(rootUid.Value.Owner);
+            var configs = _dockSystem.GetDockingConfigs(rootUid.Value.Owner, target.Value, shuttleDocks, gridDocks, entry.PriorityTag, ignored: false);
+
+            DockingConfig? chosenConfig = null;
+            int maxNewDocks = 0;
+            foreach (var cfg in configs)
+            {
+                var newDocks = cfg.Docks.Count(pair => !usedGridDocks.Contains(pair.DockBUid));
+                if (newDocks > maxNewDocks)
+                {
+                    maxNewDocks = newDocks;
+                    chosenConfig = cfg;
+                }
+            }
+
+            if (chosenConfig != null && chosenConfig.Docks.All(pair => !usedGridDocks.Contains(pair.DockBUid)))
+            {
+                foreach (var pair in chosenConfig.Docks)
+                {
+                    usedGridDocks.Add(pair.DockBUid);
+                }
+
+                _shuttles.FTLToDockСonfig(
+                    rootUid.Value.Owner,
+                    shuttleComp,
+                    target.Value,
+                    chosenConfig,
+                    5f,
+                    5f,
+                    priorityTag: entry.PriorityTag,
+                    ignored: false);
+            }
+            else
+            {
+                _shuttles.FTLToDock(
+                    rootUid.Value.Owner,
+                    shuttleComp,
+                    target.Value,
+                    5f,
+                    5f,
+                    priorityTag: entry.PriorityTag,
+                    ignored: false);
+            }
+
+            currentOffset += offsetStep;
+        }
    }
 }
--- a/Content.Server/_Sunrise/GridDock/SpawnGridAndDockToStationComponent.cs
+++ b/Content.Server/_Sunrise/GridDock/SpawnGridAndDockToStationComponent.cs
@ -1,12 +1,19 @@
 using Robust.Shared.Utility;

-namespace Content.Server._Sunrise.RoundStartFtl;
+namespace Content.Server._Sunrise.GridDock;

 [RegisterComponent]
 public sealed partial class SpawnGridAndDockToStationComponent : Component
 {
-    [DataField]
-    public ResPath? GridPath { get; set; }
+    [DataField(required: true)]
+    public List<GridDockEntry> Grids { get; set; } = new();
+}
+
+[DataDefinition]
+public sealed partial class GridDockEntry
+{
+    [DataField(required: true)]
+    public ResPath GridPath;

    [DataField(required: true)]
    public string PriorityTag;
--- a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
+++ b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
@ -299,7 +299,7 @@ public sealed partial class SunriseCCVars : CVars
    public static readonly CVarDef<bool> VotePause =
        CVarDef.Create("vote.pause", true, CVar.SERVERONLY);

-    public static readonly CVarDef<bool> ExcludeMaps = CVarDef.Create("vote.exclude_maps", false, CVar.SERVERONLY);
+    public static readonly CVarDef<bool> ExcludeMaps = CVarDef.Create("vote.exclude_maps", true, CVar.SERVERONLY);

    public static readonly CVarDef<bool> ExcludePresets =
        CVarDef.Create("vote.exclude_presets", true, CVar.SERVERONLY);
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@ -20834,3 +20834,30 @@
  id: 1366
  time: '2025-08-17T21:25:32.0000000+00:00'
  url: https://github.com/space-sunrise/sunrise-station/pull/2809
+- author: VigersRay
+  changes:
+  - message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D \u0448\u0430\u0442\
+      \u0442\u043B \u0441\u043B\u0443\u0436\u0431\u044B \u0431\u0435\u0437\u043E\u043F\
+      \u0430\u0441\u0442\u043D\u043E\u0441\u0442\u0438."
+    type: Add
+  - message: "\u041D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438 \u0434\u043E\
+      \u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\u0441\u043E\u043D\
+      \u0430\u043B\u044C\u043D\u044B\u0435 \u0433\u0440\u0430\u0436\u0434\u0430\u043D\
+      \u0441\u043A\u0438\u0435 \u0448\u0430\u0442\u0442\u043B\u044B."
+    type: Add
+  - message: "\u0428\u0430\u0442\u0442\u043B \u0443\u0442\u0438\u043B\u0438\u0437\u0430\
+      \u0442\u043E\u0440\u043E\u0432 \u0431\u044B\u043B \u0443\u043B\u0443\u0447\u0448\
+      \u0435\u043D."
+    type: Tweak
+  - message: "\u041D\u0430 \u0431\u043E\u043A\u0441\u0435 \u0440\u0430\u0441\u0448\
+      \u0438\u0440\u0435\u043D\u043E \u043E\u0442\u0431\u044B\u0442\u0438\u0435 (\u0441\
+      \u043E\u0440\u0438, \u044F \u043D\u0435 \u0441\u0442\u0430\u0440\u0430\u043B\
+      \u0441\u044F)."
+    type: Tweak
+  - message: "\u041F\u0443\u043B\u0435\u043C\u0435\u0442 \u0441\u0432\u0430\u043B\u0438\
+      \u043D \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043F\u043E\u043B\u044C\
+      \u0437\u0443\u0435\u0442 \u044D\u043D\u0435\u0440\u0433\u043E\u044F\u0447\u0435\
+      \u0439\u043A\u0438."
+    type: Tweak
+  id: 1367
+  time: '2025-08-17T22:15:46.920749+00:00'
--- a/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
+++ b/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
@ -2,9 +2,9 @@ meta:
  format: 7
  category: Grid
  engineVersion: 266.0.0
-  forkId: sunrise_station
-  forkVersion: 83b3edfcb7c8626abb4f21a2cbec5109a3bf87ef
-  time: 08/16/2025 09:06:59
+  forkId: ""
+  forkVersion: ""
+  time: 08/17/2025 22:05:26
  entityCount: 3866
 maps: []
 grids:
@ -4073,6 +4073,14 @@ entities:
    - type: Transform
      pos: 32.5,-12.5
      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        165:
+        - - DockStatus
+          - Toggle
+        166:
+        - - DockStatus
+          - Toggle
  - uid: 56
    components:
    - type: Transform
@ -20864,7 +20872,7 @@ entities:
      pos: 18.5,0.5
      parent: 1
    - type: Door
-      secondsUntilStateChange: -65560.984
+      secondsUntilStateChange: -65590.22
      state: Opening
    - type: DeviceLinkSource
      lastSignals:
--- a/Resources/Maps/_Sunrise/Shuttles/arrivals.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/arrivals.yml
@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Grid
-  engineVersion: 262.0.0
+  engineVersion: 266.0.0
  forkId: ""
  forkVersion: ""
-  time: 06/13/2025 01:34:18
-  entityCount: 2525
+  time: 08/17/2025 21:45:49
+  entityCount: 2501
 maps: []
 grids:
 - 1
@ -994,6 +994,8 @@ entities:
      - 2304
      - 2303
      - 1242
+    - type: Fixtures
+      fixtures: {}
  - uid: 2348
    components:
    - type: Transform
@ -1013,6 +1015,8 @@ entities:
      - 2316
      - 2317
      - 2318
+    - type: Fixtures
+      fixtures: {}
  - uid: 2349
    components:
    - type: Transform
@ -1032,6 +1036,8 @@ entities:
      - 2253
      - 2266
      - 2246
+    - type: Fixtures
+      fixtures: {}
  - uid: 2350
    components:
    - type: Transform
@ -1048,6 +1054,8 @@ entities:
      - 2254
      - 2255
      - 1321
+    - type: Fixtures
+      fixtures: {}
  - uid: 2351
    components:
    - type: Transform
@ -1061,6 +1069,8 @@ entities:
      - 2097
      - 1236
      - 2241
+    - type: Fixtures
+      fixtures: {}
  - uid: 2352
    components:
    - type: Transform
@ -1079,12 +1089,16 @@ entities:
      - 1235
      - 2228
      - 1234
+    - type: Fixtures
+      fixtures: {}
  - uid: 2353
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -17.5,-7.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2354
    components:
    - type: Transform
@ -1106,6 +1120,8 @@ entities:
      - 2106
      - 2231
      - 1355
+    - type: Fixtures
+      fixtures: {}
  - uid: 2355
    components:
    - type: Transform
@ -1127,6 +1143,8 @@ entities:
      - 2172
      - 1252
      - 2193
+    - type: Fixtures
+      fixtures: {}
  - uid: 2356
    components:
    - type: Transform
@ -1145,6 +1163,8 @@ entities:
      - 2111
      - 2208
      - 1232
+    - type: Fixtures
+      fixtures: {}
  - uid: 2357
    components:
    - type: Transform
@ -1163,6 +1183,8 @@ entities:
      - 2106
      - 1356
      - 2213
+    - type: Fixtures
+      fixtures: {}
  - uid: 2358
    components:
    - type: Transform
@ -1175,6 +1197,8 @@ entities:
      - 2379
      - 1230
      - 2343
+    - type: Fixtures
+      fixtures: {}
  - uid: 2359
    components:
    - type: Transform
@ -1200,6 +1224,8 @@ entities:
      - 1231
      - 2342
      - 2341
+    - type: Fixtures
+      fixtures: {}
  - uid: 2360
    components:
    - type: Transform
@ -1211,6 +1237,8 @@ entities:
      - 2112
      - 1738
      - 1223
+    - type: Fixtures
+      fixtures: {}
 - proto: AirCanister
  entities:
  - uid: 1169
@ -1484,86 +1512,86 @@ entities:
  - uid: 95
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,17.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
      parent: 1
  - uid: 96
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,15.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-26.5
      parent: 1
  - uid: 97
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-36.5
      parent: 1
  - uid: 98
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
-      pos: -20.5,7.5
+      pos: -20.5,-26.5
      parent: 1
  - uid: 107
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,7.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,15.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,17.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-4.5
-      parent: 1
-  - uid: 263
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-6.5
-      parent: 1
-  - uid: 424
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -20.5,-12.5
      parent: 1
-  - uid: 452
+  - uid: 108
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
-      pos: -20.5,-14.5
+      pos: -20.5,7.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-6.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,15.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,17.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-34.5
      parent: 1
  - uid: 453
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-28.5
      parent: 1
  - uid: 454
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
      parent: 1
  - uid: 455
    components:
@ -1581,49 +1609,49 @@ entities:
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-36.5
+      pos: -0.5,-14.5
      parent: 1
  - uid: 458
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-34.5
+      pos: -0.5,9.5
      parent: 1
  - uid: 459
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-28.5
+      pos: -0.5,15.5
      parent: 1
  - uid: 460
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,17.5
      parent: 1
  - uid: 461
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,9.5
      parent: 1
  - uid: 462
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-4.5
      parent: 1
  - uid: 463
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-14.5
      parent: 1
  - uid: 464
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-28.5
      parent: 1
 - proto: AirlockGlass
  entities:
@ -1812,70 +1840,94 @@ entities:
      rot: 3.141592653589793 rad
      pos: -11.5,-31.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1534
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -6.5,-1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1536
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -14.5,-1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1537
    components:
    - type: Transform
      pos: -8.5,10.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1540
    components:
    - type: Transform
      pos: -8.5,-6.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2146
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -8.5,-25.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2427
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -17.5,-8.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2429
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -13.5,-30.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2441
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -7.5,-30.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2444
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -3.5,-8.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2494
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -3.5,-18.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2495
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -17.5,-18.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: APCHighCapacity
  entities:
  - uid: 174
@ -1884,30 +1936,40 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -16.5,-41.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1143
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -4.5,-41.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1535
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,18.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2451
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -17.5,11.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2452
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -3.5,11.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: ArrivalsShuttleTimer
  entities:
  - uid: 2380
@ -1916,278 +1978,208 @@ entities:
      rot: 3.141592653589793 rad
      pos: -10.5,10.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2381
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -12.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2382
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -17.5,1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2383
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2384
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -8.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2385
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -4.5,21.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2386
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -16.5,21.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2387
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -18.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2388
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2389
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -18.5,-7.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2390
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,-7.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2391
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -10.5,-6.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2392
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -10.5,-1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2393
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,-20.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2394
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -17.5,-20.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2395
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -12.5,-15.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2396
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -8.5,-15.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2397
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -14.5,-23.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2398
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -6.5,-23.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2399
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -12.5,-28.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2400
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -14.5,-38.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2401
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -6.5,-38.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2402
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -18.5,-29.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2403
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,-29.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2404
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -8.5,-28.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2405
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -10.5,-31.5
      parent: 1
- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 567
-    components:
-    - type: Transform
-      pos: -20.5,17.5
-      parent: 1
-  - uid: 568
-    components:
-    - type: Transform
-      pos: -20.5,15.5
-      parent: 1
-  - uid: 569
-    components:
-    - type: Transform
-      pos: -0.5,17.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -20.5,9.5
-      parent: 1
-  - uid: 571
-    components:
-    - type: Transform
-      pos: -0.5,15.5
-      parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: -20.5,7.5
-      parent: 1
-  - uid: 573
-    components:
-    - type: Transform
-      pos: -0.5,7.5
-      parent: 1
-  - uid: 574
-    components:
-    - type: Transform
-      pos: -0.5,9.5
-      parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: -20.5,-4.5
-      parent: 1
-  - uid: 578
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 1
-  - uid: 579
-    components:
-    - type: Transform
-      pos: -20.5,-12.5
-      parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -20.5,-14.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -20.5,-26.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: -20.5,-28.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 586
-    components:
-    - type: Transform
-      pos: -0.5,-28.5
-      parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: -0.5,-34.5
-      parent: 1
-  - uid: 588
-    components:
-    - type: Transform
-      pos: -0.5,-36.5
-      parent: 1
-  - uid: 589
-    components:
-    - type: Transform
-      pos: -20.5,-36.5
-      parent: 1
-  - uid: 590
-    components:
-    - type: Transform
-      pos: -20.5,-34.5
-      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: BedsheetMedical
  entities:
  - uid: 545
@ -6453,6 +6445,8 @@ entities:
    - type: Transform
      pos: -4.5,-38.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: ClothingHandsGlovesColorYellow
  entities:
  - uid: 1627
@ -7952,7 +7946,7 @@ entities:
      pos: -12.5,-25.5
      parent: 1
    - type: Door
-      secondsUntilStateChange: -2269.716
+      secondsUntilStateChange: -2351.2053
      state: Opening
    - type: DeviceLinkSource
      lastSignals:
@ -11727,6 +11721,8 @@ entities:
    - type: Transform
      pos: -10.5,-19.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: PottedPlantRandom
  entities:
  - uid: 244
@ -13188,11 +13184,15 @@ entities:
    - type: Transform
      pos: -13.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2086
    components:
    - type: Transform
      pos: -7.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEngineering
  entities:
  - uid: 1603
@ -13200,11 +13200,15 @@ entities:
    - type: Transform
      pos: -9.5,-34.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1604
    components:
    - type: Transform
      pos: -11.5,-34.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMedical
  entities:
  - uid: 1597
@ -13212,11 +13216,15 @@ entities:
    - type: Transform
      pos: -14.5,-2.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1617
    components:
    - type: Transform
      pos: -6.5,-2.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSec
  entities:
  - uid: 1560
@ -13224,11 +13232,15 @@ entities:
    - type: Transform
      pos: -14.5,-22.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1595
    components:
    - type: Transform
      pos: -6.5,-22.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: Sink
  entities:
  - uid: 636
--- a/Resources/Maps/_Sunrise/Shuttles/emergency.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/emergency.yml
@ -1,11 +1,11 @@
 meta:
  format: 7
  category: Grid
-  engineVersion: 262.0.0
+  engineVersion: 266.0.0
  forkId: ""
  forkVersion: ""
-  time: 06/13/2025 01:44:58
-  entityCount: 2427
+  time: 08/17/2025 21:44:12
+  entityCount: 2403
 maps: []
 grids:
 - 1
@ -994,6 +994,8 @@ entities:
      - 2304
      - 2303
      - 1242
+    - type: Fixtures
+      fixtures: {}
  - uid: 2348
    components:
    - type: Transform
@ -1013,6 +1015,8 @@ entities:
      - 2316
      - 2317
      - 2318
+    - type: Fixtures
+      fixtures: {}
  - uid: 2349
    components:
    - type: Transform
@ -1032,6 +1036,8 @@ entities:
      - 2253
      - 2266
      - 2246
+    - type: Fixtures
+      fixtures: {}
  - uid: 2350
    components:
    - type: Transform
@ -1048,6 +1054,8 @@ entities:
      - 2254
      - 2255
      - 1321
+    - type: Fixtures
+      fixtures: {}
  - uid: 2351
    components:
    - type: Transform
@ -1061,6 +1069,8 @@ entities:
      - 2097
      - 1236
      - 2241
+    - type: Fixtures
+      fixtures: {}
  - uid: 2352
    components:
    - type: Transform
@ -1079,12 +1089,16 @@ entities:
      - 1235
      - 2228
      - 1234
+    - type: Fixtures
+      fixtures: {}
  - uid: 2353
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -17.5,-7.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2354
    components:
    - type: Transform
@ -1106,6 +1120,8 @@ entities:
      - 2106
      - 2231
      - 1355
+    - type: Fixtures
+      fixtures: {}
  - uid: 2355
    components:
    - type: Transform
@ -1127,6 +1143,8 @@ entities:
      - 2172
      - 1252
      - 2193
+    - type: Fixtures
+      fixtures: {}
  - uid: 2356
    components:
    - type: Transform
@ -1145,6 +1163,8 @@ entities:
      - 2111
      - 2208
      - 1232
+    - type: Fixtures
+      fixtures: {}
  - uid: 2357
    components:
    - type: Transform
@ -1163,6 +1183,8 @@ entities:
      - 2106
      - 1356
      - 2213
+    - type: Fixtures
+      fixtures: {}
  - uid: 2358
    components:
    - type: Transform
@ -1175,6 +1197,8 @@ entities:
      - 2379
      - 1230
      - 2343
+    - type: Fixtures
+      fixtures: {}
  - uid: 2359
    components:
    - type: Transform
@ -1200,6 +1224,8 @@ entities:
      - 1231
      - 2342
      - 2341
+    - type: Fixtures
+      fixtures: {}
  - uid: 2360
    components:
    - type: Transform
@ -1211,6 +1237,8 @@ entities:
      - 2112
      - 1738
      - 1223
+    - type: Fixtures
+      fixtures: {}
 - proto: AirCanister
  entities:
  - uid: 1169
@ -1484,86 +1512,86 @@ entities:
  - uid: 95
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,17.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
      parent: 1
  - uid: 96
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,15.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-26.5
      parent: 1
  - uid: 97
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-34.5
      parent: 1
  - uid: 98
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
-      pos: -20.5,7.5
+      pos: -20.5,-26.5
      parent: 1
  - uid: 107
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,7.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,15.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,17.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-4.5
-      parent: 1
-  - uid: 263
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-6.5
-      parent: 1
-  - uid: 424
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -20.5,-12.5
      parent: 1
-  - uid: 452
+  - uid: 108
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
-      pos: -20.5,-14.5
+      pos: -20.5,-4.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,9.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,17.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,15.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-36.5
      parent: 1
  - uid: 453
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-14.5
      parent: 1
  - uid: 454
    components:
    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-28.5
      parent: 1
  - uid: 455
    components:
@ -1581,49 +1609,49 @@ entities:
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-36.5
+      pos: -0.5,-4.5
      parent: 1
  - uid: 458
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-34.5
+      pos: -0.5,9.5
      parent: 1
  - uid: 459
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
-      pos: -0.5,-28.5
+      pos: -0.5,17.5
      parent: 1
  - uid: 460
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,15.5
      parent: 1
  - uid: 461
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,7.5
      parent: 1
  - uid: 462
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-6.5
      parent: 1
  - uid: 463
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-14.5
      parent: 1
  - uid: 464
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-28.5
      parent: 1
 - proto: AirlockGlass
  entities:
@ -1812,34 +1840,46 @@ entities:
      rot: 3.141592653589793 rad
      pos: -6.5,-1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1536
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -14.5,-1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1537
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -7.5,10.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1538
    components:
    - type: Transform
      pos: -7.5,-31.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1540
    components:
    - type: Transform
      pos: -8.5,-6.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2146
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -8.5,-25.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: APCHighCapacity
  entities:
  - uid: 1143
@ -1848,134 +1888,16 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -4.5,-41.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1535
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,18.5
      parent: 1
- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 567
-    components:
-    - type: Transform
-      pos: -20.5,17.5
-      parent: 1
-  - uid: 568
-    components:
-    - type: Transform
-      pos: -20.5,15.5
-      parent: 1
-  - uid: 569
-    components:
-    - type: Transform
-      pos: -0.5,17.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -20.5,9.5
-      parent: 1
-  - uid: 571
-    components:
-    - type: Transform
-      pos: -0.5,15.5
-      parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: -20.5,7.5
-      parent: 1
-  - uid: 573
-    components:
-    - type: Transform
-      pos: -0.5,7.5
-      parent: 1
-  - uid: 574
-    components:
-    - type: Transform
-      pos: -0.5,9.5
-      parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: -20.5,-4.5
-      parent: 1
-  - uid: 578
-    components:
-    - type: Transform
-      pos: -20.5,-6.5
-      parent: 1
-  - uid: 579
-    components:
-    - type: Transform
-      pos: -20.5,-12.5
-      parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -20.5,-14.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -20.5,-26.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: -20.5,-28.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 586
-    components:
-    - type: Transform
-      pos: -0.5,-28.5
-      parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: -0.5,-34.5
-      parent: 1
-  - uid: 588
-    components:
-    - type: Transform
-      pos: -0.5,-36.5
-      parent: 1
-  - uid: 589
-    components:
-    - type: Transform
-      pos: -20.5,-36.5
-      parent: 1
-  - uid: 590
-    components:
-    - type: Transform
-      pos: -20.5,-34.5
-      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: BedsheetMedical
  entities:
  - uid: 545
@ -5755,6 +5677,8 @@ entities:
    - type: Transform
      pos: -4.5,-38.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: ClothingHandsGlovesColorYellow
  entities:
  - uid: 1627
@ -7254,7 +7178,7 @@ entities:
      pos: -12.5,-25.5
      parent: 1
    - type: Door
-      secondsUntilStateChange: -1803.3232
+      secondsUntilStateChange: -1900.3647
      state: Opening
    - type: DeviceLinkSource
      lastSignals:
@ -11011,6 +10935,8 @@ entities:
    - type: Transform
      pos: -10.5,-19.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: PottedPlantRandom
  entities:
  - uid: 244
@ -11982,133 +11908,185 @@ entities:
    - type: Transform
      pos: -10.5,10.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2380
    components:
    - type: Transform
      pos: -8.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2381
    components:
    - type: Transform
      pos: -12.5,14.5
      parent: 1
-  - uid: 2384
-    components:
-    - type: Transform
-      pos: -16.5,21.5
-      parent: 1
-  - uid: 2385
-    components:
-    - type: Transform
-      pos: -4.5,21.5
-      parent: 1
-  - uid: 2386
-    components:
-    - type: Transform
-      pos: -2.5,14.5
-      parent: 1
-  - uid: 2387
-    components:
-    - type: Transform
-      pos: -18.5,14.5
-      parent: 1
-  - uid: 2388
-    components:
-    - type: Transform
-      pos: -2.5,-7.5
-      parent: 1
-  - uid: 2389
-    components:
-    - type: Transform
-      pos: -18.5,-7.5
-      parent: 1
-  - uid: 2390
-    components:
-    - type: Transform
-      pos: -10.5,-6.5
-      parent: 1
-  - uid: 2391
-    components:
-    - type: Transform
-      pos: -17.5,-20.5
-      parent: 1
-  - uid: 2392
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 2393
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 1
-  - uid: 2394
-    components:
-    - type: Transform
-      pos: -12.5,-15.5
-      parent: 1
-  - uid: 2395
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 2396
-    components:
-    - type: Transform
-      pos: -14.5,-23.5
-      parent: 1
-  - uid: 2397
-    components:
-    - type: Transform
-      pos: -8.5,-28.5
-      parent: 1
-  - uid: 2398
-    components:
-    - type: Transform
-      pos: -6.5,-38.5
-      parent: 1
-  - uid: 2399
-    components:
-    - type: Transform
-      pos: -14.5,-38.5
-      parent: 1
-  - uid: 2400
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 2401
-    components:
-    - type: Transform
-      pos: -18.5,-29.5
-      parent: 1
-  - uid: 2402
-    components:
-    - type: Transform
-      pos: -12.5,-28.5
-      parent: 1
-  - uid: 2403
-    components:
-    - type: Transform
-      pos: -10.5,-31.5
-      parent: 1
-  - uid: 2405
-    components:
-    - type: Transform
-      pos: -10.5,-1.5
-      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2382
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -17.5,1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2383
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,1.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2384
+    components:
+    - type: Transform
+      pos: -16.5,21.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2385
+    components:
+    - type: Transform
+      pos: -4.5,21.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2386
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2387
+    components:
+    - type: Transform
+      pos: -18.5,14.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2388
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2389
+    components:
+    - type: Transform
+      pos: -18.5,-7.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2390
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2391
+    components:
+    - type: Transform
+      pos: -17.5,-20.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2393
+    components:
+    - type: Transform
+      pos: -8.5,-15.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2394
+    components:
+    - type: Transform
+      pos: -12.5,-15.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2395
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2396
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2397
+    components:
+    - type: Transform
+      pos: -8.5,-28.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2398
+    components:
+    - type: Transform
+      pos: -6.5,-38.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2399
+    components:
+    - type: Transform
+      pos: -14.5,-38.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2400
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2401
+    components:
+    - type: Transform
+      pos: -18.5,-29.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2402
+    components:
+    - type: Transform
+      pos: -12.5,-28.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2403
+    components:
+    - type: Transform
+      pos: -10.5,-31.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2405
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: ShuttleWindow
  entities:
  - uid: 7
@ -12603,11 +12581,15 @@ entities:
    - type: Transform
      pos: -13.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 2086
    components:
    - type: Transform
      pos: -7.5,14.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignEngineering
  entities:
  - uid: 1603
@ -12615,11 +12597,15 @@ entities:
    - type: Transform
      pos: -9.5,-34.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1604
    components:
    - type: Transform
      pos: -11.5,-34.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignMedical
  entities:
  - uid: 1597
@ -12627,11 +12613,15 @@ entities:
    - type: Transform
      pos: -14.5,-2.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1617
    components:
    - type: Transform
      pos: -6.5,-2.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: SignSec
  entities:
  - uid: 1560
@ -12639,11 +12629,15 @@ entities:
    - type: Transform
      pos: -14.5,-22.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
  - uid: 1595
    components:
    - type: Transform
      pos: -6.5,-22.5
      parent: 1
+    - type: Fixtures
+      fixtures: {}
 - proto: Sink
  entities:
  - uid: 636
--- a/Resources/Maps/_Sunrise/Shuttles/mining.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/mining.yml
--- a/Resources/Maps/_Sunrise/Shuttles/personal.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/personal.yml
@ -0,0 +1,917 @@
+meta:
+  format: 7
+  category: Grid
+  engineVersion: 266.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 08/17/2025 21:08:25
+  entityCount: 129
+maps: []
+grids:
+- 62
+orphans:
+- 62
+nullspace: []
+tilemap:
+  0: Space
+  55: FloorMono
+  59: FloorRGlass
+  1: FloorShuttleBlue
+  64: FloorShuttleOrange
+  66: FloorShuttleRed
+  67: FloorShuttleWhite
+  95: Lattice
+  96: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 62
+    components:
+    - type: MetaData
+      name: NT Personal-110
+    - type: Transform
+      pos: 0.07291666,1.7143848
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAAAABfAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABDAAAAAAAAQwAAAAAAAEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAQwAAAAAAAEMAAAAAAABDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAAAAAGAAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABfAAAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEMAAAAAAABDAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDAAAAAAAAQwAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAAAAAAYAAAAAAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAGAAAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAAAAAGAAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        0,0:
+          ind: 0,0
+          tiles: AQAAAAAAAGAAAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-1:
+            0: 65535
+          0,-1:
+            0: 30583
+          -1,0:
+            0: 239
+          0,0:
+            0: 55
+          -1,-3:
+            0: 65024
+          -1,-2:
+            0: 65529
+            1: 2
+            2: 4
+          0,-3:
+            0: 29440
+          0,-2:
+            1: 1
+            0: 30580
+            2: 2
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.213781
+          - 79.80423
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 20.04244
+          - 75.39776
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: RadiationGridResistance
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: ImplicitRoof
+    - type: GravityShake
+      shakeTimes: 10
+- proto: AirCanister
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 62
+- proto: AirlockCommand
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 62
+- proto: AirlockExternalGlassShuttleLocked
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 62
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 62
+- proto: APCBasic
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 62
+    - type: Fixtures
+      fixtures: {}
+- proto: CableApcExtension
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 62
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 62
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 62
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 62
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 62
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 62
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 62
+  - uid: 85
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 62
+  - uid: 87
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 62
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 62
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 62
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 62
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 62
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 62
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 62
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 62
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 62
+  - uid: 103
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 62
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 62
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 62
+- proto: CableHV
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 62
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 62
+- proto: CableMV
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 62
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 62
+- proto: ChairPilotSeat
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 62
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 62
+  - uid: 61
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 62
+  - uid: 68
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 62
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-4.5
+      parent: 62
+- proto: ClothingHeadHelmetEVA
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -0.23437434,-2.54319
+      parent: 62
+  - uid: 38
+    components:
+    - type: Transform
+      pos: -0.7033577,-2.5744615
+      parent: 62
+  - uid: 47
+    components:
+    - type: Transform
+      pos: -0.71377945,-2.1719494
+      parent: 62
+  - uid: 49
+    components:
+    - type: Transform
+      pos: -0.14057857,-2.0636902
+      parent: 62
+- proto: ClothingOuterHardsuitEVA
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -0.2864844,-2.5805764
+      parent: 62
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -0.27606136,-2.1740441
+      parent: 62
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -0.7658888,-2.611848
+      parent: 62
+  - uid: 48
+    components:
+    - type: Transform
+      pos: -0.75546646,-2.2053158
+      parent: 62
+- proto: ComputerShuttle
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 62
+- proto: FoodBoxPizzaFilled
+  entities:
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -2.4234464,-2.3027515
+      parent: 62
+- proto: GasPipeBend
+  entities:
+  - uid: 65
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+  - uid: 119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+- proto: GasPort
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
+      parent: 62
+- proto: GasPressurePump
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-6.5
+      parent: 62
+- proto: GasVentPump
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 62
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 62
+    - type: CMExplosionEffect
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 62
+- proto: Grille
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 62
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 62
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 62
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 62
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 62
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 62
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 62
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 62
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 62
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 62
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 62
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 62
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 62
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 62
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 62
+- proto: Gyroscope
+  entities:
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 62
+- proto: JetpackBlackFilled
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 1.2604167,-2.566079
+      parent: 62
+    - type: CMExplosionEffect
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 1.6458334,-2.3159053
+      parent: 62
+    - type: CMExplosionEffect
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 1.6770834,-2.6181984
+      parent: 62
+    - type: CMExplosionEffect
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 1.2708334,-2.2637858
+      parent: 62
+    - type: CMExplosionEffect
+- proto: KnifePlastic
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.38178,-2.156817
+      parent: 62
+- proto: Poweredlight
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 62
+  - uid: 93
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
+      parent: 62
+  - uid: 139
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-0.5
+      parent: 62
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: Rack
+  entities:
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 62
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 62
+- proto: ShuttleWindow
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 62
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 62
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 62
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 62
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 62
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 62
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 62
+  - uid: 27
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 62
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 62
+  - uid: 29
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 62
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 62
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 62
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 62
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 62
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 62
+- proto: SodaDispenser
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 62
+- proto: SubstationWallBasic
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-1.5
+      parent: 62
+    - type: CMExplosionEffect
+- proto: TableReinforced
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 62
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 62
+  - uid: 188
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 62
+  - uid: 189
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 62
+- proto: Thruster
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 62
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 62
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 62
+  - uid: 16
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 62
+  - uid: 55
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 62
+  - uid: 101
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-8.5
+      parent: 62
+- proto: WallShuttle
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 62
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 62
+  - uid: 39
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 62
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 62
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 62
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 62
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 62
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 62
+  - uid: 22
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 62
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 62
+  - uid: 46
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 62
+  - uid: 78
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 62
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-7.5
+      parent: 62
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 62
+  - uid: 84
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 62
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-8.5
+      parent: 62
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 62
+- proto: WarpPoint
+  entities:
+  - uid: 3
+    components:
+    - type: MetaData
+      name: NT Personal-110
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-4.5
+      parent: 62
+...
--- a/Resources/Maps/_Sunrise/Station/box.yml
+++ b/Resources/Maps/_Sunrise/Station/box.yml
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@ -51,8 +51,17 @@
  abstract: true
  components:
    - type: SpawnGridAndDockToStation
-      gridPath: /Maps/_Sunrise/Shuttles/mining.yml
-      priorityTag: DockMining
+      grids:
+        - gridPath: /Maps/_Sunrise/Shuttles/mining.yml
+          priorityTag: DockMining
+        - gridPath: /Maps/_Sunrise/Shuttles/security.yml
+          priorityTag: DockSecurity
+        - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+          priorityTag: DockPersonal
+        - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+          priorityTag: DockPersonal
+        - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+          priorityTag: DockPersonal
 #    - type: StationCargoShuttle
 #      path: /Maps/Shuttles/cargo.yml
    - type: GridSpawn
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@ -90,8 +90,7 @@
        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
        whitelist:
          tags:
-            - PowerCell
-            - PowerCellSmall
+            - PowerCage # Sunrise-edit
  - type: HitscanBatteryAmmoProvider
    proto: RedShuttleMediumLaser #RedLightLaser
    fireCost: 30 # Sunrise-edit #changed from 50 to 30
--- a/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml
@ -3,8 +3,9 @@
  abstract: true
  components:
  - type: SpawnGridAndDockToStation
-    gridPath: /Maps/_Sunrise/Shuttles/centcom_shuttle.yml
-    priorityTag: DockCentComm
+    grids:
+    - gridPath: /Maps/_Sunrise/Shuttles/centcom_shuttle.yml
+      priorityTag: DockCentComm

 - type: entity
  id: BaseStationCentComm
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml
@ -132,6 +132,22 @@
  - type: PriorityDock
    tag: DockMining

+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassSecurityShuttle
+  suffix: External, Security, Glass, Docking, AutoDock
+  components:
+  - type: PriorityDock
+    tag: DockSecurity
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassPersonalShuttle
+  suffix: External, Personal, Glass, Docking, AutoDock
+  components:
+  - type: PriorityDock
+    tag: DockPersonal
+
 - type: entity
  parent: AirlockExternalGlassShuttleArrivals
  id: AirlockExternalGlassShuttleArrivalsLockedCentComm
--- a/Resources/Prototypes/_Sunrise/Maps/box.yml
+++ b/Resources/Prototypes/_Sunrise/Maps/box.yml
@ -14,6 +14,22 @@
          nameGenerator:
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
+        - type: SpawnGridAndDockToStation
+          grids:
+          - gridPath: /Maps/_Sunrise/Shuttles/mining.yml
+            priorityTag: DockMining
+          - gridPath: /Maps/_Sunrise/Shuttles/security.yml
+            priorityTag: DockSecurity
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
        - type: StationEmergencyShuttle
          emergencyShuttlePath: /Maps/_Sunrise/Shuttles/emergency.yml
        - type: StationJobs
--- a/Resources/Prototypes/_Sunrise/Maps/delta.yml
+++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml
@ -14,6 +14,26 @@
          nameGenerator:
            !type:NanotrasenNameGenerator
            prefixCreator: 'TG'
+        - type: SpawnGridAndDockToStation
+          grids:
+          - gridPath: /Maps/_Sunrise/Shuttles/mining.yml
+            priorityTag: DockMining
+          - gridPath: /Maps/_Sunrise/Shuttles/security.yml
+            priorityTag: DockSecurity
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
+          - gridPath: /Maps/_Sunrise/Shuttles/personal.yml
+            priorityTag: DockPersonal
        - type: StationEmergencyShuttle
          emergencyShuttlePath: /Maps/_Sunrise/Shuttles/emergency.yml
        - type: StationJobs
--- a/Resources/Prototypes/_Sunrise/tags.yml
+++ b/Resources/Prototypes/_Sunrise/tags.yml
@ -417,6 +417,12 @@
 - type: Tag
  id: DockMining

+- type: Tag
+  id: DockSecurity
+
+- type: Tag
+  id: DockPersonal
+
 - type: Tag
  id: Felinid

--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@ -722,6 +722,18 @@ PoweredLightPostSmallRed: PoweredlightRed
 PoweredSmallLightMaintenanceRed: PoweredDimSmallLight
 FoodCondimentBottleSmallVinegar: FoodCondimentBottleVinegar
 PoweredLightColoredRed: PoweredlightRed
+PoweredLightColoredBlack: PoweredlightBlack
+PoweredLightColoredFrostyBlue: PoweredlightBlue
+RandomBook: null
+SpawnPointShipwreckHecate: null
+SpawnPointShipwreckTraveller: null
+SpawnMobGolemCult: null
+SpawnMobRobotMedical: null
+WindoorCommandLocked: null
+WindoorSecurityLocked: null
+SpawnMobRobotStandard: null
+OilJar`Ghee: null
+Painting`MothBigCatch: null
 AtmTerminal: ATM
 Shinai: ToySword
 PosterLegitSMMeth: RandomPosterLegit
@ -762,7 +774,6 @@ ScienceTechFab: null
 ReverseEngineeringMachine: null
 ScienceTechFabCircuitboard: null
 EngineeringTechFabCircuitboard: null
-WeaponPistolDeagle: null #Пока не обновят кабинеты ГСБ на картах.
 MagazineDeagle: null
 MagazineMagnum: null
 SpawnPointBlueShield: SpawnPointBlueShieldOfficer
@ -811,7 +822,6 @@ GrenadeEMP: GrenadeEMPTimer
 GrenadeFlash: GrenadeFlashTimer
 GrenadeFrag: GrenadeFragTimer
 WeaponEnergyGunMini: WeaponMiniEnergyGun
-# Safes
 GunSafeCombineSmallArms: SpawnerSafeSmallArms
 # SL HITSCAN START
 BoxMagazineRifle: BoxMagazineRifleSP
@ -824,6 +834,6 @@ MagazineRifle: MagazineRifleSP
 MagazineBoxMagnum: MagazineBoxMagnumSP
 SpeedLoaderMagnum: SpeedLoaderMagnumSP
 MagazineBoxRifle: MagazineBoxRifleSP
-# Sunrise-End
 PrinterDoc: CopyMachineFilled
 PrinterDocFlatpack: CopyMachineFlatpack
+# Sunrise-End