Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts:
#	Resources/Prototypes/Entities/Stations/nanotrasen.yml

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.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/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,

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/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/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.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/Lock/LockComponent.cs

@@ -86,6 +86,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

@@ -232,7 +232,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
@@ -377,4 +382,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/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>

Resources/Changelog/Changelog.yml

@@ -1,43 +1,4 @@
 Entries:
-- 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.
@@ -3780,3 +3741,45 @@
   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

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/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/Maps/meta.yml

@@ -54,6 +54,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
     - type: GridTree
     - type: MovedGrids
@@ -358,11 +359,11 @@ entities:
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA
           version: 6
         -2,-5:
           ind: -2,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
@@ -6442,7 +6443,8 @@ entities:
           -2,8:
             0: 65535
           -2,9:
-            0: 65535
+            0: 65263
+            2: 272
           -2,10:
             0: 65535
           -2,11:
@@ -6875,18 +6877,18 @@ entities:
             0: 65535
           12,-8:
             0: 30591
-            2: 34944
+            3: 34944
           13,-8:
             0: 17487
-            2: 13104
-            3: 34944
+            3: 13104
+            4: 34944
           13,-7:
             0: 65535
           13,-6:
             0: 65535
           14,-8:
             0: 52431
-            3: 13104
+            4: 13104
           14,-7:
             0: 65535
           14,-6:
@@ -6907,44 +6909,44 @@ entities:
             0: 65535
           16,-4:
             0: 32631
-            4: 136
-            5: 32768
+            5: 136
+            6: 32768
           16,-3:
             0: 32631
-            5: 32904
+            6: 32904
           16,-2:
             0: 65399
-            5: 136
+            6: 136
           16,-1:
             0: 13299
           17,-4:
-            4: 51
+            5: 51
             0: 53196
-            5: 12288
+            6: 12288
           17,-3:
-            5: 12339
+            6: 12339
             0: 53196
           17,-2:
-            5: 51
+            6: 51
             0: 65484
           16,-7:
             0: 65522
           16,-6:
             0: 32767
-            5: 32768
+            6: 32768
           16,-5:
             0: 32631
-            5: 136
-            4: 32768
+            6: 136
+            5: 32768
           17,-7:
             0: 65527
           17,-6:
             0: 53247
-            5: 12288
+            6: 12288
           17,-5:
-            5: 51
+            6: 51
             0: 53196
-            4: 12288
+            5: 12288
           12,-9:
             0: 61941
           13,-9:
@@ -7077,12 +7079,12 @@ entities:
             0: 8930
           16,-8:
             0: 60395
-            5: 4
+            6: 4
           17,-8:
             0: 65535
           18,-8:
             0: 12914
-            5: 137
+            6: 137
           18,-7:
             0: 47858
           18,-6:
@@ -7107,19 +7109,19 @@ entities:
             0: 3983
           16,-9:
             0: 59951
-            5: 1216
+            6: 1216
           17,-9:
             0: 65375
-            5: 160
+            6: 160
           17,-10:
             0: 40960
-            5: 24560
+            6: 24560
           18,-10:
             0: 4096
-            5: 8976
+            6: 8976
           18,-9:
             0: 12896
-            5: 35227
+            6: 35227
           10,-10:
             0: 63249
           10,-9:
@@ -7588,7 +7590,7 @@ entities:
             0: 65535
           3,-14:
             0: 61713
-            5: 3822
+            6: 3822
           3,-13:
             0: 65535
           -2,-16:
@@ -8098,11 +8100,11 @@ entities:
           20,7:
             0: 4369
           19,-8:
-            5: 51
+            6: 51
           16,-10:
-            5: 60608
+            6: 60608
           19,-9:
-            5: 13107
+            6: 13107
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -8134,6 +8136,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -10278,11 +10295,23 @@ entities:
     - type: Transform
       pos: 68.5,8.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12540:
+        - DoorStatus: DoorBolt
   - uid: 12560
     components:
     - type: Transform
       pos: 65.5,8.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12540:
+        - DoorStatus: DoorBolt
 - proto: AirlockEngineeringLocked
   entities:
   - uid: 1109
@@ -10446,6 +10475,14 @@ entities:
     - type: Transform
       pos: 66.5,6.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        12560:
+        - DoorStatus: DoorBolt
+        12559:
+        - DoorStatus: DoorBolt
   - uid: 23561
     components:
     - type: Transform
@@ -10558,21 +10595,58 @@ entities:
     - type: Transform
       pos: -44.5,33.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        3442:
+        - DoorStatus: DoorBolt
+        3582:
+        - DoorStatus: DoorBolt
   - uid: 3442
     components:
     - type: Transform
       pos: -43.5,29.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3445:
+        - DoorStatus: DoorBolt
+        3441:
+        - DoorStatus: DoorBolt
   - uid: 3445
     components:
     - type: Transform
       pos: -44.5,32.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        3442:
+        - DoorStatus: DoorBolt
+        3582:
+        - DoorStatus: DoorBolt
   - uid: 3582
     components:
     - type: Transform
       pos: -42.5,29.5
       parent: 5350
+    - type: Door
+      secondsUntilStateChange: -99.68158
+      state: Opening
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3445:
+        - DoorStatus: DoorBolt
+        3441:
+        - DoorStatus: DoorBolt
+      lastSignals:
+        DoorStatus: True
   - uid: 3884
     components:
     - type: Transform
@@ -10590,11 +10664,23 @@ entities:
     - type: Transform
       pos: 63.5,38.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        13927:
+        - DoorStatus: DoorBolt
   - uid: 13927
     components:
     - type: Transform
       pos: 63.5,40.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        13926:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassLocked
   entities:
   - uid: 5442
@@ -10602,21 +10688,49 @@ entities:
     - type: Transform
       pos: -76.5,8.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5443:
+        - DoorStatus: Close
   - uid: 5712
     components:
     - type: Transform
       pos: -74.5,-17.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5711:
+        - DoorStatus: Close
   - uid: 5713
     components:
     - type: Transform
       pos: -72.5,-19.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        5716:
+        - DoorStatus: Close
+        5715:
+        - DoorStatus: Close
   - uid: 5714
     components:
     - type: Transform
       pos: -73.5,-19.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        5715:
+        - DoorStatus: Close
+        5716:
+        - DoorStatus: Close
   - uid: 5742
     components:
     - type: Transform
@@ -10627,21 +10741,45 @@ entities:
     - type: Transform
       pos: -41.5,35.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        9492:
+        - DoorStatus: DoorBolt
   - uid: 9494
     components:
     - type: Transform
       pos: -32.5,45.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        9495:
+        - DoorStatus: DoorBolt
   - uid: 9495
     components:
     - type: Transform
       pos: -32.5,47.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        9494:
+        - DoorStatus: DoorBolt
   - uid: 13922
     components:
     - type: Transform
       pos: 48.5,38.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        13921:
+        - DoorStatus: DoorBolt
   - uid: 14536
     components:
     - type: Transform
@@ -10658,36 +10796,78 @@ entities:
     - type: Transform
       pos: -50.5,-40.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        16715:
+        - DoorStatus: DoorBolt
   - uid: 17204
     components:
     - type: Transform
       pos: -42.5,-63.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17205:
+        - DoorStatus: DoorBolt
   - uid: 17205
     components:
     - type: Transform
       pos: -39.5,-63.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17204:
+        - DoorStatus: DoorBolt
   - uid: 20027
     components:
     - type: Transform
       pos: 5.5,-65.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        20026:
+        - DoorStatus: DoorBolt
   - uid: 20029
     components:
     - type: Transform
       pos: 38.5,-64.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        20030:
+        - DoorStatus: DoorBolt
   - uid: 20030
     components:
     - type: Transform
       pos: 38.5,-61.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        20029:
+        - DoorStatus: DoorBolt
   - uid: 20038
     components:
     - type: Transform
       pos: 39.5,-54.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        20037:
+        - DoorStatus: DoorBolt
   - uid: 25050
     components:
     - type: Transform
@@ -10794,22 +10974,50 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -78.5,8.5
       parent: 5350
+    - type: DeviceLinkSource
+      linkedPorts:
+        5442:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 5711
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -76.5,-17.5
       parent: 5350
+    - type: DeviceLinkSource
+      linkedPorts:
+        5712:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 5715
     components:
     - type: Transform
       pos: -73.5,-22.5
       parent: 5350
+    - type: DeviceLinkSource
+      linkedPorts:
+        5713:
+        - DoorStatus: Close
+        5714:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 2
   - uid: 5716
     components:
     - type: Transform
       pos: -72.5,-22.5
       parent: 5350
+    - type: DeviceLinkSource
+      linkedPorts:
+        5713:
+        - DoorStatus: Close
+        5714:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 2
 - proto: AirlockExternalLocked
   entities:
   - uid: 9492
@@ -10817,11 +11025,23 @@ entities:
     - type: Transform
       pos: -44.5,35.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        9493:
+        - DoorStatus: DoorBolt
   - uid: 13921
     components:
     - type: Transform
       pos: 49.5,39.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        13922:
+        - DoorStatus: DoorBolt
   - uid: 13923
     components:
     - type: Transform
@@ -10831,8 +11051,6 @@ entities:
       linkedPorts:
         14536:
         - DoorStatus: DoorBolt
-        13924:
-        - DoorStatus: DoorBolt
   - uid: 13924
     components:
     - type: Transform
@@ -10842,23 +11060,39 @@ entities:
       linkedPorts:
         14536:
         - DoorStatus: DoorBolt
-        13923:
-        - DoorStatus: DoorBolt
   - uid: 16715
     components:
     - type: Transform
       pos: -52.5,-40.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        16716:
+        - DoorStatus: DoorBolt
   - uid: 20026
     components:
     - type: Transform
       pos: 5.5,-67.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        20027:
+        - DoorStatus: DoorBolt
   - uid: 20037
     components:
     - type: Transform
       pos: 41.5,-54.5
       parent: 5350
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        20038:
+        - DoorStatus: DoorBolt
 - proto: AirlockFreezerKitchenHydroLocked
   entities:
   - uid: 2433
@@ -13597,12 +13831,12 @@ entities:
     - type: Transform
       pos: -1.8845375,-5.58767
       parent: 5350
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 491
     components:
     - type: Transform
-      pos: 34.5,-12.5
+      pos: 34.5,-17.5
       parent: 5350
   - uid: 5086
     components:
@@ -13612,32 +13846,38 @@ entities:
   - uid: 5326
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 41.5,47.5
       parent: 5350
   - uid: 5330
     components:
     - type: Transform
-      pos: -63.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -64.5,-13.5
       parent: 5350
   - uid: 6473
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -45.5,16.5
       parent: 5350
   - uid: 6502
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -45.5,18.5
       parent: 5350
   - uid: 8480
     components:
     - type: Transform
-      pos: -70.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: -63.5,-5.5
       parent: 5350
   - uid: 8604
     components:
     - type: Transform
-      pos: -63.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: -70.5,-5.5
       parent: 5350
   - uid: 9158
     components:
@@ -13647,12 +13887,14 @@ entities:
   - uid: 10294
     components:
     - type: Transform
-      pos: 39.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 34.5,-12.5
       parent: 5350
   - uid: 11035
     components:
     - type: Transform
-      pos: 34.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-15.5
       parent: 5350
   - uid: 11212
     components:
@@ -13662,59 +13904,33 @@ entities:
   - uid: 14164
     components:
     - type: Transform
-      pos: -63.5,-7.5
+      pos: -11.5,-74.5
       parent: 5350
   - uid: 14682
     components:
     - type: Transform
-      pos: -70.5,-7.5
+      pos: -9.5,-74.5
       parent: 5350
   - uid: 14683
     components:
     - type: Transform
-      pos: -63.5,6.5
+      pos: -3.5,-74.5
       parent: 5350
   - uid: 14684
     components:
     - type: Transform
-      pos: -70.5,6.5
+      pos: -1.5,-74.5
       parent: 5350
   - uid: 14913
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -44.5,32.5
-      parent: 5350
-  - uid: 20063
-    components:
-    - type: Transform
-      pos: -11.5,-74.5
-      parent: 5350
-  - uid: 20064
-    components:
-    - type: Transform
-      pos: -9.5,-74.5
-      parent: 5350
-  - uid: 20065
-    components:
-    - type: Transform
-      pos: -3.5,-74.5
-      parent: 5350
-  - uid: 20066
-    components:
-    - type: Transform
-      pos: -1.5,-74.5
-      parent: 5350
-  - uid: 20167
     components:
     - type: Transform
       pos: -70.5,4.5
       parent: 5350
-  - uid: 24782
+  - uid: 24792
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -44.5,33.5
+      rot: 1.5707963267948966 rad
+      pos: 59.5,4.5
       parent: 5350
 - proto: AtmosFixBlockerMarker
   entities:
@@ -60950,6 +61166,22 @@ entities:
     - type: Transform
       pos: -16.428204,45.62322
       parent: 5350
+- proto: ClothingOuterHardsuitSecurity
+  entities:
+  - uid: 20063
+    components:
+    - type: Transform
+      parent: 9140
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 20064
+    components:
+    - type: Transform
+      parent: 10335
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingOuterHoodieBlack
   entities:
   - uid: 22120
@@ -112764,6 +112996,16 @@ entities:
     - type: Transform
       pos: 9.5,-62.5
       parent: 5350
+  - uid: 20065
+    components:
+    - type: Transform
+      pos: -34.5,-75.5
+      parent: 5350
+  - uid: 20066
+    components:
+    - type: Transform
+      pos: -34.5,-74.5
+      parent: 5350
   - uid: 20067
     components:
     - type: Transform
@@ -112949,6 +113191,11 @@ entities:
     - type: Transform
       pos: -0.5,-68.5
       parent: 5350
+  - uid: 20167
+    components:
+    - type: Transform
+      pos: -34.5,-77.5
+      parent: 5350
   - uid: 21454
     components:
     - type: Transform
@@ -113209,6 +113456,56 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 94.5,19.5
       parent: 5350
+  - uid: 24782
+    components:
+    - type: Transform
+      pos: -33.5,-77.5
+      parent: 5350
+  - uid: 24783
+    components:
+    - type: Transform
+      pos: -32.5,-77.5
+      parent: 5350
+  - uid: 24784
+    components:
+    - type: Transform
+      pos: -31.5,-77.5
+      parent: 5350
+  - uid: 24785
+    components:
+    - type: Transform
+      pos: -30.5,-77.5
+      parent: 5350
+  - uid: 24786
+    components:
+    - type: Transform
+      pos: -28.5,-77.5
+      parent: 5350
+  - uid: 24787
+    components:
+    - type: Transform
+      pos: -27.5,-77.5
+      parent: 5350
+  - uid: 24788
+    components:
+    - type: Transform
+      pos: -26.5,-77.5
+      parent: 5350
+  - uid: 24789
+    components:
+    - type: Transform
+      pos: -25.5,-77.5
+      parent: 5350
+  - uid: 24790
+    components:
+    - type: Transform
+      pos: -36.5,-74.5
+      parent: 5350
+  - uid: 24791
+    components:
+    - type: Transform
+      pos: -37.5,-74.5
+      parent: 5350
   - uid: 24922
     components:
     - type: Transform
@@ -137969,11 +138266,61 @@ entities:
     - type: Transform
       pos: -7.5,37.5
       parent: 5350
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 20063
   - uid: 10335
     components:
     - type: Transform
       pos: -7.5,38.5
       parent: 5350
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 20064
 - proto: SuitStorageWarden
   entities:
   - uid: 10358

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/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/uplink_catalog.yml

@@ -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:

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:
@@ -183,7 +183,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 +198,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 +213,7 @@
 - type: entity
   parent: ClothingHeadHatHoodCarp
   id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PressureProtection
     highPressureMultiplier: 0.6
@@ -251,7 +251,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterDefault
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: default winter coat hood
   components:
   - type: Sprite
@@ -262,7 +262,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterBartender
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: bartender winter coat hood
   components:
   - type: Sprite
@@ -273,7 +273,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 +285,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCargo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: cargo winter coat hood
   components:
   - type: Sprite
@@ -296,7 +296,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCE
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief engineer's winter coat hood
   components:
   - type: Sprite
@@ -307,7 +307,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 +319,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterChem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chemist winter coat hood
   components:
   - type: Sprite
@@ -330,7 +330,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCMO
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief medical officer's winter coat hood
   components:
   - type: Sprite
@@ -341,7 +341,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterEngineer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: engineer winter coat hood
   components:
   - type: Sprite
@@ -352,7 +352,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of personel's winter coat hood
   components:
   - type: Sprite
@@ -363,7 +363,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of security's winter coat hood
   components:
   - type: Sprite
@@ -374,7 +374,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHydro
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: hydroponics coat hood
   components:
   - type: Sprite
@@ -385,7 +385,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterJani
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: janitor coat hood
   components:
   - type: Sprite
@@ -396,7 +396,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMed
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: medic coat hood
   components:
   - type: Sprite
@@ -407,7 +407,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMime
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: mime coat hood
   components:
   - type: Sprite
@@ -418,7 +418,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMiner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: miner coat hood
   components:
   - type: Sprite
@@ -429,7 +429,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterPara
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: paramedic coat hood
   components:
   - type: Sprite
@@ -440,7 +440,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterQM
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: quartermaster's coat hood
   components:
   - type: Sprite
@@ -451,7 +451,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRD
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: research director's coat hood
   components:
   - type: Sprite
@@ -462,7 +462,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRobo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: robotics coat hood
   components:
   - type: Sprite
@@ -473,7 +473,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSci
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: scientist coat hood
   components:
   - type: Sprite
@@ -484,7 +484,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSec
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: security coat hood
   components:
   - type: Sprite
@@ -495,7 +495,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: syndicate coat hood
   components:
   - type: Sprite
@@ -506,7 +506,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterWarden
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: warden's coat hood
   components:
   - type: Sprite
@@ -517,7 +517,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/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/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

Resources/Prototypes/Entities/Effects/lightning.yml

@@ -33,7 +33,7 @@
   name: lightning
   id: Lightning
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Lightning
       canArc: true
@@ -42,7 +42,7 @@
   name: spooky lightning
   id: LightningRevenant
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -66,7 +66,7 @@
   name: charged lightning
   id: ChargedLightning
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -85,7 +85,7 @@
   name: lightning
   id: Spark
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/lightning.rsi
@@ -112,7 +112,7 @@
   name: supercharged lightning
   id: SuperchargedLightning
   parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -138,7 +138,7 @@
   name: hypercharged lightning
   id: HyperchargedLightning
   parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi

Resources/Prototypes/Entities/Effects/mobspawn.yml

@@ -1,7 +1,7 @@
-- type: entity
+- type: entity
   id: MobSpawnCrabQuartz
   name: mobspawner quartzcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Transform
     anchored: True
@@ -31,7 +31,7 @@
   id: MobSpawnCrabIron
   parent: MobSpawnCrabQuartz
   name: mobspawner ironcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -43,7 +43,7 @@
   id: MobSpawnCrabSilver
   parent: MobSpawnCrabQuartz
   name: mobspawner silvercrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -55,7 +55,7 @@
   id: MobSpawnCrabUranium
   parent: MobSpawnCrabQuartz
   name: mobspawner uraniumcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -65,7 +65,7 @@
 
 - type: entity
   id: EffectAnomalyFloraBulb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.4

Resources/Prototypes/Entities/Effects/radiation.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: shimmering anomaly
   id: RadiationPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes.
   components:
   - type: RadiationSource

Resources/Prototypes/Entities/Effects/rcd.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: EffectRCDBase
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: True
@@ -19,7 +19,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstructPreview
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstructPreview
@@ -27,7 +27,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct0
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct0
@@ -37,7 +37,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct1
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct1
@@ -47,7 +47,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct2
@@ -57,7 +57,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct3
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct3
@@ -67,7 +67,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct4
@@ -77,7 +77,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct2
@@ -87,7 +87,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct4
@@ -97,7 +97,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct6
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct6
@@ -107,7 +107,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct8
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct8

Resources/Prototypes/Entities/Effects/shuttle.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: FtlVisualizerEntity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: Visualizer for shuttles arriving. You shouldn't see this!
   components:
   - type: FtlVisualizer

Resources/Prototypes/Entities/Effects/sparks.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: EffectSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.5
@@ -20,7 +20,7 @@
 
 - type: entity
   id: EffectTeslaSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.5

Resources/Prototypes/Entities/Effects/wallspawn.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: True
@@ -29,7 +29,7 @@
 - type: entity
   id: WallSpawnAsteroidUraniumCrab
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUraniumCrab
@@ -37,7 +37,7 @@
 - type: entity
   id: WallSpawnAsteroidUranium
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUranium
@@ -45,7 +45,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartzCrab
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartzCrab
@@ -53,7 +53,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartz
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartz
@@ -61,7 +61,7 @@
 - type: entity
   id: WallSpawnAsteroidSilverCrab
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilverCrab
@@ -69,7 +69,7 @@
 - type: entity
   id: WallSpawnAsteroidSilver
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilver
@@ -77,7 +77,7 @@
 - type: entity
   id: WallSpawnAsteroidIronCrab
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockTinCrab
@@ -85,7 +85,7 @@
 - type: entity
   id: WallSpawnAsteroidIron
   parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockTin

Resources/Prototypes/Entities/Effects/weapon_arc.yml

@@ -1,7 +1,7 @@
 - type: entity
   # Just fades out with no movement animation
   id: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: TimedDespawn
       lifetime: 2.0
@@ -18,7 +18,7 @@
 - type: entity
   # Plays the state animation then disappears with no fade or swing
   id: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Effects/arcs.rsi
@@ -34,7 +34,7 @@
 - type: entity
   id: WeaponArcThrust
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       animation: Thrust
@@ -42,7 +42,7 @@
 - type: entity
   id: WeaponArcSlash
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       animation: Slash
@@ -51,7 +51,7 @@
 - type: entity
   id: WeaponArcBite
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -63,7 +63,7 @@
 - type: entity
   id: WeaponArcClaw
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -75,7 +75,7 @@
 - type: entity
   id: WeaponArcDisarm
   parent: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -87,7 +87,7 @@
 - type: entity
   id: WeaponArcFist
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: fist
@@ -95,7 +95,7 @@
 - type: entity
   id: WeaponArcPunch
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -107,7 +107,7 @@
 - type: entity
   id: WeaponArcKick
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -119,7 +119,7 @@
 - type: entity
   id: WeaponArcSmash
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false

Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml

@@ -76,7 +76,7 @@
         state: narsian
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   id: SpawnPointGhostNukeOperative
   name: ghost role spawn point
   suffix: nukeops
@@ -96,7 +96,7 @@
         state: radiation
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointLoneNukeOperative
   components:
@@ -120,7 +120,7 @@
         state: radiation
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsCommander
   components:
@@ -137,7 +137,7 @@
       settings: default
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsMedic
   components:
@@ -157,7 +157,7 @@
       settings: default
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsOperative
   components:
@@ -174,7 +174,7 @@
       settings: default
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointGhostDragon
   components:
@@ -194,7 +194,7 @@
       state: alive
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointGhostSpaceNinja
   components:

Resources/Prototypes/Entities/Markers/clientsideclone.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: clientsideclone
   id: clientsideclone
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
   - type: AnimationPlayer

Resources/Prototypes/Entities/Markers/construction_ghost.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: construction ghost
   id: constructionghost
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: '#3F38'

Resources/Prototypes/Entities/Markers/drag_shadow.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: drag shadow
   id: dragshadow
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Tag
     tags:

Resources/Prototypes/Entities/Markers/hover_entity.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: hover entity
   id: hoverentity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       layers:

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -103,6 +103,11 @@
         Slash: -15
         Piercing: -15
   - type: BorgChassis
+  - type: LockingWhitelist
+    blacklist:
+      components:
+      - BorgChassis
+      - RoboticsConsole
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
   - type: NameIdentifier
@@ -117,7 +122,9 @@
     cellSlotId: cell_slot
     fitsInCharger: true
   - type: ItemToggle
+    activated: false # gets activated when a mind is added
     onUse: false # no item-borg toggling sorry
+    toggleLight: false
   - type: AccessToggle
   # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves
   # TODO: or just have sentient speedboots be fast idk

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -265,6 +265,7 @@
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
+  - type: SolutionScanner
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHoverBorg
@@ -365,7 +366,7 @@
 
 - type: entity
   id: BorgChassisSyndicateMedical
-  parent: BaseBorgChassisSyndicate
+  parent: [BaseBorgChassisSyndicate, ShowMedicalIcons]
   name: syndicate medical cyborg
   description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities.
   components:
@@ -399,6 +400,12 @@
       interactFailureString: petting-failure-syndicate-cyborg
       interactSuccessSound:
         path: /Audio/Ambience/Objects/periodic_beep.ogg
+    - type: SolutionScanner
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepHoverBorg
+        params:
+          volume: -6
 
 - type: entity
   id: BorgChassisSyndicateSaboteur

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -1492,7 +1492,7 @@
 - type: entity
   name: guidebook monkey
   parent: MobMonkey
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: MobGuidebookMonkey
   description: A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial?
   components:
@@ -2143,11 +2143,13 @@
     states:
       Alive:
         Base: snake
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
     spawned:
-    - id: FoodMeat
+    - id: FoodMeatSnake
       amount: 1
   - type: InteractionPopup
     successChance: 0.6

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -162,7 +162,7 @@
   id: MobRatServant
   parent: [ SimpleMobBase, MobCombat ]
   description: He's da mini rat. He don't make da roolz.
-  noSpawn: true #Must be configured to a King or the AI breaks.
+  categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks.
   components:
   - type: CombatMode
   - type: MovementSpeedModifier

Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml

@@ -150,7 +150,7 @@
   description: A geras of a slime - the name is ironic, isn't it?
   id: MobSlimesGeras
   parent: BaseMobAdultSlimes
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   # they portable...
   - type: MovementSpeedModifier

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -378,6 +378,10 @@
         Base: dead_purple_snake
       Dead:
         Base: dead_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 4
   - type: Grammar
     attributes:
       proper: true
@@ -444,5 +448,9 @@
         Base: dead_small_purple_snake
       Dead:
         Base: dead_small_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 2
   - type: SolutionTransfer
     maxTransferAmount: 1

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -2,7 +2,7 @@
   parent: [MobObserver, InventoryBase]
   id: AdminObserver
   name: admin observer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ContentEye
     maxZoom: 8.916104, 8.916104

Resources/Prototypes/Entities/Mobs/Player/diona.yml

@@ -15,7 +15,7 @@
 # Reformed Diona
 - type: entity
   parent: MobDiona
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: MobDionaReformed
   name: Reformed Diona
   components:

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -154,7 +154,7 @@
     - MinorAntagonists
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: DragonsBreathGun
   name: dragon's lung
   description: For dragon's breathing

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -64,13 +64,17 @@
   id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
   suffix: Human, NukeOps
   components:
-    - type: Loadout
-      prototypes: [SyndicateOperativeGearReinforcementNukeOps]
     - type: NukeOperative
+    - type: RandomMetadata
+      nameSegments:
+      - nukeops-role-operator
+      - SyndicateNamesNormal
+    - type: Loadout
+      prototypes: [SyndicateOperativeGearFullNoUplink]
 
 # Nuclear Operative
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: Nuclear Operative
   parent: MobHuman
   id: MobHumanNukeOp
@@ -79,7 +83,7 @@
     - type: RandomHumanoidAppearance
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MobHuman
   id: MobHumanLoneNuclearOperative
   name: Lone Operative

Resources/Prototypes/Entities/Mobs/Player/observer.yml

@@ -3,7 +3,7 @@
   id: MobObserver
   name: observer
   description: Boo!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: CargoSellBlacklist
   - type: Sprite

Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml

@@ -1,7 +1,7 @@
 - type: entity
   parent: MobObserver
   id: ReplayObserver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   save: false
   components:
   - type: MovementSpeedModifier

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -128,7 +128,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobArachnidDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Arachnid

Resources/Prototypes/Entities/Mobs/Species/diona.yml

@@ -111,7 +111,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobDionaDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Diona

Resources/Prototypes/Entities/Mobs/Species/dwarf.yml

@@ -67,7 +67,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobDwarfDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     scale: 1, 0.8

Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml

@@ -52,7 +52,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobGingerbreadDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Gingerbread

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -32,7 +32,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobHumanDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Inventory
     femaleDisplacements:
@@ -40,5 +40,4 @@
         sizeMaps:
           32:
             sprite: Mobs/Species/Human/displacement.rsi
-            state: jumpsuit-female
-
+            state: jumpsuit-female

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -125,7 +125,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobMothDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Moth

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -73,7 +73,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobReptilianDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: A dummy reptilian meant to be used in character setup.
   components:
   - type: HumanoidAppearance

Resources/Prototypes/Entities/Mobs/Species/skeleton.yml

@@ -113,7 +113,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobSkeletonPersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Skeleton

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -120,7 +120,7 @@
 - type: entity
   parent: MobHumanDummy
   id: MobSlimePersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: SlimePerson

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -127,7 +127,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobVoxDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Vox

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -669,7 +669,7 @@
   id: FoodMealHappyHonkClown
   parent: HappyHonk
   suffix: random food spawner meal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

@@ -483,7 +483,7 @@
 # Trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseItem
   id: FoodPacketTrash
   description: This is rubbish.
@@ -506,7 +506,7 @@
     price: 0
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketBoritosTrash
   name: boritos bag
@@ -515,7 +515,7 @@
     state: boritos-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCnDsTrash
   name: C&Ds bag
@@ -524,7 +524,7 @@
     state: cnds-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCheesieTrash
   name: cheesie honkers
@@ -533,7 +533,7 @@
     state: cheesiehonkers-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChipsTrash
   name: chips
@@ -542,7 +542,7 @@
     state: chips-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChocolateTrash
   name: chocolate wrapper
@@ -551,7 +551,7 @@
     state: chocolatebar-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketEnergyTrash
   name: energybar wrapper
@@ -560,7 +560,7 @@
     state: energybar-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketPistachioTrash
   name: pistachios packet
@@ -569,7 +569,7 @@
     state: pistachio-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketPopcornTrash
   name: popcorn box
@@ -578,7 +578,7 @@
     state: popcorn-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketRaisinsTrash
   name: 4no raisins
@@ -587,7 +587,7 @@
     state: raisins-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSemkiTrash
   name: semki packet
@@ -596,7 +596,7 @@
     state: semki-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSusTrash
   name: sus jerky
@@ -605,7 +605,7 @@
     state: susjerky-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSyndiTrash
   name: syndi-cakes box
@@ -614,7 +614,7 @@
     state: syndicakes-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCupRamenTrash
   name: empty cup ramen
@@ -623,7 +623,7 @@
     state: ramen
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChowMeinTrash
   name: empty chow mein box
@@ -632,7 +632,7 @@
     state: chinese1
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketDanDanTrash
   name: empty dan dan box
@@ -641,7 +641,7 @@
     state: chinese2
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodCookieFortune
   name: cookie fortune
@@ -654,7 +654,7 @@
     descriptionSegments: [CookieFortuneDescriptions]
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketMRETrash
   name: MRE wrapper

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -423,7 +423,7 @@
 
 - type: entity
   id: PresentTrash
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseItem
   name: wrapping paper
   description: Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor.

Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml

@@ -37,12 +37,16 @@
 - type: entity
   parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink
+  name: nuclear operative radio
+  description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided.
   suffix: NukeOps
   components:
   - type: GhostRole
-    name: ghost-role-information-syndicate-reinforcement-name
-    description: ghost-role-information-syndicate-reinforcement-description
-    rules: ghost-role-information-syndicate-reinforcement-rules
+    name: ghost-role-information-nukeop-reinforcement-name
+    description: ghost-role-information-nukeop-reinforcement-description
+    rules: ghost-role-information-nukeop-reinforcement-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateAgentNukeops
 

Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml

@@ -22,7 +22,7 @@
       entity: ChameleonDisguise
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseMob
   id: ChameleonDisguise
   name: Urist McKleiner

Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml

@@ -18,7 +18,7 @@
   id: BackgammonBoardTabletop
   name: backgammon
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi

Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml

@@ -31,7 +31,7 @@
   id: BaseBoardTabletop
   name: baseboard
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Tag
     tags:

Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml

@@ -24,7 +24,7 @@
   id: *checkerboard
   name: checkerboard
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi

Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml

@@ -20,7 +20,7 @@
   id: ChessBoardTabletop
   name: chessboard
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi

Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml

@@ -86,7 +86,7 @@
   parent: BaseBoardTabletop
   id: GrassBoardTabletop
   name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi
@@ -98,7 +98,7 @@
   parent: BaseBoardTabletop
   id: MoonBoardTabletop
   name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi
@@ -108,7 +108,7 @@
   parent: BaseBoardTabletop
   id: SandBoardTabletop
   name: sand battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi
@@ -118,7 +118,7 @@
   parent: BaseBoardTabletop
   id: SnowBoardTabletop
   name: snow battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi
@@ -128,7 +128,7 @@
   parent: BaseBoardTabletop
   id: ShipBoardTabletop
   name: ship battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi

Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml

@@ -20,7 +20,7 @@
   id: ParchisBoardTabletop
   name: parchís
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi

Resources/Prototypes/Entities/Objects/Misc/buffering.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: BufferingIcon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Misc/buffering.rsi