diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 383a75d5f71..b3191f5f827 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,19 +20,15 @@
 
 **Changelog**
 <!--
-Введите игроков в курс дела, кратко опишите всё что было изменено в этом PR.
--->
-
-<!--
-Перед выкладыванием/запросом о рассмотрении PR, напишите Changelog вне коментария.
-Для добавления чейнжлога в Resources/Changelog/ChangelogSunrise.yml используйте скрипт manual_changelog.py который находится в директории Tools. Нужен установленый python.
-Пример команды:
-python .\Tools\manual_changelog.py
-Далее указываете чейнжлог по данному шаблону:
+Если вы хотите чтобы о ваших изменениях узнали игроки напишите что вы изменили вне коментария используя шаблон. 
+Если вы делаете слишком мелкий фикс, не стоит его указывать.
+Так же не стоил делать его слишком длинним указывая все детали, пишите кратко и по существу.
+Шаблон:
 :cl: VigersRay
 - add: Добавлено веселье!
 - remove: Удалено веселье!
 - tweak: Изменено веселье!
 - fix: Исправлено веселье!
-После чего закройте скрипт комбинацией CTRL + C.
+
+Не изменяйте файл чейнжлога сами.
 -->
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index c8606ca80d5..866c4e788f7 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -1,6 +1,7 @@
 using Content.Client.Station;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -14,6 +15,7 @@ public sealed partial class ObjectsTab : Control
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IClientConsoleHost _console = default!;
 
     private readonly List<ObjectsTabEntry> _objects = new();
     private readonly List<ObjectsTabSelection> _selections = new();
@@ -27,6 +29,9 @@ public sealed partial class ObjectsTab : Control
     private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
     private TimeSpan _nextUpdate;
 
+    private Action<NetEntity>? TeleportToObjAction { get; set; }
+    private Action<NetEntity>? DeleteObjAction { get; set; }
+
     public ObjectsTab()
     {
         RobustXamlLoader.Load(this);
@@ -57,6 +62,19 @@ public ObjectsTab()
 
         // Initialize the next update time
         _nextUpdate = TimeSpan.Zero;
+
+        TeleportToObjAction += TeleportToObj;
+        DeleteObjAction += DeleteObj;
+    }
+
+    private void TeleportToObj(NetEntity nent)
+    {
+        _console.ExecuteCommand($"tpto {nent}");
+    }
+
+    private void DeleteObj(NetEntity nent)
+    {
+        _console.ExecuteCommand($"delete {nent}");
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -129,7 +147,7 @@ private void GenerateButton(ListData data, ListContainerButton button)
         if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor }, TeleportToObjAction, DeleteObjAction);
         button.ToolTip = $"{info.Name}, {info.Entity}";
 
         button.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
index 83c4cc5697f..8b7a2055c26 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
@@ -13,5 +13,17 @@
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="TeleportButton"
+                Text="{Loc object-tab-entity-teleport}"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="DeleteButton"
+                Text="{Loc object-tab-entity-delete}"
+                SizeFlagsStretchRatio="3"
+                HorizontalExpand="True"
+                ClipText="True"/>
     </BoxContainer>
 </PanelContainer>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
index aab06c6ccd0..7e0cc7767d3 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
@@ -10,12 +10,16 @@ public sealed partial class ObjectsTabEntry : PanelContainer
 {
     public NetEntity AssocEntity;
 
-    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox)
+    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox, Action<NetEntity>? teleportToObj, Action<NetEntity>? deleteObj)
     {
         RobustXamlLoader.Load(this);
+
         AssocEntity = nent;
         EIDLabel.Text = nent.ToString();
         NameLabel.Text = name;
         BackgroundColorPanel.PanelOverride = styleBox;
+
+        TeleportButton.OnPressed += _ => teleportToObj?.Invoke(nent);
+        DeleteButton.OnPressed += _ => deleteObj?.Invoke(nent);
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
index 71a1f5c7bc6..93bb68f7855 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
@@ -17,5 +17,11 @@
                ClipText="True"
                Text="{Loc object-tab-entity-id}"
                MouseFilter="Pass"/>
+        <Label Name="EntityTeleportLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
+        <Label Name="EntityDeleteLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 06346ad42f4..c74a736b806 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -389,6 +389,7 @@ public HumanoidProfileEditor(
             {
                 PreferenceUnavailableButton.SelectId(args.Id);
                 Profile = Profile?.WithPreferenceUnavailable((PreferenceUnavailableMode) args.Id);
+                SetDirty();
             };
 
             _jobCategories = new Dictionary<string, BoxContainer>();
diff --git a/Content.Client/_Sunrise/Pacificator/PacificatorBoundUserInterface.cs b/Content.Client/_Sunrise/Pacificator/PacificatorBoundUserInterface.cs
new file mode 100644
index 00000000000..38bd6dad43e
--- /dev/null
+++ b/Content.Client/_Sunrise/Pacificator/PacificatorBoundUserInterface.cs
@@ -0,0 +1,54 @@
+using Content.Shared._Sunrise.Pacificator;
+using JetBrains.Annotations;
+
+namespace Content.Client._Sunrise.Pacificator
+{
+    [UsedImplicitly]
+    public sealed class PacificatorBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private PacificatorWindow? _window;
+
+        public PacificatorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+
+            _window = new PacificatorWindow(this);
+
+            /*
+            _window.Switch.OnPressed += _ =>
+            {
+                SendMessage(new SharedPacificatorComponent.SwitchGeneratorMessage(!IsOn));
+            };
+            */
+
+            _window.OpenCentered();
+            _window.OnClose += Close;
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+
+            var castState = (GeneratorState) state;
+            _window?.UpdateState(castState);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing) return;
+
+            _window?.Dispose();
+        }
+
+        public void SetPowerSwitch(bool on)
+        {
+            SendMessage(new SwitchGeneratorMessage(on));
+        }
+    }
+}
diff --git a/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml b/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml
new file mode 100644
index 00000000000..e6ba9a00232
--- /dev/null
+++ b/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml
@@ -0,0 +1,35 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                Title="Генератор пацифизма"
+                MinSize="270 130"
+                SetSize="360 180">
+    <BoxContainer Margin="4 0" Orientation="Horizontal">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+            <GridContainer Margin="2 0 0 0" Columns="2">
+                <!-- Power -->
+                <Label Text="{Loc 'gravity-generator-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+                <BoxContainer Orientation="Horizontal" MinWidth="120">
+                    <Button Name="OnButton" Text="{Loc 'gravity-generator-window-power-on'}" StyleClasses="OpenRight" />
+                    <Button Name="OffButton" Text="{Loc 'gravity-generator-window-power-off'}" StyleClasses="OpenLeft" />
+                </BoxContainer>
+                <Control /> <!-- Empty control to act as a spacer in the grid. -->
+                <Label Name="PowerLabel" Text="0 / 0 W" />
+                <!-- Status -->
+                <Label Text="{Loc 'gravity-generator-window-status'}"  StyleClasses="StatusFieldTitle" />
+                <Label Name="StatusLabel" Text="{Loc 'gravity-generator-window-status-fully-charged'}" />
+                <!-- ETA -->
+                <Label Text="{Loc 'gravity-generator-window-eta'}" StyleClasses="StatusFieldTitle" />
+                <Label Name="EtaLabel" Text="N/A" />
+                <!-- Charge -->
+                <Label Text="{Loc 'gravity-generator-window-charge'}" StyleClasses="StatusFieldTitle" />
+                <ProgressBar Name="ChargeBar" MaxValue="255">
+                    <Label Name="ChargeText" Margin="4 0" Text="0 %" />
+                </ProgressBar>
+            </GridContainer>
+        </BoxContainer>
+        <PanelContainer Margin="12 0 0 0" StyleClasses="Inset" VerticalAlignment="Center">
+            <SpriteView Name="EntityView" SetSize="96 96" OverrideDirection="South" />
+        </PanelContainer>
+    </BoxContainer>
+
+</controls:FancyWindow>
diff --git a/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml.cs b/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml.cs
new file mode 100644
index 00000000000..e2532674886
--- /dev/null
+++ b/Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml.cs
@@ -0,0 +1,73 @@
+using Content.Shared._Sunrise.Pacificator;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client._Sunrise.Pacificator
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class PacificatorWindow : FancyWindow
+    {
+        private readonly ButtonGroup _buttonGroup = new();
+
+        private readonly PacificatorBoundUserInterface _owner;
+
+        public PacificatorWindow(PacificatorBoundUserInterface owner)
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            _owner = owner;
+
+            OnButton.Group = _buttonGroup;
+            OffButton.Group = _buttonGroup;
+
+            OnButton.OnPressed += _ => _owner.SetPowerSwitch(true);
+            OffButton.OnPressed += _ => _owner.SetPowerSwitch(false);
+
+            EntityView.SetEntity(owner.Owner);
+        }
+
+        public void UpdateState(GeneratorState state)
+        {
+            if (state.On)
+                OnButton.Pressed = true;
+            else
+                OffButton.Pressed = true;
+
+            PowerLabel.Text = Loc.GetString(
+                "gravity-generator-window-power-label",
+                ("draw", state.PowerDraw),
+                ("max", state.PowerDrawMax));
+
+            PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
+
+            ChargeBar.Value = state.Charge;
+            ChargeText.Text = (state.Charge / 255f).ToString("P0");
+            StatusLabel.Text = Loc.GetString(state.PowerStatus switch
+            {
+                PacificatorPowerStatus.Off => "gravity-generator-window-status-off",
+                PacificatorPowerStatus.Discharging => "gravity-generator-window-status-discharging",
+                PacificatorPowerStatus.Charging => "gravity-generator-window-status-charging",
+                PacificatorPowerStatus.FullyCharged => "gravity-generator-window-status-fully-charged",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
+            {
+                PacificatorPowerStatus.Off => "Danger",
+                PacificatorPowerStatus.Discharging => "Caution",
+                PacificatorPowerStatus.Charging => "Caution",
+                PacificatorPowerStatus.FullyCharged => "Good",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            EtaLabel.Text = state.EtaSeconds >= 0
+                ? Loc.GetString("gravity-generator-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
+                : Loc.GetString("gravity-generator-window-eta-none");
+
+            EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
+        }
+    }
+}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 30bb8f347b4..596b0bd4c1e 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -229,15 +229,21 @@ private void SpawnPlayer(ICommonSession player,
 
             _playTimeTrackings.PlayerRolesChanged(player);
 
-            var arrivals = true;
-
+            // Все появляются в прибытии в начале раунда. Зачем? А мне нравится эта бегающаа орящая толпа.
+            EntityUid? mobMaybe = null;
+            var spawnPointType = SpawnPointType.Arrivals;
             if (jobPrototype.AlwaysUseSpawner)
             {
                 lateJoin = false;
-                arrivals = false;
+                spawnPointType = SpawnPointType.Job;
+            }
+            else
+            {
+                mobMaybe = _arrivals.SpawnPlayersOnArrivals(station, job, character);
             }
 
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, arrivals: arrivals);
+            if (mobMaybe == null)
+                mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, spawnPointType: spawnPointType);
 
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 5b38fe8a632..557e44f0952 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -49,7 +49,7 @@ private void OnBeforeSpawn(PlayerBeforeSpawnEvent ev)
             var newMind = _mind.CreateMind(ev.Player.UserId, ev.Profile.Name);
             _mind.SetUserId(newMind, ev.Player.UserId);
 
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(ev.Station, null, ev.Profile, arrivals: false);
+            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(ev.Station, null, ev.Profile);
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;
 
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index e65b5d0ba41..ac03a17325b 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using System.Numerics;
+using Content.Server._Sunrise.DontSellingGrid;
+using Content.Server._Sunrise.ImmortalGrid;
 using Content.Server.Administration;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Events;
 using Content.Server.Parallax;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
@@ -21,7 +22,6 @@
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Tiles;
 using Robust.Server.GameObjects;
@@ -45,9 +45,7 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly IConsoleHost _console = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
@@ -70,13 +68,6 @@ public sealed class ArrivalsSystem : EntitySystem
     /// </summary>
     private const float RoundStartFTLDuration = 10f;
 
-    private readonly List<ProtoId<BiomeTemplatePrototype>> _arrivalsBiomeOptions = new()
-    {
-        "Grasslands",
-        "LowDesert",
-        "Snow",
-    };
-
     public override void Initialize()
     {
         base.Initialize();
@@ -304,16 +295,54 @@ private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<T
         }
     }
 
+    public List<EntityCoordinates> GetArrivalsSpawnPoints()
+    {
+        TryGetArrivalsSource(out var arrivals);
+        var possiblePositions = new List<EntityCoordinates>();
+
+        if (TryComp(arrivals, out TransformComponent? arrivalsXform))
+        {
+            var mapId = arrivalsXform.MapID;
+
+            var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+
+            while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
+            {
+                if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId)
+                    continue;
+
+                possiblePositions.Add(xform.Coordinates);
+            }
+        }
+
+        return possiblePositions;
+    }
+
+    public EntityUid? SpawnPlayersOnArrivals(EntityUid? station, JobComponent? job, HumanoidCharacterProfile? profile)
+    {
+        var possiblePositions = GetArrivalsSpawnPoints();
+
+        var spawnLoc = _random.Pick(possiblePositions);
+
+        var playerMob = _stationSpawning.SpawnPlayerMob(
+            spawnLoc,
+            job,
+            profile,
+            station);
+
+        return playerMob;
+    }
+
     public void HandlePlayerSpawning(PlayerSpawningEvent ev)
     {
         if (ev.SpawnResult != null)
             return;
 
         // Only works on latejoin even if enabled.
-        if (!Enabled || !ev.Arrivals)
+        if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
             return;
 
-        if (!HasComp<StationArrivalsComponent>(ev.Station) && !ev.Arrivals)
+        if (!HasComp<StationArrivalsComponent>(ev.Station))
             return;
 
         TryGetArrivalsSource(out var arrivals);
@@ -507,7 +536,9 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component, Des
             var shuttleComp = Comp<ShuttleComponent>(shuttleUids[0]);
             var arrivalsComp = EnsureComp<ArrivalsShuttleComponent>(shuttleUids[0]);
             arrivalsComp.Station = uid;
-            EnsureComp<ProtectedGridComponent>(uid);
+            EnsureComp<ImmortalGridComponent>(shuttleUids[0]); // Sunrise-Edit
+            EnsureComp<DontSellingGridComponent>(shuttleUids[0]); // Sunrise-Edit
+
             var target = destination == Destination.Station ? uid : arrivals;
             _shuttles.FTLToDock(shuttleUids[0], shuttleComp, target, hyperspaceTime: RoundStartFTLDuration, priorityTag: "DockArrivals");
             arrivalsComp.NextTransfer = _timing.CurTime + TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index f7a4929e575..52de838826a 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -1,5 +1,7 @@
 using System.Numerics;
 using System.Threading;
+using Content.Server._Sunrise.DontSellingGrid;
+using Content.Server._Sunrise.ImmortalGrid;
 using Content.Server._Sunrise.TransitHub;
 using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
@@ -130,10 +132,10 @@ private void OnRoundCleanup(RoundRestartCleanupEvent ev)
 
     private void OnCentcommShutdown(EntityUid uid, StationTransitHubComponent component, ComponentShutdown args) // Sunrise-Edit
     {
-        ClearCentcomm(component);
+        ClearTransitHub(component);
     }
 
-    private void ClearCentcomm(StationTransitHubComponent component) // Sunrise-Edit
+    private void ClearTransitHub(StationTransitHubComponent component) // Sunrise-Edit
     {
         QueueDel(component.Entity);
         QueueDel(component.MapEntity);
@@ -441,7 +443,7 @@ private void AddTransitHub(EntityUid station, StationTransitHubComponent compone
             if (!Exists(otherComp.MapEntity) || !Exists(otherComp.Entity))
             {
                 Log.Error($"Discovered invalid centcomm component?");
-                ClearCentcomm(otherComp);
+                ClearTransitHub(otherComp);
                 continue;
             }
 
@@ -472,6 +474,8 @@ private void AddTransitHub(EntityUid station, StationTransitHubComponent compone
 
         EnsureComp<ProtectedGridComponent>(uids[0]);
         EnsureComp<ArrivalsSourceComponent>(uids[0]); // Sunrise-Edit
+        EnsureComp<ImmortalGridComponent>(uids[0]); // Sunrise-Edit
+        EnsureComp<DontSellingGridComponent>(uids[0]); // Sunrise-Edit
 
         var template = _random.Pick(component.Biomes);
         _biomes.EnsurePlanet(mapUid, _protoManager.Index<BiomeTemplatePrototype>(template), mapLight: component.PlanetLightColor);
diff --git a/Content.Server/Spawners/Components/SpawnPointComponent.cs b/Content.Server/Spawners/Components/SpawnPointComponent.cs
index c6d14dfeb31..4dbfe64bbc5 100644
--- a/Content.Server/Spawners/Components/SpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/SpawnPointComponent.cs
@@ -27,4 +27,5 @@ public enum SpawnPointType
     LateJoin,
     Job,
     Observer,
+    Arrivals
 }
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
index be555dd54ac..81d041fb484 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameTicking;
+using Content.Server.Shuttles.Systems;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Systems;
 using Robust.Shared.Map;
@@ -27,11 +28,29 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
         var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
         var possiblePositions = new List<EntityCoordinates>();
 
-        while ( points.MoveNext(out var uid, out var spawnPoint, out var xform))
+        while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
         {
             if (args.Station != null && _stationSystem.GetOwningStation(uid, xform) != args.Station)
                 continue;
 
+            // Delta-V: Allow setting a desired SpawnPointType
+            if (args.DesiredSpawnPointType != SpawnPointType.Unset)
+            {
+                var isMatchingJob = spawnPoint.SpawnType == SpawnPointType.Job &&
+                                    (args.Job == null || spawnPoint.Job == args.Job.Prototype);
+
+                switch (args.DesiredSpawnPointType)
+                {
+                    case SpawnPointType.Job when isMatchingJob:
+                    case SpawnPointType.LateJoin when spawnPoint.SpawnType == SpawnPointType.LateJoin:
+                    case SpawnPointType.Observer when spawnPoint.SpawnType == SpawnPointType.Observer:
+                        possiblePositions.Add(xform.Coordinates);
+                        break;
+                    default:
+                        continue;
+                }
+            }
+
             if (_gameTicker.RunLevel == GameRunLevel.InRound && spawnPoint.SpawnType == SpawnPointType.LateJoin)
             {
                 possiblePositions.Add(xform.Coordinates);
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 4d0b2363bb7..c4b4a822af2 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Mind.Commands;
 using Content.Server.PDA;
 using Content.Server.Shuttles.Systems;
+using Content.Server.Spawners.Components;
 using Content.Server.Spawners.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Shared.Access.Components;
@@ -81,12 +82,12 @@ public override void Initialize()
     /// <remarks>
     /// This only spawns the character, and does none of the mind-related setup you'd need for it to be playable.
     /// </remarks>
-    public EntityUid? SpawnPlayerCharacterOnStation(EntityUid? station, JobComponent? job, HumanoidCharacterProfile? profile, bool arrivals, StationSpawningComponent? stationSpawning = null)
+    public EntityUid? SpawnPlayerCharacterOnStation(EntityUid? station, JobComponent? job, HumanoidCharacterProfile? profile, StationSpawningComponent? stationSpawning = null, SpawnPointType spawnPointType = SpawnPointType.Unset)
     {
         if (station != null && !Resolve(station.Value, ref stationSpawning))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        var ev = new PlayerSpawningEvent(job, profile, station, arrivals);
+        var ev = new PlayerSpawningEvent(job, profile, station, spawnPointType);
 
         if (station != null && profile != null)
         {
@@ -307,13 +308,16 @@ public sealed class PlayerSpawningEvent : EntityEventArgs
     /// The target station, if any.
     /// </summary>
     public readonly EntityUid? Station;
-    public readonly bool Arrivals;
+    /// <summary>
+    /// Delta-V: Desired SpawnPointType, if any.
+    /// </summary>
+    public readonly SpawnPointType DesiredSpawnPointType;
 
-    public PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoidCharacterProfile, EntityUid? station, bool arrivals)
+    public PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoidCharacterProfile, EntityUid? station, SpawnPointType spawnPointType = SpawnPointType.Unset)
     {
         Job = job;
         HumanoidCharacterProfile = humanoidCharacterProfile;
         Station = station;
-        Arrivals = arrivals;
+        DesiredSpawnPointType = spawnPointType;
     }
 }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 7c39f1ed666..837ff321584 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
+using Content.Shared.Tag;
 
 namespace Content.Server.Traitor.Uplink
 {
@@ -14,6 +15,7 @@ public sealed class UplinkSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly StoreSystem _store = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
 
         [ValidatePrototypeId<CurrencyPrototype>]
         public const string TelecrystalCurrencyPrototype = "Telecrystal";
@@ -64,6 +66,11 @@ public bool AddUplink(EntityUid user, FixedPoint2? balance, EntityUid? uplinkEnt
                 {
                     if (!pdaUid.ContainedEntity.HasValue) continue;
 
+                    // Sunrtise-Start
+                    if (_tagSystem.HasTag(pdaUid.ContainedEntity.Value, "SunriseUplink"))
+                        continue;
+                    // Sunrtise-End
+
                     if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
                         return pdaUid.ContainedEntity.Value;
                 }
@@ -72,11 +79,42 @@ public bool AddUplink(EntityUid user, FixedPoint2? balance, EntityUid? uplinkEnt
             // Also check hands
             foreach (var item in _handsSystem.EnumerateHeld(user))
             {
+                // Sunrtise-Start
+                if (_tagSystem.HasTag(item, "SunriseUplink"))
+                    continue;
+                // Sunrtise-End
+
                 if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
                     return item;
             }
 
             return null;
         }
+
+        // Sunrtise-Start
+        public EntityUid? FindUplinkByTag(EntityUid user, string tag)
+        {
+            // Try to find PDA in inventory
+            if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
+            {
+                while (containerSlotEnumerator.MoveNext(out var uplinkUid))
+                {
+                    if (!uplinkUid.ContainedEntity.HasValue) continue;
+
+                    if (_tagSystem.HasTag(uplinkUid.ContainedEntity.Value, tag))
+                        return uplinkUid.ContainedEntity.Value;
+                }
+            }
+
+            // Also check hands
+            foreach (var item in _handsSystem.EnumerateHeld(user))
+            {
+                if (_tagSystem.HasTag(item, tag))
+                    return item;
+            }
+
+            return null;
+        }
+        // Sunrtise-End
     }
 }
diff --git a/Content.Server/_Sunrise/Carrying/CarryingSystem.cs b/Content.Server/_Sunrise/Carrying/CarryingSystem.cs
index 27afba02351..7e06385236b 100644
--- a/Content.Server/_Sunrise/Carrying/CarryingSystem.cs
+++ b/Content.Server/_Sunrise/Carrying/CarryingSystem.cs
@@ -43,6 +43,7 @@ public sealed class CarryingSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
 
         public override void Initialize()
         {
@@ -122,10 +123,9 @@ private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEven
             if (!TryComp<VirtualItemComponent>(args.ItemUid, out var virtItem) || !HasComp<CarriableComponent>(virtItem.BlockingEntity))
                 return;
 
-            args.ItemUid = virtItem.BlockingEntity;
-
             var multiplier = MassContest(uid, virtItem.BlockingEntity);
-            args.ThrowStrength = 5f * multiplier;
+
+            _throwingSystem.TryThrow(virtItem.BlockingEntity, args.Direction, 3f * multiplier, uid);
         }
 
         private void OnParentChanged(EntityUid uid, CarryingComponent component, ref EntParentChangedMessage args)
@@ -171,7 +171,7 @@ private void OnMoveInput(EntityUid uid, BeingCarriedComponent component, ref Mov
 
             if (_actionBlockerSystem.CanInteract(uid, component.Carrier))
             {
-                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, MassContest(uid, component.Carrier));
+                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, MassContest(component.Carrier, uid));
             }
         }
 
diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs
new file mode 100644
index 00000000000..6ee893a2478
--- /dev/null
+++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server._Sunrise.DontSellingGrid;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+public sealed partial class DontSellComponent : Component
+{
+
+}
diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridComponent.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridComponent.cs
new file mode 100644
index 00000000000..cdb4c5fcc66
--- /dev/null
+++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server._Sunrise.DontSellingGrid;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+public sealed partial class DontSellingGridComponent : Component
+{
+
+}
diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs
new file mode 100644
index 00000000000..546121db805
--- /dev/null
+++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs
@@ -0,0 +1,70 @@
+using Content.Server.Cargo.Components;
+using Content.Server.Cargo.Systems;
+using Content.Server.GameTicking;
+using Content.Server.Station.Events;
+using Robust.Shared.Containers;
+
+namespace Content.Server._Sunrise.DontSellingGrid;
+
+public sealed class StationDontSellingSystems : EntitySystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<DontSellingGridComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<StationDontSellingGridComponent, StationPostInitEvent>(OnPostInit);
+        SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawning);
+        SubscribeLocalEvent<DontSellComponent, PriceCalculationEvent>(OnCalculatePrice);
+    }
+
+    private void OnCalculatePrice(EntityUid uid, DontSellComponent component, ref PriceCalculationEvent args)
+    {
+        args.Price = 0;
+        args.Handled = true;
+    }
+
+    private void OnStartup(EntityUid uid, DontSellingGridComponent component, ref ComponentStartup args)
+    {
+        var entities = new HashSet<Entity<StaticPriceComponent>>();
+        _lookup.GetChildEntities(uid, entities);
+
+        foreach (var entityUid in entities)
+        {
+            DepreciatePrice(entityUid);
+        }
+    }
+
+    private void DepreciatePrice(EntityUid uid)
+    {
+        EnsureComp<DontSellComponent>(uid);
+
+        if (!TryComp<ContainerManagerComponent>(uid, out var containers))
+            return;
+
+        foreach (var container in containers.Containers.Values)
+        {
+            foreach (var ent in container.ContainedEntities)
+            {
+                DepreciatePrice(ent);
+            }
+        }
+    }
+
+    private void OnPlayerSpawning(PlayerSpawnCompleteEvent ev)
+    {
+        if (!HasComp<StationDontSellingGridComponent>(ev.Station))
+            return;
+
+        DepreciatePrice(ev.Mob);
+    }
+
+    private void OnPostInit(EntityUid uid, StationDontSellingGridComponent component, ref StationPostInitEvent args)
+    {
+        foreach (var gridUid in args.Station.Comp.Grids)
+        {
+            AddComp<DontSellingGridComponent>(gridUid);
+        }
+    }
+}
diff --git a/Content.Server/_Sunrise/DontSellingGrid/StationDontSellingComponent.cs b/Content.Server/_Sunrise/DontSellingGrid/StationDontSellingComponent.cs
new file mode 100644
index 00000000000..6b37844c843
--- /dev/null
+++ b/Content.Server/_Sunrise/DontSellingGrid/StationDontSellingComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server._Sunrise.DontSellingGrid;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+public sealed partial class StationDontSellingGridComponent : Component
+{
+
+}
diff --git a/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridComponent.cs b/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridComponent.cs
new file mode 100644
index 00000000000..3bbbb2eb1e8
--- /dev/null
+++ b/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server._Sunrise.ImmortalGrid;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+public sealed partial class ImmortalGridComponent : Component
+{
+
+}
diff --git a/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridSystems.cs b/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridSystems.cs
new file mode 100644
index 00000000000..9c27bff9cee
--- /dev/null
+++ b/Content.Server/_Sunrise/ImmortalGrid/ImmortalGridSystems.cs
@@ -0,0 +1,40 @@
+using Content.Server.Station.Events;
+using Content.Shared._Sunrise.BlockedTool;
+using Content.Shared.Damage.Components;
+using Content.Shared.Tiles;
+
+namespace Content.Server._Sunrise.ImmortalGrid;
+
+public sealed class ImmortalGridSystems : EntitySystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ImmortalGridComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<StationImmortalComponent, StationPostInitEvent>(OnPostInit);
+    }
+
+    private void OnPostInit(EntityUid uid, StationImmortalComponent component, ref StationPostInitEvent args)
+    {
+        foreach (var gridUid in args.Station.Comp.Grids)
+        {
+            AddComp<ImmortalGridComponent>(gridUid);
+        }
+    }
+
+    private void OnStartup(EntityUid uid, ImmortalGridComponent component, ref ComponentStartup args)
+    {
+        EnsureComp<ProtectedGridComponent>(uid);
+
+        var entities = new HashSet<Entity<TransformComponent>>();
+        _lookup.GetChildEntities(uid, entities);
+
+        foreach (var entityUid in entities)
+        {
+            EnsureComp<GodmodeComponent>(entityUid);
+            EnsureComp<BlockedToolComponent>(entityUid);
+        }
+    }
+}
diff --git a/Content.Server/_Sunrise/ImmortalGrid/StationImmortalComponent.cs b/Content.Server/_Sunrise/ImmortalGrid/StationImmortalComponent.cs
new file mode 100644
index 00000000000..608e2a0fdcf
--- /dev/null
+++ b/Content.Server/_Sunrise/ImmortalGrid/StationImmortalComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server._Sunrise.ImmortalGrid;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+public sealed partial class StationImmortalComponent : Component
+{
+
+}
diff --git a/Content.Server/_Sunrise/Pacificator/PacificatorComponent.cs b/Content.Server/_Sunrise/Pacificator/PacificatorComponent.cs
new file mode 100644
index 00000000000..e08aa9058ff
--- /dev/null
+++ b/Content.Server/_Sunrise/Pacificator/PacificatorComponent.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Humanoid;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server._Sunrise.Pacificator;
+
+/// <summary>
+///
+/// </summary>
+[RegisterComponent]
+[Access(typeof(PacificatorSystems))]
+public sealed partial class PacificatorComponent : Component
+{
+    // 1% charge per second.
+    [ViewVariables(VVAccess.ReadWrite)] [DataField("chargeRate")]
+    public float ChargeRate { get; set; } = 0.01f;
+    // The gravity generator has two power values.
+    // Idle power is assumed to be the power needed to run the control systems and interface.
+    [DataField("idlePower")] public float IdlePowerUse { get; set; }
+    // Active power is the power needed to keep the gravity field stable.
+    [DataField("activePower")] public float ActivePowerUse { get; set; }
+    [DataField("lightRadiusMin")] public float LightRadiusMin { get; set; }
+    [DataField("lightRadiusMax")] public float LightRadiusMax { get; set; }
+
+    /// <summary>
+    /// Is the power switch on?
+    /// </summary>
+    [DataField("switchedOn")]
+    public bool SwitchedOn { get; set; } = true;
+
+    /// <summary>
+    /// Is the gravity generator intact?
+    /// </summary>
+    [DataField("intact")]
+    public bool Intact { get; set; } = true;
+
+    [DataField("maxCharge")]
+    public float MaxCharge { get; set; } = 1;
+
+    // 0 -> 1
+    [ViewVariables(VVAccess.ReadWrite)] [DataField("charge")] public float Charge { get; set; } = 1;
+
+    [ViewVariables]
+    public bool Active { get; set; } = false;
+
+    [ViewVariables] public bool NeedUIUpdate { get; set; }
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("nextTick", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextTick = TimeSpan.Zero;
+
+    public TimeSpan RefreshCooldown = TimeSpan.FromSeconds(5);
+
+    [DataField]
+    public float Range = 32f;
+
+    public HashSet<Entity<HumanoidAppearanceComponent>> PacifiedEntities = [];
+}
diff --git a/Content.Server/_Sunrise/Pacificator/PacificatorSystems.cs b/Content.Server/_Sunrise/Pacificator/PacificatorSystems.cs
new file mode 100644
index 00000000000..7af5207c973
--- /dev/null
+++ b/Content.Server/_Sunrise/Pacificator/PacificatorSystems.cs
@@ -0,0 +1,320 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Audio;
+using Content.Server.Power.Components;
+using Content.Shared._Sunrise.Pacificator;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Database;
+using Content.Shared.Humanoid;
+using Content.Shared.Interaction;
+using Robust.Server.GameObjects;
+using Robust.Shared.Timing;
+
+namespace Content.Server._Sunrise.Pacificator;
+
+public sealed class PacificatorSystems : EntitySystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly AmbientSoundSystem _ambientSoundSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedPointLightSystem _lights = default!;
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<Pacificator.PacificatorComponent, ComponentInit>(OnCompInit);
+        SubscribeLocalEvent<Pacificator.PacificatorComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<Pacificator.PacificatorComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<Pacificator.PacificatorComponent, SwitchGeneratorMessage>(
+            OnSwitchGenerator);
+    }
+
+    private void OnInteractHand(EntityUid uid, Pacificator.PacificatorComponent component, InteractHandEvent args)
+    {
+        ApcPowerReceiverComponent? powerReceiver = default!;
+        if (!Resolve(uid, ref powerReceiver))
+            return;
+
+        // Do not allow opening UI if broken or unpowered.
+        if (!component.Intact || powerReceiver.PowerReceived < component.IdlePowerUse)
+            return;
+
+        _uiSystem.TryOpenUi(uid, PacificatorUiKey.Key, args.User);
+        component.NeedUIUpdate = true;
+    }
+
+    private void OnComponentShutdown(EntityUid uid, Pacificator.PacificatorComponent component, ComponentShutdown args)
+    {
+        foreach (var pacifiedEntity in component.PacifiedEntities)
+        {
+            RemComp<PacifiedComponent>(pacifiedEntity);
+            component.PacifiedEntities.Remove(pacifiedEntity);
+        }
+    }
+
+    private void OnCompInit(Entity<Pacificator.PacificatorComponent> ent, ref ComponentInit args)
+    {
+        ApcPowerReceiverComponent? powerReceiver = null;
+        if (!Resolve(ent, ref powerReceiver, false))
+            return;
+
+        UpdatePowerState(ent, powerReceiver);
+        UpdateState((ent, ent.Comp, powerReceiver));
+    }
+
+    public void UpdateState(Entity<Pacificator.PacificatorComponent, ApcPowerReceiverComponent> ent)
+    {
+        var (uid, grav, powerReceiver) = ent;
+        var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
+        _appearance.SetData(uid, PacificatorVisuals.Charge, grav.Charge, appearance);
+
+        if (_lights.TryGetLight(uid, out var pointLight))
+        {
+            _lights.SetEnabled(uid, grav.Charge > 0, pointLight);
+            _lights.SetRadius(uid, MathHelper.Lerp(grav.LightRadiusMin, grav.LightRadiusMax, grav.Charge), pointLight);
+        }
+
+        if (!grav.Intact)
+        {
+            MakeBroken((uid, grav), appearance);
+        }
+        else if (powerReceiver.PowerReceived < grav.IdlePowerUse)
+        {
+            MakeUnpowered((uid, grav), appearance);
+        }
+        else if (!grav.SwitchedOn)
+        {
+            MakeOff((uid, grav), appearance);
+        }
+        else
+        {
+            MakeOn((uid, grav), appearance);
+        }
+    }
+
+    private void MakeBroken(Entity<Pacificator.PacificatorComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PacificatorVisuals.State, PacificatorStatus.Broken);
+    }
+
+    private void MakeUnpowered(Entity<Pacificator.PacificatorComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PacificatorVisuals.State, PacificatorStatus.Unpowered, appearance);
+    }
+
+    private void MakeOff(Entity<Pacificator.PacificatorComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, false);
+
+        _appearance.SetData(ent, PacificatorVisuals.State, PacificatorStatus.Off, appearance);
+    }
+
+    private void MakeOn(Entity<Pacificator.PacificatorComponent> ent, AppearanceComponent? appearance)
+    {
+        _ambientSoundSystem.SetAmbience(ent, true);
+
+        _appearance.SetData(ent, PacificatorVisuals.State, PacificatorStatus.On, appearance);
+    }
+
+    private void OnSwitchGenerator(
+        EntityUid uid,
+        Pacificator.PacificatorComponent component,
+        SwitchGeneratorMessage args)
+    {
+        SetSwitchedOn(uid, args.Actor, component, args.On);
+    }
+
+    private void SetSwitchedOn(EntityUid uid, EntityUid actor, Pacificator.PacificatorComponent component, bool on,
+        ApcPowerReceiverComponent? powerReceiver = null)
+    {
+        if (!Resolve(uid, ref powerReceiver))
+            return;
+
+        _adminLogger.Add(LogType.Action, on ? LogImpact.Medium : LogImpact.High, $"{actor:player} set ${ToPrettyString(uid):target} to {(on ? "on" : "off")}");
+
+        component.SwitchedOn = on;
+        UpdatePowerState(component, powerReceiver);
+        component.NeedUIUpdate = true;
+    }
+
+    private static void UpdatePowerState(
+        Pacificator.PacificatorComponent component,
+        ApcPowerReceiverComponent powerReceiver)
+    {
+        powerReceiver.Load = component.SwitchedOn ? component.ActivePowerUse : component.IdlePowerUse;
+    }
+
+    private void UpdateUI(Entity<Pacificator.PacificatorComponent, ApcPowerReceiverComponent> ent, float chargeRate)
+    {
+        var (_, component, powerReceiver) = ent;
+        if (!_uiSystem.IsUiOpen(ent.Owner, PacificatorUiKey.Key))
+            return;
+
+        var chargeTarget = chargeRate < 0 ? 0 : component.MaxCharge;
+        short chargeEta;
+        var atTarget = false;
+        if (MathHelper.CloseTo(component.Charge, chargeTarget))
+        {
+            chargeEta = short.MinValue; // N/A
+            atTarget = true;
+        }
+        else
+        {
+            var diff = chargeTarget - component.Charge;
+            chargeEta = (short) Math.Abs(diff / chargeRate);
+        }
+
+        var status = chargeRate switch
+        {
+            > 0 when atTarget => PacificatorPowerStatus.FullyCharged,
+            < 0 when atTarget => PacificatorPowerStatus.Off,
+            > 0 => PacificatorPowerStatus.Charging,
+            < 0 => PacificatorPowerStatus.Discharging,
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        var state = new GeneratorState(
+            component.SwitchedOn,
+            (byte) (component.Charge * 255),
+            status,
+            (short) Math.Round(powerReceiver.PowerReceived),
+            (short) Math.Round(powerReceiver.Load),
+            chargeEta
+        );
+
+        _uiSystem.SetUiState(
+            ent.Owner,
+            PacificatorUiKey.Key,
+            state);
+
+        component.NeedUIUpdate = false;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<Pacificator.PacificatorComponent, ApcPowerReceiverComponent>();
+        while (query.MoveNext(out var uid, out var pacificator, out var powerReceiver))
+        {
+            var ent = (uid, pacificator, powerReceiver);
+            if (!pacificator.Intact)
+                continue;
+
+            // Calculate charge rate based on power state and such.
+            // Negative charge rate means discharging.
+            float chargeRate;
+            if (pacificator.SwitchedOn)
+            {
+                if (powerReceiver.Powered)
+                {
+                    chargeRate = pacificator.ChargeRate;
+                }
+                else
+                {
+                    // Scale discharge rate such that if we're at 25% active power we discharge at 75% rate.
+                    var receiving = powerReceiver.PowerReceived;
+                    var mainSystemPower = Math.Max(0, receiving - pacificator.IdlePowerUse);
+                    var ratio = 1 - mainSystemPower / (pacificator.ActivePowerUse - pacificator.IdlePowerUse);
+                    chargeRate = -(ratio * pacificator.ChargeRate);
+                }
+            }
+            else
+            {
+                chargeRate = -pacificator.ChargeRate;
+            }
+
+            var active = pacificator.Active;
+            var lastCharge = pacificator.Charge;
+            pacificator.Charge = Math.Clamp(pacificator.Charge + frameTime * chargeRate, 0, pacificator.MaxCharge);
+            if (chargeRate > 0)
+            {
+                // Charging.
+                if (MathHelper.CloseTo(pacificator.Charge, pacificator.MaxCharge) && !pacificator.Active)
+                {
+                    pacificator.Active = true;
+                }
+            }
+            else
+            {
+                // Discharging
+                if (MathHelper.CloseTo(pacificator.Charge, 0) && pacificator.Active)
+                {
+                    pacificator.Active = false;
+                }
+            }
+
+            var updateUI = pacificator.NeedUIUpdate;
+            if (!MathHelper.CloseTo(lastCharge, pacificator.Charge))
+            {
+                UpdateState(ent);
+                updateUI = true;
+            }
+
+            if (updateUI)
+                UpdateUI(ent, chargeRate);
+
+            if (active != pacificator.Active)
+            {
+                if (!pacificator.Active)
+                {
+                    foreach (var pacifiedEntity in pacificator.PacifiedEntities)
+                    {
+                        RemComp<PacifiedComponent>(pacifiedEntity);
+                        pacificator.PacifiedEntities.Remove(pacifiedEntity);
+                    }
+                }
+            }
+
+            UpdatePacified((ent.uid, ent.pacificator));
+        }
+    }
+
+    private void UpdatePacified(Entity<Pacificator.PacificatorComponent> ent)
+    {
+        if (ent.Comp.NextTick > _timing.CurTime)
+            return;
+
+        ent.Comp.NextTick += ent.Comp.RefreshCooldown;
+
+        if (!ent.Comp.Active)
+            return;
+
+        var coords = Transform(ent.Owner).Coordinates;
+
+        var entities = _lookup.GetEntitiesInRange<HumanoidAppearanceComponent>(coords, ent.Comp.Range);
+
+        foreach (var entityUid in entities)
+        {
+            if (ent.Comp.PacifiedEntities.Contains(entityUid))
+                continue;
+
+            EnsureComp<PacifiedComponent>(entityUid);
+            ent.Comp.PacifiedEntities.Add(entityUid);
+        }
+
+        var entitiesToRemove = new HashSet<Entity<HumanoidAppearanceComponent>>();
+
+        foreach (var pacifiedEntity in ent.Comp.PacifiedEntities)
+        {
+            if (entities.Contains(pacifiedEntity))
+                continue;
+
+            RemComp<PacifiedComponent>(pacifiedEntity);
+            entitiesToRemove.Add(pacifiedEntity);
+        }
+
+        foreach (var entityToRemove in entitiesToRemove)
+        {
+            ent.Comp.PacifiedEntities.Remove(entityToRemove);
+        }
+    }
+}
+
diff --git a/Content.Server/_Sunrise/StationEvents/Components/AnnounceRuleComponent.cs b/Content.Server/_Sunrise/StationEvents/Components/AnnounceRuleComponent.cs
new file mode 100644
index 00000000000..b97761b7bc4
--- /dev/null
+++ b/Content.Server/_Sunrise/StationEvents/Components/AnnounceRuleComponent.cs
@@ -0,0 +1,23 @@
+using Content.Server.StationEvents.Events;
+using Robust.Shared.Audio;
+using System.Threading;
+
+namespace Content.Server.StationEvents.Components;
+
+[RegisterComponent]
+public sealed partial class AnnounceRuleComponent : Component
+{
+    [DataField]
+    public bool EnableAnnouncement;
+
+    [DataField]
+    public SoundSpecifier? AnnounceAudio;
+
+    [DataField("roundStartAnnouncementDelay")]
+    public int RoundStartAnnouncementDelay = 60; // 1 minute from roundstart by default
+
+    [DataField("announcementText")]
+    public string? AnnouncementText;
+
+    public CancellationToken TimerCancel = new();
+}
diff --git a/Content.Server/_Sunrise/StationEvents/Events/AnnounceRule.cs b/Content.Server/_Sunrise/StationEvents/Events/AnnounceRule.cs
new file mode 100644
index 00000000000..189974529fe
--- /dev/null
+++ b/Content.Server/_Sunrise/StationEvents/Events/AnnounceRule.cs
@@ -0,0 +1,37 @@
+using System.Threading;
+using Content.Server.Chat.Systems;
+using Content.Shared.GameTicking.Components;
+using Content.Server.StationEvents.Components;
+using Robust.Shared.Player;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Server.StationEvents.Events;
+
+public sealed class AnnounceRule : StationEventSystem<AnnounceRuleComponent>
+{
+    [Dependency] private readonly EventManagerSystem _event = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    protected override void Started(EntityUid uid, AnnounceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        base.Started(uid, component, gameRule, args);
+        Timer.Spawn(component.RoundStartAnnouncementDelay * 1000, () => DispatchAnnouncement(uid, component, gameRule, args), component.TimerCancel);
+    }
+
+    protected override void Ended(EntityUid uid, AnnounceRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
+    {
+        base.Ended(uid, component, gameRule, args);
+    }
+
+    private void DispatchAnnouncement(EntityUid uid, AnnounceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        if (component.AnnouncementText != null)
+        {
+            if (component.EnableAnnouncement)
+                _chat.DispatchGlobalAnnouncement(Loc.GetString(component.AnnouncementText), announcementSound: component.AnnounceAudio, playTts: true, colorOverride: Color.Green);
+            else
+                _chat.DispatchGlobalAnnouncement(Loc.GetString(component.AnnouncementText), playDefault: true, playTts: true, colorOverride: Color.Green);
+        }
+        component.TimerCancel = new CancellationToken();
+    }
+}
diff --git a/Content.Server/_Sunrise/TTS/TTSSystem.cs b/Content.Server/_Sunrise/TTS/TTSSystem.cs
index 812d97c137e..10fbcd9d6cf 100644
--- a/Content.Server/_Sunrise/TTS/TTSSystem.cs
+++ b/Content.Server/_Sunrise/TTS/TTSSystem.cs
@@ -42,7 +42,7 @@ public sealed partial class TTSSystem : EntitySystem
     private bool _isEnabled;
     private string _defaultAnnounceVoice = "Hanson";
     private List<ICommonSession> _ignoredRecipients = new();
-    private const float WhisperVoiceVolumeModifier = 0.1f; // how far whisper goes in world units
+    private const float WhisperVoiceVolumeModifier = 0.6f; // how far whisper goes in world units
     private const int WhisperVoiceRange = 3; // how far whisper goes in world units
 
     public override void Initialize()
@@ -145,7 +145,7 @@ private async void OnEntitySpoke(EntityUid uid, TTSComponent component, EntitySp
 
         if (args.ObfuscatedMessage != null)
         {
-            HandleWhisper(uid, args.Message, protoVoice.Speaker, args.IsRadio);
+            HandleWhisper(uid, args.Message, protoVoice.Speaker);
             return;
         }
 
@@ -170,7 +170,7 @@ private async void HandleSay(EntityUid uid, string message, string speaker)
         RaiseNetworkEvent(new PlayTTSEvent(soundData, netEntity), recipients);
     }
 
-    private async void HandleWhisper(EntityUid uid, string message, string speaker, bool isRadio)
+    private async void HandleWhisper(EntityUid uid, string message, string speaker)
     {
         // If it's a whisper into a radio, generate speech without whisper
         // attributes to prevent an additional speech synthesis event
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 21fad142b3a..8c260a9c2e7 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -296,6 +296,11 @@ private float? SecondsUntilStateChange
 
     [DataField(customTypeSerializer: typeof(ConstantSerializer<DrawDepthTag>))]
     public int ClosedDrawDepth = (int) DrawDepth.DrawDepth.Doors;
+
+    // Sunrise-Start
+    [DataField]
+    public bool ForcedCrushClose = true;
+    // Sunrise-End
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index ab2df72568e..e35b26cfb72 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -533,6 +533,11 @@ public void Crush(EntityUid uid, DoorComponent? door = null, PhysicsComponent? p
         if (door.CurrentlyCrushing.Count == 0)
             return;
 
+        // Sunrise-Start
+        if (door.ForcedCrushClose)
+            return;
+        // Sunrise-Start
+
         // queue the door to open so that the player is no longer stunned once it has FINISHED opening.
         door.NextStateChange = GameTiming.CurTime + door.DoorStunTime;
         door.Partial = false;
@@ -749,7 +754,8 @@ private void NextState(Entity<DoorComponent> ent, TimeSpan time)
         var door = ent.Comp;
         door.NextStateChange = null;
 
-        if (door.CurrentlyCrushing.Count > 0)
+        // Sunrise-Edit: А вот нехуй.
+        if (door.CurrentlyCrushing.Count > 0 && !door.ForcedCrushClose)
             // This is a closed door that is crushing people and needs to auto-open. Note that we don't check "can open"
             // here. The door never actually finished closing and we don't want people to get stuck inside of doors.
             StartOpening(ent, door);
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index 72e984fd82a..60ffb2f060e 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -12,6 +12,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using BlockedToolComponent = Content.Shared._Sunrise.BlockedTool.BlockedToolComponent;
 
 namespace Content.Shared.Tools.Systems;
 
@@ -50,7 +51,13 @@ private void OnDoAfter(EntityUid uid, ToolComponent tool, ToolDoAfterEvent args)
         ev.DoAfter = args.DoAfter;
 
         if (args.OriginalTarget != null)
+        {
+            // Sunrise-Start
+            if (HasComp<BlockedToolComponent>(GetEntity(args.OriginalTarget.Value)))
+                return;
+            // Sunrise-End
             RaiseLocalEvent(GetEntity(args.OriginalTarget.Value), (object) ev);
+        }
         else
             RaiseLocalEvent((object) ev);
     }
diff --git a/Content.Shared/_Sunrise/BlockedTool/BlockedToolComponent.cs b/Content.Shared/_Sunrise/BlockedTool/BlockedToolComponent.cs
new file mode 100644
index 00000000000..004298151ec
--- /dev/null
+++ b/Content.Shared/_Sunrise/BlockedTool/BlockedToolComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared._Sunrise.BlockedTool;
+
+/// <summary>
+///  Я думаю здесь всё ясно
+/// </summary>
+[RegisterComponent]
+public sealed partial class BlockedToolComponent : Component
+{
+
+}
diff --git a/Content.Shared/_Sunrise/Pacificator/SharedPacificatorSystem.cs b/Content.Shared/_Sunrise/Pacificator/SharedPacificatorSystem.cs
new file mode 100644
index 00000000000..81a225c3d5a
--- /dev/null
+++ b/Content.Shared/_Sunrise/Pacificator/SharedPacificatorSystem.cs
@@ -0,0 +1,81 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Sunrise.Pacificator;
+
+public abstract partial class SharedPacificatorSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class SwitchGeneratorMessage : BoundUserInterfaceMessage
+{
+    public bool On;
+
+    public SwitchGeneratorMessage(bool on)
+    {
+        On = on;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class GeneratorState : BoundUserInterfaceState
+{
+    public bool On;
+    // 0 -> 255
+    public byte Charge;
+    public PacificatorPowerStatus PowerStatus;
+    public short PowerDraw;
+    public short PowerDrawMax;
+    public short EtaSeconds;
+
+    public GeneratorState(
+        bool on,
+        byte charge,
+        PacificatorPowerStatus powerStatus,
+        short powerDraw,
+        short powerDrawMax,
+        short etaSeconds)
+    {
+        On = on;
+        Charge = charge;
+        PowerStatus = powerStatus;
+        PowerDraw = powerDraw;
+        PowerDrawMax = powerDrawMax;
+        EtaSeconds = etaSeconds;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum PacificatorUiKey
+{
+    Key
+}
+
+[Serializable, NetSerializable]
+public enum PacificatorVisuals
+{
+    State,
+    Charge
+}
+
+[Serializable, NetSerializable]
+public enum PacificatorStatus
+{
+    Broken,
+    Unpowered,
+    Off,
+    On
+}
+
+[Serializable, NetSerializable]
+public enum PacificatorPowerStatus : byte
+{
+    Off,
+    Discharging,
+    Charging,
+    FullyCharged
+}
diff --git a/Resources/Audio/Lobby/Spectral_Synth.ogg b/Resources/Audio/Lobby/Spectral_Synth.ogg
new file mode 100644
index 00000000000..59621c3545c
Binary files /dev/null and b/Resources/Audio/Lobby/Spectral_Synth.ogg differ
diff --git a/Resources/Audio/Lobby/TO.ogg b/Resources/Audio/Lobby/TO.ogg
new file mode 100644
index 00000000000..63b7cb9eb5c
Binary files /dev/null and b/Resources/Audio/Lobby/TO.ogg differ
diff --git a/Resources/Audio/Lobby/The_first_day_on_orbit.ogg b/Resources/Audio/Lobby/The_first_day_on_orbit.ogg
new file mode 100644
index 00000000000..3607d8e4b5e
Binary files /dev/null and b/Resources/Audio/Lobby/The_first_day_on_orbit.ogg differ
diff --git a/Resources/Audio/Lobby/peace_in_the_lags.ogg b/Resources/Audio/Lobby/peace_in_the_lags.ogg
new file mode 100644
index 00000000000..d90984b4dc0
Binary files /dev/null and b/Resources/Audio/Lobby/peace_in_the_lags.ogg differ
diff --git a/Resources/Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg b/Resources/Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg
new file mode 100644
index 00000000000..68ea4ba0c04
Binary files /dev/null and b/Resources/Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg differ
diff --git a/Resources/Audio/_Sunrise/Music/Spectral_Synth.ogg b/Resources/Audio/_Sunrise/Music/Spectral_Synth.ogg
new file mode 100644
index 00000000000..59621c3545c
Binary files /dev/null and b/Resources/Audio/_Sunrise/Music/Spectral_Synth.ogg differ
diff --git a/Resources/Audio/_Sunrise/Music/TO.ogg b/Resources/Audio/_Sunrise/Music/TO.ogg
new file mode 100644
index 00000000000..63b7cb9eb5c
Binary files /dev/null and b/Resources/Audio/_Sunrise/Music/TO.ogg differ
diff --git a/Resources/Audio/_Sunrise/Music/The_first_day_on_orbit.ogg b/Resources/Audio/_Sunrise/Music/The_first_day_on_orbit.ogg
new file mode 100644
index 00000000000..3607d8e4b5e
Binary files /dev/null and b/Resources/Audio/_Sunrise/Music/The_first_day_on_orbit.ogg differ
diff --git a/Resources/Audio/_Sunrise/Music/attributions.yml b/Resources/Audio/_Sunrise/Music/attributions.yml
new file mode 100644
index 00000000000..6bb87011ac8
--- /dev/null
+++ b/Resources/Audio/_Sunrise/Music/attributions.yml
@@ -0,0 +1,24 @@
+- files: ["peace_in_the_lags.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
+
+- files: ["Spectral_Synth.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
+
+- files: ["The_first_day_on_orbit.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
+
+- files: ["TO.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
+
+- files: ["3D_is_just_a_measurement.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by qdzava prod. Oxygen. Converted from MP3 to OGG."
+  source: "https://www.youtube.com/channel/UCKL0ZRkj9nOP684aRGh09ZQ"
diff --git a/Resources/Audio/_Sunrise/Music/peace_in_the_lags.ogg b/Resources/Audio/_Sunrise/Music/peace_in_the_lags.ogg
new file mode 100644
index 00000000000..d90984b4dc0
Binary files /dev/null and b/Resources/Audio/_Sunrise/Music/peace_in_the_lags.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_1.ogg b/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_1.ogg
new file mode 100644
index 00000000000..af0ac90377e
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_1.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_2.ogg b/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_2.ogg
new file mode 100644
index 00000000000..8832b323cc2
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/plasma_gun_2.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/plasma_pistol_1.ogg b/Resources/Audio/_Sunrise/SyndiGuns/plasma_pistol_1.ogg
new file mode 100644
index 00000000000..f020fc7c2ed
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/plasma_pistol_1.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/red_mamba.ogg b/Resources/Audio/_Sunrise/SyndiGuns/red_mamba.ogg
new file mode 100644
index 00000000000..36c588486b0
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/red_mamba.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/usp_1.ogg b/Resources/Audio/_Sunrise/SyndiGuns/usp_1.ogg
new file mode 100644
index 00000000000..71816590aa5
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/usp_1.ogg differ
diff --git a/Resources/Audio/_Sunrise/SyndiGuns/usp_2.ogg b/Resources/Audio/_Sunrise/SyndiGuns/usp_2.ogg
new file mode 100644
index 00000000000..943cba7a8ab
Binary files /dev/null and b/Resources/Audio/_Sunrise/SyndiGuns/usp_2.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c5ed9267b1b..2b334e2ec1e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,26 +1,4 @@
 Entries:
-- author: BlitzTheSquishy
-  changes:
-  - message: Irish Coffee recipe adjusted to be more logical
-    type: Tweak
-  id: 6207
-  time: '2024-03-22T08:23:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26327
-- author: SlamBamActionman
-  changes:
-  - message: Space glue/lube tubes can now be used through the right-click menu.
-    type: Tweak
-  id: 6208
-  time: '2024-03-22T09:37:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26002
-- author: RenQ
-  changes:
-  - message: brought back the classic long bedhead as an alternative to the current
-      one.
-    type: Add
-  id: 6209
-  time: '2024-03-22T17:35:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26336
 - author: metalgearsloth
   changes:
   - message: Fix NPCs getting stuck on railings.
@@ -3853,3 +3831,24 @@
   id: 6706
   time: '2024-06-09T18:28:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28775
+- author: Zonespace27
+  changes:
+  - message: Fixed a typo under the "Cargonia" header in the glossary.
+    type: Fix
+  id: 6707
+  time: '2024-06-10T13:19:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28818
+- author: EmoGarbage404
+  changes:
+  - message: Fixed drinks page not having a search bar.
+    type: Fix
+  id: 6708
+  time: '2024-06-10T13:20:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28815
+- author: Aquif
+  changes:
+  - message: It is now possible to save after chaining you job unavailable preference.
+    type: Fix
+  id: 6709
+  time: '2024-06-11T02:48:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28839
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
index a4e9deb594a..fcee2d4b49e 100644
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@@ -458,3 +458,132 @@ Entries:
     type: Fix
   id: 38
   time: '2024-06-09T22:14:50.302018+00:00'
+- author: Pacable
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u043D\u0430\u0447\u0430\
+      \u043B\u0435 \u0440\u0435\u0436\u0438\u043C\u0430 \u0431\u0435\u0437 \u0441\u043E\
+      \u0431\u044B\u0442\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u043E\u0442\u043F\
+      \u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0441\u043F\u0435\u0446\u0438\u0430\
+      \u043B\u044C\u043D\u043E\u0435 \u043E\u0431\u044C\u044F\u0432\u043B\u0435\u043D\
+      \u0438\u0435 \u043E\u0442 \u0426\u041A."
+    type: Tweak
+  id: 39
+  time: '2024-06-10T22:53:47.672769+00:00'
+- author: Babaev
+  changes:
+  - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u0432\u0441\u0435\u0445\
+      \ \u0432\u0435\u0449\u043C\u0435\u0448\u043A\u043E\u0432."
+    type: Tweak
+  id: 40
+  time: '2024-06-10T22:54:21.579847+00:00'
+- author: Babaev
+  changes:
+  - message: "\u042F\u0434\u0435\u0440\u043D\u044B\u043C \u043E\u043F\u0435\u0440\u0430\
+      \u0442\u0438\u0432\u043D\u0438\u043A\u0430\u043C \u0434\u043E\u0431\u0430\u0432\
+      \u043B\u0435\u043D\u043E 4 \u043D\u043E\u0432\u044B\u0445 \u043E\u0440\u0443\
+      \u0436\u0438\u044F."
+    type: Add
+  id: 41
+  time: '2024-06-10T22:56:03.418904+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0428\u043B\u044E\u0437\u044B \u0448\u0430\u0442\u0442\u043B\u0430\
+      \ \u043F\u0440\u0438\u0431\u044B\u0442\u0438\u044F \u0431\u043E\u043B\u044C\u0448\
+      \u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u043E\u0442\u043A\u0440\u044B\u0442\
+      \u044C \u0432\u0440\u0443\u0447\u043D\u0443\u044E."
+    type: Fix
+  - message: "\u0428\u043B\u044E\u0437\u044B \u0448\u0430\u0442\u0442\u043B\u0430\
+      \ \u043F\u0440\u0438\u0431\u044B\u0442\u0438\u044F \u0431\u0443\u0434\u0443\u0442\
+      \ \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0442\u044C\u0441\u044F \u0434\u0430\
+      \u0436\u0435 \u0435\u0441\u043B\u0438 \u0438\u0445 \u043F\u043E\u043F\u044B\u0442\
+      \u0430\u0435\u0442\u0441\u044F \u0437\u0430\u0431\u043B\u043E\u043A\u0438\u0440\
+      \u043E\u0432\u0430\u0442\u044C \u0438\u0433\u0440\u043E\u043A."
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043C\u0443\
+      \u0441\u043E\u0440\u043A\u0430 \u043A\u043E\u0441\u043C\u043E\u043F\u043E\u0440\
+      \u0442\u0430."
+    type: Fix
+  id: 42
+  time: '2024-06-10T22:58:45.162965+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u044B\
+      \u0434\u0430\u0447\u0430 \u0440\u043E\u043B\u0435\u0439 \u0432 \u0440\u0435\u0436\
+      \u0438\u043C\u0435 \u0440\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u0438."
+    type: Fix
+  id: 43
+  time: '2024-06-10T22:59:22.763930+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u041A\u043B\u0430\u0441\u0442\u0435\u0440 \u0431\u043E\u043B\u044C\u0448\
+      \u0435 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u043F\u0430\u0441\
+      \u0442\u044C \u0432 \u0441\u0435\u043A\u0440\u0435\u0442\u0435 \u043F\u0440\u0438\
+      \ \u0431\u043E\u043B\u044C\u0448\u043E\u043C \u043A\u043E\u043B\u0438\u0447\u0435\
+      \u0441\u0442\u0432\u0435 \u0438\u0433\u0440\u043E\u043A\u043E\u0432."
+    type: Fix
+  id: 44
+  time: '2024-06-10T22:59:58.529029+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0428\u0435\u043F\u043E\u0442 \u0441\u0442\u0430\u043B \u0437\u043D\
+      \u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0433\u0440\u043E\u043C\
+      \u0447\u0435."
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\
+      \u043B\u0437\u0443\u043D\u043A\u0438 \u0433\u0440\u043E\u043C\u043A\u043E\u0441\
+      \u0442\u0438 \u0422\u0422\u0421\u0430."
+    type: Fix
+  id: 45
+  time: '2024-06-10T23:00:51.010242+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0412\u0435\u0449\u0438 \u0441\u043E \u0441\u0442\u0430\u043D\u0446\
+      \u0438\u0438 \u0438 \u043A\u043E\u0441\u043C\u043E\u043F\u043E\u0440\u0442\u0430\
+      \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u043F\u0440\u043E\u0434\u0430\u0442\u044C."
+    type: Tweak
+  - message: "\u0428\u0430\u0442\u0442\u043B \u043F\u0440\u0438\u0431\u044B\u0442\u0438\
+      \u044F \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0440\u0430\u0437\u0440\u0443\u0448\u0438\u0442\u044C."
+    type: Tweak
+  id: 46
+  time: '2024-06-10T23:59:39.305410+00:00'
+- author: qdzava
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
+      \u0430\u044F \u043C\u0443\u0437\u044B\u043A\u0430 \u0432 \u0438\u0433\u0440\u0443\
+      !"
+    type: Add
+  id: 47
+  time: '2024-06-10T23:59:40.069013+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0430\u0446\u0438\
+      \u0444\u0438\u043A\u0430\u0442\u043E\u0440."
+    type: Add
+  id: 48
+  time: '2024-06-11T01:05:21.902292+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u043D\u043E\u0441\u0438\u043C\u044B\u0445 \u043B\
+      \u044E\u0434\u0435\u0439 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\
+      \u043D\u043E \u0431\u0440\u043E\u0441\u0430\u0442\u044C, \u0441\u0438\u043B\u0430\
+      \ \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043E\u0442 \u0440\u0430\u0437\
+      \u043D\u0438\u0446\u044B \u0432\u0435\u0441\u0430."
+    type: Fix
+  id: 49
+  time: '2024-06-11T02:24:28.644847+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u041A\u041F\u0411 \u0431\u044B\u043B\u0438 \u0434\u0435\u0431\u0430\
+      \u0444\u043D\u0443\u0442\u044B."
+    type: Tweak
+  - message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u044B \u0431\u044B\u043B\u0438\
+      \ \u0431\u0430\u0444\u043D\u0443\u0442\u044B."
+    type: Tweak
+  - message: "\u041D\u0430\u043D\u043E\u043F\u0430\u0441\u0442\u0430 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043B\u0435\u0447\u0438\u0442 \u043D\u0430 50% \u0445\u0443\
+      \u0436\u0435."
+    type: Tweak
+  id: 50
+  time: '2024-06-11T04:44:21.370877+00:00'
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 7b2897fa204..ecf2aa81943 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -1,13 +1,10 @@
-# Base configuration preset used on all Wizard's Den servers.
+# Base configuration preset used on all Wizard's Den servers.
 # Loaded before server-specific config presets by configuration.
 
 [game]
 desc             = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
 lobbyenabled     = true
 soft_max_players = 80
-panic_bunker.enabled = true
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = true
 panic_bunker.show_reason = true
 panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on another Wizard's Den server for now."
 
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
index ae6ad2864db..630025fc5db 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -6,12 +6,9 @@
 
 [game]
 soft_max_players = 50
-hostname = "[EN] Wizard's Den Red Firefly"
+hostname = "[EN] Wizard's Den Red Firefly [US East]"
 desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
-panic_bunker.enabled = true
 panic_bunker.show_reason = true
 panic_bunker.min_overall_minutes = 15
 
@@ -19,4 +16,4 @@ panic_bunker.min_overall_minutes = 15
 rules_file = "CoreRuleset"
 
 [hub]
-tags = "lang:en,rp:none"
+tags = "lang:en,region:am_n_e,rp:none"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
index 9fcba254f7a..2d085c816c3 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -5,7 +5,7 @@
 # needs region tag
 
 [game]
-hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper"
+hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper [US East]"
 desc = "Official English Space Station 14 servers for new players. Vanilla, roleplay ruleset."
 panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
@@ -17,4 +17,4 @@ baby_jail.max_overall_minutes = 15
 baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
 baby_jail.whitelisted_can_bypass = true
 [hub]
-tags = "lang:en,rp:low"
+tags = "lang:en,region:am_n_e,rp:low"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
index 6019bc2eed2..21abbf2e3f0 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
@@ -1,4 +1,4 @@
-# Configuration preset layer for "Core Only" Wizard's Den servers.
+# Configuration preset layer for LRP temporary Wizard's Den servers.
 # Intended to be loaded after wizardsDen.toml
 
 # hostname is a placeholder
@@ -6,12 +6,12 @@
 
 [game]
 soft_max_players = 50
-hostname = "[EN] Wizard's Den Granite Flea"
-desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
+hostname = "[EN] Wizard's Den Granite Flea [US East]"
+desc = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
 panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
 
 [hub]
-tags = "lang:en,rp:low"
+tags = "lang:en,region:am_n_e,rp:low"
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/game-ticking/preset-event.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/game-ticking/preset-event.ftl
new file mode 100644
index 00000000000..a68b3167277
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/game-ticking/preset-event.ftl
@@ -0,0 +1,2 @@
+event-title = Event
+event-description = Game masters are running an event. There are no threats, including random ones.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/greenshift.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/greenshift.ftl
new file mode 100644
index 00000000000..412c9d9c0d2
--- /dev/null
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/gamerules/greenshift.ftl
@@ -0,0 +1 @@
+station-event-greenshift = Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to Space Station 14. Have a secure shift!
diff --git a/Resources/Locale/ru-RU/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_sunrise/store/uplink-catalog.ftl
new file mode 100644
index 00000000000..91638b2c218
--- /dev/null
+++ b/Resources/Locale/ru-RU/_sunrise/store/uplink-catalog.ftl
@@ -0,0 +1,12 @@
+uplink-magazine-shotgun-name = Барабан (.50 дробь).
+uplink-magazine-shotgun-desc = Барабан на 8 выстрелов для дробовика. Совместим с "Бульдогом".
+uplink-magazine-lmg-name = Коробка патронов (.30 винтовочные)
+uplink-magazine-lmg-desc = Коробка патронов на 100 выстрелов. Совместим с "L6-SAW".
+uplink-grenade-frag-name = Осколочная граната
+uplink-grenade-frag-desc = Осколочная граната. Совместима с "China-Lake".
+uplink-grenade-blast-name = Фугасная граната
+uplink-grenade-blast-desc = Фугасная граната. Совместима с "China-Lake".
+uplink-hardsuit-syndie-commander-name = скафандр Командира Синдиката
+uplink-hardsuit-syndie-commander-desc = Скафандр предназначеный для командиров отрядов Горлекса.
+uplink-hardsuit-syndie-medic-name = скафандр Медика Синдиката
+uplink-hardsuit-syndie-medic-desc = Скафандр предназначеный для боевых врачей отрядов Горлекса.
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl
new file mode 100644
index 00000000000..a252a515960
--- /dev/null
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/object-tab.ftl
@@ -0,0 +1,4 @@
+object-tab-entity-id = ID сущности
+object-tab-object-name = Имя обьекта
+object-tab-entity-teleport = Телепорт
+object-tab-entity-delete = Удалить
diff --git a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
index 4fcabb64ec7..16af72cb762 100644
--- a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
+++ b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
@@ -7,7 +7,7 @@ doc-text-printer-report-station =
     =============================================
                                 ОТЧЁТ О СИТУАЦИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -30,7 +30,7 @@ doc-text-printer-report-on-elimination-of-violations =
     =============================================
                             ОТЧЁТ ОБ УСТРАНЕНИИ НАРУШЕНИЙ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -52,7 +52,7 @@ doc-text-printer-report-department =
     =============================================
                                 ОТЧЁТ О РАБОТЕ ОТДЕЛА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -74,7 +74,7 @@ doc-text-printer-report-employee-performance =
     =============================================
                         ОТЧЁТ О РАБОТЕ СОТРУДНИКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -92,7 +92,7 @@ doc-text-printer-report-on-the-chapters-meeting =
     =============================================
                                 ОТЧЁТ О СОБРАНИИ ГЛАВ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -119,7 +119,7 @@ doc-text-printer-internal-affairs-agents-report =
     =============================================
                 ОТЧЁТ О ВНУТРЕННЕМ РАСЛЕДОВАНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -138,7 +138,7 @@ doc-text-printer-condition-report =
     =============================================
                         ОТЧЁТ О ТЕХНИЧЕСКОМ СОСТОЯНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -160,7 +160,7 @@ doc-text-printer-Report-study-object =
     =============================================
                         ОТЧЁТ ОБ ИЗУЧЕНИИ ОБЪЕКТА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -180,7 +180,7 @@ doc-text-printer-experiment-report =
     =============================================
                         ОТЧЁТ ОБ ЭКСПЕРИМЕНТЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -208,7 +208,7 @@ doc-text-printer-disposal-report =
     =============================================
                             ОТЧЁТ ОБ УТИЛИЗАЦИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -226,7 +226,7 @@ doc-text-printer-application-appointment-interim =
     =============================================
                     ЗАЯВЛЕНИЕ О НАЗНАЧЕНИИ НА ВРИО
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -245,7 +245,7 @@ doc-text-printer-application-employment =
     =============================================
                         ЗАЯВЛЕНИЕ О ТРУДОУСТРОЙСТВЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -262,7 +262,7 @@ doc-text-printer-letter-resignation =
     =============================================
                         ЗАЯВЛЕНИЕ ОБ УВОЛЬНЕНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -279,7 +279,7 @@ doc-text-printer-application-access =
     =============================================
                     ЗАЯВЛЕНИЕ НА ПОЛУЧЕНИЕ ДОСТУПА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -298,7 +298,7 @@ doc-text-printer-application-equipment =
     =============================================
                     ЗАЯВЛЕНИЕ НА ПОЛУЧЕНИЕ СНАРЯЖЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -317,7 +317,7 @@ doc-text-printer-appeal =
     =============================================
                             ОБРАЩЕНИЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -337,7 +337,7 @@ doc-text-printer-evacuation-shuttle-request =
     =============================================
                     ЗАПРОС ЭВАКУАЦИОННОГО ШАТТЛА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -355,7 +355,7 @@ doc-text-printer-shuttle-registration-request =
     =============================================
                         ЗАПРОС РЕГИСТРАЦИИ ШАТТЛА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -379,7 +379,7 @@ doc-text-printer-request-call-members-central-committee-dso =
     =============================================
                     ЗАПРОС НА ВЫЗОВ ЧЛЕНОВ ЦК, ДСО
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -398,7 +398,7 @@ doc-text-printer-request-to-establish-threat-level =
     =============================================
                     ЗАПРОС УСТАНОВЛЕНИЯ УРОВНЯ УГРОЗЫ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -417,7 +417,7 @@ doc-text-printer-request-change-salary =
     =============================================
             ЗАПРОС НА ИЗМЕНЕНИЕ ЗАРАБОТНОЙ ПЛАТЫ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -435,7 +435,7 @@ doc-text-printer-request-for-non-listed-employment =
     =============================================
             ЗАПРОС ВНЕПЕРЕЧНЕВОГО ТРУДОУСТРОЙСТВА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -461,7 +461,7 @@ doc-text-printer-request-for-promotion =
     =============================================
                 ЗАПРОС ПОВЫШЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -483,7 +483,7 @@ doc-text-printer-request-documents =
     =============================================
             ЗАПРОС ПРЕДОСТАВЛЕНИЯ ДОКУМЕНТОВ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -500,7 +500,7 @@ doc-text-printer-request-euthanasia =
     =============================================
                     ЗАПРОС НА ПРОВЕДЕНИЕ ЭВТАНАЗИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -517,7 +517,7 @@ doc-text-printer-request-construction-work =
     =============================================
         ЗАПРОС НА ПРОВЕДЕНИЕ СТРОИТЕЛЬНЫХ РАБОТ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -535,7 +535,7 @@ doc-text-printer-request-modernization =
     =============================================
                 ЗАПРОС НА ПРОВЕДЕНИЕ МОДЕРНИЗАЦИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -553,7 +553,7 @@ doc-text-printer-complaint-violation-labor-rules =
     =============================================
             ЖАЛОБА НА НАРУШЕНИЕ ТРУДОВОГО ПОРЯДКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -571,7 +571,7 @@ doc-text-printer-complaint-offense =
     =============================================
                         ЖАЛОБА НА ПРАВОНАРУШЕНИЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -589,7 +589,7 @@ doc-text-printer-permission-equipment =
     =============================================
         РАЗРЕШЕНИЕ НА ИСПОЛЬЗОВАНИЕ СНАРЯЖЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -606,7 +606,7 @@ doc-text-printer-permission-to-travel-in-case-of-threat=
     =============================================
             РАЗРЕШЕНИЕ НА ПЕРЕДВИЖЕНИЕ ПРИ УГРОЗЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -626,7 +626,7 @@ doc-text-printer-search-permission =
     =============================================
                         РАЗРЕШЕНИЕ НА ОБЫСК
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -644,7 +644,7 @@ doc-text-printer-permission-to-carry-weapons =
     =============================================
                     РАЗРЕШЕНИЕ НА НОШЕНИЕ ОРУЖИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -666,7 +666,7 @@ doc-text-printer-prescription-drug-authorization =
     =============================================
                 РАЗРЕШЕНИЕ НА РЕЦЕПТУРНЫЙ ПРЕПАРАТ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -686,7 +686,7 @@ doc-text-printer-permission-dispose-body =
     =============================================
                     РАЗРЕШЕНИЕ НА УТИЛИЗАЦИЮ ТЕЛА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -704,7 +704,7 @@ doc-text-printer-construction-permit =
     =============================================
                         РАЗРЕШЕНИЕ НА СТРОИТЕЛЬСТВО
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -722,7 +722,7 @@ doc-text-printer-permission-to-extend-marriage =
     =============================================
                 РАЗРЕШЕНИЕ НА РАСШИРЕНИЕ БРАКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -745,7 +745,7 @@ doc-text-printer-order-dismissal =
     =============================================
                             ПРИКАЗ ОБ УВОЛЬНЕНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -762,7 +762,7 @@ doc-text-printer-order-deprivation-access =
     =============================================
                         ПРИКАЗ О ЛИШЕНИИ ДОСТУПА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -779,7 +779,7 @@ doc-text-printer-order-encouragement =
     =============================================
                             ПРИКАЗ О ПООЩРЕНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -796,7 +796,7 @@ doc-text-printer-order-parole-prisoner =
     =============================================
                     ПРИКАЗ ОБ УДО ЗАКЛЮЧЕННОГО
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -813,7 +813,7 @@ doc-text-printer-order-recognizing-rentience-creature =
     =============================================
             ПРИКАЗ О ПРИЗНАНИИ РАЗУМНОСТИ СУЩЕСТВА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -834,7 +834,7 @@ doc-text-printer-order-medical-intervention =
     =============================================
     РАСПОРЯЖЕНИЕ О МЕДИЦИНСКОМ ВМЕШАТЕЛЬСТВЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -852,7 +852,7 @@ doc-text-printer-product-manufacturing-order =
     =============================================
                     ЗАКАЗ НА ПРОИЗВОДСТВО ПРОДУКТА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -872,7 +872,7 @@ doc-text-printer-order-purchase-resources-equipment =
     =============================================
             ЗАКАЗ НА ЗАКУПКУ РЕСУРСОВ, СНАРЯЖЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -893,7 +893,7 @@ doc-text-printer-ordering-special-equipment =
     =============================================
                     ЗАКАЗ СПЕЦИАЛЬНОГО СНАРЯЖЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -913,7 +913,7 @@ doc-text-printer-order-purchase-weapons =
     =============================================
                     ЗАКАЗ НА ЗАКУПКУ ВООРУЖЕНИЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -931,7 +931,7 @@ doc-text-printer-certificate =
     =============================================
                                         ГРАМОТА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -948,7 +948,7 @@ doc-text-printer-certificate-advanced-training =
     =============================================
     СВИДЕТЕЛЬСТВО О ПОВЫШЕНИИ КВАЛИФИКАЦИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -964,7 +964,7 @@ doc-text-printer-certificate-offense =
     =============================================
                 СВИДЕТЕЛЬСТВО О ПРАВОНАРУШЕНИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -989,7 +989,7 @@ doc-text-printer-death-certificate =
     =============================================
                             СВИДЕТЕЛЬСТВО О СМЕРТИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1011,7 +1011,7 @@ doc-text-printer-marriage-certificate =
     =============================================
                 СВИДЕТЕЛЬСТВО О ЗАКЛЮЧЕНИИ БРАКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1032,7 +1032,7 @@ doc-text-printer-divorce-certificate =
     =============================================
                 СВИДЕТЕЛЬСТВО О РАСТОРЖЕНИИ БРАКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1055,7 +1055,7 @@ doc-text-printer-closing-indictment =
     =============================================
                         ОБВИНИТЕЛЬНОЕ ЗАКЛЮЧЕНИЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1077,7 +1077,7 @@ doc-text-printer-sentence =
         =============================================
                                         ПРИГОВОР
         =============================================
-        Время от начала смены и дата:
+        Время и дата:
         Составитель документа:
         Должность составителя:
 
@@ -1100,7 +1100,7 @@ doc-text-printer-judgment =
     =============================================
                     СУДЕБНОЕ РЕШЕНИЕ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1132,7 +1132,7 @@ doc-text-printer-statement-health =
     =============================================
                     ЗАКЛЮЧЕНИЕ О СОСТОЯНИИ ЗДОРОВЬЯ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1158,7 +1158,7 @@ doc-text-printer-decision-to-start-trial =
     =============================================
             РЕШЕНИЕ О НАЧАЛЕ СУДЕБНОГО ПРОЦЕССА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Составитель документа:
     Должность составителя:
 
@@ -1176,7 +1176,7 @@ doc-text-printer-error-loading-form-header =
     =============================================
                         НАИМЕНОВАНИЕ ДОКУМЕНТА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Позывной Агента:
 
     Полное содержание документа со всей необходимой информацией и описанием
@@ -1191,7 +1191,7 @@ doc-text-printer-notice-of-liquidation =
     =============================================
                         УВЕДОМЛЕНИЕ О ЛИКВИДАЦИИ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Позывной агента:
 
     Уважаемый (ФИО), в должности (полное наименование должности)! Руководством Синдиката принято решение о вашей немедленной ликвидации в ходе данной смены. Просим заранее подготовить завещание и направить его Медицинскому отделу станции. Уничтожение вашего тела будет произведено силами Синдиката.
@@ -1208,7 +1208,7 @@ doc-text-printer-business-deal =
     =============================================
                                 ДЕЛОВАЯ СДЕЛКА
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Позывной агента:
 
     Синдикат любезно предлагает заключить сделку между станцией и агентом (позывной агента). Со стороны станции необходимо:
@@ -1226,7 +1226,7 @@ doc-text-printer-note-beginning-military-actions =
     =============================================
                     НОТА О НАЧАЛЕ ВОЕННЫХ ДЕЙСТВИЙ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Позывной агента:
 
     Неуважаемые корпоративные крысы NanoTrasen! Синдикат официально объявляет о начале военных действий с вами, а также о начале операции по вашему истреблению.
@@ -1243,7 +1243,7 @@ doc-text-printer-report-accomplishment-goals =
     =============================================
                         ОТЧЁТ О ВЫПОЛНЕНИИ ЦЕЛЕЙ
     =============================================
-    Время от начала смены и дата:
+    Время и дата:
     Позывной агента:
 
     Я, (позывной агента), успешно выполнил поставленные передо мной руководством Синдиката цели. Прошу принять отчёт о выполнении.
diff --git a/Resources/Locale/ru-RU/game-ticking/game-presets/preset-event.ftl b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-event.ftl
new file mode 100644
index 00000000000..80621a37413
--- /dev/null
+++ b/Resources/Locale/ru-RU/game-ticking/game-presets/preset-event.ftl
@@ -0,0 +1,2 @@
+event-title = Ивент
+event-description = Гейм-мастеры проводят ивент. Отсутсвуют любые угрозы, включая случайные.
diff --git a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl
index 22190b51ea1..0347050c3c5 100644
--- a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl
+++ b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl
@@ -9,7 +9,7 @@ gravity-generator-window-title = Генератор гравитации
 
 gravity-generator-window-status = Состояние:
 gravity-generator-window-power = Питание:
-gravity-generator-window-eta = Оставшееся время:
+gravity-generator-window-eta = ETA:
 gravity-generator-window-charge = Заряд:
 
 ## UI statuses
diff --git a/Resources/Locale/ru-RU/station-events/events/greenshift.ftl b/Resources/Locale/ru-RU/station-events/events/greenshift.ftl
new file mode 100644
index 00000000000..5b6aec1c10d
--- /dev/null
+++ b/Resources/Locale/ru-RU/station-events/events/greenshift.ftl
@@ -0,0 +1 @@
+station-event-greenshift = Благодаря неустанным усилиям наших отделов Службы Безопасности, в настоящее время нет никаких достоверных угроз для космической станции 14. Удачной смены!
diff --git a/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml b/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
index 87ab684ffc3..36466033895 100644
--- a/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
+++ b/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
@@ -39,11 +39,11 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: fgAAAAAALwAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAAQgAAAAAAagAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAAfgAAAAAAQgAAAAAAfgAAAAAALwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAfgAAAAAAawAAAAAAXQAAAAAAfgAAAAAANAAAAAAANAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAawAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAALwAAAAAALwAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAA
+          tiles: fgAAAAAALwAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAAQgAAAAAAagAAAAAALwAAAAAAagAAAAAALwAAAAAAagAAAAAAXQAAAAAAQgAAAAAAfgAAAAAALwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAfgAAAAAAawAAAAAAXQAAAAAAfgAAAAAANAAAAAAANAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAawAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAALwAAAAAALwAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAALwAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAawAAAAAAXQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAALwAAAAAALwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAawAAAAAAXQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAALwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAQgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -55,11 +55,11 @@ entities:
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAANAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: QgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAQgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAXQAAAAAAXQAAAAAALwAAAAAALwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
@@ -75,7 +75,7 @@ entities:
           version: 6
         -2,0:
           ind: -2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
@@ -157,7 +157,6 @@ entities:
             183: -6,-7
             239: -10,7
             240: -10,-7
-            247: 17,0
             597: 27,5
             598: 27,2
             599: 27,-2
@@ -568,12 +567,6 @@ entities:
             165: -10,-3
             166: -11,-4
             167: -12,-2
-        - node:
-            angle: -3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Delivery
-          decals:
-            291: 9,-2
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -590,20 +583,10 @@ entities:
             264: 1,2
             265: 2,-2
             266: 1,-2
-            288: 9,2
             473: -6,10
             474: -4,10
             475: -6,-10
             476: -4,-10
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: Delivery
-          decals:
-            19: 15.980766,-1.0046234
-            20: 15.996391,0.9953766
-            21: 13.996391,0.9797516
-            22: 13.996391,-0.98899835
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
@@ -632,8 +615,6 @@ entities:
             377: 7,-1
             378: 9,0
             379: 12,-1
-            380: 13,0
-            381: 13,1
             382: 12,2
             383: 12,2
             384: 9,1
@@ -641,7 +622,6 @@ entities:
             386: 11,0
             387: 11,1
             388: 10,2
-            389: 9,2
             390: 8,0
             465: 19,-8
             466: 19,-9
@@ -659,7 +639,6 @@ entities:
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            461: 17,1
             462: 18,0
             463: 18,-1
             464: 18,-4
@@ -1105,28 +1084,6 @@ entities:
           decals:
             485: 31,-12
             490: 31,12
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNE
-          decals:
-            283: 13,0
-            290: 13,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNW
-          decals:
-            282: 17,0
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSE
-          decals:
-            281: 13,0
-            289: 13,2
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSW
-          decals:
-            280: 17,0
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
@@ -1144,15 +1101,6 @@ entities:
             492: 40,-5
             493: 40,3
             494: 40,5
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarnFull
-          decals:
-            23: 15.949516,1.0110016
-            24: 16.027641,-0.98899835
-            25: 14.074516,-1.0202484
-            26: 14.027641,0.9797516
         - node:
             color: '#B02E26FF'
             id: WarnFullGreyscale
@@ -1163,8 +1111,6 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            276: 13,1
-            277: 13,-1
             285: 7,-1
             286: 7,0
             287: 7,1
@@ -1173,7 +1119,6 @@ entities:
             id: WarnLineGreyscaleN
           decals:
             297: 11,2
-            298: 13,2
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -1199,8 +1144,6 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            278: 17,1
-            279: 17,-1
             284: 9,0
             294: 9,-1
             295: 9,1
@@ -1618,16 +1561,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-20.5
       parent: 1
-- proto: AirlockEngineeringGlassLocked
+- proto: AirlockEngineeringLocked
   entities:
-  - uid: 1295
+  - uid: 37
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -20.5,0.5
       parent: 1
-- proto: AirlockEngineeringLocked
-  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-3.5
+      parent: 1
   - uid: 989
     components:
     - type: Transform
@@ -1640,12 +1587,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-20.5
       parent: 1
-  - uid: 1265
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-3.5
-      parent: 1
   - uid: 1270
     components:
     - type: Transform
@@ -1683,6 +1624,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,5.5
       parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 31.5,-10.5
+      parent: 1
   - uid: 30
     components:
     - type: Transform
@@ -1701,15 +1647,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,3.5
       parent: 1
-  - uid: 2851
-    components:
-    - type: Transform
-      pos: 31.5,-10.5
-      parent: 1
   - uid: 2885
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 38.5,-10.5
       parent: 1
   - uid: 2888
@@ -1722,13 +1662,8 @@ entities:
     - type: Transform
       pos: 38.5,11.5
       parent: 1
-- proto: AirlockExternalGlassShuttleArrivals
+- proto: AirlockExternalGlassShuttleArrivalsLockedCentComm
   entities:
-  - uid: 24
-    components:
-    - type: Transform
-      pos: 38.5,-12.5
-      parent: 1
   - uid: 516
     components:
     - type: Transform
@@ -1737,6 +1672,12 @@ entities:
   - uid: 588
     components:
     - type: Transform
+      pos: 38.5,-12.5
+      parent: 1
+  - uid: 2851
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 38.5,13.5
       parent: 1
   - uid: 2872
@@ -1792,79 +1733,76 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,2.5
       parent: 1
-  - uid: 839
+  - uid: 51
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -11.5,5.5
       parent: 1
-  - uid: 889
+  - uid: 54
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -9.5,-4.5
       parent: 1
-  - uid: 1319
+  - uid: 71
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 1.5,-1.5
       parent: 1
-  - uid: 1320
+  - uid: 72
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 2.5,-1.5
       parent: 1
-  - uid: 1321
+  - uid: 83
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: -5.5,-9.5
       parent: 1
-  - uid: 1322
+  - uid: 125
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: -3.5,-9.5
       parent: 1
-  - uid: 1323
+  - uid: 137
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: -5.5,10.5
       parent: 1
-  - uid: 1324
+  - uid: 152
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: -3.5,10.5
       parent: 1
-  - uid: 1399
+  - uid: 154
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -11.5,-4.5
       parent: 1
-  - uid: 1400
+  - uid: 156
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -9.5,5.5
       parent: 1
 - proto: AirlockJanitorLocked
   entities:
-  - uid: 893
+  - uid: 173
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -25.5,4.5
       parent: 1
 - proto: AirlockMaintLocked
   entities:
-  - uid: 72
+  - uid: 193
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 4.5,-8.5
       parent: 1
   - uid: 367
@@ -1872,17 +1810,35 @@ entities:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-17.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-19.5
+      parent: 1
   - uid: 1394
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-8.5
       parent: 1
-  - uid: 1396
+  - uid: 1400
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -19.5,5.5
       parent: 1
   - uid: 1468
     components:
@@ -1896,12 +1852,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,9.5
       parent: 1
-  - uid: 1473
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,11.5
-      parent: 1
   - uid: 1483
     components:
     - type: Transform
@@ -1932,35 +1882,42 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-7.5
       parent: 1
-  - uid: 1746
+- proto: AirlockMaintMedLocked
+  entities:
+  - uid: 248
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-8.5
       parent: 1
-  - uid: 2247
+  - uid: 426
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,-7.5
       parent: 1
-- proto: AirlockMaintMedLocked
-  entities:
-  - uid: 54
+  - uid: 440
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 6.5,-13.5
       parent: 1
-  - uid: 83
+  - uid: 457
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: 14.5,-5.5
       parent: 1
-  - uid: 125
+  - uid: 575
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 15.5,-12.5
       parent: 1
   - uid: 848
@@ -1969,39 +1926,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-18.5
       parent: 1
-  - uid: 1477
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-17.5
-      parent: 1
-  - uid: 1482
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-19.5
-      parent: 1
 - proto: AirlockMaintSecLocked
   entities:
-  - uid: 440
+  - uid: 839
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,5.5
       parent: 1
-  - uid: 2222
+  - uid: 889
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,16.5
       parent: 1
 - proto: AirlockMaintTheatreLocked
   entities:
-  - uid: 941
+  - uid: 1263
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -17.5,5.5
       parent: 1
-  - uid: 1475
+  - uid: 1265
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2009,16 +1956,16 @@ entities:
       parent: 1
 - proto: AirlockMedicalGlassLocked
   entities:
-  - uid: 193
+  - uid: 955
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 6.5,-1.5
       parent: 1
-  - uid: 248
+  - uid: 977
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 5.5,-1.5
       parent: 1
   - uid: 1520
@@ -2043,11 +1990,6 @@ entities:
       parent: 1
 - proto: AirlockSecurityGlassLocked
   entities:
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 14.5,5.5
-      parent: 1
   - uid: 95
     components:
     - type: Transform
@@ -2060,11 +2002,6 @@ entities:
       parent: 1
     - type: PaintableAirlock
       department: Medical
-  - uid: 152
-    components:
-    - type: Transform
-      pos: 14.5,9.5
-      parent: 1
   - uid: 345
     components:
     - type: Transform
@@ -2083,22 +2020,36 @@ entities:
     - type: Transform
       pos: 16.5,11.5
       parent: 1
-  - uid: 154
+  - uid: 1048
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,5.5
+      parent: 1
+  - uid: 1058
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,9.5
+      parent: 1
+  - uid: 1171
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 17.5,5.5
       parent: 1
 - proto: AirlockServiceLocked
   entities:
-  - uid: 977
+  - uid: 1241
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -4.5,3.5
       parent: 1
-  - uid: 1058
+  - uid: 1251
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
 - proto: AirlockTheatreLocked
@@ -2589,54 +2540,21 @@ entities:
       parent: 1
 - proto: BlastDoorOpen
   entities:
-  - uid: 37
-    components:
-    - type: Transform
-      pos: 15.5,0.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 173
-  - uid: 388
-    components:
-    - type: Transform
-      pos: 15.5,-0.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 173
-  - uid: 426
-    components:
-    - type: Transform
-      pos: 15.5,1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 173
   - uid: 2455
     components:
     - type: Transform
       pos: 8.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2458
   - uid: 2456
     components:
     - type: Transform
       pos: 8.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2458
   - uid: 2457
     components:
     - type: Transform
       pos: 8.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2458
 - proto: BlockGameArcade
   entities:
   - uid: 2738
@@ -2796,18 +2714,6 @@ entities:
     - type: Transform
       pos: 15.5,18.5
       parent: 1
-- proto: ButtonFrameCautionSecurity
-  entities:
-  - uid: 71
-    components:
-    - type: Transform
-      pos: 9.7,6.5
-      parent: 1
-  - uid: 2459
-    components:
-    - type: Transform
-      pos: 9.214063,6.5
-      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 2
@@ -6729,11 +6635,6 @@ entities:
     - type: Transform
       pos: -9.5,7.5
       parent: 1
-  - uid: 1684
-    components:
-    - type: Transform
-      pos: -17.5,5.5
-      parent: 1
   - uid: 1685
     components:
     - type: Transform
@@ -6799,25 +6700,10 @@ entities:
     - type: Transform
       pos: -15.5,8.5
       parent: 1
-  - uid: 1698
-    components:
-    - type: Transform
-      pos: -15.5,7.5
-      parent: 1
-  - uid: 1699
-    components:
-    - type: Transform
-      pos: -15.5,6.5
-      parent: 1
-  - uid: 1700
-    components:
-    - type: Transform
-      pos: -15.5,5.5
-      parent: 1
   - uid: 1701
     components:
     - type: Transform
-      pos: -16.5,5.5
+      pos: -18.5,6.5
       parent: 1
   - uid: 1702
     components:
@@ -6904,6 +6790,11 @@ entities:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: -18.5,7.5
+      parent: 1
   - uid: 1795
     components:
     - type: Transform
@@ -6959,6 +6850,21 @@ entities:
     - type: Transform
       pos: 4.5,13.5
       parent: 1
+  - uid: 2222
+    components:
+    - type: Transform
+      pos: -18.5,8.5
+      parent: 1
+  - uid: 2247
+    components:
+    - type: Transform
+      pos: -17.5,8.5
+      parent: 1
+  - uid: 2273
+    components:
+    - type: Transform
+      pos: -16.5,8.5
+      parent: 1
   - uid: 2308
     components:
     - type: Transform
@@ -8320,6 +8226,37 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,11.5
       parent: 1
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: -16.5,8.5
+      parent: 1
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: -17.5,8.5
+      parent: 1
+  - uid: 1477
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,4.5
+      parent: 1
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: -18.5,8.5
+      parent: 1
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: -18.5,7.5
+      parent: 1
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: -18.5,6.5
+      parent: 1
   - uid: 2029
     components:
     - type: Transform
@@ -8448,27 +8385,12 @@ entities:
   - uid: 2598
     components:
     - type: Transform
-      pos: 5.5,15.5
-      parent: 1
-  - uid: 2599
-    components:
-    - type: Transform
-      pos: 5.5,16.5
-      parent: 1
-  - uid: 2602
-    components:
-    - type: Transform
-      pos: -23.5,4.5
-      parent: 1
-  - uid: 2603
-    components:
-    - type: Transform
-      pos: -22.5,5.5
+      pos: 5.5,15.5
       parent: 1
-  - uid: 2604
+  - uid: 2599
     components:
     - type: Transform
-      pos: -22.5,4.5
+      pos: 5.5,16.5
       parent: 1
   - uid: 2605
     components:
@@ -9801,33 +9723,48 @@ entities:
       parent: 1
 - proto: ConveyorBelt
   entities:
-  - uid: 2588
+  - uid: 1321
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -23.5,6.5
       parent: 1
-  - uid: 2589
+    - type: DeviceLinkSink
+      links:
+      - 1319
+  - uid: 1322
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -24.5,6.5
       parent: 1
-  - uid: 2590
+    - type: DeviceLinkSink
+      links:
+      - 1319
+  - uid: 1323
     components:
     - type: Transform
-      pos: -20.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -25.5,6.5
       parent: 1
-  - uid: 2591
+  - uid: 2588
     components:
     - type: Transform
-      pos: -20.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,6.5
       parent: 1
-  - uid: 2592
+    - type: DeviceLinkSink
+      links:
+      - 1319
+  - uid: 2589
     components:
     - type: Transform
-      pos: -20.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,6.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1319
 - proto: CrateEngineeringSecure
   entities:
   - uid: 2694
@@ -9906,11 +9843,6 @@ entities:
     - type: Transform
       pos: 22.5,15.5
       parent: 1
-  - uid: 2595
-    components:
-    - type: Transform
-      pos: -20.5,4.5
-      parent: 1
   - uid: 2596
     components:
     - type: Transform
@@ -10081,6 +10013,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,5.5
       parent: 1
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,5.5
+      parent: 1
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,5.5
+      parent: 1
   - uid: 1891
     components:
     - type: Transform
@@ -10991,11 +10935,6 @@ entities:
     - type: Transform
       pos: -22.5,4.5
       parent: 1
-  - uid: 2473
-    components:
-    - type: Transform
-      pos: -22.5,5.5
-      parent: 1
   - uid: 2484
     components:
     - type: Transform
@@ -11343,10 +11282,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-17.5
       parent: 1
-  - uid: 688
+  - uid: 893
     components:
     - type: Transform
-      pos: -22.5,6.5
+      pos: -21.5,6.5
       parent: 1
   - uid: 1107
     components:
@@ -12254,28 +12193,6 @@ entities:
     - type: Transform
       pos: 10.5,9.5
       parent: 1
-- proto: HighSecDoor
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: 14.5,1.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: 16.5,1.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 14.5,-0.5
-      parent: 1
-  - uid: 457
-    components:
-    - type: Transform
-      pos: 16.5,-0.5
-      parent: 1
 - proto: HospitalCurtains
   entities:
   - uid: 355
@@ -12291,7 +12208,7 @@ entities:
       pos: 14.5,-11.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -25902.277
+      secondsUntilStateChange: -28443.578
       state: Opening
   - uid: 1061
     components:
@@ -12300,7 +12217,7 @@ entities:
       pos: 14.5,-9.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -25901.51
+      secondsUntilStateChange: -28442.81
       state: Opening
 - proto: KitchenElectricGrill
   entities:
@@ -12337,34 +12254,6 @@ entities:
     - type: Transform
       pos: -13.356459,4.6490784
       parent: 1
-- proto: LockableButtonArmory
-  entities:
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 9.7,6.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        426:
-        - Pressed: Toggle
-        37:
-        - Pressed: Toggle
-        388:
-        - Pressed: Toggle
-  - uid: 2458
-    components:
-    - type: Transform
-      pos: 9.2,6.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        2455:
-        - Pressed: Toggle
-        2456:
-        - Pressed: Toggle
-        2457:
-        - Pressed: Toggle
 - proto: LockableButtonMedical
   entities:
   - uid: 2654
@@ -12819,6 +12708,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.426771,5.563141
       parent: 1
+- proto: PlasticFlapsAirtightOpaque
+  entities:
+  - uid: 1396
+    components:
+    - type: Transform
+      pos: -25.5,6.5
+      parent: 1
 - proto: PlushieLizard
   entities:
   - uid: 1474
@@ -13427,31 +13323,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-13.5
       parent: 1
-- proto: PoweredlightLED
-  entities:
-  - uid: 1388
-    components:
-    - type: Transform
-      pos: 15.5,1.5
-      parent: 1
-  - uid: 1389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-0.5
-      parent: 1
-  - uid: 1390
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,0.5
-      parent: 1
-  - uid: 1391
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,0.5
-      parent: 1
 - proto: PoweredlightRed
   entities:
   - uid: 1310
@@ -14568,17 +14439,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,12.5
       parent: 1
-  - uid: 2289
-    components:
-    - type: Transform
-      pos: 9.5,2.5
-      parent: 1
-  - uid: 2551
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-1.5
-      parent: 1
   - uid: 3013
     components:
     - type: Transform
@@ -14796,12 +14656,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,0.5
       parent: 1
-  - uid: 1171
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,0.5
-      parent: 1
 - proto: RandomFoodBakedSingle
   entities:
   - uid: 1410
@@ -14980,11 +14834,15 @@ entities:
       parent: 1
 - proto: Recycler
   entities:
-  - uid: 2594
+  - uid: 1390
     components:
     - type: Transform
-      pos: -20.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,6.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1319
 - proto: ReinforcedWindow
   entities:
   - uid: 47
@@ -16963,6 +16821,35 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,4.5
       parent: 1
+- proto: TwoWayLever
+  entities:
+  - uid: 1319
+    components:
+    - type: Transform
+      pos: -22.5,5.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2589:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        1322:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        1321:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        1390:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        2588:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
 - proto: VendingMachineBooze
   entities:
   - uid: 834
@@ -17954,18 +17841,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 13.5,-2.5
       parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,0.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,0.5
-      parent: 1
   - uid: 583
     components:
     - type: Transform
@@ -18684,11 +18559,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,7.5
       parent: 1
-  - uid: 955
-    components:
-    - type: Transform
-      pos: -16.5,8.5
-      parent: 1
   - uid: 956
     components:
     - type: Transform
@@ -19256,12 +19126,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,7.5
       parent: 1
-  - uid: 1241
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,6.5
-      parent: 1
   - uid: 1242
     components:
     - type: Transform
@@ -19302,12 +19166,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,7.5
       parent: 1
-  - uid: 1251
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,7.5
-      parent: 1
   - uid: 1252
     components:
     - type: Transform
@@ -19362,12 +19220,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,3.5
       parent: 1
-  - uid: 1263
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,5.5
-      parent: 1
   - uid: 1266
     components:
     - type: Transform
@@ -19419,17 +19271,31 @@ entities:
     - type: Transform
       pos: 13.5,-21.5
       parent: 1
-  - uid: 1376
+  - uid: 1388
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,6.5
+      pos: -19.5,8.5
+      parent: 1
+  - uid: 1389
+    components:
+    - type: Transform
+      pos: -19.5,9.5
+      parent: 1
+  - uid: 1391
+    components:
+    - type: Transform
+      pos: -17.5,9.5
       parent: 1
   - uid: 1395
     components:
     - type: Transform
       pos: 4.5,-6.5
       parent: 1
+  - uid: 1399
+    components:
+    - type: Transform
+      pos: -18.5,9.5
+      parent: 1
   - uid: 1415
     components:
     - type: Transform
@@ -19512,6 +19378,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,21.5
       parent: 1
+  - uid: 1457
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,7.5
+      parent: 1
   - uid: 1459
     components:
     - type: Transform
@@ -20109,19 +19981,6 @@ entities:
     - type: Transform
       pos: 7.5317163,7.5535507
       parent: 1
-- proto: WeaponTurretNanoTrasen
-  entities:
-  - uid: 2273
-    components:
-    - type: Transform
-      pos: 9.5,2.5
-      parent: 1
-  - uid: 2550
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-1.5
-      parent: 1
 - proto: WeldingFuelTankFull
   entities:
   - uid: 1934
@@ -20166,6 +20025,12 @@ entities:
     - type: Transform
       pos: 12.5,-8.5
       parent: 1
+  - uid: 1376
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,6.5
+      parent: 1
   - uid: 2672
     components:
     - type: Transform
@@ -20426,12 +20291,6 @@ entities:
     - type: Transform
       pos: 11.5,-8.5
       parent: 1
-  - uid: 414
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,5.5
-      parent: 1
   - uid: 513
     components:
     - type: Transform
@@ -20443,17 +20302,17 @@ entities:
     - type: Transform
       pos: -20.5,1.5
       parent: 1
-  - uid: 1041
+  - uid: 941
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -21.5,5.5
       parent: 1
-  - uid: 1048
+  - uid: 1041
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-0.5
       parent: 1
   - uid: 1172
     components:
@@ -20485,6 +20344,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-0.5
       parent: 1
+  - uid: 1295
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,5.5
+      parent: 1
   - uid: 1297
     components:
     - type: Transform
@@ -20497,11 +20362,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-0.5
       parent: 1
-  - uid: 1457
+  - uid: 1482
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,5.5
+      rot: 3.141592653589793 rad
+      pos: -23.5,5.5
+      parent: 1
+  - uid: 1684
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,5.5
       parent: 1
   - uid: 2448
     components:
diff --git a/Resources/Maps/_Sunrise/Shuttles/arrivals.yml b/Resources/Maps/_Sunrise/Shuttles/arrivals.yml
index a5c97e29842..e286e041bd0 100644
--- a/Resources/Maps/_Sunrise/Shuttles/arrivals.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/arrivals.yml
@@ -23,19 +23,19 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAANQAAAAAANQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAANQAAAAAANQAAAAAANQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAGAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAANQAAAAAANQAAAAAANQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANQAAAAAAGAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: TQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: TQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAANQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAGAAAAAAAPAAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAANQAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAGAAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAGAAAAAAANQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAPAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -69,104 +69,95 @@ entities:
             1: 2,-4
             2: -3,-4
             3: -4,-4
-            24: -2,2
-            25: -2,1
-            26: -2,0
-            27: -2,-1
-            28: 0,-1
-            29: 0,0
-            30: 0,1
-            31: 0,2
-            32: 2,1
-            33: 2,2
-            34: -2,-2
-            35: 0,-2
-            36: 0,3
-            37: -2,3
-            38: -2,4
-            39: -2,5
-            40: -1,5
-            44: 0,5
-            45: -1,4
-            46: 0,4
-            47: -1,3
-            48: -1,2
-            49: -1,1
-            50: -1,0
-            51: -1,-1
-            52: -1,-2
+            16: -2,2
+            17: -2,1
+            18: -2,0
+            19: -2,-1
+            20: 0,-1
+            21: 0,0
+            22: 0,1
+            23: 0,2
+            24: 2,1
+            25: 2,2
+            26: -2,-2
+            27: 0,-2
+            28: 0,3
+            29: -2,3
+            30: -2,4
+            31: -2,5
+            32: -1,5
+            33: 0,5
+            34: -1,4
+            35: 0,4
+            36: -1,3
+            37: -1,2
+            38: -1,1
+            39: -1,0
+            40: -1,-1
+            41: -1,-2
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            14: -4,-2
-            15: -4,-1
-            16: -4,0
-            17: -4,1
-            18: -4,2
-            19: -4,3
-            20: 2,3
-            21: 2,0
-            22: 2,-1
-            23: 2,-2
+            6: -4,-2
+            7: -4,-1
+            8: -4,0
+            9: -4,1
+            10: -4,2
+            11: -4,3
+            12: 2,3
+            13: 2,0
+            14: 2,-1
+            15: 2,-2
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            8: -4,-3
-            54: 2,-3
+            4: -4,-3
+            42: 2,-3
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            11: 2,4
-            55: -4,4
+            5: 2,4
+            43: -4,4
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
+          -2,-2:
+            0: 2048
+          -2,-1:
+            0: 128
           -1,-1:
             0: 65535
+          -1,-2:
+            1: 16
+            0: 36352
           -1,0:
             0: 65535
-          -2,-2:
-            0: 34816
-            1: 128
-          -2,-1:
-            0: 34952
-          -1,-2:
-            0: 65520
-            1: 15
+          0,-2:
+            0: 2816
+            1: 64
+          0,-1:
+            0: 30711
           0,0:
-            0: 65535
+            0: 30583
           0,1:
-            0: 32767
+            0: 14207
             1: 32768
+          -1,1:
+            0: 61439
           0,2:
-            0: 307
             1: 4
-          -2,0:
-            0: 34952
           -2,1:
-            0: 2184
+            0: 8
             1: 32768
-          -1,1:
-            0: 65535
           -1,2:
-            0: 3310
             1: 1
-          0,-2:
-            0: 65392
-            1: 135
-          0,-1:
-            0: 65535
-          -1,-3:
-            1: 57344
-          0,-3:
-            1: 12288
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -184,7 +175,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -203,39 +194,53 @@ entities:
     - type: RadiationGridResistance
     - type: SpreaderGrid
     - type: GridPathfinding
-- proto: AirCanister
+- proto: AirAlarm
   entities:
-  - uid: 267
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 292
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 177
+  - uid: 206
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: -4.5,5.5
       parent: 292
-  - uid: 178
+    - type: DeviceList
+      devices:
+      - 187
+- proto: AirCanister
+  entities:
+  - uid: 65
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,4.5
+      anchored: True
+      pos: 0.5,-5.5
       parent: 292
-  - uid: 179
+    - type: Physics
+      bodyType: Static
+- proto: AirlockExternalGlassShuttleArrivalsLockedCentComm
+  entities:
+  - uid: 25
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,4.5
       parent: 292
-  - uid: 180
+  - uid: 50
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-2.5
       parent: 292
+  - uid: 59
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 292
+  - uid: 205
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 292
 - proto: AirlockMaintEngiLocked
   entities:
   - uid: 174
@@ -330,6 +335,26 @@ entities:
     - type: Transform
       pos: 1.5,5.5
       parent: 292
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 292
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 292
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 292
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 292
   - uid: 110
     components:
     - type: Transform
@@ -460,6 +485,11 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 292
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 292
   - uid: 149
     components:
     - type: Transform
@@ -505,73 +535,38 @@ entities:
     - type: Transform
       pos: -3.5,-2.5
       parent: 292
-  - uid: 257
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 292
-  - uid: 262
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 292
-  - uid: 314
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 292
-  - uid: 315
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 292
-  - uid: 316
+  - uid: 176
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 2.5,-5.5
       parent: 292
-  - uid: 317
+  - uid: 177
     components:
     - type: Transform
-      pos: 1.5,-5.5
+      pos: -1.5,-4.5
       parent: 292
-  - uid: 319
+  - uid: 178
     components:
     - type: Transform
-      pos: -0.5,-5.5
+      pos: -3.5,-5.5
       parent: 292
-  - uid: 320
+  - uid: 257
     components:
     - type: Transform
-      pos: -1.5,-5.5
+      pos: 3.5,5.5
       parent: 292
-  - uid: 321
+  - uid: 262
     components:
     - type: Transform
-      pos: -2.5,-5.5
+      pos: 2.5,5.5
       parent: 292
   - uid: 322
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 292
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 292
 - proto: CableHV
   entities:
-  - uid: 50
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 292
-  - uid: 59
-    components:
-    - type: Transform
-      pos: -1.5,-6.5
-      parent: 292
   - uid: 86
     components:
     - type: Transform
@@ -692,36 +687,21 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 292
-  - uid: 115
+  - uid: 179
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: -1.5,-5.5
       parent: 292
-  - uid: 181
+  - uid: 237
     components:
     - type: Transform
-      pos: -0.5,-6.5
+      pos: -2.5,-4.5
       parent: 292
   - uid: 240
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 292
-  - uid: 247
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 292
-  - uid: 252
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 292
-  - uid: 253
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 292
 - proto: CableMV
   entities:
   - uid: 14
@@ -744,11 +724,6 @@ entities:
     - type: Transform
       pos: 1.5,0.5
       parent: 292
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 292
   - uid: 72
     components:
     - type: Transform
@@ -794,45 +769,35 @@ entities:
     - type: Transform
       pos: -0.5,3.5
       parent: 292
-  - uid: 216
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 292
-  - uid: 239
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 292
-  - uid: 241
+  - uid: 213
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      pos: -0.5,-2.5
       parent: 292
-  - uid: 242
+  - uid: 216
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: -1.5,-2.5
       parent: 292
-  - uid: 243
+  - uid: 218
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: -2.5,-2.5
       parent: 292
-  - uid: 244
+  - uid: 219
     components:
     - type: Transform
-      pos: -0.5,-6.5
+      pos: -2.5,-3.5
       parent: 292
-  - uid: 245
+  - uid: 229
     components:
     - type: Transform
-      pos: -1.5,-6.5
+      pos: -2.5,-4.5
       parent: 292
-  - uid: 246
+  - uid: 239
     components:
     - type: Transform
-      pos: -2.5,-5.5
+      pos: 2.5,5.5
       parent: 292
   - uid: 258
     components:
@@ -851,28 +816,11 @@ entities:
       parent: 292
 - proto: CableTerminal
   entities:
-  - uid: 270
+  - uid: 207
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-6.5
-      parent: 292
-- proto: Catwalk
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 292
-  - uid: 60
-    components:
-    - type: Transform
-      pos: 0.5,-6.5
-      parent: 292
-  - uid: 63
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-5.5
       parent: 292
 - proto: ChairPilotSeat
   entities:
@@ -1097,25 +1045,37 @@ entities:
   - uid: 85
     components:
     - type: Transform
+      anchored: True
       pos: -3.5,-3.5
       parent: 292
+    - type: Physics
+      bodyType: Static
   - uid: 168
     components:
     - type: Transform
+      anchored: True
       pos: 2.5,-3.5
       parent: 292
+    - type: Physics
+      bodyType: Static
 - proto: ClosetFireFilled
   entities:
   - uid: 84
     components:
     - type: Transform
+      anchored: True
       pos: -2.5,-3.5
       parent: 292
+    - type: Physics
+      bodyType: Static
   - uid: 109
     components:
     - type: Transform
+      anchored: True
       pos: 1.5,-3.5
       parent: 292
+    - type: Physics
+      bodyType: Static
 - proto: ClothingOuterWinterCoat
   entities:
   - uid: 232
@@ -1154,47 +1114,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-3.5
       parent: 292
-- proto: FoodMealMilkape
+- proto: GasPipeBend
   entities:
-  - uid: 310
+  - uid: 181
     components:
     - type: Transform
-      pos: -0.33190894,-6.474305
+      rot: 3.141592653589793 rad
+      pos: -0.5,-5.5
       parent: 292
-- proto: GasPipeBend
+- proto: GasPipeStraight
   entities:
-  - uid: 188
+  - uid: 185
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-4.5
       parent: 292
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 292
-  - uid: 256
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-5.5
-      parent: 292
 - proto: GasPort
   entities:
-  - uid: 148
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-5.5
-      parent: 292
-- proto: GasPressurePump
-  entities:
-  - uid: 61
+  - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
       parent: 292
 - proto: GasVentPump
   entities:
@@ -1203,24 +1145,24 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 292
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 206
 - proto: GeneratorBasic15kW
   entities:
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 292
-  - uid: 265
+  - uid: 115
     components:
     - type: Transform
-      pos: -1.5,-6.5
+      pos: -1.5,-5.5
       parent: 292
 - proto: GravityGeneratorMini
   entities:
-  - uid: 325
+  - uid: 63
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 1.5,-5.5
       parent: 292
 - proto: Grille
   entities:
@@ -1291,14 +1233,6 @@ entities:
     - type: Transform
       pos: -0.5,8.5
       parent: 292
-- proto: Gyroscope
-  entities:
-  - uid: 69
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 292
 - proto: MedkitFilled
   entities:
   - uid: 184
@@ -1387,11 +1321,11 @@ entities:
       parent: 292
 - proto: PoweredSmallLight
   entities:
-  - uid: 204
+  - uid: 175
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -0.5,-6.5
+      pos: -0.5,-5.5
       parent: 292
 - proto: RandomDrinkGlass
   entities:
@@ -1494,17 +1428,18 @@ entities:
       parent: 292
 - proto: SMESBasic
   entities:
-  - uid: 65
+  - uid: 204
     components:
     - type: Transform
-      pos: 1.5,-5.5
+      pos: -2.5,-5.5
       parent: 292
-- proto: SubstationBasic
+- proto: SubstationWallBasic
   entities:
-  - uid: 176
+  - uid: 60
     components:
     - type: Transform
-      pos: -2.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-4.5
       parent: 292
 - proto: TableReinforced
   entities:
@@ -1682,25 +1617,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 292
-  - uid: 66
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-7.5
-      parent: 292
-  - uid: 70
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-7.5
-      parent: 292
-  - uid: 175
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-7.5
-      parent: 292
-  - uid: 185
+  - uid: 180
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1712,40 +1629,46 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-4.5
       parent: 292
-  - uid: 218
+  - uid: 188
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-6.5
       parent: 292
-  - uid: 230
+  - uid: 193
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
       parent: 292
-  - uid: 248
+  - uid: 208
     components:
     - type: Transform
-      pos: 2.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
       parent: 292
-  - uid: 284
+  - uid: 211
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
       parent: 292
-  - uid: 286
+  - uid: 212
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
       parent: 292
-  - uid: 287
+  - uid: 230
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
+      pos: -3.5,7.5
+      parent: 292
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 2.5,7.5
       parent: 292
   - uid: 288
     components:
@@ -1783,23 +1706,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,8.5
       parent: 292
-  - uid: 250
+  - uid: 209
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,-7.5
+      pos: 2.5,-6.5
       parent: 292
-  - uid: 260
+  - uid: 210
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
-      parent: 292
-- proto: Wrench
-  entities:
-  - uid: 229
-    components:
-    - type: Transform
-      pos: -1.0083898,-5.7334137
+      pos: -3.5,-6.5
       parent: 292
 ...
diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml
index e805489f122..c8c792f6de7 100644
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
@@ -194110,7 +194110,7 @@ entities:
                              УВЕДОМЛЕНИЕ О ЛИКВИДАЦИИ
         =============================================
 
-        Время от начала смены и дата:
+        Время и дата:
 
         ДАННЫЕ УДАЛЕНЫ
 
@@ -194174,10 +194174,10 @@ entities:
         [italic]Кто-бы мог подумать, что листок бумаги и ручка будет последним, что мои руки будут держать прежде, чем я умру. К сожалению, воздух практически закончился, и описать всё, что произошло со мной, я не смогу.
 
 
-        Моё имя - Йонас Андор. Я командир 17-го разведывательного звена, выполняющий особое задание по проникновению в тыл врага. К сожалению, моя группа вступила в неравный бой с теми, кого мы должны были обойти. До последних сил надеялся, что моё подбитое корыто сможет дотянуть до ближайшей базы, но у проклятого астероида, видимо, были свои планы на меня. 
+        Моё имя - Йонас Андор. Я командир 17-го разведывательного звена, выполняющий особое задание по проникновению в тыл врага. К сожалению, моя группа вступила в неравный бой с теми, кого мы должны были обойти. До последних сил надеялся, что моё подбитое корыто сможет дотянуть до ближайшей базы, но у проклятого астероида, видимо, были свои планы на меня.
 
 
-        Воздуха в моём баллоне вот вот не станет, по крайней мере, карп, который не позволяет мне даже выйти в космос, позаботится о моих останках. 
+        Воздуха в моём баллоне вот вот не станет, по крайней мере, карп, который не позволяет мне даже выйти в космос, позаботится о моих останках.
 
                    Я прожил достойную жизнь. Слава Синдикату![/italic]
   - uid: 40509
@@ -226769,7 +226769,7 @@ entities:
                           РАЗРЕШЕНИЕ НА НОШЕНИЕ ОРУЖИЯ
         =============================================
 
-        Время от начала смены и дата: 00:00 01/03/3024
+        Время и дата: 00:00 01/03/3024
 
         Составитель документа: Джон Уорт
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index b9ce46878b8..20f95242879 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -44,7 +44,7 @@
   suffix: Prisoner EVA
   components:
   - type: StorageFill
-    contents:   
+    contents:
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
@@ -255,7 +255,7 @@
   - type: StorageFill
     contents:
         - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitSyndie
+        - id: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit
         - id: ClothingShoesBootsMagSyndie
         - id: ClothingMaskGasSyndicate
 
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
index eb51a4b2e12..fb6fa1397b4 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -2,7 +2,7 @@
   id: CatEars
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Human]
+  speciesRestriction: []
   sponsorOnly: true # Sunrise-Sponsors
   coloring:
     default:
@@ -26,7 +26,7 @@
   id: CatTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Human]
+  speciesRestriction: []
   sponsorOnly: true # Sunrise-Sponsors
   coloring:
     default:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index def1ad3b6b6..86060b1bbee 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1222,6 +1222,7 @@
     - type: StaminaDamageOnHit
       damage: 8
     - type: MeleeWeapon
+      wideAnimationRotation: -135
       damage:
         types:
           Blunt: 0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 825d3cc4a70..9ba48348968 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -978,3 +978,133 @@
   - type: Tag
     tags:
       - HideContextMenu
+
+# SUNRISE
+
+- type: entity
+  name : syndie plasma
+  id: BulletSyndiPlasma
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/red_projectile.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 1
+  - type: Projectile
+    impactEffect: BulletImpactEffectSyndiPlasma
+    damage:
+      types:
+        Heat: 12
+    soundHit:
+      collection: WeakHit
+
+- type: entity
+  name : syndie plasma
+  id: BulletSyndiPlasma2
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/red_projectile.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 1
+  - type: Projectile
+    impactEffect: BulletImpactEffectSyndiPlasma
+    damage:
+      types:
+        Heat: 8
+    soundHit:
+      collection: WeakHit
+    soundForce: true
+
+- type: entity
+  name : syndie plasma
+  id: BulletSyndiPlasma3
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/big_red_projectile.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.15,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: *flybyfixture
+  - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 1
+  - type: Projectile
+    impactEffect: BulletImpactEffectSyndiPlasma
+    damage:
+      types:
+        Heat: 20
+    soundHit:
+      collection: WeakHit
+    soundForce: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 7f593353bb5..592fe56b475 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -128,7 +128,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: 145
     attackRate: 1
     hidden: true
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index ffa55cb7c56..da8ccfea1a5 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -44,6 +44,8 @@
   - type: DamageExaminable
   - type: TTS
     voice: FactCore # Sunrise-TTS
+  - type: StaticPrice
+    price: 0 # Sunrise-TTS
 
 - type: entity
   name: "storage item"
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 686c8e8f709..a7e1fb6959f 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -147,6 +147,18 @@
       - CentCommShuttle
       - ErtShuttle
 
+- type: entity
+  id: BaseStationImmortal
+  abstract: true
+  components:
+  - type: StationImmortal
+
+- type: entity
+  id: BaseStationDontSelling
+  abstract: true
+  components:
+  - type: StationDontSellingGrid
+
 - type: entity
   id: BaseStationTransitHub
   abstract: true
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index a63df3dd63d..d0a7b8fe1d8 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -26,7 +26,10 @@
     - BaseStationNanotrasen
     - BaseRandomStation
     - BaseStationCentComm
+    # Sunrise-Start
     - BaseStationTransitHub
+    - BaseStationDontSelling
+    # Sunrise-End
   noSpawn: true
   components:
     - type: Transform
@@ -40,7 +43,11 @@
     - BaseStationRecords
     - BaseRandomStation
     - BaseStationJobsSpawning
+    # Sunrise-Start
     - BaseCentCommShuttles
+    - BaseStationImmortal
+    - BaseStationDontSelling
+    # Sunrise-End
   noSpawn: true
   components:
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index e92da80c4b2..0f41f6c5477 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1154,6 +1154,31 @@
   - type: PriorityDock
     tag: DockArrivals
 
+- type: entity
+  parent: AirlockExternalGlassShuttleArrivals
+  id: AirlockExternalGlassShuttleArrivalsLocked
+  suffix: External, Arrivals, Glass, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
+
+- type: entity
+  parent: AirlockExternalGlassShuttleArrivals
+  id: AirlockExternalGlassShuttleArrivalsLockedCentComm
+  suffix: External, Arrivals, Glass, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+  - type: Airlock
+    safety: false
+  - type: Door
+    forcedCrushClose: true
+    crushDamage:
+      types:
+        Blunt: 1000 # А вот нехуй.
+
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEscape
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index 1c3d5b59ede..0f017bf43da 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -27,6 +27,8 @@
       - Structure
   - type: TTS
     voice: FactCore # Sunrise-TTS
+  - type: StaticPrice
+    price: 0 # Sunrise-TTS
 
 - type: entity
   # This means that it's not anchored on spawn.
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 6b732b3235d..03c0642caaf 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -245,6 +245,16 @@
       - type: InitialInfectedRole
         prototype: InitialInfected
 
+- type: entity
+  id: GreenshiftAnnouncement
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: AnnounceRule  # Sunrise
+    enableAnnouncement: true
+    announcementText: station-event-greenshift
+    roundStartAnnouncementDelay: 120
+
 # event schedulers
 - type: entity
   id: BasicStationEventScheduler
diff --git a/Resources/Prototypes/Guidebook/references.yml b/Resources/Prototypes/Guidebook/references.yml
index 19f490001ba..502961fb2e6 100644
--- a/Resources/Prototypes/Guidebook/references.yml
+++ b/Resources/Prototypes/Guidebook/references.yml
@@ -12,6 +12,7 @@
   id: Drinks
   name: guide-entry-drinks
   text: "/ServerInfo/Guidebook/ReferenceTables/Drinks.xml"
+  filterEnabled: True
 
 - type: guideEntry
   id: FoodRecipes
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 11bf6127534..6c7f1c5094e 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -54,7 +54,7 @@
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
+    outerClothing: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
     pocket1: DoubleEmergencyOxygenTankFilled
@@ -73,7 +73,7 @@
   parent: SyndicateOperativeGearFull
   equipment:
     neck: SyndicateWhistle
-    outerClothing: ClothingOuterHardsuitSyndieCommander
+    outerClothing: ClothingOuterHardsuitSyndieCommanderBiocode # Sunrise-Edit
   inhand:
     - NukeOpsDeclarationOfWar
 
@@ -83,7 +83,7 @@
   parent: SyndicateOperativeGearFull
   equipment:
     eyes: ClothingEyesHudSyndicateAgent
-    outerClothing: ClothingOuterHardsuitSyndieMedic
+    outerClothing: ClothingOuterHardsuitSyndieMedicBiocode # Sunrise-Edit
     shoes: ClothingShoesBootsMagSyndie
     id: SyndiAgentPDA
     belt: ClothingBeltMilitaryWebbingMedFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index 17bed0ee7f6..eb99ae8d9b7 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -21,4 +21,5 @@
     ears: ClothingHeadsetMedical
   storage:
     back:
-    - BoxSurvivalMedical
\ No newline at end of file
+    - BoxSurvivalMedical
+    - RubberStampPsychologist
diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
index f44c14695f6..61911a2dc42 100644
--- a/Resources/Prototypes/SoundCollections/NukeMusic.yml
+++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -5,3 +5,4 @@
     - /Audio/StationEvents/countdown.ogg
     - /Audio/StationEvents/clearly_nuclear.ogg
     - /Audio/_Sunrise/StationEvents/level.ogg
+    - /Audio/_Sunrise/Music/Spectral_Synth.ogg  # Sunrise-Music
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
index f85a8b22af2..f952d62be7a 100644
--- a/Resources/Prototypes/SoundCollections/lobby.yml
+++ b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -15,3 +15,7 @@
     - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
     - /Audio/Lobby/atomicamnesiammx.ogg
+    - /Audio/_Sunrise/Music/peace_in_the_lags.ogg  # Sunrise-Music
+    - /Audio/_Sunrise/Music/The_first_day_on_orbit.ogg  # Sunrise-Music
+    - /Audio/_Sunrise/Music/TO.ogg  # Sunrise-Music
+    - /Audio/_Sunrise/Music/3D_is_just_a_measurement.ogg  # Sunrise-Music
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 704ef37a1e5..1fa2d82748c 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -1,21 +1,40 @@
 - type: entity
   noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackIAAFilled
+  parent: ClothingBackpackSyndie
+  id: ClothingBackpackSyndieAJ100Filled
+  name: набор AJ-10
+  description: Включает в себя пистолет-пулемёт AJ-100 и два магазина патрон.
   components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
+  - type: StorageFill
+    contents:
+    - id: WeaponAJ100Biocode
+    - id: MagazinePistolSubMachineGun
+      amount: 2
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSyndie
+  id: ClothingBackpackSyndieDL6902Filled
+  name: набор DL-6902
+  description: Включает в себя пулемёт DL6902 и один магазин патрон.
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDL6902Biocode
+    - id: MagazineDl6902
 
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackPsychologistFilled
+  parent: ClothingBackpackSyndie
+  id: ClothingBackpackSyndieSIAR52Filled
+  name: набор SIAR-52
+  description: Включает в себя пулемёт SIAR-52 и два магазина патрон.
   components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: RubberStampPsychologist
+  - type: StorageFill
+    contents:
+    - id: WeaponSIAR52Biocode
+    - id: MagazinePistolSubMachineGunSIAR52
+      amount: 2
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
new file mode 100644
index 00000000000..e725ed064f6
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -0,0 +1,207 @@
+
+# For the Buldog
+- type: listing
+  id: UplinkMagazineShotgun
+  name: uplink-magazine-shotgun-name
+  description: uplink-magazine-shotgun-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: pellets }
+  productEntity: MagazineShotgun
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+
+
+# For the LMG
+- type: listing
+  id: UplinkMagazineLightRifleBox
+  name: uplink-magazine-lmg-name
+  description: uplink-magazine-lmg-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon }
+  productEntity: MagazineLightRifleBox
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+
+
+# For the China-Lake
+- type: listing
+  id: UplinkGrenadeFrag
+  name: uplink-grenade-frag-name
+  description: uplink-grenade-frag-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag }
+  productEntity: GrenadeFrag
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+
+- type: listing
+  id: UplinkGrenadeBlast
+  name: uplink-grenade-blast-name
+  description: uplink-grenade-blast-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast }
+  productEntity: GrenadeBlast
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkAmmo
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+
+- type: listing
+  id: UplinkClothingBackpackSyndie
+  name: Рюкзак Синдиката
+  productEntity: ClothingBackpackSyndie
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkWearables
+
+- type: listing
+  id: UplinkClothingBackpackSyndieAJ100Filled
+  name: Набор ПП AJ-100
+  productEntity: ClothingBackpackSyndieAJ100Filled
+  description: Включает в себя пистолет-пулемёт AJ-100 и два магазина патрон.
+  icon: { sprite: _Sunrise/SyndieGuns/AJ-100.rsi, state: icon }
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkWeaponSyndieLaserPistol
+  name: SAM-300
+  productEntity: WeaponSyndieLaserPistolBiocode
+  icon: { sprite: _Sunrise/SyndieGuns/syndielaserpistol.rsi, state: icon }
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkClothingBackpackSyndieDL6902Filled
+  name: Набор DL6902
+  productEntity: ClothingBackpackSyndieDL6902Filled
+  description: Включает в себя пулемёт DL6902 и один магазин патрон.
+  icon: { sprite: _Sunrise/SyndieGuns/DL6902.rsi, state: icon }
+  cost:
+    Telecrystal: 50
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkClothingBackpackSyndieSIAR52Filled
+  name: Набор SIAR-52
+  productEntity: ClothingBackpackSyndieSIAR52Filled
+  description: Включает в себя пулемёт SIAR-52 и два магазина патрон.
+  icon: { sprite: _Sunrise/SyndieGuns/IAR-52.rsi, state: icon }
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkWeaponLaserMinigun
+  name: UVL-21 «Виверна»
+  productEntity: WeaponLaserMinigunBiocode
+  icon: { sprite: _Sunrise/SyndieGuns/laserminigun.rsi, state: icon }
+  cost:
+    Telecrystal: 50
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkWeaponSyndieLaserGun
+  name: S-13 «Чёрная мамба»
+  productEntity: WeaponSyndieLaserGunBiocode
+  icon: { sprite: _Sunrise/SyndieGuns/syndielasergun.rsi, state: icon }
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkWeaponry
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkHardsuitSyndieCommander
+  name: uplink-hardsuit-syndie-commander-name
+  description: uplink-hardsuit-syndie-commander-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitSyndieCommanderBiocode
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkHardsuitSyndieMedic
+  name: uplink-hardsuit-syndie-medic-name
+  description: uplink-hardsuit-syndie-medic-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi, state: icon }
+  productEntity: ClothingOuterHardsuitSyndieMedicBiocode
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
diff --git a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
index 79c8d084785..b385d766455 100644
--- a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
@@ -11,12 +11,11 @@
 - type: damageModifierSet
   id: Felinid
   coefficients:
-    Blunt: 1.5
-    Piercing: 1.5
-    Slash: 1.5
-    Cold: 1.5
-    Heat: 1.5
-    Poison: 1.5
+    Blunt: 1.3
+    Piercing: 1.3
+    Slash: 1.3
+    Cold: 1.3
+    Heat: 1.3
 
 - type: damageModifierSet
   id: Swine
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml
index 21207bf5bd2..b475ea99c2c 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml
@@ -8,15 +8,6 @@
   - type: OwOAccent
   - type: Speech
     speechVerb: Felinid
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      25: 0.7
-      50: 0.5
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      75: Critical
-      150: Dead
   - type: Thieving
     stealthy: true
     stripTimeReduction: 1
@@ -55,7 +46,7 @@
   - type: DamageOnHighSpeedImpact
     damage:
       types:
-        Blunt: 25
+        Blunt: 5
     soundHit:
       path: /Audio/Effects/hit_kick.ogg
   - type: Stamina
@@ -68,10 +59,10 @@
   - type: Respirator
     damage:
       types:
-        Asphyxiation: 2.5
+        Asphyxiation: 1.5
     damageRecovery:
       types:
-        Asphyxiation: -2.5
+        Asphyxiation: -1.5
   - type: NpcFactionMember
     factions:
       - NanoTrasen
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml
index d75c76b0b34..d5dda9c60b4 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/synth.yml
@@ -93,7 +93,6 @@
     sprite: _Sunrise/Mobs/Species/Synth/parts.rsi
     state: full
   - type: Stamina
-    critThreshold: 150
   - type: Sprite
     noRot: true
     drawdepth: Mobs
@@ -165,7 +164,7 @@
     canResistFire: true
     damage:
       types:
-        Heat: 0.15 #per second, scales with number of fire 'stacks'
+        Heat: 1 #per second, scales with number of fire 'stacks'
   - type: Temperature
     heatDamageThreshold: 1000
     coldDamageThreshold: 0
@@ -176,7 +175,7 @@
         Cold: 0
     heatDamage:
       types:
-        Heat: 1.5 #per second, scales with temperature & other constants
+        Heat: 1 #per second, scales with temperature & other constants
   - type: HumanoidAppearance
     species: Synth
   - type: Body
@@ -252,7 +251,7 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 5
+        Blunt: 8
   - type: Pullable
   - type: DoAfter
   - type: CreamPied
@@ -306,12 +305,11 @@
   - type: Synth
   - type: Repairable
     doAfterDelay: 3
-    selfRepairPenalty: 1
     damage:
       types:
-        Blunt: -10
-        Slash: -10
-        Piercing: -10
+        Blunt: -5
+        Slash: -5
+        Piercing: -5
   - type: EyeProtection
 
 - type: entity
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
index bd53d52f7e5..1f6d2a4a9ba 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
@@ -19,11 +19,11 @@
     - Silicon
     damage:
       types:
-        Heat: -15
-        Shock: -15
-        Blunt: -15
-        Slash: -15
-        Piercing: -15
+        Heat: -10
+        Shock: -10
+        Blunt: -10
+        Slash: -10
+        Piercing: -10
     healingBeginSound:
       path: "/Audio/Items/Medical/ointment_begin.ogg"
     healingEndSound:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml
index e6d97912302..35c987fd45b 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml
@@ -117,3 +117,63 @@
     factions:
     - Syndicate
     alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponSIAR52
+  id: WeaponSIAR52Biocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponDL6902
+  id: WeaponDL6902Biocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponAJ100
+  id: WeaponAJ100Biocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponSyndieLaserPistol
+  id: WeaponSyndieLaserPistolBiocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponLaserMinigun
+  id: WeaponLaserMinigunBiocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponSyndieLaserGun
+  id: WeaponSyndieLaserGunBiocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
new file mode 100644
index 00000000000..039a0a39f96
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: BulletImpactEffectSyndiPlasma
+  noSpawn: true
+  components:
+  - type: TimedDespawn
+    lifetime: 0.2
+  - type: Sprite
+    drawdepth: Effects
+    layers:
+    - shader: unshaded
+      map: ["enum.EffectLayers.Unshaded"]
+      sprite: _Sunrise/SyndieGuns/big_red_projectile.rsi
+      state: impact_laser_blue
+  - type: EffectVisuals
+  - type: Tag
+    tags:
+    - HideContextMenu
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
new file mode 100644
index 00000000000..56fa6f53aa0
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: BulletAcid2
+  name: acid spit
+  parent: BaseBullet
+  noSpawn: true
+  components:
+    - type: Projectile
+      damage:
+        types:
+          Caustic: 12
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi
+      layers:
+        - state: xeno_toxic
+    - type: Ammo
+      muzzleFlash: null
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
index 2ce72db55ab..d719b3f0bf5 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Security/brigmedic.yml
@@ -5,7 +5,7 @@
 - type: startingGear
   id: BrigmedicBackpack
   equipment:
-    back: ClothingBackpackBrigmedicFilled
+    back: ClothingBackpackBrigmedic
 
 - type: loadout
   id: BrigmedicDuffel
@@ -14,7 +14,7 @@
 - type: startingGear
   id: BrigmedicDuffel
   equipment:
-    back: ClothingBackpackDuffelBrigmedicFilled
+    back: ClothingBackpackDuffelBrigmedic
 
 - type: loadout
   id: BrigmedicSatchel
@@ -23,7 +23,7 @@
 - type: startingGear
   id: BrigmedicSatchel
   equipment:
-    back: ClothingBackpackSatchelBrigmedicFilled
+    back: ClothingBackpackSatchelBrigmedic
 
 - type: loadout
   id: BrigmedicJumpsuit
diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml
index 22b4c6a580f..c6c3201fcc8 100644
--- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Wildcards/psychologist.yml
@@ -6,7 +6,7 @@
 - type: startingGear
   id: PsychologistBackpack
   equipment:
-    back: ClothingBackpackPsychologistFilled
+    back: ClothingBackpack
 
 - type: loadout
   id: PsychologistSatchel
@@ -15,7 +15,7 @@
 - type: startingGear
   id: PsychologistSatchel
   equipment:
-    back: ClothingBackpackSatchelPsychologistFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
   id: PsychologistDuffel
@@ -24,4 +24,4 @@
 - type: startingGear
   id: PsychologistDuffel
   equipment:
-    back: ClothingBackpackDuffelPsychologistFilled
+    back: ClothingBackpackDuffel
diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml
index ac3989c1ecb..4ad5bcbbbe6 100644
--- a/Resources/Prototypes/_Sunrise/Maps/cluster.yml
+++ b/Resources/Prototypes/_Sunrise/Maps/cluster.yml
@@ -3,6 +3,7 @@
   mapName: 'Cluster'
   mapPath: /Maps/_Sunrise/Station/cluster.yml
   minPlayers: 0
+  maxPlayers: 30
   stations:
     Cluster:
       stationProto: StandardNanotrasenStation
diff --git a/Resources/Prototypes/_Sunrise/Pacificator/pacificator.yml b/Resources/Prototypes/_Sunrise/Pacificator/pacificator.yml
new file mode 100644
index 00000000000..c701f2cf6f7
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/Pacificator/pacificator.yml
@@ -0,0 +1,99 @@
+- type: entity
+  id: Pacificator
+  parent: BaseMachinePowered
+  name: генератор пацифизма
+  description: Делает всех разумных существ в радиусе действия пацифистами.
+  placement:
+    mode: AlignTileAny
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/gravity_generator_mini.rsi
+    snapCardinals: true
+    layers:
+    - state: on
+      map: ["enum.GravityGeneratorVisualLayers.Base"]
+    - sprite: Structures/Machines/gravity_generator_core.rsi
+      state: activated
+      shader: unshaded
+      map: ["enum.GravityGeneratorVisualLayers.Core"]
+      scale: "0.4,0.4"
+      offset: "0,0.2"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 3125
+        mask:
+        - LargeMobMask
+        layer:
+        - WallLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MachineFrameDestroyed:
+            min: 1
+            max: 1
+  - type: Machine
+    board: PacificatorCircuitboard
+  - type: Pacificator
+    range: 128
+    idlePower: 15
+    activePower: 500
+    lightRadiusMin: 0.75
+    lightRadiusMax: 2.5
+  - type: StaticPrice
+    price: 5000
+  - type: UserInterface
+    interfaces:
+      enum.PacificatorUiKey.Key:
+        type: PacificatorBoundUserInterface
+  - type: Appearance
+  - type: PointLight
+    radius: 2.5
+    energy: 0.5
+    # Gravity generator is a large machine, not casting shadows is fine within the radius set above.
+    castShadows: false
+    color: "#a8ffd9"
+  - type: Repairable
+    fuelCost: 10
+    doAfterDelay: 5
+  - type: ExtensionCableReceiver
+  - type: Physics
+    bodyType: Static
+  - type: Transform
+    anchored: true
+  - type: ApcPowerReceiver
+    powerLoad: 500
+  - type: AmbientSound
+    enabled: false
+    volume: -6
+    range: 7
+    sound:
+      path: /Audio/Ambience/Objects/gravity_gen_hum.ogg
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: PacificatorCircuitboard
+  name: генератор пацифизма (машинная плата)
+  description:
+  components:
+  - type: MachineBoard
+    prototype: Pacificator
+    stackRequirements:
+      Capacitor: 4
+      MatterBin: 3
+      Steel: 5
+      CableHV: 5
+      Uranium: 2
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml
index 0037f2cbc18..74c24263c7c 100644
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml
@@ -43,7 +43,7 @@
   id: MagistratGear
   equipment:
     jumpsuit: MagistratUniformSuit
-    back: ClothingBackpackIAAFilled
+    back: ClothingBackpack
     shoes: ClothingShoesBootsLaceup
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesColorWhite
@@ -53,3 +53,6 @@
     head: ClothingHeadHatPwig
     pocket1: Flash
     pocket2: ClothingNeckLawyerbadge
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml
index 94cf662c2f5..9530c1feea5 100644
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml
@@ -36,3 +36,7 @@
     ears: ClothingHeadsetBrigmedic
     mask: ClothingMaskSterile
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalBrigmedic
+    - Flash
diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/gunshots.yml b/Resources/Prototypes/_Sunrise/SoundCollections/gunshots.yml
new file mode 100644
index 00000000000..311f6bdd84d
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/SoundCollections/gunshots.yml
@@ -0,0 +1,11 @@
+- type: soundCollection
+  id: syndiplasma
+  files:
+  - /Audio/_Sunrise/SyndiGuns/plasma_gun_1.ogg
+  - /Audio/_Sunrise/SyndiGuns/plasma_gun_2.ogg
+
+- type: soundCollection
+  id: usp
+  files:
+  - /Audio/_Sunrise/SyndiGuns/usp_1.ogg
+  - /Audio/_Sunrise/SyndiGuns/usp_2.ogg
diff --git a/Resources/Prototypes/_Sunrise/game_presets.yml b/Resources/Prototypes/_Sunrise/game_presets.yml
new file mode 100644
index 00000000000..86f6273e2d9
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/game_presets.yml
@@ -0,0 +1,11 @@
+- type: gamePreset
+  id: Event
+  alias:
+  - event
+  - ivent
+  - SilentGreenshift
+  name: event-title
+  showInVote: false
+  description: event-description
+  rules:
+  - BasicRoundstartVariation
diff --git a/Resources/Prototypes/_Sunrise/syndi_guns.yml b/Resources/Prototypes/_Sunrise/syndi_guns.yml
new file mode 100644
index 00000000000..3a0f03c1371
--- /dev/null
+++ b/Resources/Prototypes/_Sunrise/syndi_guns.yml
@@ -0,0 +1,413 @@
+# РПС и Рюкзак
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackSyndie
+  name: Рюкзак Синдиката
+  description: Рюкзак оперативника с повышенной вместительностью.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/syndiebackpack.rsi
+  - type: Storage
+    maxItemSize: Huge
+    grid:
+    - 0,0,7,4
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltSyndieWebbing
+  name: РПС Синдиката
+  description: Довольно вместительное хранилище для боеприпасов.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/syndieRPS.rsi
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/syndieRPS.rsi
+
+# Оружие:
+- type: entity
+  name: Пистолет-пулёмет SIAR-52
+  parent: BaseWeaponSubMachineGun
+  id: WeaponSIAR52
+  description: Высокоскорострельный ПП, оборудован интегрированым глушителем.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/IAR-52.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/IAR-52.rsi
+  - type: Gun
+    minAngle: 4
+    maxAngle: 4
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 6.5
+    selectedMode: FullAuto
+    soundGunshot:
+      collection: usp # SUNRISE new gun sounds
+      params:
+        volume: 10
+    availableModes:
+    - FullAuto
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolSubMachineGunSIAR52
+        insertSound: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineCaselessRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeCaselessRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeCaselessRifle
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+
+# Магазин расширенный (безгильзовые)
+- type: entity
+  id: MagazinePistolSubMachineGunSIAR52
+  name: "Расширенный магазин (безгильзовые)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: Tag
+    tags:
+      - MagazineCaselessRifle
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifle
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeCaselessRifle
+    capacity: 35
+  - type: Item
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/IAR-52mag.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 8
+    zeroVisible: false
+  - type: Appearance
+
+# DL6902 Пулемет:
+- type: entity
+  name: Пулемёт DL6902
+  id: WeaponDL6902
+  parent: BaseWeaponLightMachineGun
+  description: Тяжёлый пулемёт Cybersun.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/DL6902.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-3
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -15
+    maxAngle: -15
+  - type: Gun
+    minAngle: 30
+    maxAngle: 50
+    fireRate: 6
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineDl6902
+        insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineDl6902
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+
+# Магазин Dl6902
+- type: entity
+  id: MagazineDl6902
+  name: "Коробка-магазин DL6902"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: Tag
+    tags:
+      - MagazineDl6902
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifle
+    capacity: 200
+  - type: Item
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/Dl6902mag.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 8
+    zeroVisible: false
+  - type: Appearance
+
+- type: Tag
+  id: MagazineDl6902
+
+# AJ-100
+- type: entity
+  name: AJ-100
+  parent: BaseWeaponSubMachineGun
+  id: WeaponAJ100
+  description: Высокоскорострельный ПП, оборудован универсальным разъёмом для других типов пистолетных магазинов.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/AJ-100.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/AJ-100.rsi
+  - type: Gun
+    minAngle: 8
+    maxAngle: 8
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 7.4
+    selectedMode: FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+    availableModes:
+    - FullAuto
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolSubMachineGunSIAR52
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazineCaselessRifle
+          - MagazinePistolSubMachineGun
+          - MagazinePistol
+          - MagazinePistolHighCapacity
+          - MagazinePistolCaselessRifle
+          - MagazineMagnumSubMachineGun
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgeCaselessRifle
+          - CartridgePistol
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+
+# Плазменное оружие:
+- type: entity
+  name: SAM-300
+  parent: BaseWeaponBattery
+  id: WeaponSyndieLaserPistol
+  description: Лазерный пистолет Синдиката, разработанный на базе пистолета капитана НТ.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/syndielaserpistol.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    sprite: _Sunrise/SyndieGuns/syndielaserpistol.rsi
+    size: Small
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/syndielaserpistol.rsi
+  - type: Gun
+    minAngle: 5
+    maxAngle: 9
+    angleIncrease: 2
+    angleDecay: 6
+    fireRate: 4
+    selectedMode: SemiAuto
+    soundGunshot:
+      path: /Audio/_Sunrise/SyndiGuns/plasma_pistol_1.ogg
+    availableModes:
+      - SemiAuto
+      - FullAuto
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletSyndiPlasma
+    fireCost: 50
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 10
+
+- type: entity
+  name: UVL-21 «Виверна»
+  parent: BaseWeaponBattery
+  id: WeaponLaserMinigun
+  description: Тяжелое оружие массового поражения разработанное на основе минигана.
+  components:
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - Back
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/laserminigun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    sprite: _Sunrise/SyndieGuns/laserminigun.rsi
+    size: Huge
+  - type: Gun
+    minAngle: 8
+    maxAngle: 15
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 4.75
+    selectedMode: FullAuto
+    soundGunshot:
+      collection: syndiplasma
+      params:
+        volume: -1
+    availableModes:
+    - FullAuto
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletSyndiPlasma2
+    fireCost: 25
+  - type: MultiHandedItem
+  - type: Battery
+    maxCharge: 7500
+    startingCharge: 7500
+
+- type: entity
+  name: S-13 «Чёрная мамба»
+  parent: BaseWeaponBattery
+  id: WeaponSyndieLaserGun
+  description: Модернизированный «Лектер», переделаный под плазменый энергомодуль.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/syndielasergun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    sprite: _Sunrise/SyndieGuns/syndielasergun.rsi
+    size: Huge
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/syndielasergun.rsi
+  - type: Gun
+    minAngle: 20
+    maxAngle: 30
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 1.1
+    selectedMode: SemiAuto
+    soundGunshot:
+      path: /Audio/_Sunrise/SyndiGuns/red_mamba.ogg
+      params:
+        volume: 5
+    availableModes:
+    - SemiAuto
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletSyndiPlasma3
+    fireCost: 100
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -18
+    maxAngle: -29
+  - type: Battery
+    maxCharge: 3000
+    startingCharge: 3000
+
+- type: entity
+  name: MS-42
+  parent: BaseWeaponSubMachineGun
+  id: WeaponAMS-42
+  description: Более совершенная версия Лектера.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/SyndieGuns/MS-42.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/SyndieGuns/MS-42.rsi
+  - type: Gun
+    minAngle: 10
+    maxAngle: 15
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 6
+    selectedMode: FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    availableModes:
+    - FullAuto
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -8
+    maxAngle: -13
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazineRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgeRifle
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml
index fcf5af5d11e..4600aa02d69 100644
--- a/Resources/Prototypes/_Sunrise/tags.yml
+++ b/Resources/Prototypes/_Sunrise/tags.yml
@@ -1,2 +1,5 @@
 - type: Tag
   id: Nanopaste
+
+- type: Tag
+  id: SunriseUplink
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 3bc6ae6208c..1989c51f54a 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -43,6 +43,7 @@
   description: greenshift-description
   rules:
   - BasicRoundstartVariation
+  - GreenshiftAnnouncement
 
 - type: gamePreset
   id: Secret
diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index 3186737d3a6..dad3b051358 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -35,7 +35,7 @@ The main area of the security department. This is where prisoners are brought an
 Short for Captain.
 
 ## Cargonia
-Reference to cargo declaring independance. Against the rules.
+Reference to cargo declaring independence. Against the rules.
 
 ## CE
 Short for Chief Engineer, the head of the Engineering Department.
diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png
index 311f0339138..73775bf7cc1 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json
index b441449def6..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14, and modified by linkblyat (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png
index bbdf579a940..3dc79bc0dbe 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png
index a3a5b515aa6..58876fd9db6 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png
index b723b23bce9..fd5118269bf 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png
index 912d2a7bb38..3833f7ecddf 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json
index fce8c90ce86..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png
index 1f26f1cc809..3cb8fdbf8b8 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png
index 669c6e31af1..efc6f66fa46 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png
index f446031db72..8cbfa79a541 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png
index 1679e41b96f..8c4f58337c9 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json
index 8e0d473c71d..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
index ce67965c1eb..4c32e6a4a93 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json
index d3f32cd8f07..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png
index d69734dc8a0..65955034e88 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json
index fce8c90ce86..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/icon.png
index f8c4e35cef6..b53276f78d3 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
index fce8c90ce86..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png
index e67468659ad..36acf8a4368 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json
index fce8c90ce86..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png
index f016402d95a..98251150816 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json
index 745e688f84e..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png
index 363f156aede..2101d675581 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png
index ede6d76675e..f93128fff45 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json
index b867224a6d9..a2d346787ac 100644
--- a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/0a4a0fadb32e3245f8bc2ee03f88d776de1852b5",
+  "copyright": "Sprited by discord: odlieerr",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png
index 27226fba0be..59e02a7f5f4 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
index 5c891e460ea..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1. Modified by potato1234x (github) for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png
index 2c0192c6e65..f5a57932f79 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json
index 89236692cc9..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png
index 937e82349af..bb8cc0865f4 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json
index 89236692cc9..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACK.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACK.png
deleted file mode 100644
index f4985e40cf4..00000000000
Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/equipped-BACK.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png
index f384dbde9d6..da2e27480c6 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png
index 97c6daa708e..3f611d36913 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png
index b0a31671a29..54ca73feca0 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json
index df8c42373b7..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/salvage.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/eeb99fcbde07bcf2e8bce93383744e3e142839df",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png
index 6655fbb71bb..bbd3156dcad 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json
index d3f32cd8f07..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png
index 8f16dfb3528..de10996b646 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-ammo.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
index 210878cb81d..aba5e1fb555 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png
index 3da810039e9..38c40c1f1c7 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
index acd669d798b..2114630af49 100644
--- a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
@@ -1,56 +1,56 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "icon-ammo"
-    },
-    {
-      "name": "icon-med"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "ammo-equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "med-equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ammo-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "ammo-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "med-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "med-inhand-right",
-      "directions": 4
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-ammo"
+        },
+        {
+            "name": "icon-med"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "ammo-equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "med-equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "ammo-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "med-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "med-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png
index 2f3eb624751..00fc2d56c89 100644
Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json
index 745e688f84e..c7f1e87537d 100644
--- a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json
@@ -1,27 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by discord: odlieerr",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png
index 86be79038b7..dd9a1e80bcb 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/aesir.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png
index 037de6fdeeb..1a9beb3378f 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png
index 340caf40464..375a1fc9f2f 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png
index 6cff981ad67..646e486d1b1 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png
index eda7228dace..e3a144480e2 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png
index 93ea9e5fecd..5f383760a95 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png
index 5fcb6725a55..c62661cac54 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png
index a90ed4846c4..af0ff712515 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png
index a90ed4846c4..255b8be127a 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json
index 616fc1b571e..3d2d2d36f8c 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi. Modified by Ko4erga (discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/icon.png
new file mode 100644
index 00000000000..59140223892
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
index ae6061f323b..a64a2646f71 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "icon"
+        },
         {
             "name": "mag-1"
         },
@@ -32,4 +35,4 @@
             "name": "mag-7"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png
index f3f81a2a5a5..499ec46a539 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png
index 8018b7608bb..844bd201f10 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png
index 541c0778c79..119666c833c 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png
index c169d0fb250..7c80bc210c4 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png
index 643346d7b7b..761e9164ce4 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png
index 69b243c5be8..51ae8ad3623 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png
index 37740c03dfc..dfe4d406eda 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png
index c14c1833bc1..31f7a5f9f06 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
index 06f016743a3..126434bce54 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
@@ -1,340 +1,158 @@
 {
-    "version": 1,
-    "license": "CLA",
-    "copyright": "Sprited by discord: odlieerr",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
     },
-    "states": [
-        {
-            "name": "assembly",
-            "directions": 4
-        },
-        {
-            "name": "bolted_unlit",
-            "directions": 4
-        },
-        {
-            "name": "bolted_open_unlit"
-        },
-        {
-            "name": "closed",
-            "directions": 4
-        },
-        {
-            "name": "closed_unlit",
-            "directions": 4
-        },
-        {
-            "name": "open_unlit"
-        },
-        {
-            "name": "closing",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "closing_unlit",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "deny_unlit",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "open",
-            "directions": 4
-        },
-        {
-            "name": "opening",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "opening_unlit",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "panel_closing",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "panel_closed"
-        },
-        {
-            "name": "panel_opening",
-            "directions": 4,
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-
-        {
-            "name": "panel_open",
-            "directions": 4
-        },
-        {
-            "name": "welded",
-            "directions": 4
-        },
-        {
-            "name": "emergency_unlit",
-            "directions": 4,
-            "delays": [
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ]
-            ]
-        },
-        {
-            "name": "emergency_open_unlit"
-        }
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
     ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_closed"
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "emergency_open_unlit"
+    }
+  ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png
index a7783772686..5b2e45d833a 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png
index 527b92ba2c2..0546c13db55 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png
index 69b243c5be8..51ae8ad3623 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png
index e1bd432b35e..6afe206992a 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png
index 93d9fc33b81..d7d4122c087 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png
index e1bd432b35e..e6c87d740e2 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png
index 46949bbfd86..eed2758c795 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/base.png
new file mode 100644
index 00000000000..3236f36577a
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/bolt-open.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/bolt-open.png
new file mode 100644
index 00000000000..31738f8c62c
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..58087096c5a
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/icon.png
new file mode 100644
index 00000000000..46733575752
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-left.png
new file mode 100644
index 00000000000..82952f0e33d
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-right.png
new file mode 100644
index 00000000000..3912c4f4564
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/mag-0.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/mag-0.png
new file mode 100644
index 00000000000..2ff0feacc41
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/mag-0.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/meta.json
new file mode 100644
index 00000000000..3aff5a372c0
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..ec29250e5b7
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..0c4ce99b7a0
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/AJ-100.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/base.png
new file mode 100644
index 00000000000..ede832ece47
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/bolt-open.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/bolt-open.png
new file mode 100644
index 00000000000..ec4c9140c09
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/icon.png
new file mode 100644
index 00000000000..901697e6eb5
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-left.png
new file mode 100644
index 00000000000..fd8a749102e
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-right.png
new file mode 100644
index 00000000000..31999b11636
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-0.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-0.png
new file mode 100644
index 00000000000..7e0c2856aa2
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-0.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-1.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-1.png
new file mode 100644
index 00000000000..01105892093
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-2.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-2.png
new file mode 100644
index 00000000000..5da98df0e29
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-3.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-3.png
new file mode 100644
index 00000000000..aacc5f8ba91
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/mag-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/meta.json
new file mode 100644
index 00000000000..8ce16b00486
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/meta.json
@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..17790a411fc
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..649604015ae
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/DL6902.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/base.png
new file mode 100644
index 00000000000..f41c759ed38
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-1.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-1.png
new file mode 100644
index 00000000000..04b9db8ce36
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-2.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-2.png
new file mode 100644
index 00000000000..4ffe887c6a1
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-3.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-3.png
new file mode 100644
index 00000000000..b57e15cf761
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-4.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-4.png
new file mode 100644
index 00000000000..f1ad70d838c
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-4.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-5.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-5.png
new file mode 100644
index 00000000000..371f1844f5c
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-5.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-6.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-6.png
new file mode 100644
index 00000000000..116fadaa781
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-6.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-7.png b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-7.png
new file mode 100644
index 00000000000..c59880df5b6
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/mag-7.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/meta.json
new file mode 100644
index 00000000000..e6c5440ec19
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/Dl6902mag.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        },
+        {
+            "name": "mag-7"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/base.png
new file mode 100644
index 00000000000..4da79df66b3
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/bolt-open.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/bolt-open.png
new file mode 100644
index 00000000000..64c35418f8d
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..ea9b234a770
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/icon.png
new file mode 100644
index 00000000000..b04a68c2745
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-left.png
new file mode 100644
index 00000000000..602e34e492e
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-right.png
new file mode 100644
index 00000000000..fd26e2a7b20
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/mag-0.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/mag-0.png
new file mode 100644
index 00000000000..ed63916ca47
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/mag-0.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/meta.json
new file mode 100644
index 00000000000..3aff5a372c0
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..1777edb850d
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..1da22f596c2
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/base.png
new file mode 100644
index 00000000000..b0ddb5f49f5
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-1.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-1.png
new file mode 100644
index 00000000000..9215015426b
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-2.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-2.png
new file mode 100644
index 00000000000..fe0abffae67
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-3.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-3.png
new file mode 100644
index 00000000000..37650b1f921
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-4.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-4.png
new file mode 100644
index 00000000000..538e34ff536
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-4.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-5.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-5.png
new file mode 100644
index 00000000000..067fd967e90
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-5.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-6.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-6.png
new file mode 100644
index 00000000000..2d6e636a96f
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-6.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-7.png b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-7.png
new file mode 100644
index 00000000000..66c240cf153
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/mag-7.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/meta.json
new file mode 100644
index 00000000000..e6c5440ec19
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/IAR-52mag.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        },
+        {
+            "name": "mag-7"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/base.png
new file mode 100644
index 00000000000..663468984d5
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/bolt-open.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/bolt-open.png
new file mode 100644
index 00000000000..f27b38573f2
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..20c8d84ae4b
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/icon.png
new file mode 100644
index 00000000000..1368508e0de
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-left.png
new file mode 100644
index 00000000000..a0da5499ce5
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-right.png
new file mode 100644
index 00000000000..6d1fded219f
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/mag-0.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/mag-0.png
new file mode 100644
index 00000000000..466cbe273bd
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/mag-0.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/meta.json
new file mode 100644
index 00000000000..3aff5a372c0
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..05366d77330
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..4cca1ef5821
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/MS-42.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_bullet.png b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_bullet.png
new file mode 100644
index 00000000000..9af9ad53d61
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_bullet.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_laser_blue.png b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_laser_blue.png
new file mode 100644
index 00000000000..8ea283c9b13
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/impact_laser_blue.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/meta.json
new file mode 100644
index 00000000000..99afe448b87
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "omnilaser"
+    },
+    {
+      "name": "impact_bullet",
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "impact_laser_blue",
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/omnilaser.png b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/omnilaser.png
new file mode 100644
index 00000000000..e458fde36bf
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/big_red_projectile.rsi/omnilaser.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/base.png
new file mode 100644
index 00000000000..67aa7c6ed7e
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/icon.png
new file mode 100644
index 00000000000..b384f77c040
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-left.png
new file mode 100644
index 00000000000..d4270c8cc86
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-right.png
new file mode 100644
index 00000000000..60c8cbf98b3
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-1.png
new file mode 100644
index 00000000000..677ab835400
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-2.png
new file mode 100644
index 00000000000..620347324e1
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-3.png
new file mode 100644
index 00000000000..627dc193051
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-4.png
new file mode 100644
index 00000000000..2c25db53fde
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/meta.json
new file mode 100644
index 00000000000..c1ca0ebbb88
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/laserminigun.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "icon"
+	},
+	{
+		"name": "base"
+	},
+	{
+		"name": "mag-unshaded-1"
+	},
+	{
+		"name": "mag-unshaded-2"
+	},
+	{
+		"name": "mag-unshaded-3"
+	},
+	{
+		"name": "mag-unshaded-4"
+	},
+	{
+		"name": "inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "inhand-right",
+		"directions": 4
+	}
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_bullet.png b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_bullet.png
new file mode 100644
index 00000000000..9af9ad53d61
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_bullet.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_laser_blue.png b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_laser_blue.png
new file mode 100644
index 00000000000..8ea283c9b13
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/impact_laser_blue.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/meta.json
new file mode 100644
index 00000000000..99afe448b87
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "omnilaser"
+    },
+    {
+      "name": "impact_bullet",
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "impact_laser_blue",
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/omnilaser.png b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/omnilaser.png
new file mode 100644
index 00000000000..bff9069bce0
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/red_projectile.rsi/omnilaser.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..17737652d20
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/icon.png
new file mode 100644
index 00000000000..5e08c73b1e1
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-left.png
new file mode 100644
index 00000000000..730d398ee48
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-right.png
new file mode 100644
index 00000000000..fc202d6a1b3
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/meta.json
new file mode 100644
index 00000000000..164fdd5fe07
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/syndieRPS.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..e8104a604df
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/icon.png
new file mode 100644
index 00000000000..d295304db53
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-left.png
new file mode 100644
index 00000000000..a23c26469b1
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-right.png
new file mode 100644
index 00000000000..39693c88b0b
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/meta.json
new file mode 100644
index 00000000000..9fff42eed31
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/syndiebackpack.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/base.png
new file mode 100644
index 00000000000..a8eb1edc881
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..451fd9fafc4
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/icon.png
new file mode 100644
index 00000000000..e35c730a9e0
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-left.png
new file mode 100644
index 00000000000..6a7ca5c03be
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-right.png
new file mode 100644
index 00000000000..5990df7e55e
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-1.png
new file mode 100644
index 00000000000..971da847819
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-2.png
new file mode 100644
index 00000000000..4a0c283e883
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-3.png
new file mode 100644
index 00000000000..ebb6857f32c
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-4.png
new file mode 100644
index 00000000000..c90400ae24f
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/meta.json
new file mode 100644
index 00000000000..c81997e2f63
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/meta.json
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "icon"
+	},
+	{
+		"name": "base"
+	},
+	{
+		"name": "mag-unshaded-1"
+	},
+	{
+		"name": "mag-unshaded-2"
+	},
+	{
+		"name": "mag-unshaded-3"
+	},
+	{
+		"name": "mag-unshaded-4"
+	},
+	{
+		"name": "inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "inhand-right",
+		"directions": 4
+	},
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..d45a0bdd8f1
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..1e5a65f2512
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielasergun.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/base.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/base.png
new file mode 100644
index 00000000000..d50b0b99c68
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/base.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..941e7a60de0
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/icon.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/icon.png
new file mode 100644
index 00000000000..ee23a93c2b3
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/icon.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-left.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-left.png
new file mode 100644
index 00000000000..3accfc508ec
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-right.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-right.png
new file mode 100644
index 00000000000..c3283eaafa4
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-1.png
new file mode 100644
index 00000000000..34e4239948d
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-2.png
new file mode 100644
index 00000000000..b21aa0efb87
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-3.png
new file mode 100644
index 00000000000..7dcc6df9a17
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-4.png
new file mode 100644
index 00000000000..9b52184d709
Binary files /dev/null and b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/meta.json b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/meta.json
new file mode 100644
index 00000000000..33127be9bf7
--- /dev/null
+++ b/Resources/Textures/_Sunrise/SyndieGuns/syndielaserpistol.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt",
+    "copyright": "SUNRISE",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "icon"
+	},
+	{
+		"name": "base"
+	},
+	{
+		"name": "mag-unshaded-1"
+	},
+	{
+		"name": "mag-unshaded-2"
+	},
+	{
+		"name": "mag-unshaded-3"
+	},
+	{
+		"name": "mag-unshaded-4"
+	},
+	{
+		"name": "inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "inhand-right",
+		"directions": 4
+	},
+	{
+		"name": "equipped-BELT",
+		"directions": 4
+	}
+    ]
+}
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 5f73d4d2530..ebf4a174d06 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -348,3 +348,6 @@ DoorRemoteFirefight: null
 
 # 2024-06-03
 AirlockServiceCaptainLocked: AirlockCaptainLocked
+
+# Sunrise migrations
+AirlockExternalGlassShuttleArrivals: AirlockExternalGlassShuttleArrivalsLocked