Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

.github/labeler.yml

@@ -12,6 +12,10 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.xaml*'
 
+"Changes: Shaders":
+- changed-files:
+  - any-glob-to-any-file: '**/*.swsl'
+
 "No C#":
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.

Content.Client/Arcade/BlockGameMenu.cs

@@ -380,7 +380,7 @@ namespace Content.Client.Arcade
             {
                 PanelOverride = back,
                 HorizontalExpand = true,
-                SizeFlagsStretchRatio = 60
+                SizeFlagsStretchRatio = 34.25f
             };
             var backgroundPanel = new PanelContainer
             {

Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs

@@ -17,6 +17,7 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface
         base.Open();
 
         _menu = this.CreateWindow<BlockGameMenu>();
+        _menu.OnAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)

Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs

@@ -25,6 +25,7 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface
         base.Open();
 
         _menu = this.CreateWindow<SpaceVillainArcadeMenu>();
+        _menu.OnPlayerAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)

Content.Client/Mech/Ui/MechMenu.xaml.cs

@@ -12,7 +12,7 @@ public sealed partial class MechMenu : FancyWindow
 {
     [Dependency] private readonly IEntityManager _ent = default!;
 
-    private readonly EntityUid _mech;
+    private EntityUid _mech;
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
 
@@ -25,6 +25,7 @@ public sealed partial class MechMenu : FancyWindow
     public void SetEntity(EntityUid uid)
     {
         MechView.SetEntity(uid);
+        _mech = uid;
     }
 
     public void UpdateMechStats()

Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs

@@ -170,11 +170,12 @@ public sealed partial class ReplaySpectatorSystem
         {
             var size = grid.LocalAABB.Size.LengthSquared();
 
-            if (maxSize is not null && size < maxSize)
-                continue;
-
             var station = HasComp<StationMemberComponent>(uid);
 
+            //We want the first station grid to overwrite any previous non-station grids no matter the size, in case the vgroid was found first
+            if (maxSize is not null && size < maxSize && !(!stationFound && station))
+                continue;
+
             if (!station && stationFound)
                continue;
 
@@ -183,7 +184,6 @@ public sealed partial class ReplaySpectatorSystem
 
             if (station)
                 stationFound = true;
-
         }
 
         coords = new EntityCoordinates(maxUid ?? default, default);

Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.CCVar;
@@ -36,7 +36,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
   id: TestRule
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
   components:
   - type: GameRule
     minPlayers: 0
@@ -45,7 +45,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
   id: TestRuleTenPlayers
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
   components:
   - type: GameRule
     minPlayers: 10

Content.Server/Administration/Commands/JobWhitelistCommands.cs

@@ -47,7 +47,7 @@ public sealed class JobWhitelistAddCommand : LocalizedCommands
             var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
             if (isWhitelisted)
             {
-                shell.WriteLine(Loc.GetString("cmd-jobwhitelist-already-whitelisted",
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelistadd-already-whitelisted",
                     ("player", player),
                     ("jobId", job.Id),
                     ("jobName", jobPrototype.LocalizedName)));

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -285,18 +285,18 @@ public sealed partial class AdminVerbSystem
             {
                 Text = "admin-smite-remove-hands-name",
                 Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"),
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"),
                 Act = () =>
                 {
                     _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow!
-                    var organs = _bodySystem.GetBodyOrganComponents<TransformComponent>(args.Target, body);
+                    var organs = _bodySystem.GetBodyOrganEntityComps<TransformComponent>((args.Target, body));
                     var baseXform = Transform(args.Target);
-                    foreach (var (xform, organ) in organs)
+                    foreach (var organ in organs)
                     {
-                        if (HasComp<BrainComponent>(xform.Owner) || HasComp<EyeComponent>(xform.Owner))
+                        if (HasComp<BrainComponent>(organ.Owner) || HasComp<EyeComponent>(organ.Owner))
                             continue;
 
-                        _transformSystem.AttachToGridOrMap(organ.Owner);
+                        _transformSystem.PlaceNextTo((organ.Owner, organ.Comp1), (args.Target, baseXform));
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target,
@@ -361,9 +361,9 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"),
                 Act = () =>
                 {
-                    foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<StomachComponent>(args.Target, body))
+                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<StomachComponent>((args.Target, body)))
                     {
-                        QueueDel(component.Owner);
+                        QueueDel(entity.Owner);
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target,
@@ -381,9 +381,9 @@ public sealed partial class AdminVerbSystem
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"),
                 Act = () =>
                 {
-                    foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<LungComponent>(args.Target, body))
+                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<LungComponent>((args.Target, body)))
                     {
-                        QueueDel(component.Owner);
+                        QueueDel(entity.Owner);
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target,

Content.Server/Anomaly/AnomalySynchronizerSystem.cs

@@ -122,7 +122,7 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
     }
 
-    //TO DO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
+    //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
     private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
     {

Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs

@@ -76,7 +76,7 @@ public sealed class ReagentProducerAnomalySystem : EntitySystem
             if (anomaly.Severity >= 0.97) reagentProducingAmount *= component.SupercriticalReagentProducingModifier;
 
             newSol.AddReagent(component.ProducingReagent, reagentProducingAmount);
-            _solutionContainer.TryAddSolution(component.Solution.Value, newSol); //TO DO - the container is not fully filled. 
+            _solutionContainer.TryAddSolution(component.Solution.Value, newSol); // TODO - the container is not fully filled.
 
             component.AccumulatedFrametime = 0;
 

Content.Server/Antag/AntagSelectionSystem.cs

@@ -336,7 +336,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             }
 
             _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
-            _role.MindAddRoles(curMind.Value, def.MindComponents);
+            _role.MindAddRoles(curMind.Value, def.MindComponents, null, true);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
         }

Content.Server/Arcade/BlockGame/BlockGame.Ui.cs

@@ -157,7 +157,7 @@ public sealed partial class BlockGame
     /// <param name="message">The message to broadcase to all players/spectators.</param>
     private void SendMessage(BoundUserInterfaceMessage message)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message);
     }
 
     /// <summary>
@@ -167,7 +167,7 @@ public sealed partial class BlockGame
     /// <param name="actor">The target recipient.</param>
     private void SendMessage(BoundUserInterfaceMessage message, EntityUid actor)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message, actor);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message, actor);
     }
 
     /// <summary>

Content.Server/CharacterInfo/CharacterInfoSystem.cs

@@ -31,7 +31,7 @@ public sealed class CharacterInfoSystem : EntitySystem
         var entity = args.SenderSession.AttachedEntity.Value;
 
         var objectives = new Dictionary<string, List<ObjectiveInfo>>();
-        var jobTitle = "No Profession";
+        var jobTitle = Loc.GetString("character-info-no-profession");
         string? briefing = null;
         if (_minds.TryGetMind(entity, out var mindId, out var mind))
         {

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -206,9 +206,9 @@ public sealed class InjectorSystem : SharedInjectorSystem
             BreakOnMove = true,
             BreakOnWeightlessMove = false,
             BreakOnDamage = true,
-            NeedHand = true,
-            BreakOnHandChange = true,
-            MovementThreshold = 0.1f,
+            NeedHand = injector.Comp.NeedHand,
+            BreakOnHandChange = injector.Comp.BreakOnHandChange,
+            MovementThreshold = injector.Comp.MovementThreshold,
         });
     }
 

Content.Server/Flash/DamagedByFlashingSystem.cs

@@ -16,7 +16,7 @@ public sealed class DamagedByFlashingSystem : EntitySystem
     {
         _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage);
 
-        //To Do: It would be more logical if different flashes had different power,
+        //TODO: It would be more logical if different flashes had different power,
         //and the damage would be inflicted depending on the strength of the flash.
     }
 }

Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs

@@ -96,7 +96,7 @@ public sealed class ToggleableGhostRoleSystem : EntitySystem
 
     private void AddWipeVerb(EntityUid uid, ToggleableGhostRoleComponent component, GetVerbsEvent<ActivationVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract)
+        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
             return;
 
         if (TryComp<MindContainerComponent>(uid, out var mind) && mind.HasMind)

Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs

@@ -157,7 +157,7 @@ namespace Content.Server.Kitchen.EntitySystems
             var outputContainer = _itemSlotsSystem.GetItemOrNull(uid, SharedReagentGrinder.BeakerSlotId);
             _appearanceSystem.SetData(uid, ReagentGrinderVisualState.BeakerAttached, outputContainer.HasValue);
 
-            if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp<ActiveReagentGrinderComponent>(uid))
+            if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp<ActiveReagentGrinderComponent>(uid) && this.IsPowered(uid, EntityManager))
             {
                 var program = reagentGrinder.AutoMode == GrinderAutoMode.Grind ? GrinderProgram.Grind : GrinderProgram.Juice;
                 DoWork(uid, reagentGrinder, program);

Content.Server/Lightning/LightningSystem.cs

@@ -71,9 +71,9 @@ public sealed class LightningSystem : SharedLightningSystem
     /// <param name="triggerLightningEvents">if the lightnings being fired should trigger lightning events.</param>
     public void ShootRandomLightnings(EntityUid user, float range, int boltCount, string lightningPrototype = "Lightning", int arcDepth = 0, bool triggerLightningEvents = true)
     {
-        //To Do: add support to different priority target tablem for different lightning types
-        //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
-        //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
+        //TODO: add support to different priority target tablem for different lightning types
+        //TODO: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
+        //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
 
         var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(_transform.GetMapCoordinates(user), range).ToList();

Content.Server/Shuttles/Components/GridSpawnComponent.cs

@@ -26,6 +26,11 @@ public interface IGridSpawnGroup
     /// </summary>
     public float MinimumDistance { get; }
 
+    /// <summary>
+    /// Maximum distance to spawn away from the station.
+    /// </summary>
+    public float MaximumDistance { get;  }
+
     /// <inheritdoc />
     public ProtoId<DatasetPrototype>? NameDataset { get; }
 
@@ -67,6 +72,8 @@ public sealed class DungeonSpawnGroup : IGridSpawnGroup
     /// <inheritdoc />
     public float MinimumDistance { get; }
 
+    public float MaximumDistance { get; }
+
     /// <inheritdoc />
     public ProtoId<DatasetPrototype>? NameDataset { get; }
 
@@ -94,7 +101,11 @@ public sealed class GridSpawnGroup : IGridSpawnGroup
 {
     public List<ResPath> Paths = new();
 
+    /// <inheritdoc />
     public float MinimumDistance { get; }
+
+    /// <inheritdoc />
+    public float MaximumDistance { get; }
     public ProtoId<DatasetPrototype>? NameDataset { get; }
     public int MinCount { get; set; } = 1;
     public int MaxCount { get; set; } = 1;

Content.Server/Shuttles/Systems/DockingSystem.cs

@@ -281,24 +281,24 @@ namespace Content.Server.Shuttles.Systems
             {
                 if (_doorSystem.TryOpen(dockAUid, doorA))
                 {
-                    doorA.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockAUid, out var airlockA))
                     {
                         _doorSystem.SetBoltsDown((dockAUid, airlockA), true);
                     }
                 }
+                doorA.ChangeAirtight = false;
             }
 
             if (TryComp(dockBUid, out DoorComponent? doorB))
             {
                 if (_doorSystem.TryOpen(dockBUid, doorB))
                 {
-                    doorB.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockBUid, out var airlockB))
                     {
                         _doorSystem.SetBoltsDown((dockBUid, airlockB), true);
                     }
                 }
+                doorB.ChangeAirtight = false;
             }
 
             if (_pathfinding.TryCreatePortal(dockAXform.Coordinates, dockBXform.Coordinates, out var handle))

Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs

@@ -10,6 +10,7 @@ using Content.Shared.Shuttles.Components;
 using Content.Shared.Station.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -86,9 +87,15 @@ public sealed partial class ShuttleSystem
         _mapManager.DeleteMap(mapId);
     }
 
-    private bool TryDungeonSpawn(EntityUid targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned)
+    private bool TryDungeonSpawn(Entity<MapGridComponent?> targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned)
     {
         spawned = EntityUid.Invalid;
+
+        if (!_gridQuery.Resolve(targetGrid.Owner, ref targetGrid.Comp))
+        {
+            return false;
+        }
+
         var dungeonProtoId = _random.Pick(group.Protos);
 
         if (!_protoManager.TryIndex(dungeonProtoId, out var dungeonProto))
@@ -96,11 +103,13 @@ public sealed partial class ShuttleSystem
             return false;
         }
 
-        var spawnCoords = new EntityCoordinates(targetGrid, Vector2.Zero);
+        var targetPhysics = _physicsQuery.Comp(targetGrid);
+        var spawnCoords = new EntityCoordinates(targetGrid, targetPhysics.LocalCenter);
 
         if (group.MinimumDistance > 0f)
         {
-            spawnCoords = spawnCoords.Offset(_random.NextVector2(group.MinimumDistance, group.MinimumDistance * 1.5f));
+            var distancePadding = MathF.Max(targetGrid.Comp.LocalAABB.Width, targetGrid.Comp.LocalAABB.Height);
+            spawnCoords = spawnCoords.Offset(_random.NextVector2(distancePadding + group.MinimumDistance, distancePadding + group.MaximumDistance));
         }
 
         var spawnMapCoords = _transform.ToMapCoordinates(spawnCoords);

Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs

@@ -1,4 +1,5 @@
 using Content.Server.Shuttles.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
@@ -12,6 +13,26 @@ public sealed partial class ShuttleSystem
         SubscribeLocalEvent<IFFConsoleComponent, AnchorStateChangedEvent>(OnIFFConsoleAnchor);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowIFFMessage>(OnIFFShow);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowVesselMessage>(OnIFFShowVessel);
+        SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+    }
+
+    private void OnGridSplit(ref GridSplitEvent ev)
+    {
+        var splitMass = _cfg.GetCVar(CCVars.HideSplitGridsUnder);
+
+        if (splitMass < 0)
+            return;
+
+        foreach (var grid in ev.NewGrids)
+        {
+            if (!_physicsQuery.TryGetComponent(grid, out var physics) ||
+                physics.Mass > splitMass)
+            {
+                continue;
+            }
+
+            AddIFFFlag(grid, IFFFlags.HideLabel);
+        }
     }
 
     private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args)

Content.Server/Shuttles/Systems/ShuttleSystem.cs

@@ -60,12 +60,16 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly AtmosphereSystem _atmos = default!; //CP14 FTL atmos
 
+    private EntityQuery<MapGridComponent> _gridQuery;
+
     public const float TileMassMultiplier = 0.5f;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        _gridQuery = GetEntityQuery<MapGridComponent>();
+
         InitializeFTL();
         InitializeGridFills();
         InitializeIFF();

Content.Shared/Body/Systems/SharedBodySystem.Organs.cs

@@ -183,6 +183,30 @@ public partial class SharedBodySystem
         return list;
     }
 
+    /// <summary>
+    /// Returns a list of Entity<<see cref="T"/>, <see cref="OrganComponent"/>>
+    /// for each organ of the body
+    /// </summary>
+    /// <typeparam name="T">The component that we want to return</typeparam>
+    /// <param name="entity">The body to check the organs of</param>
+    public List<Entity<T, OrganComponent>> GetBodyOrganEntityComps<T>(
+        Entity<BodyComponent?> entity)
+        where T : IComponent
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return new List<Entity<T, OrganComponent>>();
+
+        var query = GetEntityQuery<T>();
+        var list = new List<Entity<T, OrganComponent>>(3);
+        foreach (var organ in GetBodyOrgans(entity.Owner, entity.Comp))
+        {
+            if (query.TryGetComponent(organ.Id, out var comp))
+                list.Add((organ.Id, comp, organ.Component));
+        }
+
+        return list;
+    }
+
     /// <summary>
     ///     Tries to get a list of ValueTuples of <see cref="T"/> and OrganComponent on each organs
     ///     in the given body.

Content.Shared/CCVar/CCVars.cs

@@ -1505,6 +1505,13 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool> GodmodeArrivals =
             CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
 
+        /// <summary>
+        /// If a grid is split then hide any smaller ones under this mass (kg) from the map.
+        /// This is useful to avoid split grids spamming out labels.
+        /// </summary>
+        public static readonly CVarDef<int> HideSplitGridsUnder =
+            CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY);
+
         /// <summary>
         /// Whether to automatically spawn escape shuttles.
         /// </summary>

Content.Shared/Chemistry/Components/InjectorComponent.cs

@@ -87,6 +87,22 @@ public sealed partial class InjectorComponent : Component
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
+
+    #region Arguments for injection doafter
+
+    /// <inheritdoc cref=DoAfterArgs.NeedHand>
+    [DataField]
+    public bool NeedHand = true;
+
+    /// <inheritdoc cref=DoAfterArgs.BreakOnHandChange>
+    [DataField]
+    public bool BreakOnHandChange = true;
+
+    /// <inheritdoc cref=DoAfterArgs.MovementThreshold>
+    [DataField]
+    public float MovementThreshold = 0.1f;
+
+    #endregion
 }
 
 /// <summary>

Content.Shared/Cuffs/SharedCuffableSystem.cs

@@ -58,7 +58,7 @@ namespace Content.Shared.Cuffs
         {
             base.Initialize();
 
-            SubscribeLocalEvent<HandCountChangedEvent>(OnHandCountChanged);
+            SubscribeLocalEvent<CuffableComponent, HandCountChangedEvent>(OnHandCountChanged);
             SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt);
 
             SubscribeLocalEvent<CuffableComponent, EntRemovedFromContainerMessage>(OnCuffsRemovedFromContainer);
@@ -380,33 +380,24 @@ namespace Content.Shared.Cuffs
         /// <summary>
         ///     Check the current amount of hands the owner has, and if there's less hands than active cuffs we remove some cuffs.
         /// </summary>
-        private void OnHandCountChanged(HandCountChangedEvent message)
+        private void OnHandCountChanged(Entity<CuffableComponent> ent, ref HandCountChangedEvent message)
         {
-            var owner = message.Sender;
-
-            if (!TryComp(owner, out CuffableComponent? cuffable) ||
-                !cuffable.Initialized)
-            {
-                return;
-            }
-
             var dirty = false;
-            var handCount = CompOrNull<HandsComponent>(owner)?.Count ?? 0;
+            var handCount = CompOrNull<HandsComponent>(ent.Owner)?.Count ?? 0;
 
-            while (cuffable.CuffedHandCount > handCount && cuffable.CuffedHandCount > 0)
+            while (ent.Comp.CuffedHandCount > handCount && ent.Comp.CuffedHandCount > 0)
             {
                 dirty = true;
 
-                var container = cuffable.Container;
-                var entity = container.ContainedEntities[^1];
+                var handcuffContainer = ent.Comp.Container;
+                var handcuffEntity = handcuffContainer.ContainedEntities[^1];
 
-                _container.Remove(entity, container);
-                _transform.SetWorldPosition(entity, _transform.GetWorldPosition(owner));
+                _transform.PlaceNextTo(handcuffEntity, ent.Owner);
             }
 
             if (dirty)
             {
-                UpdateCuffState(owner, cuffable);
+                UpdateCuffState(ent.Owner, ent.Comp);
             }
         }
 

Content.Shared/Doors/Systems/SharedDoorSystem.cs

@@ -21,6 +21,7 @@ using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
+using Robust.Shared.Map.Components;
 
 namespace Content.Shared.Doors.Systems;
 
@@ -40,6 +41,8 @@ public abstract partial class SharedDoorSystem : EntitySystem
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
     [Dependency] private readonly PryingSystem _pryingSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+
 
     [ValidatePrototypeId<TagPrototype>]
     public const string DoorBumpTag = "DoorBumpOpener";
@@ -546,29 +549,37 @@ public abstract partial class SharedDoorSystem : EntitySystem
         if (!Resolve(uid, ref physics))
             yield break;
 
+        var xform = Transform(uid);
+        // Getting the world bounds from the gridUid allows us to use the version of
+        // GetCollidingEntities that returns Entity<PhysicsComponent>
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGridComp))
+            yield break;
+        var tileRef = _mapSystem.GetTileRef(xform.GridUid.Value, mapGridComp, xform.Coordinates);
+        var doorWorldBounds = _entityLookup.GetWorldBounds(tileRef);
+
         // TODO SLOTH fix electro's code.
         // ReSharper disable once InconsistentNaming
         var doorAABB = _entityLookup.GetWorldAABB(uid);
 
-        foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorAABB))
+        foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorWorldBounds))
         {
-            if (otherPhysics == physics)
+            if (otherPhysics.Comp == physics)
                 continue;
 
             //TODO: Make only shutters ignore these objects upon colliding instead of all airlocks
             // Excludes Glasslayer for windows, GlassAirlockLayer for windoors, TableLayer for tables
-            if (!otherPhysics.CanCollide || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassAirlockLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.TableLayer)
+            if (!otherPhysics.Comp.CanCollide || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassAirlockLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.TableLayer)
                 continue;
 
             //If the colliding entity is a slippable item ignore it by the airlock
-            if (otherPhysics.CollisionLayer == (int)CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int)CollisionGroup.ItemMask)
+            if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.SlipLayer && otherPhysics.Comp.CollisionMask == (int) CollisionGroup.ItemMask)
                 continue;
 
             //For when doors need to close over conveyor belts
-            if (otherPhysics.CollisionLayer == (int) CollisionGroup.ConveyorMask)
+            if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.ConveyorMask)
                 continue;
 
-            if ((physics.CollisionMask & otherPhysics.CollisionLayer) == 0 && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0)
+            if ((physics.CollisionMask & otherPhysics.Comp.CollisionLayer) == 0 && (otherPhysics.Comp.CollisionMask & physics.CollisionLayer) == 0)
                 continue;
 
             if (_entityLookup.GetWorldAABB(otherPhysics.Owner).IntersectPercentage(doorAABB) < IntersectPercentage)

Content.Shared/Examine/ExamineSystemShared.cs

@@ -18,6 +18,7 @@ namespace Content.Shared.Examine
 {
     public abstract partial class ExamineSystemShared : EntitySystem
     {
+        [Dependency] private readonly OccluderSystem _occluder = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
@@ -182,12 +183,9 @@ namespace Content.Shared.Examine
                 length = MaxRaycastRange;
             }
 
-            var occluderSystem = Get<OccluderSystem>();
-            IoCManager.Resolve(ref entMan);
-
             var ray = new Ray(origin.Position, dir.Normalized());
-            var rayResults = occluderSystem
-                .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false).ToList();
+            var rayResults = _occluder
+                .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false);
 
             if (rayResults.Count == 0) return true;
 
@@ -195,13 +193,13 @@ namespace Content.Shared.Examine
 
             foreach (var result in rayResults)
             {
-                if (!entMan.TryGetComponent(result.HitEntity, out OccluderComponent? o))
+                if (!TryComp(result.HitEntity, out OccluderComponent? o))
                 {
                     continue;
                 }
 
                 var bBox = o.BoundingBox;
-                bBox = bBox.Translated(entMan.GetComponent<TransformComponent>(result.HitEntity).WorldPosition);
+                bBox = bBox.Translated(_transform.GetWorldPosition(result.HitEntity));
 
                 if (bBox.Contains(origin.Position) || bBox.Contains(other.Position))
                 {
@@ -216,7 +214,6 @@ namespace Content.Shared.Examine
 
         public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
             var otherPos = _transform.GetMapCoordinates(other);
 
@@ -225,16 +222,14 @@ namespace Content.Shared.Examine
 
         public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
-            var otherPos = other.ToMap(entMan, _transform);
+            var otherPos = _transform.ToMapCoordinates(other);
 
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
         public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
 
             return InRangeUnOccluded(originPos, other, range, predicate, ignoreInsideBlocker);
@@ -250,11 +245,12 @@ namespace Content.Shared.Examine
             }
 
             var hasDescription = false;
+            var metadata = MetaData(entity);
 
             //Add an entity description if one is declared
-            if (!string.IsNullOrEmpty(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription))
+            if (!string.IsNullOrEmpty(metadata.EntityDescription))
             {
-                message.AddText(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription);
+                message.AddText(metadata.EntityDescription);
                 hasDescription = true;
             }
 

Content.Shared/Lock/LockComponent.cs

@@ -92,6 +92,13 @@ public sealed partial class LockComponent : Component
 [ByRefEvent]
 public record struct LockToggleAttemptEvent(EntityUid User, bool Silent = false, bool Cancelled = false);
 
+/// <summary>
+/// Event raised on the user when a toggle is attempted.
+/// Can be cancelled to prevent it.
+/// </summary>
+[ByRefEvent]
+public record struct UserLockToggleAttemptEvent(EntityUid Target, bool Silent = false, bool Cancelled = false);
+
 /// <summary>
 /// Event raised on a lock after it has been toggled.
 /// </summary>

Content.Shared/Lock/LockSystem.cs

@@ -259,7 +259,12 @@ public sealed class LockSystem : EntitySystem
 
         var ev = new LockToggleAttemptEvent(user, quiet);
         RaiseLocalEvent(uid, ref ev, true);
-        return !ev.Cancelled;
+        if (ev.Cancelled)
+            return false;
+
+        var userEv = new UserLockToggleAttemptEvent(uid, quiet);
+        RaiseLocalEvent(user, ref userEv, true);
+        return !userEv.Cancelled;
     }
 
     // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it
@@ -408,4 +413,3 @@ public sealed class LockSystem : EntitySystem
         _activatableUI.CloseAll(uid);
     }
 }
-

Content.Shared/Lock/LockingWhitelistComponent.cs

@@ -0,0 +1,18 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// Adds whitelist and blacklist for this mob to lock things.
+/// The whitelist and blacklist are checked against the object being locked, not the mob.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockingWhitelistSystem))]
+public sealed partial class LockingWhitelistComponent : Component
+{
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    [DataField]
+    public EntityWhitelist? Blacklist;
+}

Content.Shared/Lock/LockingWhitelistSystem.cs

@@ -0,0 +1,28 @@
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Lock;
+
+public sealed class LockingWhitelistSystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LockingWhitelistComponent, UserLockToggleAttemptEvent>(OnUserLockToggleAttempt);
+    }
+
+    private void OnUserLockToggleAttempt(Entity<LockingWhitelistComponent> ent, ref UserLockToggleAttemptEvent args)
+    {
+        if (_whitelistSystem.CheckBoth(args.Target, ent.Comp.Blacklist, ent.Comp.Whitelist))
+            return;
+
+        if (!args.Silent)
+            _popupSystem.PopupClient(Loc.GetString("locking-whitelist-component-lock-toggle-deny"), ent.Owner);
+
+        args.Cancelled = true;
+    }
+}

Content.Shared/Slippery/NoSlipComponent.cs

@@ -1,7 +1,9 @@
-namespace Content.Shared.Slippery
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Slippery;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoSlipComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class NoSlipComponent : Component
-    {
-    }
+
 }

Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs

@@ -45,7 +45,7 @@ public sealed class SwapTeleporterSystem : EntitySystem
     private void OnInteract(Entity<SwapTeleporterComponent> ent, ref AfterInteractEvent args)
     {
         var (uid, comp) = ent;
-        if (args.Target == null)
+        if (args.Target == null || !args.CanReach)
             return;
 
         var target = args.Target.Value;

Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs

@@ -15,4 +15,7 @@ public sealed partial class GunRequiresWieldComponent : Component
 
     [DataField, AutoNetworkedField]
     public TimeSpan PopupCooldown = TimeSpan.FromSeconds(1);
+
+    [DataField]
+    public LocId? WieldRequiresExamineMessage  = "gunrequireswield-component-examine";
 }

Content.Shared/Whitelist/EntityWhitelistSystem.cs

@@ -23,6 +23,23 @@ public sealed class EntityWhitelistSystem : EntitySystem
         return uid != null && IsValid(list, uid.Value);
     }
 
+    /// <summary>
+    /// Checks whether a given entity is allowed by a whitelist and not blocked by a blacklist.
+    /// If a blacklist is provided and it matches then this returns false.
+    /// If a whitelist is provided and it does not match then this returns false.
+    /// If either list is null it does not get checked.
+    /// </summary>
+    public bool CheckBoth([NotNullWhen(true)] EntityUid? uid, EntityWhitelist? blacklist = null, EntityWhitelist? whitelist = null)
+    {
+        if (uid == null)
+            return false;
+
+        if (blacklist != null && IsValid(blacklist, uid))
+            return false;
+
+        return whitelist == null || IsValid(whitelist, uid);
+    }
+
     /// <summary>
     /// Checks whether a given entity satisfies a whitelist.
     /// </summary>

Content.Shared/Wieldable/WieldableSystem.cs

@@ -47,6 +47,7 @@ public sealed class WieldableSystem : EntitySystem
         SubscribeLocalEvent<WieldableComponent, HandDeselectedEvent>(OnDeselectWieldable);
 
         SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
+        SubscribeLocalEvent<GunRequiresWieldComponent, ExaminedEvent>(OnExamineRequires);
         SubscribeLocalEvent<GunRequiresWieldComponent, ShotAttemptedEvent>(OnShootAttempt);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemWieldedEvent>(OnGunWielded);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemUnwieldedEvent>(OnGunUnwielded);
@@ -116,8 +117,17 @@ public sealed class WieldableSystem : EntitySystem
         }
     }
 
+    private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref ExaminedEvent args)
+    {
+        if(entity.Comp.WieldRequiresExamineMessage != null)
+            args.PushText(Loc.GetString(entity.Comp.WieldRequiresExamineMessage));
+    }
+
     private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
     {
+        if (HasComp<GunRequiresWieldComponent>(uid)) 
+            return;
+
         if (component.WieldBonusExamineMessage != null)
             args.PushText(Loc.GetString(component.WieldBonusExamineMessage));
     }

Resources/Changelog/Changelog.yml

@@ -1,177 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Lockers can now be deconstructed again.
-    type: Fix
-  id: 6474
-  time: '2024-04-28T05:26:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27431
-- author: SlamBamActionman
-  changes:
-  - message: "Removed Exterminators pending redesign. \U0001F525\U0001F44D\U0001F525"
-    type: Remove
-  id: 6475
-  time: '2024-04-28T05:45:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26978
-- author: Boaz1111
-  changes:
-  - message: Circuit imprinter recipes now cost less glass
-    type: Tweak
-  id: 6476
-  time: '2024-04-28T05:46:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27310
-- author: Piksqu & Boaz1111
-  changes:
-  - message: Added the hyperconvection circuit imprinter
-    type: Add
-  id: 6477
-  time: '2024-04-28T05:49:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27283
-- author: exincore
-  changes:
-  - message: Fax machines now copy the labels attached to papers.
-    type: Add
-  - message: Fax machine "Print File" functionality now applies the first line of
-      the file as a label when it begins with `#`.
-    type: Add
-  id: 6478
-  time: '2024-04-28T06:12:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25979
-- author: Plykiya
-  changes:
-  - message: Hardsuits, EVA suits, firesuits and other things now protect your feet
-      from dangerous glass shards.
-    type: Tweak
-  id: 6479
-  time: '2024-04-28T07:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26764
-- author: FungiFellow
-  changes:
-  - message: Bows now fit in Exosuit slot.
-    type: Tweak
-  id: 6480
-  time: '2024-04-28T08:23:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27433
-- author: osjarw
-  changes:
-  - message: Fixed some anomaly behaviours pulsing at wrong rates.
-    type: Fix
-  id: 6481
-  time: '2024-04-28T09:28:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27435
-- author: Ubaser
-  changes:
-  - message: Pyrotton can now be mutated from cotton.
-    type: Add
-  id: 6482
-  time: '2024-04-28T11:07:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27200
-- author: Plykiya
-  changes:
-  - message: You can now pick up Smile and put them in your bag.
-    type: Add
-  id: 6483
-  time: '2024-04-29T02:44:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27458
-- author: Beck Thompson, CoffeePoweredPHD
-  changes:
-  - message: Fixed infinite reagent duplication glitch with toilets and drains.
-    type: Fix
-  - message: Dirty water toilets now function correctly as toilets.
-    type: Fix
-  id: 6484
-  time: '2024-04-29T03:08:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27446
-- author: Nopey
-  changes:
-  - message: Many more items can now be recycled, including mops, medkits, and stun
-      batons.
-    type: Tweak
-  id: 6485
-  time: '2024-04-29T03:36:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24435
-- author: Hanzdegloker
-  changes:
-  - message: '"Denied" and "Approved" stamps are now guaranteed to appear in the lockers
-      of the HoP and QM.'
-    type: Tweak
-  id: 6486
-  time: '2024-04-29T03:38:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25604
-- author: Potato1234_x
-  changes:
-  - message: Added rainbow weed. It is obtained by mutating regular weed.
-    type: Add
-  id: 6487
-  time: '2024-04-29T04:06:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25759
-- author: Gotimanga
-  changes:
-  - message: Chemists can now create opporozidone, which reverses the effects of rotting
-      in deceased patients while in cryo.
-    type: Add
-  id: 6488
-  time: '2024-04-29T04:13:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24074
-- author: Mangohydra
-  changes:
-  - message: Added a new syndicate cyborg module that contains a very dangerous explosive
-      as a 4tc purchase.
-    type: Add
-  id: 6489
-  time: '2024-04-29T04:16:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25815
-- author: Morb0
-  changes:
-  - message: Added emote panel (by default Y)
-    type: Add
-  id: 6490
-  time: '2024-04-29T04:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26702
-- author: MilenVolf
-  changes:
-  - message: Borgs now have brand new voice and walking sounds.
-    type: Add
-  - message: Syndicate assault borgs now have new feature to scare - manic laugher.
-    type: Add
-  id: 6491
-  time: '2024-04-29T04:38:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27205
-- author: KrasnoshchekovPavel
-  changes:
-  - message: Fixed formatting of floating point numbers during localization
-    type: Fix
-  id: 6492
-  time: '2024-04-29T04:52:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27441
-- author: mirrorcult
-  changes:
-  - message: Random events should now occur much more frequently
-    type: Tweak
-  id: 6493
-  time: '2024-04-29T06:38:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27469
-- author: Plykiya
-  changes:
-  - message: Latejoin players now have a chance to roll thief.
-    type: Add
-  id: 6494
-  time: '2024-04-29T06:38:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27466
-- author: ElectroJr
-  changes:
-  - message: Fixed actions sometimes disappearing from the hotbar when double clicking
-    type: Fix
-  id: 6495
-  time: '2024-04-29T08:36:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27468
-- author: DrSmugleaf
-  changes:
-  - message: Fixed bullets not going exactly where you click when moving.
-    type: Fix
-  id: 6496
-  time: '2024-04-29T13:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27484
 - author: FungiFellow
   changes:
   - message: Syndi-Cats now have a Wideswing, 80% Explosion Resist, 6/6/15 Pierce/Slash/Structural
@@ -3780,3 +3607,177 @@
   id: 6973
   time: '2024-07-23T08:13:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30229
+- author: Scribbles0
+  changes:
+  - message: Handless mobs can no longer wipe devices like positronic brains or pAIs.
+    type: Fix
+  id: 6974
+  time: '2024-07-23T17:47:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30149
+- author: Quantus
+  changes:
+  - message: Reagent grinders can no longer auto-grind when unpowered.
+    type: Fix
+  id: 6975
+  time: '2024-07-23T21:02:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30267
+- author: BombasterDS
+  changes:
+  - message: Fixed items disappearing after shelfs and mannequin disassembling
+    type: Fix
+  id: 6976
+  time: '2024-07-24T08:57:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30313
+- author: Cojoke-dot
+  changes:
+  - message: Fix infinite QSI linking range
+    type: Fix
+  id: 6977
+  time: '2024-07-24T20:57:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30332
+- author: deltanedas
+  changes:
+  - message: Borgs can no longer unlock the robotics console or other borgs.
+    type: Tweak
+  id: 6978
+  time: '2024-07-25T03:54:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27888
+- author: themias
+  changes:
+  - message: Fixed the ripley control panel not loading
+    type: Fix
+  id: 6979
+  time: '2024-07-25T05:23:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30325
+- author: Timur2011
+  changes:
+  - message: Space adders are now butcherable.
+    type: Add
+  - message: Snakes now drop snake meat when butchered.
+    type: Fix
+  - message: Snakes now appear lying when in critical state.
+    type: Tweak
+  id: 6980
+  time: '2024-07-25T10:52:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29629
+- author: Plykiya
+  changes:
+  - message: You can now build atmos gas pipes through things like walls.
+    type: Tweak
+  id: 6981
+  time: '2024-07-25T23:26:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28707
+- author: Ilya246
+  changes:
+  - message: Nuclear operative reinforcements now come with full nuclear operative
+      gear (and a toy carp) at no additional cost.
+    type: Tweak
+  - message: Nuclear operative reinforcements now get nuclear operative names.
+    type: Tweak
+  id: 6982
+  time: '2024-07-25T23:37:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30173
+- author: Cojoke-dot
+  changes:
+  - message: Engineering goggles and other similar-looking eyewear now help block
+      identity.
+    type: Tweak
+  - message: Radiation suit's hood now blocks identity.
+    type: Fix
+  id: 6983
+  time: '2024-07-26T05:26:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30305
+- author: Moomoobeef
+  changes:
+  - message: Some radio channel colors have been tweaked in order to be more easily
+      distinguishable.
+    type: Tweak
+  id: 6984
+  time: '2024-07-26T06:47:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30133
+- author: Errant
+  changes:
+  - message: Replay ghosts now actually spawn on the proper station, take two.
+    type: Fix
+  id: 6985
+  time: '2024-07-26T12:59:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30273
+- author: themias
+  changes:
+  - message: Arcade machines are functional again
+    type: Fix
+  id: 6986
+  time: '2024-07-26T17:30:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30376
+- author: themias
+  changes:
+  - message: Zombies now get uncuffed upon transformation
+    type: Fix
+  id: 6987
+  time: '2024-07-26T18:48:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30321
+- author: metalgearsloth
+  changes:
+  - message: Fix grid labels getting spammed from VGRoid.
+    type: Fix
+  id: 6988
+  time: '2024-07-27T01:54:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29946
+- author: GoldenCan
+  changes:
+  - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe.
+    type: Add
+  id: 6989
+  time: '2024-07-27T04:09:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30249
+- author: Plykiya
+  changes:
+  - message: Thief game rule now properly selects more than one thief.
+    type: Fix
+  id: 6990
+  time: '2024-07-27T07:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30393
+- author: BombasterDS
+  changes:
+  - message: Added new plant mutations for apple, sugarcane and galaxythistle
+    type: Add
+  id: 6991
+  time: '2024-07-27T15:08:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28993
+- author: Spessmann
+  changes:
+  - message: Thief objectives for figurines and stamps now require less items
+    type: Tweak
+  id: 6992
+  time: '2024-07-27T23:11:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30390
+- author: metalgearsloth
+  changes:
+  - message: Moved VGRoid from 1,000m away to ~500m.
+    type: Tweak
+  id: 6993
+  time: '2024-07-28T03:14:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29943
+- author: lzk228
+  changes:
+  - message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks
+      would give you default pancakes.
+    type: Fix
+  id: 6994
+  time: '2024-07-28T03:49:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30270
+- author: Plykiya
+  changes:
+  - message: Fixed the client mispredicting people slipping with their magboots turned
+      on
+    type: Fix
+  id: 6995
+  time: '2024-07-28T06:17:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30425
+- author: Katzenminer
+  changes:
+  - message: Pun and similar pets are no longer firemune
+    type: Fix
+  id: 6996
+  time: '2024-07-28T08:32:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30424

Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

@@ -15,7 +15,7 @@ baby_jail.enabled = true
 baby_jail.show_reason = true
 baby_jail.max_account_age = 5256000 # 10 years. Disabling this check specifically isn't currently supported
 baby_jail.max_overall_minutes = 3000 # 50 hours
-baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
+baby_jail.custom_reason = "Sorry! Only new and whitelisted players can join this server. Apply to be whitelisted in our Discord server (discord.ss14.io) or try joining another server instead!"
 baby_jail.whitelisted_can_bypass = true
 
 [hub]

Resources/Locale/en-US/actions/actions/polymorph.ftl

@@ -0,0 +1 @@
+gera-transformation-popup = This action will transform you. Use it again to confirm.

Resources/Locale/en-US/character-info/components/character-info-component.ftl

@@ -1,3 +1,4 @@
 character-info-title = Character
 character-info-roles-antagonist-text = Antagonist Roles
 character-info-objectives-label = Objectives
+character-info-no-profession = No Profession

Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

@@ -206,6 +206,9 @@ ghost-role-information-syndicate-reinforcement-spy-description = Someone needs r
 ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief
 ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent.
 
+ghost-role-information-nukeop-reinforcement-name = Nuclear Operative
+ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them.
+ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you.
 
 ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
 ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.

Resources/Locale/en-US/lock/locking-whitelist-component.ftl

@@ -0,0 +1 @@
+locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.

Resources/Locale/en-US/mass-media/news-ui.ftl

@@ -34,4 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text
     {"[bullet/]bullet[/color]"}
 
 news-pda-notification-header = New news article
-news-publish-admin-announcement = {$actor} published news article {$title} by {$author}"
+news-publish-admin-announcement = {$actor} published news article {$title} by {$author}

Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl

@@ -58,4 +58,5 @@ humanoid-profile-editor-no-traits = No traits available
 humanoid-profile-editor-trait-count-hint = Points available: [{$current}/{$max}]
 
 trait-category-disabilities = Disabilities
-trait-category-speech = Speech traits
+trait-category-speech = Speech traits
+trait-category-quirks = Quirks

Resources/Locale/en-US/seeds/seeds.ftl

@@ -32,6 +32,8 @@ seeds-potato-name = potato
 seeds-potato-display-name = potatoes
 seeds-sugarcane-name = sugarcane
 seeds-sugarcane-display-name = sugarcanes
+seeds-papercane-name = papercane
+seeds-papercane-display-name = papercanes
 seeds-towercap-name = tower cap
 seeds-towercap-display-name = tower caps
 seeds-steelcap-name = steel cap
@@ -48,6 +50,8 @@ seeds-eggplant-name = eggplant
 seeds-eggplant-display-name = eggplants
 seeds-apple-name = apple
 seeds-apple-display-name = apple tree
+seeds-goldenapple-name = golden apple
+seeds-goldenapple-display-name = golden apple tree
 seeds-corn-name = corn
 seeds-corn-display-name = ears of corn
 seeds-onion-name = onion
@@ -88,6 +92,8 @@ seeds-ambrosiadeus-name = ambrosia deus
 seeds-ambrosiadeus-display-name = ambrosia deus
 seeds-galaxythistle-name = galaxythistle
 seeds-galaxythistle-display-name = galaxythistle
+seeds-glasstle-name = glasstle
+seeds-glasstle-display-name = glasstle
 seeds-flyamanita-name = fly amanita
 seeds-flyamanita-display-name = fly amanita
 seeds-gatfruit-name = gatfruit

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -124,10 +124,11 @@ uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in spac
 uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Teleporter
 uplink-reinforcement-radio-ancestor-desc =  Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette.
 
-
 uplink-reinforcement-radio-name = Reinforcement Teleporter
 uplink-reinforcement-radio-traitor-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck.
-uplink-reinforcement-radio-nukeops-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
+
+uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter
+uplink-reinforcement-radio-nukeops-desc =  Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear.
 
 uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter
 uplink-reinforcement-radio-cyborg-assault-desc =  A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer.

Resources/Locale/en-US/wieldable/wieldable-component.ftl

@@ -18,3 +18,5 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!
 
 gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
+
+gunrequireswield-component-examine = This weapon can only be fired when wielded.

Resources/Maps/atlas.yml

@@ -2921,6 +2921,9 @@ entities:
     - type: DeviceList
       devices:
       - 5914
+      - 1087
+      - 6891
+      - 6173
   - uid: 1948
     components:
     - type: Transform
@@ -2930,6 +2933,7 @@ entities:
     - type: DeviceList
       devices:
       - 6719
+      - 7056
   - uid: 1949
     components:
     - type: Transform
@@ -3031,6 +3035,9 @@ entities:
       devices:
       - 6799
       - 7235
+      - 7798
+      - 8673
+      - 8508
   - uid: 6648
     components:
     - type: Transform
@@ -3045,6 +3052,7 @@ entities:
       - 3817
       - 3815
       - 7599
+      - 929
   - uid: 7372
     components:
     - type: Transform
@@ -3060,6 +3068,11 @@ entities:
       - 3771
       - 2164
       - 2131
+      - 4537
+      - 8468
+      - 2085
+      - 819
+      - 820
   - uid: 7532
     components:
     - type: Transform
@@ -3342,6 +3355,15 @@ entities:
     - type: DeviceList
       devices:
       - 8623
+  - uid: 8680
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 30
+    - type: DeviceList
+      devices:
+      - 8668
+      - 8669
 - proto: AirCanister
   entities:
   - uid: 5877
@@ -4717,6 +4739,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 22.5,34.5
       parent: 30
+  - uid: 2442
+    components:
+    - type: Transform
+      pos: -15.5,4.5
+      parent: 30
   - uid: 6874
     components:
     - type: Transform
@@ -4767,13 +4794,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,30.5
       parent: 30
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 2442
-    components:
-    - type: Transform
-      pos: -15.5,4.5
-      parent: 30
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 4894
@@ -24027,12 +24047,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -40.5,-0.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 1947
   - uid: 6891
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -40.5,0.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 1947
   - uid: 7205
     components:
     - type: Transform
@@ -34907,6 +34933,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,5.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 7372
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1087
@@ -34915,6 +34944,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,5.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 1947
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1146
@@ -35236,6 +35268,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,17.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 7372
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 4548
@@ -35511,6 +35546,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -61.5,-1.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 6101
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 8226
@@ -35536,11 +35574,23 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8508
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -62.5,1.5
+      parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 6101
   - uid: 8669
     components:
     - type: Transform
       pos: 2.5,6.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 8680
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -35636,6 +35686,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,7.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 7372
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 845
@@ -35650,6 +35703,9 @@ entities:
     - type: Transform
       pos: 1.5,10.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 6648
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1099
@@ -35715,6 +35771,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,11.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 7372
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2127
@@ -36074,6 +36133,9 @@ entities:
     - type: Transform
       pos: -36.5,9.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 1948
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 7235
@@ -36197,6 +36259,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,18.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 7372
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 8629
@@ -36213,8 +36278,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,7.5
       parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 8680
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8673
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -62.5,2.5
+      parent: 30
+    - type: DeviceNetwork
+      deviceLists:
+      - 6101
 - proto: GasVolumePump
   entities:
   - uid: 7730

Resources/Maps/bagel.yml

@@ -14327,6 +14327,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,31.5
       parent: 60
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 23.5,-29.5
+      parent: 60
+  - uid: 902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-25.5
+      parent: 60
   - uid: 3189
     components:
     - type: Transform
@@ -14339,6 +14350,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 59.5,14.5
       parent: 60
+  - uid: 6129
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,29.5
+      parent: 60
+  - uid: 6130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-0.5
+      parent: 7536
   - uid: 6768
     components:
     - type: Transform
@@ -14363,6 +14386,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-70.5
       parent: 60
+  - uid: 9110
+    components:
+    - type: Transform
+      pos: -11.5,-4.5
+      parent: 7536
+  - uid: 9214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 7536
   - uid: 12269
     components:
     - type: Transform
@@ -14410,38 +14444,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,-70.5
       parent: 60
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 6129
-    components:
-    - type: Transform
-      pos: -11.5,-0.5
-      parent: 7536
-  - uid: 6130
-    components:
-    - type: Transform
-      pos: -11.5,-4.5
-      parent: 7536
-  - uid: 9110
-    components:
-    - type: Transform
-      pos: 0.5,-0.5
-      parent: 7536
-  - uid: 9214
-    components:
-    - type: Transform
-      pos: 23.5,-29.5
-      parent: 60
-  - uid: 13825
-    components:
-    - type: Transform
-      pos: 25.5,-25.5
-      parent: 60
-  - uid: 19808
-    components:
-    - type: Transform
-      pos: 20.5,28.5
-      parent: 60
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 6252
@@ -74858,18 +74860,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 898
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-22.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 899
     components:
     - type: Transform
@@ -74894,18 +74884,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 902
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-22.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 903
     components:
     - type: Transform

Resources/Maps/cluster.yml

@@ -7605,6 +7605,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -44.5,3.5
       parent: 1
+  - uid: 3147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 3148
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+      parent: 1
   - uid: 4816
     components:
     - type: Transform
@@ -7647,18 +7659,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,38.5
       parent: 1
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 3147
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-  - uid: 3148
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 7260

Resources/Maps/fland.yml

@@ -18042,6 +18042,12 @@ entities:
     - type: Transform
       pos: 91.5,71.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        31366:
+        - DoorStatus: Close
   - uid: 16663
     components:
     - type: Transform
@@ -18492,12 +18498,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -42.5,-55.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12402:
+        - DoorStatus: DoorBolt
   - uid: 12402
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -45.5,-55.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12401:
+        - DoorStatus: DoorBolt
   - uid: 23029
     components:
     - type: Transform
@@ -18512,6 +18530,12 @@ entities:
     - type: Transform
       pos: 99.5,0.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        23457:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlass
   entities:
   - uid: 2870
@@ -18586,11 +18610,23 @@ entities:
     - type: Transform
       pos: 25.5,-59.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15609:
+        - DoorStatus: Close
   - uid: 15612
     components:
     - type: Transform
       pos: 27.5,-59.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15610:
+        - DoorStatus: Close
   - uid: 33581
     components:
     - type: Transform
@@ -18618,11 +18654,23 @@ entities:
     - type: Transform
       pos: 16.5,-36.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10120:
+        - DoorStatus: DoorBolt
   - uid: 10120
     components:
     - type: Transform
       pos: 16.5,-33.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10119:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
   entities:
   - uid: 3715
@@ -18649,36 +18697,72 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -45.5,-59.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12421:
+        - DoorStatus: DoorBolt
   - uid: 12404
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,-47.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12395:
+        - DoorStatus: Close
   - uid: 12420
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -37.5,-62.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12400:
+        - DoorStatus: Close
   - uid: 12421
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -45.5,-62.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12403:
+        - DoorStatus: DoorBolt
   - uid: 12503
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,-59.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12397:
+        - DoorStatus: Close
   - uid: 12504
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-62.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12399:
+        - DoorStatus: Close
   - uid: 20640
     components:
     - type: Transform
@@ -18713,6 +18797,12 @@ entities:
     - type: Transform
       pos: 96.5,0.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        23458:
+        - DoorStatus: DoorBolt
   - uid: 24737
     components:
     - type: Transform
@@ -18792,6 +18882,8 @@ entities:
     - type: Transform
       pos: -41.5,-1.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         3000:
@@ -18837,21 +18929,53 @@ entities:
     - type: Transform
       pos: 22.5,-50.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        19166:
+        - DoorStatus: DoorBolt
+        19165:
+        - DoorStatus: DoorBolt
   - uid: 19164
     components:
     - type: Transform
       pos: 22.5,-49.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19166:
+        - DoorStatus: DoorBolt
+        19165:
+        - DoorStatus: DoorBolt
   - uid: 19165
     components:
     - type: Transform
       pos: 20.5,-50.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19164:
+        - DoorStatus: DoorBolt
+        19163:
+        - DoorStatus: DoorBolt
   - uid: 19166
     components:
     - type: Transform
       pos: 20.5,-49.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19164:
+        - DoorStatus: DoorBolt
+        19163:
+        - DoorStatus: DoorBolt
   - uid: 26786
     components:
     - type: Transform
@@ -18938,6 +19062,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -41.5,32.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEscape
   entities:
   - uid: 6767
@@ -19008,38 +19134,80 @@ entities:
     - type: Transform
       pos: -29.5,-48.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12404:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 12397
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -29.5,-58.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12503:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 12399
     components:
     - type: Transform
       pos: -32.5,-64.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12504:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 12400
     components:
     - type: Transform
       pos: -37.5,-64.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12420:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 15609
     components:
     - type: Transform
       pos: 25.5,-61.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        15611:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 15610
     components:
     - type: Transform
       pos: 27.5,-61.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        15612:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 31366
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 91.5,74.5
       parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        16079:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalLocked
   entities:
   - uid: 3833
@@ -19047,6 +19215,8 @@ entities:
     - type: Transform
       pos: -38.5,16.5
       parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         3834:
@@ -27381,17 +27551,18 @@ entities:
     - type: Transform
       pos: 63.5,-57.5
       parent: 13329
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 1203
     components:
     - type: Transform
-      pos: -6.5,25.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,28.5
       parent: 13329
   - uid: 1204
     components:
     - type: Transform
-      pos: -7.5,28.5
+      pos: -6.5,25.5
       parent: 13329
   - uid: 3030
     components:
@@ -27401,52 +27572,62 @@ entities:
   - uid: 3758
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -41.5,32.5
       parent: 13329
   - uid: 3759
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -41.5,34.5
       parent: 13329
   - uid: 3760
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -41.5,40.5
       parent: 13329
   - uid: 3761
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -41.5,42.5
       parent: 13329
   - uid: 6764
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,76.5
       parent: 13329
   - uid: 10112
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-37.5
       parent: 13329
   - uid: 10113
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-35.5
       parent: 13329
   - uid: 12422
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -43.5,-32.5
       parent: 13329
   - uid: 12423
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -43.5,-39.5
       parent: 13329
   - uid: 13166
     components:
     - type: Transform
-      pos: -30.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -37.5,-20.5
       parent: 13329
   - uid: 13167
     components:
@@ -27456,27 +27637,30 @@ entities:
   - uid: 13252
     components:
     - type: Transform
-      pos: -37.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -30.5,-20.5
       parent: 13329
   - uid: 13282
     components:
     - type: Transform
-      pos: -28.5,-30.5
+      pos: -33.5,-30.5
       parent: 13329
   - uid: 13283
     components:
     - type: Transform
-      pos: -33.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,61.5
       parent: 13329
   - uid: 13284
     components:
     - type: Transform
-      pos: 95.5,61.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,66.5
       parent: 13329
   - uid: 13285
     components:
     - type: Transform
-      pos: 95.5,66.5
+      pos: -28.5,-30.5
       parent: 13329
 - proto: AtmosFixBlockerMarker
   entities:
@@ -164811,6 +164995,11 @@ entities:
     - type: Transform
       pos: 106.5,-45.5
       parent: 13329
+  - uid: 34593
+    components:
+    - type: Transform
+      pos: 17.5,-35.5
+      parent: 13329
   - uid: 35403
     components:
     - type: Transform
@@ -165044,6 +165233,11 @@ entities:
     - type: Transform
       pos: 36.5,56.5
       parent: 13329
+  - uid: 34228
+    components:
+    - type: Transform
+      pos: 17.5,-34.5
+      parent: 13329
   - uid: 34456
     components:
     - type: Transform
@@ -182222,13 +182416,6 @@ entities:
       pos: 22.5,15.5
       parent: 13329
 - proto: SignAtmos
-  entities:
-  - uid: 26471
-    components:
-    - type: Transform
-      pos: 78.5,-21.5
-      parent: 13329
-- proto: SignAtmosMinsky
   entities:
   - uid: 26468
     components:
@@ -182245,6 +182432,11 @@ entities:
     - type: Transform
       pos: 90.5,-19.5
       parent: 13329
+  - uid: 26471
+    components:
+    - type: Transform
+      pos: 78.5,-21.5
+      parent: 13329
 - proto: SignBar
   entities:
   - uid: 1188
@@ -182333,8 +182525,6 @@ entities:
     - type: Transform
       pos: 16.5,39.5
       parent: 13329
-- proto: SignChemistry1
-  entities:
   - uid: 18455
     components:
     - type: Transform
@@ -182775,13 +182965,6 @@ entities:
     - type: Transform
       pos: 70.5,42.5
       parent: 13329
-- proto: SignDrones
-  entities:
-  - uid: 26692
-    components:
-    - type: Transform
-      pos: 82.5,-21.5
-      parent: 13329
 - proto: SignElectricalMed
   entities:
   - uid: 4728
@@ -182975,21 +183158,17 @@ entities:
       pos: 66.5,46.5
       parent: 13329
 - proto: SignHydro1
-  entities:
-  - uid: 20091
-    components:
-    - type: Transform
-      pos: -11.5,33.5
-      parent: 13329
-- proto: SignHydro2
   entities:
   - uid: 20090
     components:
     - type: Transform
       pos: -2.5,37.5
       parent: 13329
-- proto: SignHydro3
-  entities:
+  - uid: 20091
+    components:
+    - type: Transform
+      pos: -11.5,33.5
+      parent: 13329
   - uid: 20092
     components:
     - type: Transform
@@ -183068,6 +183247,13 @@ entities:
     - type: Transform
       pos: 14.5,-14.5
       parent: 13329
+- proto: SignMaterials
+  entities:
+  - uid: 26692
+    components:
+    - type: Transform
+      pos: 82.5,-21.5
+      parent: 13329
 - proto: SignMedical
   entities:
   - uid: 10600
@@ -183303,21 +183489,17 @@ entities:
     - type: Transform
       pos: 39.5,-12.5
       parent: 13329
-- proto: SignScience1
-  entities:
-  - uid: 20084
-    components:
-    - type: Transform
-      pos: 26.5,-48.5
-      parent: 13329
-- proto: SignScience2
-  entities:
   - uid: 19938
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-40.5
       parent: 13329
+  - uid: 20084
+    components:
+    - type: Transform
+      pos: 26.5,-48.5
+      parent: 13329
 - proto: SignSecurearea
   entities:
   - uid: 15808

Resources/Maps/marathon.yml

@@ -140,7 +140,7 @@ entities:
           version: 6
         -4,2:
           ind: -4,2
-          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         -4,3:
           ind: -4,3
@@ -4400,6 +4400,12 @@ entities:
             1037: 5,41
             1386: 22,25
             1387: 22,23
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            3190: -53,36
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale
@@ -9735,6 +9741,12 @@ entities:
     - type: Transform
       pos: -82.5,-60.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6606:
+        - DoorStatus: Close
   - uid: 17373
     components:
     - type: Transform
@@ -9763,11 +9775,23 @@ entities:
     - type: Transform
       pos: 15.5,30.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1826:
+        - DoorStatus: DoorBolt
   - uid: 1826
     components:
     - type: Transform
       pos: 17.5,30.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1695:
+        - DoorStatus: DoorBolt
   - uid: 22631
     components:
     - type: Transform
@@ -9884,18 +9908,42 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-58.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
   - uid: 6272
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-56.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3531:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
   - uid: 7207
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-58.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        3531:
+        - DoorStatus: DoorBolt
   - uid: 10135
     components:
     - type: Transform
@@ -9939,6 +9987,12 @@ entities:
     - type: Transform
       pos: -63.5,-18.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17342:
+        - DoorStatus: DoorBolt
   - uid: 5391
     components:
     - type: Transform
@@ -9971,6 +10025,12 @@ entities:
     - type: Transform
       pos: -63.5,-20.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        386:
+        - DoorStatus: DoorBolt
   - uid: 18018
     components:
     - type: Transform
@@ -10065,6 +10125,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,43.5
       parent: 30
+  - uid: 11449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
+      parent: 30
 - proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 11864
@@ -10087,6 +10153,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,46.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1696:
+        - DoorStatus: DoorBolt
   - uid: 5390
     components:
     - type: Transform
@@ -10101,11 +10173,23 @@ entities:
     - type: Transform
       pos: 45.5,16.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15830:
+        - DoorStatus: DoorBolt
   - uid: 15830
     components:
     - type: Transform
       pos: 48.5,16.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15829:
+        - DoorStatus: DoorBolt
   - uid: 16278
     components:
     - type: Transform
@@ -10132,6 +10216,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -85.5,-60.5
       parent: 30
+    - type: DeviceLinkSource
+      linkedPorts:
+        841:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockFreezerKitchenHydroLocked
   entities:
   - uid: 460
@@ -10516,6 +10606,18 @@ entities:
     - type: Transform
       pos: -69.5,-54.5
       parent: 30
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 9121
+    components:
+    - type: Transform
+      pos: -52.5,-10.5
+      parent: 30
+  - uid: 11452
+    components:
+    - type: Transform
+      pos: -59.5,-10.5
+      parent: 30
 - proto: AirlockHatchMaintenance
   entities:
   - uid: 9957
@@ -11089,7 +11191,7 @@ entities:
       pos: -20.5,-5.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -537.51984
+      secondsUntilStateChange: -1046.2256
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -11276,6 +11378,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,46.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5070:
+        - DoorStatus: DoorBolt
   - uid: 1756
     components:
     - type: Transform
@@ -12136,8 +12244,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7079
     components:
     - type: MetaData
@@ -12163,8 +12269,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7433
     components:
     - type: MetaData
@@ -12183,8 +12287,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7610
     components:
     - type: MetaData
@@ -13115,28 +13217,68 @@ entities:
     - type: Transform
       pos: -73.5,-38.5
       parent: 30
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 380
     components:
     - type: Transform
-      pos: -59.5,-7.5
+      pos: -52.5,-10.5
+      parent: 30
+  - uid: 868
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,43.5
+      parent: 30
+  - uid: 1083
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-3.5
+      parent: 30
+  - uid: 1475
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-5.5
+      parent: 30
+  - uid: 1490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,23.5
+      parent: 30
+  - uid: 1493
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,15.5
       parent: 30
   - uid: 3707
     components:
     - type: Transform
-      pos: 25.5,43.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,13.5
       parent: 30
-  - uid: 9121
+  - uid: 11451
     components:
     - type: Transform
-      pos: 38.5,-5.5
+      pos: -59.5,-10.5
       parent: 30
-  - uid: 9122
+  - uid: 11453
     components:
     - type: Transform
-      pos: 38.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
       parent: 30
+  - uid: 11454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,21.5
+      parent: 30
+- proto: AtmosDeviceFanTiny
+  entities:
   - uid: 9123
     components:
     - type: Transform
@@ -13147,41 +13289,6 @@ entities:
     - type: Transform
       pos: -19.5,17.5
       parent: 30
-  - uid: 9798
-    components:
-    - type: Transform
-      pos: -52.5,-7.5
-      parent: 30
-  - uid: 16402
-    components:
-    - type: Transform
-      pos: -65.5,23.5
-      parent: 30
-  - uid: 16403
-    components:
-    - type: Transform
-      pos: -65.5,21.5
-      parent: 30
-  - uid: 16404
-    components:
-    - type: Transform
-      pos: -65.5,15.5
-      parent: 30
-  - uid: 16405
-    components:
-    - type: Transform
-      pos: -65.5,13.5
-      parent: 30
-  - uid: 20590
-    components:
-    - type: Transform
-      pos: -52.5,2.5
-      parent: 30
-  - uid: 20591
-    components:
-    - type: Transform
-      pos: -59.5,2.5
-      parent: 30
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 16997
@@ -14242,7 +14349,7 @@ entities:
     - type: Transform
       pos: -60.353844,-63.575558
       parent: 30
-- proto: BookChefGaming
+- proto: BookHowToCookForFortySpaceman
   entities:
   - uid: 9948
     components:
@@ -49781,6 +49888,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: -52.5,37.5
+      parent: 30
   - uid: 11750
     components:
     - type: Transform
@@ -54510,6 +54622,13 @@ entities:
     - type: Transform
       pos: 1.5,-33.5
       parent: 30
+- proto: DefaultStationBeaconEscapePod
+  entities:
+  - uid: 11455
+    components:
+    - type: Transform
+      pos: -52.5,36.5
+      parent: 30
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 20552
@@ -89848,10 +89967,11 @@ entities:
     - type: Transform
       pos: -42.5,34.5
       parent: 30
-  - uid: 1493
+  - uid: 1476
     components:
     - type: Transform
-      pos: -53.5,34.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,37.5
       parent: 30
   - uid: 1494
     components:
@@ -91782,6 +91902,12 @@ entities:
     - type: Transform
       pos: 24.5,-34.5
       parent: 30
+  - uid: 9122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,35.5
+      parent: 30
   - uid: 9129
     components:
     - type: Transform
@@ -93351,11 +93477,6 @@ entities:
     - type: Transform
       pos: -58.5,36.5
       parent: 30
-  - uid: 16951
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
   - uid: 17032
     components:
     - type: Transform
@@ -108641,21 +108762,11 @@ entities:
     - type: Transform
       pos: -42.5,34.5
       parent: 30
-  - uid: 1476
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
   - uid: 1489
     components:
     - type: Transform
       pos: -52.5,34.5
       parent: 30
-  - uid: 1490
-    components:
-    - type: Transform
-      pos: -53.5,34.5
-      parent: 30
   - uid: 1491
     components:
     - type: Transform
@@ -110473,6 +110584,18 @@ entities:
     - type: Transform
       pos: -64.5,16.5
       parent: 30
+  - uid: 11448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,37.5
+      parent: 30
+  - uid: 11450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,35.5
+      parent: 30
   - uid: 11602
     components:
     - type: Transform
@@ -113375,6 +113498,11 @@ entities:
       parent: 30
 - proto: SignAtmos
   entities:
+  - uid: 7012
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 30
   - uid: 9082
     components:
     - type: Transform
@@ -113385,13 +113513,6 @@ entities:
     - type: Transform
       pos: 4.5,-32.5
       parent: 30
-- proto: SignAtmosMinsky
-  entities:
-  - uid: 7012
-    components:
-    - type: Transform
-      pos: 8.5,-21.5
-      parent: 30
 - proto: SignBar
   entities:
   - uid: 1384
@@ -113447,8 +113568,6 @@ entities:
     - type: Transform
       pos: -10.5,-11.5
       parent: 30
-- proto: SignChemistry1
-  entities:
   - uid: 9032
     components:
     - type: Transform
@@ -113909,13 +114028,6 @@ entities:
     - type: Transform
       pos: 47.5,20.5
       parent: 30
-- proto: SignDrones
-  entities:
-  - uid: 12263
-    components:
-    - type: Transform
-      pos: -37.5,26.5
-      parent: 30
 - proto: SignElectricalMed
   entities:
   - uid: 3194
@@ -114041,20 +114153,16 @@ entities:
     - type: Transform
       pos: -20.5,13.5
       parent: 30
-- proto: SignHydro2
-  entities:
-  - uid: 1386
-    components:
-    - type: Transform
-      pos: -29.5,4.5
-      parent: 30
-- proto: SignHydro3
-  entities:
   - uid: 1385
     components:
     - type: Transform
       pos: -22.5,8.5
       parent: 30
+  - uid: 1386
+    components:
+    - type: Transform
+      pos: -29.5,4.5
+      parent: 30
 - proto: SignInterrogation
   entities:
   - uid: 1774
@@ -114090,6 +114198,13 @@ entities:
     - type: Transform
       pos: 18.5,-0.5
       parent: 30
+- proto: SignMaterials
+  entities:
+  - uid: 12263
+    components:
+    - type: Transform
+      pos: -37.5,26.5
+      parent: 30
 - proto: SignMedical
   entities:
   - uid: 6763
@@ -114102,13 +114217,6 @@ entities:
     - type: Transform
       pos: -12.5,0.5
       parent: 30
-- proto: SignMinerDock
-  entities:
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: 15.5,-9.5
-      parent: 30
 - proto: SignMorgue
   entities:
   - uid: 6903
@@ -114245,26 +114353,22 @@ entities:
       pos: 16.5,24.5
       parent: 30
 - proto: SignScience
-  entities:
-  - uid: 13389
-    components:
-    - type: Transform
-      pos: 16.5,16.5
-      parent: 30
-- proto: SignScience1
   entities:
   - uid: 6576
     components:
     - type: Transform
       pos: 11.5,19.5
       parent: 30
-- proto: SignScience2
-  entities:
   - uid: 13388
     components:
     - type: Transform
       pos: 11.5,13.5
       parent: 30
+  - uid: 13389
+    components:
+    - type: Transform
+      pos: 16.5,16.5
+      parent: 30
 - proto: SignSecurearea
   entities:
   - uid: 11895
@@ -114355,6 +114459,13 @@ entities:
     - type: Transform
       pos: -37.5,38.5
       parent: 30
+- proto: SignShipDock
+  entities:
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 30
 - proto: SignSmoking
   entities:
   - uid: 9125
@@ -123118,11 +123229,6 @@ entities:
     - type: Transform
       pos: -50.5,11.5
       parent: 30
-  - uid: 868
-    components:
-    - type: Transform
-      pos: -59.5,-10.5
-      parent: 30
   - uid: 882
     components:
     - type: Transform
@@ -123223,11 +123329,6 @@ entities:
     - type: Transform
       pos: -61.5,-10.5
       parent: 30
-  - uid: 1083
-    components:
-    - type: Transform
-      pos: -52.5,-10.5
-      parent: 30
   - uid: 1140
     components:
     - type: Transform
@@ -123424,12 +123525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -51.5,34.5
       parent: 30
-  - uid: 1475
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,35.5
-      parent: 30
   - uid: 1477
     components:
     - type: Transform
@@ -127408,6 +127503,12 @@ entities:
     - type: Transform
       pos: -39.5,-22.5
       parent: 30
+  - uid: 9798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,34.5
+      parent: 30
   - uid: 9855
     components:
     - type: Transform

Resources/Maps/packed.yml

@@ -7294,11 +7294,27 @@ entities:
     - type: Transform
       pos: 37.5,-39.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
   - uid: 4391
     components:
     - type: Transform
       pos: 35.5,-37.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        4385:
+        - DoorStatus: DoorBolt
+        4392:
+        - DoorStatus: DoorBolt
+        4390:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 69
@@ -7306,21 +7322,45 @@ entities:
     - type: Transform
       pos: 11.5,37.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        70:
+        - DoorStatus: DoorBolt
   - uid: 70
     components:
     - type: Transform
       pos: 11.5,35.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        69:
+        - DoorStatus: DoorBolt
   - uid: 171
     components:
     - type: Transform
       pos: 15.5,-41.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        173:
+        - DoorStatus: DoorBolt
   - uid: 173
     components:
     - type: Transform
       pos: 13.5,-43.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        171:
+        - DoorStatus: DoorBolt
   - uid: 225
     components:
     - type: Transform
@@ -7336,31 +7376,67 @@ entities:
     - type: Transform
       pos: 74.5,45.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2128:
+        - DoorStatus: DoorBolt
   - uid: 2128
     components:
     - type: Transform
       pos: 72.5,45.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1902:
+        - DoorStatus: DoorBolt
   - uid: 4385
     components:
     - type: Transform
       pos: 33.5,-39.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
   - uid: 4392
     components:
     - type: Transform
       pos: 35.5,-41.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
   - uid: 12931
     components:
     - type: Transform
       pos: 33.5,-47.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12932:
+        - DoorStatus: DoorBolt
   - uid: 12932
     components:
     - type: Transform
       pos: 32.5,-49.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12931:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassCargoLocked
   entities:
   - uid: 258
@@ -7378,21 +7454,53 @@ entities:
     - type: Transform
       pos: 6.5,16.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7886:
+        - DoorStatus: DoorBolt
+        7881:
+        - DoorStatus: DoorBolt
   - uid: 7674
     components:
     - type: Transform
       pos: 6.5,17.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        7886:
+        - DoorStatus: DoorBolt
+        7881:
+        - DoorStatus: DoorBolt
   - uid: 7881
     components:
     - type: Transform
       pos: 4.5,17.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6863:
+        - DoorStatus: DoorBolt
+        7674:
+        - DoorStatus: DoorBolt
   - uid: 7886
     components:
     - type: Transform
       pos: 4.5,16.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7674:
+        - DoorStatus: DoorBolt
+        6863:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassLocked
   entities:
   - uid: 2734
@@ -7400,11 +7508,23 @@ entities:
     - type: Transform
       pos: -5.5,-18.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6839:
+        - DoorStatus: DoorBolt
   - uid: 6839
     components:
     - type: Transform
       pos: -5.5,-15.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2734:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassShuttleArrivals
   entities:
   - uid: 1332
@@ -7448,26 +7568,56 @@ entities:
     - type: Transform
       pos: 1.5,-35.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1370:
+        - DoorStatus: DoorBolt
   - uid: 1370
     components:
     - type: Transform
       pos: -0.5,-35.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1369:
+        - DoorStatus: DoorBolt
   - uid: 3202
     components:
     - type: Transform
       pos: 56.5,49.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2167:
+        - DoorStatus: Close
   - uid: 8728
     components:
     - type: Transform
       pos: 87.5,-20.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10751:
+        - DoorStatus: DoorBolt
   - uid: 10751
     components:
     - type: Transform
       pos: 84.5,-20.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        8728:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalShuttleLocked
   entities:
   - uid: 2167
@@ -7476,6 +7626,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 56.5,51.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3202:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockFreezer
   entities:
   - uid: 10
@@ -9272,47 +9428,61 @@ entities:
     - type: Transform
       pos: 36.5,-21.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 136
     components:
     - type: Transform
-      pos: -2.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,2.5
       parent: 2
   - uid: 373
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -12.5,-10.5
       parent: 2
   - uid: 608
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -19.5,-10.5
       parent: 2
   - uid: 2027
     components:
     - type: Transform
-      pos: -4.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 5262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-10.5
       parent: 2
   - uid: 6591
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 32.5,-10.5
       parent: 2
   - uid: 6592
     components:
     - type: Transform
-      pos: 28.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,26.5
       parent: 2
-  - uid: 12295
+  - uid: 6874
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,24.5
       parent: 2
-  - uid: 12296
+  - uid: 6876
     components:
     - type: Transform
-      pos: 4.5,26.5
+      rot: 1.5707963267948966 rad
+      pos: 87.5,4.5
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
@@ -10063,7 +10233,7 @@ entities:
     - type: Transform
       pos: 114.5,-17.5
       parent: 2
-- proto: BookChefGaming
+- proto: BookHowToCookForFortySpaceman
   entities:
   - uid: 297
     components:
@@ -21935,6 +22105,16 @@ entities:
     - type: Transform
       pos: 16.5,-12.5
       parent: 2
+  - uid: 6938
+    components:
+    - type: Transform
+      pos: 116.5,-15.5
+      parent: 2
+  - uid: 6939
+    components:
+    - type: Transform
+      pos: 116.5,-17.5
+      parent: 2
   - uid: 7148
     components:
     - type: Transform
@@ -31765,6 +31945,14 @@ entities:
       - Steel
       - Glass
       - Gold
+- proto: CleanerDispenser
+  entities:
+  - uid: 6875
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 2
 - proto: ClosetBombFilled
   entities:
   - uid: 12854
@@ -65770,19 +65958,17 @@ entities:
       pos: 42.47835,25.502422
       parent: 2
 - proto: SignAtmos
-  entities:
-  - uid: 4575
-    components:
-    - type: Transform
-      pos: 28.5,-26.5
-      parent: 2
-- proto: SignAtmosMinsky
   entities:
   - uid: 4574
     components:
     - type: Transform
       pos: 37.5,-38.5
       parent: 2
+  - uid: 4575
+    components:
+    - type: Transform
+      pos: 28.5,-26.5
+      parent: 2
 - proto: SignBar
   entities:
   - uid: 11198
@@ -65826,7 +66012,7 @@ entities:
     - type: Transform
       pos: 39.519363,4.4919653
       parent: 2
-- proto: SignChemistry1
+- proto: SignChem
   entities:
   - uid: 6817
     components:
@@ -65840,13 +66026,6 @@ entities:
     - type: Transform
       pos: 25.484035,39.437214
       parent: 2
-- proto: SignCourt
-  entities:
-  - uid: 13166
-    components:
-    - type: Transform
-      pos: 24.5,28.5
-      parent: 2
 - proto: SignCryogenicsMed
   entities:
   - uid: 11804
@@ -66195,20 +66374,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-2.5
       parent: 2
-- proto: SignHydro2
-  entities:
-  - uid: 6651
-    components:
-    - type: Transform
-      pos: 41.5,-2.5
-      parent: 2
-- proto: SignHydro3
+- proto: SignHydro1
   entities:
   - uid: 6648
     components:
     - type: Transform
       pos: 47.5,-2.5
       parent: 2
+  - uid: 6651
+    components:
+    - type: Transform
+      pos: 41.5,-2.5
+      parent: 2
 - proto: SignInterrogation
   entities:
   - uid: 11209
@@ -66246,6 +66423,11 @@ entities:
     - type: Transform
       pos: -4.5,-6.5
       parent: 2
+  - uid: 13166
+    components:
+    - type: Transform
+      pos: 24.5,28.5
+      parent: 2
 - proto: SignLibrary
   entities:
   - uid: 11201
@@ -66268,13 +66450,6 @@ entities:
     - type: Transform
       pos: 53.5,1.5
       parent: 2
-- proto: SignMinerDock
-  entities:
-  - uid: 7784
-    components:
-    - type: Transform
-      pos: 6.5,18.5
-      parent: 2
 - proto: SignMorgue
   entities:
   - uid: 11196
@@ -66379,6 +66554,11 @@ entities:
       parent: 2
 - proto: SignShipDock
   entities:
+  - uid: 7784
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2
   - uid: 9306
     components:
     - type: Transform
@@ -66493,7 +66673,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-13.5
       parent: 2
-- proto: SignToxins2
+- proto: SignToxins
   entities:
   - uid: 12304
     components:

Resources/Maps/saltern.yml

@@ -4519,6 +4519,12 @@ entities:
     - type: Transform
       pos: -8.5,-42.5
       parent: 31
+  - uid: 10766
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-16.5
+      parent: 31
 - proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 6995
@@ -5740,63 +5746,76 @@ entities:
     - type: Transform
       pos: 5.5,-32.5
       parent: 31
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-4.5
+      parent: 31
   - uid: 5157
     components:
     - type: Transform
-      pos: -14.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,0.5
       parent: 31
   - uid: 6694
     components:
     - type: Transform
-      pos: -44.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,2.5
       parent: 31
   - uid: 7138
     components:
     - type: Transform
-      pos: -44.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,8.5
       parent: 31
   - uid: 7346
     components:
     - type: Transform
-      pos: -44.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,10.5
       parent: 31
   - uid: 7566
     components:
     - type: Transform
-      pos: -44.5,10.5
+      rot: 3.141592653589793 rad
+      pos: 20.5,28.5
       parent: 31
   - uid: 7567
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 22.5,28.5
       parent: 31
   - uid: 7943
     components:
     - type: Transform
-      pos: 20.5,28.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-2.5
       parent: 31
   - uid: 9923
     components:
     - type: Transform
-      pos: -12.5,-2.5
+      pos: -8.5,-42.5
       parent: 31
   - uid: 10583
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-42.5
+      pos: -51.5,-12.5
       parent: 31
   - uid: 10765
     components:
     - type: Transform
       pos: -44.5,-12.5
       parent: 31
-  - uid: 10766
+  - uid: 11466
     components:
     - type: Transform
-      pos: -51.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: 31.5,-16.5
       parent: 31
 - proto: AtmosFixBlockerMarker
   entities:
@@ -28720,6 +28739,20 @@ entities:
       parent: 31
     - type: NavMapBeacon
       text: Tesla Storage
+- proto: DefaultStationBeaconEscapePod
+  entities:
+  - uid: 11467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-17.5
+      parent: 31
+  - uid: 11468
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-41.5
+      parent: 31
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 7640
@@ -56347,8 +56380,6 @@ entities:
     - type: Transform
       pos: 18.5,-3.5
       parent: 31
-- proto: SignChemistry2
-  entities:
   - uid: 7291
     components:
     - type: Transform
@@ -56586,13 +56617,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.497889,6.2645836
       parent: 31
-- proto: SignDrones
-  entities:
-  - uid: 7224
-    components:
-    - type: Transform
-      pos: 26.5,2.5
-      parent: 31
 - proto: SignElectrical
   entities:
   - uid: 11377
@@ -56642,7 +56666,7 @@ entities:
     - type: Transform
       pos: 50.5,-1.5
       parent: 31
-- proto: SignHydro2
+- proto: SignHydro1
   entities:
   - uid: 10545
     components:
@@ -56685,6 +56709,13 @@ entities:
     - type: Transform
       pos: 32.5,23.5
       parent: 31
+- proto: SignMaterials
+  entities:
+  - uid: 7224
+    components:
+    - type: Transform
+      pos: 26.5,2.5
+      parent: 31
 - proto: SignMedical
   entities:
   - uid: 4151
@@ -56692,14 +56723,6 @@ entities:
     - type: Transform
       pos: 5.5,2.5
       parent: 31
-- proto: SignMinerDock
-  entities:
-  - uid: 9941
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 34.5,38.5
-      parent: 31
 - proto: SignMorgue
   entities:
   - uid: 4230
@@ -56792,6 +56815,14 @@ entities:
     - type: Transform
       pos: 54.5,-10.5
       parent: 31
+- proto: SignShipDock
+  entities:
+  - uid: 9941
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,38.5
+      parent: 31
 - proto: SignSomethingOld2
   entities:
   - uid: 1469
@@ -61591,11 +61622,6 @@ entities:
     - type: Transform
       pos: 53.5,-12.5
       parent: 31
-  - uid: 950
-    components:
-    - type: Transform
-      pos: 31.5,-16.5
-      parent: 31
   - uid: 951
     components:
     - type: Transform

Resources/Maps/train.yml

@@ -74144,7 +74144,7 @@ entities:
       pos: 8.5,-176.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -141100.73
+      secondsUntilStateChange: -141260.94
       state: Closing
   - uid: 11227
     components:
@@ -81637,6 +81637,11 @@ entities:
     - type: Transform
       pos: -8.5,-314.5
       parent: 2
+  - uid: 16962
+    components:
+    - type: Transform
+      pos: -5.5,-382.5
+      parent: 2
 - proto: RandomArtifactSpawner20
   entities:
   - uid: 12481
@@ -84582,7 +84587,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-338.5
       parent: 2
-- proto: SignAtmosMinsky
+- proto: SignAtmos
   entities:
   - uid: 12994
     components:
@@ -90882,11 +90887,8 @@ entities:
   - uid: 13995
     components:
     - type: Transform
-      anchored: False
-      pos: -5.4964814,-84.54825
+      pos: -5.5,-84.5
       parent: 2
-    - type: Physics
-      bodyType: Dynamic
 - proto: VendingMachineSeedsUnlocked
   entities:
   - uid: 13996

Resources/Prototypes/Actions/types.yml

@@ -166,6 +166,8 @@
   name: Morph into Geras
   description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
   components:
+  - type: ConfirmableAction
+    popup: gera-transformation-popup
   - type: InstantAction
     itemIconStyle: BigAction
     useDelay: 10 # prevent spam

Resources/Prototypes/Body/Organs/Animal/animal.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseAnimalOrganUnGibbable
   parent: BaseItem
   abstract: true
@@ -34,7 +34,7 @@
   id: OrganAnimalLungs
   parent: BaseAnimalOrgan
   name: lungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -65,7 +65,7 @@
   id: OrganAnimalStomach
   parent: BaseAnimalOrgan
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: stomach
@@ -91,7 +91,7 @@
   id: OrganMouseStomach
   parent: OrganAnimalStomach
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
@@ -102,7 +102,7 @@
   id: OrganAnimalLiver
   parent: BaseAnimalOrgan
   name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: liver
@@ -118,7 +118,7 @@
   id: OrganAnimalHeart
   parent: BaseAnimalOrgan
   name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: heart-on
@@ -135,7 +135,7 @@
   id: OrganAnimalKidneys
   parent: BaseAnimalOrgan
   name: kidneys
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml

@@ -1,8 +1,8 @@
-- type: entity
+- type: entity
   id: OrganBloodsuckerStomach
   parent: OrganAnimalStomach
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]
@@ -11,7 +11,7 @@
   id: OrganBloodsuckerLiver
   parent: OrganAnimalLiver
   name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]
@@ -20,7 +20,7 @@
   id: OrganBloodsuckerHeart
   parent: OrganAnimalHeart
   name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]

Resources/Prototypes/Body/Organs/Animal/ruminant.yml

@@ -1,8 +1,8 @@
-- type: entity
+- type: entity
   id: OrganAnimalRuminantStomach
   parent: OrganAnimalStomach
   name: ruminant stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:

Resources/Prototypes/Body/Organs/arachnid.yml

@@ -105,7 +105,7 @@
   parent: BaseHumanOrgan
   name: liver
   description: "Pairing suggestion: chianti and fava beans."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: liver
@@ -122,7 +122,7 @@
   parent: BaseHumanOrgan
   name: kidneys
   description: "Filters toxins from the bloodstream."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Body/Organs/diona.yml

@@ -126,7 +126,7 @@
 - type: entity
   id: OrganDionaBrainNymph
   parent: OrganDionaBrain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
@@ -138,7 +138,7 @@
 - type: entity
   id: OrganDionaStomachNymph
   parent: OrganDionaStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: stomach
   description: "Gross. This is hard to stomach."
   components:
@@ -148,7 +148,7 @@
 - type: entity
   id: OrganDionaLungsNymph
   parent: OrganDionaLungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: lungs
   description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
   components:
@@ -159,7 +159,7 @@
 - type: entity
   id: OrganDionaNymphBrain
   parent: MobDionaNymph
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Brain
   description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
@@ -171,7 +171,7 @@
 - type: entity
   id: OrganDionaNymphStomach
   parent: MobDionaNymphAccent 
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
   description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
@@ -183,7 +183,7 @@
 - type: entity
   id: OrganDionaNymphLungs
   parent: MobDionaNymphAccent
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
   description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 

Resources/Prototypes/Body/Organs/moth.yml

@@ -1,7 +1,7 @@
-- type: entity
+- type: entity
   id: OrganMothStomach
   parent: [OrganAnimalStomach, OrganHumanStomach]
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stomach
     specialDigestible:

Resources/Prototypes/Body/Organs/reptilian.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: OrganReptilianStomach
   parent: OrganAnimalStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stomach
     specialDigestible:

Resources/Prototypes/Body/Parts/animal.yml

@@ -36,7 +36,7 @@
   id: HandsAnimal
   name: animal hands
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -50,7 +50,7 @@
   id: LegsAnimal
   name: animal legs
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -64,7 +64,7 @@
   id: FeetAnimal
   name: animal feet
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -77,7 +77,7 @@
   id: TorsoAnimal
   name: animal torso
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Body/Parts/rat.yml

@@ -4,7 +4,7 @@
   id: TorsoRat
   name: "animal torso"
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BodyPart
     partType: Torso

Resources/Prototypes/Catalog/Bounties/bounties.yml

@@ -502,6 +502,9 @@
       - TemperatureProtection
       tags:
       - Scarf
+    blacklist:
+      components:
+      - ToggleableClothing
 
 - type: cargoBounty
   id: BountyBattery

Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml

@@ -0,0 +1,372 @@
+- type: entity
+  name: Perma Escape Crate Spawner
+  id: CratePermaEscapeSpawner
+  parent: CrateEmptySpawner
+  components:
+  - type: RandomSpawner
+    prototypes:
+    # Please note any duplicates & alphabetize <3
+      - CrateEngineeringMiniJetpack
+      - CratePermaEscapeBureaucracy
+      - CratePermaEscapeEVA
+      - CratePermaEscapeGiftsFromSyndicate
+      - CratePermaEscapeGun
+      - CratePermaEscapeLights
+      - CratePermaEscapeMerc
+      - CrateServiceCustomSmokable
+      - CrateTrashCartFilled
+      - CratePermaEscapeComs # x2
+      - CratePermaEscapeComs
+      - CratePermaEscapeDigging # x2
+      - CratePermaEscapeDigging
+      - CratePermaEscapeMats #x2
+      - CratePermaEscapeMats
+      - CratePermaEscapeTowercap # x2
+      - CratePermaEscapeTowercap
+      - ClosetMaintenanceFilledRandom # x3
+      - ClosetMaintenanceFilledRandom
+      - ClosetMaintenanceFilledRandom
+    rarePrototypes:
+      - MobTick # These need to be killable by one dude with a shovel.
+    rareChance: .30
+    chance: 1
+    offset: 0.0
+
+- type: entity
+  id: CratePermaEscapeDigging
+  parent: CrateGenericSteel
+  suffix: Digging
+  components:
+  - type: StorageFill
+    contents:
+      - id: Shovel
+      - id: Pickaxe
+        prob: 0.90
+      - id: Pickaxe
+        prob: 0.40
+      - id: Pickaxe
+        prob: 0.10
+      - id: Shovel
+        prob: 0.50
+      - id: Shovel
+        prob: 0.20
+      - id: HydroponicsToolSpade
+        prob: 0.10
+      - id: HydroponicsToolHatchet
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeEVA
+  parent: CrateGenericSteel
+  suffix: EVAs
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetEVALarge
+      - id: ClothingOuterHardsuitEVAPrisoner
+      - id: ClothingHeadHelmetEVALarge
+        prob: 0.80
+      - id: ClothingOuterHardsuitEVAPrisoner
+        prob: 0.80
+      - id: ClothingOuterHardsuitVoidParamed
+        prob: 0.10
+      - id: ClothingOuterRedRacoon
+        prob: 0.10
+      - id: ClothingOuterSanta
+        prob: 0.10
+      - id: ClothingOuterHardsuitSyndicate
+        prob: 0.20
+      - id: EmergencyOxygenTankFilled
+        prob: 0.25
+      - id: EmergencyOxygenTank
+        prob: 0.25
+      - id: OxygenTankFilled
+        prob: 0.05
+        
+- type: entity
+  id: CratePermaEscapeGun
+  parent: CrateGenericSteel
+  suffix: Gun
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolMk58
+      prob: 0.15
+      orGroup: gun
+    - id: FoamCrossbow
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponRifleFoam
+      prob: 0.05
+      orGroup: gun
+    - id: WeaponPistolFlintlock
+      prob: 0.20
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponRevolverPirate
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponProtoKineticAccelerator
+      prob: 0.20
+      orGroup: gun
+
+- type: entity
+  id: CratePermaEscapeBureaucracy
+  parent: CrateGenericSteel
+  suffix: Writing
+  components:
+  - type: StorageFill
+    contents:
+      - id: RubberStampApproved
+      - id: RubberStampDenied
+      - id: Pen
+      - id: Pen
+      - id: Pen
+      - id: BoxFolderBase
+        orGroup: folderA
+      - id: BoxFolderBlack
+        orGroup: folderA
+      - id: BoxFolderBlue
+        orGroup: folderA
+      - id: BoxFolderGreen
+        orGroup: folderA
+      - id: BoxFolderGrey
+        orGroup: folderA
+      - id: BoxFolderRed
+        orGroup: folderA
+      - id: BoxFolderWhite
+        orGroup: folderA
+      - id: BoxFolderYellow
+        orGroup: folderA
+      - id: BoxFolderBase
+        orGroup: folderB
+      - id: BoxFolderBlack
+        orGroup: folderB
+      - id: BoxFolderBlue
+        orGroup: folderB
+      - id: BoxFolderGreen
+        orGroup: folderB
+      - id: BoxFolderGrey
+        orGroup: folderB
+      - id: BoxFolderRed
+        orGroup: folderB
+      - id: BoxFolderWhite
+        orGroup: folderB
+      - id: BoxFolderYellow
+        orGroup: folderB
+      - id: CrayonBox
+        prob: 0.50
+      - id: CrayonBox
+        prob: 0.10
+      - id: ClearPDA # change to visitor one day.
+        prob: 0.10
+      - id: PersonalAI
+
+- type: entity
+  id: CratePermaEscapeLights
+  parent: CrateGenericSteel
+  suffix: Glowsticks
+  components:
+  - type: StorageFill
+    contents:
+      - id: GlowstickBlue
+        prob: 0.50
+      - id: GlowstickBlue
+        prob: 0.20
+      - id: GlowstickBlue
+        prob: 0.05
+      - id: GlowstickBase
+        prob: 0.50
+      - id: GlowstickBase
+        prob: 0.20
+      - id: GlowstickBase
+        prob: 0.05
+      - id: GlowstickPurple
+        prob: 0.50
+      - id: GlowstickPurple
+        prob: 0.20
+      - id: GlowstickPurple
+        prob: 0.05
+      - id: GlowstickRed
+        prob: 0.50
+      - id: GlowstickRed
+        prob: 0.20
+      - id: GlowstickRed
+        prob: 0.05
+      - id: GlowstickYellow
+        prob: 0.50
+      - id: GlowstickYellow
+        prob: 0.20
+      - id: GlowstickYellow
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeMats
+  parent: CrateGenericSteel
+  suffix: Mats
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetSteel
+        orGroup: matA
+      - id: PartRodMetal
+        orGroup: matA
+      - id: SheetSteel
+        orGroup: matB
+      - id: PartRodMetal
+        orGroup: matB
+
+- type: entity
+  id: CratePermaEscapeGiftsFromSyndicate
+  parent: CrateGenericSteel
+  suffix: Syndi Gifts
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesGlassesOutlawGlasses
+      - id: ClothingHeadHatOutlawHat
+      - id: HappyHonkNukieSnacks
+      # - id: BaseUplinkRadio # too spicy I think.
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.70
+      # - id: Telecrystal
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.20
+      # - id: Telecrystal
+        # prob: 0.10
+      # - id: Telecrystal
+        # prob: 0.05
+      # - id: Telecrystal
+        # prob: 0.01
+      # - id: Telecrystal5
+        # prob: 0.01
+      - id: CyberPen
+        prob: 0.10
+      - id: CockroachCube
+        orGroup: cube
+      - id: AbominationCube
+        prob: 0.20
+        orGroup: cube
+      - id: SpaceCarpCube
+        prob: 0.20
+        orGroup: cube
+      - id: SyndicateSponge
+        prob: 0.20
+        orGroup: cube
+      - id: MindShieldImplanter
+        prob: 0.20
+      - id: ClothingHandsGlovesConducting # funny
+        prob: 0.30
+      - id: CigPackSyndicate
+        prob: 0.80
+      - id: StimpackMini
+        prob: 0.20
+      - id: StimpackMini
+        prob: 0.10
+      - id: CombatMedipen
+        prob: 0.05
+      - id: MedkitCombatFilled
+        prob: 0.01
+      - id: SoapSyndie
+        prob: 0.15
+      - id: DnaScramblerImplanter
+        prob: 0.005
+
+
+- type: entity
+  id: CratePermaEscapeMerc
+  parent: CrateGenericSteel
+  suffix: Merc
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingUniformJumpsuitMercenary
+      - id: ClothingHeadBandMerc
+        prob: 0.50
+      - id: ClothingHeadHatBeretMerc
+        prob: 0.20
+      - id: ClothingHeadHelmetMerc
+        prob: 0.05
+      - id: ClothingEyesGlassesMercenary
+        prob: 0.20
+      - id: ClothingMaskGasMerc
+        prob: 0.10
+      - id: ClothingHandsGlovesMercFingerless
+        prob: 0.20
+      - id: ClothingHandsMercGlovesCombat
+        prob: 0.05
+      - id: ClothingBackpackMerc
+        prob: 0.50
+      - id: ClothingShoesBootsMerc
+        prob: 0.50
+      - id: ClothingOuterVestWebMerc
+        prob: 0.25
+      - id: ClothingBeltMercWebbing
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeComs
+  parent: CrateGenericSteel
+  suffix: Coms
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetGrey
+        orGroup: coms
+      - id: ClothingHeadsetScience
+        orGroup: coms
+      - id: ClothingHeadsetService
+        orGroup: coms
+      - id: ClothingHeadsetEngineering
+        orGroup: coms
+      - id: ClothingHeadsetMedical
+        orGroup: coms
+      - id: EncryptionKeyCargo
+        prob: 0.05
+      - id: EncryptionKeyScience
+        prob: 0.05
+      - id: EncryptionKeyService
+        prob: 0.05
+      - id: EncryptionKeyMedical
+        prob: 0.05
+      - id: EncryptionKeyEngineering
+        prob: 0.05
+      - id: EncryptionKeySecurity
+        prob: 0.01
+
+- type: entity
+  id: CratePermaEscapeTowercap
+  parent: CrateGenericSteel
+  suffix: Towercap
+  components:
+  - type: StorageFill
+    contents:
+      - id: TowercapSeeds
+      - id: TowercapSeeds
+        prob: 0.80
+      - id: TowercapSeeds
+        prob: 0.50
+      - id: TowercapSeeds
+        prob: 0.20
+      - id: SteelcapSeeds
+        prob: 0.10
+      - id: SteelLog
+      - id: HydroponicsToolHatchet
+        prob: 0.75

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -26,7 +26,7 @@
 - type: entity
   id: CrateSalvageAssortedGoodies
   suffix: Filled, Salvage Random
-  noSpawn: true # You should use SalvageMaterialCrateSpawner instead
+  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
   parent: CrateGenericSteel
   components:
   - type: StorageFill

Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml

@@ -9,6 +9,6 @@
     ClothingHeadHatVioletwizard: 3
     ClothingOuterWizardViolet: 3
     ClothingShoesWizard: 9
-    #TO DO:
+    #TODO:
     #only missing staff
     #and if wizarditis reagent when hacked if we want this.

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -23,3 +23,5 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
+  contrabandInventory:
+    ClothingMaskClownSecurity: 1

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -122,7 +122,7 @@
   name: uplink-sniper-bundle-name
   description: uplink-sniper-bundle-desc
   icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
-  productEntity: BriefcaseSyndieSniperBundleFilled  
+  productEntity: BriefcaseSyndieSniperBundleFilled
   cost:
     Telecrystal: 12
   categories:
@@ -916,11 +916,11 @@
           - NukeOpsUplink
 
 - type: listing
-  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
-  name: uplink-reinforcement-radio-name
+  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink.
+  name: uplink-reinforcement-radio-nukeops-name
   description: uplink-reinforcement-radio-nukeops-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop }
   cost:
     Telecrystal: 35
   categories:
@@ -1004,7 +1004,7 @@
     Telecrystal: 6
   categories:
     - UplinkAllies
-  
+
 - type: listing
   id: UplinkSyndicatePersonalAI
   name: uplink-syndicate-pai-name

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -63,6 +63,8 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: EyeProtection
+  - type: IdentityBlocker
+    coverage: EYES
 
 - type: entity
   parent: ClothingEyesBase
@@ -194,6 +196,8 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: IdentityBlocker
+    coverage: EYES
 
 #Make a scanner category when these actually function and we get the trayson
 - type: entity
@@ -211,6 +215,8 @@
       coefficients:
         Heat: 0.95
   - type: GroupExamine
+  - type: IdentityBlocker
+    coverage: EYES
 
 - type: entity
   parent: ClothingEyesBase
@@ -223,6 +229,8 @@
     - type: Clothing
       sprite: Clothing/Eyes/Glasses/science.rsi
     - type: SolutionScanner
+    - type: IdentityBlocker
+      coverage: EYES
 
 - type: entity
   parent: ClothingEyesBase

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: ShowSecurityIcons
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ShowJobIcons
   - type: ShowMindShieldIcons
@@ -10,7 +10,7 @@
 - type: entity
   id: ShowMedicalIcons
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ShowHealthBars
     damageContainers:

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -59,7 +59,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadLightBase
   name: base helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -151,7 +151,7 @@
   # No parent since we aren't actually an item.
   id: ClothingHeadHardsuitBase
   name: base hardsuit helmet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BreathMask
   - type: Sprite
@@ -195,7 +195,7 @@
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHardsuitWithLightBase
   name: base hardsuit helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -247,7 +247,7 @@
   id: ClothingHeadHatHoodWinterBase
   name: base winter coat hood
   description: A hood, made to keep your head warm.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: icon

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -138,7 +138,7 @@
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: salvager maxim helmet
   description: A predication of decay washes over your mind.
   components:

Resources/Prototypes/Entities/Clothing/Head/hoods.yml

@@ -89,7 +89,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodChaplainHood
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chaplain's hood
   description: Maximum piety in this star system.
   components:
@@ -155,6 +155,7 @@
       coefficients:
         Heat: 0.95
         Radiation: 0.65
+  - type: IdentityBlocker
   - type: BreathMask
   - type: HideLayerClothing
     slots:
@@ -183,7 +184,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodIan
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: ian hood
   description: A hood to complete the 'Good boy' look.
   components:
@@ -198,7 +199,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: carp hood
   description: A gnarly hood adorned with plastic space carp teeth.
   components:
@@ -213,7 +214,7 @@
 - type: entity
   parent: ClothingHeadHatHoodCarp
   id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PressureProtection
     highPressureMultiplier: 0.6
@@ -251,7 +252,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterDefault
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: default winter coat hood
   components:
   - type: Sprite
@@ -262,7 +263,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterBartender
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: bartender winter coat hood
   components:
   - type: Sprite
@@ -273,7 +274,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCaptain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: captain's winter coat hood
   description: An expensive hood, to keep the captain's head warm.
   components:
@@ -285,7 +286,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCargo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: cargo winter coat hood
   components:
   - type: Sprite
@@ -296,7 +297,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCE
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief engineer's winter coat hood
   components:
   - type: Sprite
@@ -307,7 +308,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCentcom
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: Centcom winter coat hood
   description: A hood for keeping the central comander's head warm.
   components:
@@ -319,7 +320,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterChem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chemist winter coat hood
   components:
   - type: Sprite
@@ -330,7 +331,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCMO
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief medical officer's winter coat hood
   components:
   - type: Sprite
@@ -341,7 +342,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterEngineer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: engineer winter coat hood
   components:
   - type: Sprite
@@ -352,7 +353,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of personel's winter coat hood
   components:
   - type: Sprite
@@ -363,7 +364,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of security's winter coat hood
   components:
   - type: Sprite
@@ -374,7 +375,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHydro
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: hydroponics coat hood
   components:
   - type: Sprite
@@ -385,7 +386,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterJani
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: janitor coat hood
   components:
   - type: Sprite
@@ -396,7 +397,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMed
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: medic coat hood
   components:
   - type: Sprite
@@ -407,7 +408,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMime
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: mime coat hood
   components:
   - type: Sprite
@@ -418,7 +419,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMiner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: miner coat hood
   components:
   - type: Sprite
@@ -429,7 +430,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterPara
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: paramedic coat hood
   components:
   - type: Sprite
@@ -440,7 +441,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterQM
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: quartermaster's coat hood
   components:
   - type: Sprite
@@ -451,7 +452,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRD
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: research director's coat hood
   components:
   - type: Sprite
@@ -462,7 +463,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRobo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: robotics coat hood
   components:
   - type: Sprite
@@ -473,7 +474,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSci
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: scientist coat hood
   components:
   - type: Sprite
@@ -484,7 +485,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSec
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: security coat hood
   components:
   - type: Sprite
@@ -495,7 +496,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: syndicate coat hood
   components:
   - type: Sprite
@@ -506,7 +507,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterWarden
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: warden's coat hood
   components:
   - type: Sprite
@@ -517,7 +518,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterWeb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: web coat hood
   components:
   - type: Sprite

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -205,7 +205,7 @@
     accent: OwOAccent
 
 - type: entity
-  noSpawn: true
+  categories: [ Actions, HideSpawnMenu ]
   id: ActionBecomeValid
   name: Become Valid
   description: "*notices your killsign* owo whats this"

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -230,6 +230,24 @@
     graph: BananaClownMask
     node: mask
 
+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskClownSecurity
+  name: security clown wig and mask
+  description: A debatably oxymoronic but protective mask and wig.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskJoy

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -113,7 +113,7 @@
     modifiers:
       coefficients:
         Heat: 0.90
-        Radiation: 0.001
+        Radiation: 0.01
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/rad.rsi
   - type: GroupExamine

Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml

@@ -38,7 +38,7 @@
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterCoatToggleable
   name: winter coat with hood
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterDefault

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -213,6 +213,7 @@
   - type: Tag
     tags:
     - ClownSuit
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingUniformJumpsuitClown

Resources/Prototypes/Entities/Debugging/clicktest.yml

@@ -1,11 +1,11 @@
-# Entities specifically for testing click detection with ClickableComponent.
+# Entities specifically for testing click detection with ClickableComponent.
 #
 # Each entity has a bounding box AND texture equivalent.
 # Note that bounding box versions still have dots on the outside or center to make it possible to... see them.
 # These dots' texture detection should not interfere with the actual bounding box being tested.
 
 - type: entity
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
   id: ClickTestBase
   suffix: DEBUG
   components:

Resources/Prototypes/Entities/Debugging/debug_sweps.yml

@@ -60,7 +60,7 @@
   id: BulletDebug
   name: bang, ded bullet
   parent: BaseBullet
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
   suffix: DEBUG
   components:
   - type: Tag

Resources/Prototypes/Entities/Debugging/tippy.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: Tippy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     netsync: false

Resources/Prototypes/Entities/Effects/ambient_sounds.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: AmbientSoundSourceFlies
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AmbientSound
     volume: -5

Resources/Prototypes/Entities/Effects/bluespace_flash.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: EffectFlashBluespace
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     radius: 10.5

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -36,7 +36,7 @@
   parent: BaseFoam
   id: Smoke
   name: smoke
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Occluder
   - type: Sprite
@@ -52,7 +52,7 @@
   parent: BaseFoam
   id: Foam
   name: foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: "#ffffffcc"
@@ -83,7 +83,7 @@
 - type: entity
   id: MetalFoam
   name: metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: Foam
   components:
   - type: Sprite
@@ -109,7 +109,7 @@
 - type: entity
   id: IronMetalFoam
   name: iron metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MetalFoam
   components:
   - type: SpawnOnDespawn
@@ -118,7 +118,7 @@
 - type: entity
   id: AluminiumMetalFoam
   name: aluminium metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MetalFoam
   components:
   - type: SpawnOnDespawn

Resources/Prototypes/Entities/Effects/emp_effects.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: EffectEmpPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.8
@@ -23,7 +23,7 @@
 
 - type: entity
   id: EffectEmpDisabled
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.4

Resources/Prototypes/Entities/Effects/exclamation.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: Exclamation
   name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   save: false
   components:
     - type: Transform
@@ -22,7 +22,7 @@
 - type: entity
   id: WhistleExclamation
   name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Structures/Storage/closet.rsi

Resources/Prototypes/Entities/Effects/explosion_light.yml

@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: ExplosionLight
   name: explosion light
   components:

Resources/Prototypes/Entities/Effects/hearts.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: EffectHearts
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.85