diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index 02c4ed64c359f0..3522aabc66a7da 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -319,6 +319,8 @@ protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
 
         private void RunOnSaved()
         {
+            // Prevent further saving while text processing still in
+            SaveButton.Disabled = true;
             OnSaved?.Invoke(Rope.Collapse(Input.TextRope));
         }
 
diff --git a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs
new file mode 100644
index 00000000000000..1a49b4d1f7773a
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class MedTekCartridgeComponent : Component
+{
+}
diff --git a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs
new file mode 100644
index 00000000000000..4d1b71dad04f0c
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Medical.Components;
+using Content.Shared.CartridgeLoader;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class MedTekCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MedTekCartridgeComponent, CartridgeAddedEvent>(OnCartridgeAdded);
+        SubscribeLocalEvent<MedTekCartridgeComponent, CartridgeRemovedEvent>(OnCartridgeRemoved);
+    }
+
+    private void OnCartridgeAdded(Entity<MedTekCartridgeComponent> ent, ref CartridgeAddedEvent args)
+    {
+        var healthAnalyzer = EnsureComp<HealthAnalyzerComponent>(args.Loader);
+    }
+
+    private void OnCartridgeRemoved(Entity<MedTekCartridgeComponent> ent, ref CartridgeRemovedEvent args)
+    {
+        // only remove when the program itself is removed
+        if (!_cartridgeLoaderSystem.HasProgram<MedTekCartridgeComponent>(args.Loader))
+        {
+            RemComp<HealthAnalyzerComponent>(args.Loader);
+        }
+    }
+}
diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
index fe179be402f9f5..a1f195bf43ed88 100644
--- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
@@ -14,6 +14,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using Robust.Shared.Map;
 
 namespace Content.Server.Fluids.EntitySystems;
 
@@ -35,6 +36,19 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SprayComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<SprayComponent, UserActivateInWorldEvent>(OnActivateInWorld);
+    }
+
+    private void OnActivateInWorld(Entity<SprayComponent> entity, ref UserActivateInWorldEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        var targetMapPos = _transform.GetMapCoordinates(GetEntityQuery<TransformComponent>().GetComponent(args.Target));
+
+        Spray(entity, args.User, targetMapPos);
     }
 
     private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEvent args)
@@ -44,29 +58,36 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
 
         args.Handled = true;
 
+        var clickPos = _transform.ToMapCoordinates(args.ClickLocation);
+
+        Spray(entity, args.User, clickPos);
+    }
+
+    public void Spray(Entity<SprayComponent> entity, EntityUid user, MapCoordinates mapcoord)
+    {
         if (!_solutionContainer.TryGetSolution(entity.Owner, SprayComponent.SolutionName, out var soln, out var solution))
             return;
 
-        var ev = new SprayAttemptEvent(args.User);
+        var ev = new SprayAttemptEvent(user);
         RaiseLocalEvent(entity, ref ev);
         if (ev.Cancelled)
             return;
 
-        if (!TryComp<UseDelayComponent>(entity, out var useDelay)
-            || _useDelay.IsDelayed((entity, useDelay)))
+        if (TryComp<UseDelayComponent>(entity, out var useDelay)
+            && _useDelay.IsDelayed((entity, useDelay)))
             return;
 
         if (solution.Volume <= 0)
         {
-            _popupSystem.PopupEntity(Loc.GetString("spray-component-is-empty-message"), entity.Owner, args.User);
+            _popupSystem.PopupEntity(Loc.GetString("spray-component-is-empty-message"), entity.Owner, user);
             return;
         }
 
         var xformQuery = GetEntityQuery<TransformComponent>();
-        var userXform = xformQuery.GetComponent(args.User);
+        var userXform = xformQuery.GetComponent(user);
 
         var userMapPos = _transform.GetMapCoordinates(userXform);
-        var clickMapPos = args.ClickLocation.ToMap(EntityManager, _transform);
+        var clickMapPos = mapcoord;
 
         var diffPos = clickMapPos.Position - userMapPos.Position;
         if (diffPos == Vector2.Zero || diffPos == Vector2Helpers.NaN)
@@ -88,8 +109,6 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
 
         var amount = Math.Max(Math.Min((solution.Volume / entity.Comp.TransferAmount).Int(), entity.Comp.VaporAmount), 1);
         var spread = entity.Comp.VaporSpread / amount;
-        // TODO: Just use usedelay homie.
-        var cooldownTime = 0f;
 
         for (var i = 0; i < amount; i++)
         {
@@ -131,20 +150,19 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
             // impulse direction is defined in world-coordinates, not local coordinates
             var impulseDirection = rotation.ToVec();
             var time = diffLength / entity.Comp.SprayVelocity;
-            cooldownTime = MathF.Max(time, cooldownTime);
 
-            _vapor.Start(ent, vaporXform, impulseDirection * diffLength, entity.Comp.SprayVelocity, target, time, args.User);
+            _vapor.Start(ent, vaporXform, impulseDirection * diffLength, entity.Comp.SprayVelocity, target, time, user);
 
-            if (TryComp<PhysicsComponent>(args.User, out var body))
+            if (TryComp<PhysicsComponent>(user, out var body))
             {
-                if (_gravity.IsWeightless(args.User, body))
-                    _physics.ApplyLinearImpulse(args.User, -impulseDirection.Normalized() * entity.Comp.PushbackAmount, body: body);
+                if (_gravity.IsWeightless(user, body))
+                    _physics.ApplyLinearImpulse(user, -impulseDirection.Normalized() * entity.Comp.PushbackAmount, body: body);
             }
         }
 
         _audio.PlayPvs(entity.Comp.SpraySound, entity, entity.Comp.SpraySound.Params.WithVariation(0.125f));
 
-        _useDelay.SetLength(entity.Owner, TimeSpan.FromSeconds(cooldownTime));
-        _useDelay.TryResetDelay((entity, useDelay));
+        if (useDelay != null)
+            _useDelay.TryResetDelay((entity, useDelay));
     }
 }
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 85956b60299bac..34b7af0212dd87 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -54,7 +54,7 @@ public sealed partial class HealthAnalyzerComponent : Component
     /// Sound played on scanning end
     /// </summary>
     [DataField]
-    public SoundSpecifier? ScanningEndSound;
+    public SoundSpecifier ScanningEndSound = new SoundPathSpecifier("/Audio/Items/Medical/healthscanner.ogg");
 
     /// <summary>
     /// Whether to show up the popup
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 82f80759028218..60a492a755fe0a 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -13,11 +13,9 @@
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
-using Content.Shared.PowerCell;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Medical;
@@ -104,7 +102,8 @@ private void OnDoAfter(Entity<HealthAnalyzerComponent> uid, ref HealthAnalyzerDo
         if (args.Handled || args.Cancelled || args.Target == null || !_cell.HasDrawCharge(uid, user: args.User))
             return;
 
-        _audio.PlayPvs(uid.Comp.ScanningEndSound, uid);
+        if (!uid.Comp.Silent)
+            _audio.PlayPvs(uid.Comp.ScanningEndSound, uid);
 
         OpenUserInterface(args.User, uid);
         BeginAnalyzingEntity(uid, args.Target.Value);
diff --git a/Content.Server/NPC/Queries/Considerations/TargetOnFireCon.cs b/Content.Server/NPC/Queries/Considerations/TargetOnFireCon.cs
new file mode 100644
index 00000000000000..d86dbc06eca973
--- /dev/null
+++ b/Content.Server/NPC/Queries/Considerations/TargetOnFireCon.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.NPC.Queries.Considerations;
+
+/// <summary>
+/// Returns 1f if the target is on fire or 0f if not.
+/// </summary>
+public sealed partial class TargetOnFireCon : UtilityConsideration
+{
+
+}
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index c4485e50ce8891..63d5dc1a2774f5 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.NPC.Queries;
 using Content.Server.NPC.Queries.Considerations;
@@ -364,6 +365,12 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
                 }
                 return 0f;
             }
+            case TargetOnFireCon:
+                {
+                    if (TryComp(targetUid, out FlammableComponent? fire) && fire.OnFire)
+                        return 1f;
+                    return 0f;
+                }
             default:
                 throw new NotImplementedException();
         }
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 4d88663ca09641..80e7ff966986e3 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -552,8 +552,7 @@ public IEnumerable<EntityUid> GetColliding(EntityUid uid, PhysicsComponent? phys
         var tileRef = _mapSystem.GetTileRef(xform.GridUid.Value, mapGridComp, xform.Coordinates);
 
         _doorIntersecting.Clear();
-
-        _entityLookup.GetLocalEntitiesIntersecting(xform.GridUid.Value, tileRef.GridIndices, _doorIntersecting, gridComp: mapGridComp);
+        _entityLookup.GetLocalEntitiesIntersecting(xform.GridUid.Value, tileRef.GridIndices, _doorIntersecting, gridComp: mapGridComp, flags: (LookupFlags.All & ~LookupFlags.Sensors));
 
         // TODO SLOTH fix electro's code.
         // ReSharper disable once InconsistentNaming
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index 4feb0445f8f9e3..746bc994ee16c0 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Input;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
+using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
@@ -151,8 +152,13 @@ private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
             _hands.TryDrop(uid, hands.ActiveHand, handsComp: hands);
             _storage.Insert(slotItem, handItem.Value, out var stacked, out _);
 
-            if (stacked != null)
-                _hands.TryPickup(uid, stacked.Value, handsComp: hands);
+            // if the hand item stacked with the things in inventory, but there's no more space left for the rest
+            // of the stack, place the stack back in hand rather than dropping it on the floor
+            if (stacked != null && !_storage.CanInsert(slotItem, handItem.Value, out _))
+            {
+                if (TryComp<StackComponent>(handItem.Value, out var handStack) && handStack.Count > 0)
+                    _hands.TryPickup(uid, handItem.Value, handsComp: hands);
+            }
 
             return;
         }
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index 98029f97d5f6ec..d5bbaac12c330e 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -71,7 +71,7 @@ private void OnUseInHand(Entity<ItemToggleComponent> ent, ref UseInHandEvent arg
 
     private void OnActivateVerb(Entity<ItemToggleComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract)
+        if (!args.CanAccess || !args.CanInteract || !ent.Comp.OnActivate)
             return;
 
         var user = args.User;
diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index dc4858fd7458dd..01539936b95b10 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Shared.Research.Components;
 
 namespace Content.Shared.Materials;
 
@@ -34,6 +35,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<MaterialStorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<MaterialStorageComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<MaterialStorageComponent, TechnologyDatabaseModifiedEvent>(OnDatabaseModified);
     }
 
     public override void Update(float frameTime)
@@ -312,6 +314,11 @@ private void OnInteractUsing(EntityUid uid, MaterialStorageComponent component,
         args.Handled = TryInsertMaterialEntity(args.User, args.Used, uid, component);
     }
 
+    private void OnDatabaseModified(Entity<MaterialStorageComponent> ent, ref TechnologyDatabaseModifiedEvent args)
+    {
+        UpdateMaterialWhitelist(ent);
+    }
+
     public int GetSheetVolume(MaterialPrototype material)
     {
         if (material.StackEntity == null)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fcd23b07ef74a1..1e5ad4afbc6f9b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,126 +1,4 @@
 Entries:
-- author: IProduceWidgets
-  changes:
-  - message: Zookeepers can now possess Nonlethal shotguns according to spacelaw.
-    type: Tweak
-  id: 6963
-  time: '2024-07-22T09:33:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30237
-- author: Plykiya
-  changes:
-  - message: Bag sounds can now only be heard from half the distance and is quieter
-      in general.
-    type: Tweak
-  id: 6964
-  time: '2024-07-22T09:54:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30225
-- author: osjarw
-  changes:
-  - message: Syringes are now 0.5 seconds faster.
-    type: Tweak
-  id: 6965
-  time: '2024-07-22T10:20:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29825
-- author: Errant
-  changes:
-  - message: Replay observers now always spawn on the station.
-    type: Fix
-  id: 6966
-  time: '2024-07-22T19:32:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30252
-- author: Cojoke-dot
-  changes:
-  - message: You can now read the volume of a gas tank in its examine text
-    type: Tweak
-  id: 6967
-  time: '2024-07-22T21:41:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29771
-- author: Cojoke-dot
-  changes:
-  - message: Throwing a jetpack mid-flight will no longer freeze your character
-    type: Fix
-  id: 6968
-  time: '2024-07-22T22:24:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30223
-- author: Flareguy
-  changes:
-  - message: Added vox sprites for a few headwear items, including radiation suits
-      and the paramedic helmet.
-    type: Add
-  id: 6969
-  time: '2024-07-23T02:18:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30150
-- author: Cojoke-dot
-  changes:
-  - message: You can no longer use telescreens and televisions while blind or asleep.
-    type: Fix
-  id: 6970
-  time: '2024-07-23T02:33:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30260
-- author: Cojoke-dot
-  changes:
-  - message: Fix one of the QSI popups
-    type: Fix
-  id: 6971
-  time: '2024-07-23T03:23:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30265
-- author: Errant
-  changes:
-  - message: Players are now notified when trying to insert an incompatible magazine
-      into a gun.
-    type: Add
-  id: 6972
-  time: '2024-07-23T06:36:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29046
-- author: TheKittehJesus
-  changes:
-  - message: The Syndicate Assault Borg can now wield their double esword
-    type: Fix
-  id: 6973
-  time: '2024-07-23T08:13:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30229
-- author: Scribbles0
-  changes:
-  - message: Handless mobs can no longer wipe devices like positronic brains or pAIs.
-    type: Fix
-  id: 6974
-  time: '2024-07-23T17:47:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30149
-- author: Quantus
-  changes:
-  - message: Reagent grinders can no longer auto-grind when unpowered.
-    type: Fix
-  id: 6975
-  time: '2024-07-23T21:02:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30267
-- author: BombasterDS
-  changes:
-  - message: Fixed items disappearing after shelfs and mannequin disassembling
-    type: Fix
-  id: 6976
-  time: '2024-07-24T08:57:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30313
-- author: Cojoke-dot
-  changes:
-  - message: Fix infinite QSI linking range
-    type: Fix
-  id: 6977
-  time: '2024-07-24T20:57:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30332
-- author: deltanedas
-  changes:
-  - message: Borgs can no longer unlock the robotics console or other borgs.
-    type: Tweak
-  id: 6978
-  time: '2024-07-25T03:54:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27888
-- author: themias
-  changes:
-  - message: Fixed the ripley control panel not loading
-    type: Fix
-  id: 6979
-  time: '2024-07-25T05:23:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30325
 - author: Timur2011
   changes:
   - message: Space adders are now butcherable.
@@ -3938,3 +3816,132 @@
   id: 7462
   time: '2024-09-30T22:40:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32411
+- author: Golinth
+  changes:
+  - message: Firebots can now be constructed by scientists - the bots wander the station
+      looking for fires to put out with their built-in extinguisher.
+    type: Add
+  id: 7463
+  time: '2024-10-01T03:13:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32482
+- author: ScarKy0
+  changes:
+  - message: Binary encryption key now uses an AI icon
+    type: Tweak
+  id: 7464
+  time: '2024-10-01T04:03:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32327
+- author: BramvanZijp
+  changes:
+  - message: Fixed borgs being able to be briefly disabled by others.
+    type: Fix
+  id: 7465
+  time: '2024-10-01T15:13:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32485
+- author: BackeTako
+  changes:
+  - message: Gay Pin
+    type: Add
+  id: 7466
+  time: '2024-10-01T21:07:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32584
+- author: BackeTako
+  changes:
+  - message: Reinforced walls sprite see throu top
+    type: Fix
+  id: 7467
+  time: '2024-10-01T21:44:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32578
+- author: Zylo
+  changes:
+  - message: Seismic charges being uncraftable
+    type: Fix
+  id: 7468
+  time: '2024-10-02T02:56:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32459
+- author: slarticodefast
+  changes:
+  - message: Fixed the chameleon settings menu not showing up for the voice mask.
+    type: Fix
+  id: 7469
+  time: '2024-10-02T03:22:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32546
+- author: metalgearsloth
+  changes:
+  - message: Fix physics sensors (e.g. proximity triggers) being able to block doors.
+    type: Fix
+  id: 7470
+  time: '2024-10-02T05:00:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32591
+- author: Plykiya
+  changes:
+  - message: You can now quick-swap uneven stacks of items into your inventory without
+      it getting "stuck" in your hands.
+    type: Fix
+  id: 7471
+  time: '2024-10-02T05:27:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32560
+- author: BackeTako
+  changes:
+  - message: New hydroponics doors
+    type: Add
+  id: 7472
+  time: '2024-10-02T05:33:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32575
+- author: BackeTako
+  changes:
+  - message: Red circuit tile
+    type: Add
+  id: 7473
+  time: '2024-10-02T05:35:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32557
+- author: ArchRBX
+  changes:
+  - message: The MedTek PDA cartridge has now been added, providing health analyzer
+      functionality to PDA's
+    type: Add
+  - message: The MedTek cartridge has been added to the CMO locker, and comes preinstalled
+      on medical PDA's, replacing the built-in analyzer functionality on these PDA's
+    type: Add
+  id: 7474
+  time: '2024-10-02T06:17:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32450
+- author: Toly65
+  changes:
+  - message: fixed slippery and bioluminescent effects persisting on planters after
+      the plant has been harvested
+    type: Fix
+  - message: removed the slippery and bioluminescent visuals from planters temporararily
+    type: Remove
+  id: 7475
+  time: '2024-10-02T09:37:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32576
+- author: lzk228
+  changes:
+  - message: Star sticker can be used in chameleon menu.
+    type: Fix
+  id: 7476
+  time: '2024-10-02T10:53:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32594
+- author: deltanedas
+  changes:
+  - message: Fixed the Instigator shuttle event never happening.
+    type: Fix
+  id: 7477
+  time: '2024-10-02T11:44:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32597
+- author: FluffMe
+  changes:
+  - message: Fixed accidental erase of paper contents by spamming save action.
+    type: Fix
+  id: 7478
+  time: '2024-10-02T12:00:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32598
+- author: PJB3005
+  changes:
+  - message: Removed bioluminescence plant mutations due to it breaking the rendering
+      engine.
+    type: Remove
+  id: 7479
+  time: '2024-10-02T13:52:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32561
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 21d0f430bdfb9d..b18c4646ede2a3 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem, zzylex
+0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, joelsgp, JohnGinnane, johnku1, Jophire, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNorthStar, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index 804da0992fa3b7..ceeac1be3c9751 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -22,6 +22,8 @@ log-probe-label-number = #
 
 astro-nav-program-name = AstroNav
 
+med-tek-program-name = MedTek
+
 # Wanted list cartridge
 wanted-list-program-name = Wanted list
 wanted-list-label-no-records = It's all right, cowboy
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 33f2627f6c8845..cb147a95eff266 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -66,6 +66,7 @@ petting-success-honkbot = You pet {THE($target)} on {POSS-ADJ($target)} slippery
 petting-success-mimebot = You pet {THE($target)} on {POSS-ADJ($target)} cold metal head.
 petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
 petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
+petting-success-firebot = You pet {THE($target)} on {POSS-ADJ($target)} warm metal head. 
 petting-success-generic-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} metal head.
 petting-success-salvage-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dirty metal head.
 petting-success-cargo-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} scratched metal head.
@@ -80,6 +81,7 @@ petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($tar
 petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
+petting-failure-firebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} sprays you in the face before you can get close!
 petting-failure-generic-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy stating laws!
 petting-failure-salvage-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy drilling!
 petting-failure-engineer-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy repairing!
diff --git a/Resources/Locale/en-US/npc/firebot.ftl b/Resources/Locale/en-US/npc/firebot.ftl
new file mode 100644
index 00000000000000..758874ceaa552b
--- /dev/null
+++ b/Resources/Locale/en-US/npc/firebot.ftl
@@ -0,0 +1 @@
+firebot-fire-detected = Fire detected!
diff --git a/Resources/Locale/en-US/station-events/events/immovable-friend.ftl b/Resources/Locale/en-US/station-events/events/immovable-friend.ftl
new file mode 100644
index 00000000000000..08ee72ca3048e2
--- /dev/null
+++ b/Resources/Locale/en-US/station-events/events/immovable-friend.ftl
@@ -0,0 +1 @@
+station-event-immovable-friend-spawn-announcement = High velocity unidentified friend is on a collision course with the station. Impact imminent.
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 35cea19f7862e6..b5202356142252 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -90,6 +90,7 @@ tiles-reinforced-glass-floor = reinforced glass floor
 tiles-metal-foam = metal foam floor
 tiles-green-circuit-floor = green circuit floor
 tiles-blue-circuit-floor = blue circuit floor
+tiles-red-circuit-floor = red circuit floor
 tiles-snow = snow
 tiles-snow-plating = snowed plating
 tiles-snow-dug = dug snow
diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml
index 562b27f87f4ae3..7bc328d7982ac7 100644
--- a/Resources/Maps/cog.yml
+++ b/Resources/Maps/cog.yml
@@ -805,8 +805,6 @@ entities:
             5555: -28,58
             5779: 31,-8
             5786: 31,-2
-            5798: 0,-4
-            5799: -2,-4
             6198: 3,-46
             6200: 3,-40
             6258: 58,-27
@@ -13373,6 +13371,29 @@ entities:
       - 4266
       - 32067
       - 32069
+  - uid: 32231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-1.5
+      parent: 12
+    - type: DeviceList
+      devices:
+      - 32227
+      - 32226
+      - 32234
+      - 32225
+      - 32224
+      - 32235
+  - uid: 32232
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 12
+    - type: DeviceList
+      devices:
+      - 32229
+      - 10069
 - proto: AirAlarmVox
   entities:
   - uid: 7822
@@ -13412,16 +13433,6 @@ entities:
     - type: Transform
       pos: 38.5,-32.5
       parent: 12
-  - uid: 7195
-    components:
-    - type: Transform
-      anchored: True
-      pos: 0.5,-3.5
-      parent: 12
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
   - uid: 8863
     components:
     - type: Transform
@@ -18395,6 +18406,12 @@ entities:
     - type: Transform
       pos: -9.5,-16.5
       parent: 12
+  - uid: 145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 12
   - uid: 247
     components:
     - type: Transform
@@ -24190,17 +24207,12 @@ entities:
   - uid: 2217
     components:
     - type: Transform
-      pos: -0.5,-10.5
+      pos: -0.5,0.5
       parent: 12
   - uid: 2218
     components:
     - type: Transform
-      pos: -0.5,-9.5
-      parent: 12
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
+      pos: -0.5,-0.5
       parent: 12
   - uid: 2220
     components:
@@ -24215,7 +24227,7 @@ entities:
   - uid: 2222
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: -1.5,-1.5
       parent: 12
   - uid: 2223
     components:
@@ -24265,18 +24277,13 @@ entities:
   - uid: 2232
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 0.5,-1.5
       parent: 12
   - uid: 2233
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 12
-  - uid: 2234
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 12
   - uid: 2262
     components:
     - type: Transform
@@ -36062,6 +36069,11 @@ entities:
     - type: Transform
       pos: -20.5,-62.5
       parent: 12
+  - uid: 20074
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 12
   - uid: 20257
     components:
     - type: Transform
@@ -43702,6 +43714,11 @@ entities:
     - type: Transform
       pos: -63.5,-53.5
       parent: 12
+  - uid: 32230
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 12
 - proto: CableApcStack
   entities:
   - uid: 16561
@@ -56175,6 +56192,11 @@ entities:
     - type: Transform
       pos: -2.5,-9.5
       parent: 12
+  - uid: 2234
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 12
   - uid: 2246
     components:
     - type: Transform
@@ -62365,11 +62387,6 @@ entities:
     - type: Transform
       pos: -47.5,17.5
       parent: 12
-  - uid: 20074
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 12
   - uid: 20343
     components:
     - type: Transform
@@ -103019,6 +103036,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,67.5
       parent: 12
+  - uid: 32228
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 928
@@ -103223,12 +103247,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-1.5
-      parent: 12
   - uid: 2168
     components:
     - type: Transform
@@ -103907,23 +103925,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,-32.5
       parent: 12
-  - uid: 7188
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 12
   - uid: 7189
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      pos: 0.5,-3.5
       parent: 12
-  - uid: 7190
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7194
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
+      pos: -0.5,-3.5
       parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7205
     components:
     - type: Transform
@@ -106210,6 +106227,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,68.5
       parent: 12
+  - uid: 32223
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 2577
@@ -106259,6 +106284,20 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7188
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7190
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 10894
     components:
     - type: Transform
@@ -107744,6 +107783,13 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2124
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2128
     components:
     - type: Transform
@@ -112564,6 +112610,41 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7185
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7186
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7192
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7193
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7196
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7204
     components:
     - type: Transform
@@ -114582,6 +114663,13 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 10033
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10034
     components:
     - type: Transform
@@ -114766,13 +114854,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10066
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 12
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10067
     components:
     - type: Transform
@@ -129244,6 +129325,65 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 32216
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32217
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32218
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32219
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32220
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32222
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 103
@@ -130207,6 +130347,22 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7206
     components:
     - type: Transform
@@ -130611,13 +130767,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10033
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 12
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10064
     components:
     - type: Transform
@@ -130634,6 +130783,14 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 10066
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 10070
     components:
     - type: Transform
@@ -132652,18 +132809,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 36.5,-32.5
       parent: 12
-  - uid: 7191
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-3.5
-      parent: 12
-  - uid: 7192
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 12
   - uid: 9038
     components:
     - type: Transform
@@ -132994,19 +133139,6 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7193
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 12
-    - type: GasPressurePump
-      targetPressure: 4500
-  - uid: 7194
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-2.5
-      parent: 12
   - uid: 7212
     components:
     - type: Transform
@@ -133638,11 +133770,6 @@ entities:
       - 32066
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7186
-    components:
-    - type: Transform
-      pos: 1.5,-0.5
-      parent: 12
   - uid: 7327
     components:
     - type: Transform
@@ -133819,6 +133946,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-10.5
       parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32232
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 10073
@@ -135226,6 +135356,38 @@ entities:
       - 32066
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 32224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 32225
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 32235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentPumpVox
   entities:
   - uid: 6688
@@ -135634,11 +135796,6 @@ entities:
       - 28365
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7185
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 12
   - uid: 7519
     components:
     - type: Transform
@@ -136864,6 +137021,49 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 32226
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32229
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-10.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32232
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentScrubberVox
   entities:
   - uid: 7844
@@ -147563,7 +147763,7 @@ entities:
     - type: Transform
       pos: -0.5,-8.5
       parent: 12
-  - uid: 145
+  - uid: 2219
     components:
     - type: Transform
       pos: -0.5,-4.5
@@ -159531,7 +159731,7 @@ entities:
   - uid: 24354
     components:
     - type: Transform
-      pos: 39.5,45.5
+      pos: 39.5,46.5
       parent: 12
   - uid: 24355
     components:
@@ -173430,16 +173630,6 @@ entities:
     - type: Transform
       pos: 36.5,-32.5
       parent: 12
-  - uid: 7196
-    components:
-    - type: Transform
-      anchored: True
-      pos: -1.5,-3.5
-      parent: 12
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
   - uid: 20776
     components:
     - type: Transform
@@ -174058,7 +174248,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI core entrance
+      id: AI core entrance hall
   - uid: 32075
     components:
     - type: Transform
@@ -174070,6 +174260,20 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Gravity Gen
+  - uid: 32214
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 12
+    - type: SurveillanceCamera
+      id: AI core entrance
+  - uid: 32215
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 12
+    - type: SurveillanceCamera
+      id: AI core power room
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 4167
@@ -181447,6 +181651,13 @@ entities:
     - type: Transform
       pos: -0.5,-44.5
       parent: 12
+- proto: VendingMachineHappyHonk
+  entities:
+  - uid: 32236
+    components:
+    - type: Transform
+      pos: 39.5,45.5
+      parent: 12
 - proto: VendingMachineHydrobe
   entities:
   - uid: 10333
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 71ff6d93d88c98..25ea6306773089 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -30953,6 +30953,31 @@ entities:
     - type: Transform
       pos: 19.5,-39.5
       parent: 30
+  - uid: 22544
+    components:
+    - type: Transform
+      pos: -11.5,-44.5
+      parent: 30
+  - uid: 22547
+    components:
+    - type: Transform
+      pos: -10.5,-44.5
+      parent: 30
+  - uid: 22550
+    components:
+    - type: Transform
+      pos: -9.5,-44.5
+      parent: 30
+  - uid: 22551
+    components:
+    - type: Transform
+      pos: -8.5,-44.5
+      parent: 30
+  - uid: 22552
+    components:
+    - type: Transform
+      pos: -7.5,-44.5
+      parent: 30
 - proto: CableApcStack
   entities:
   - uid: 1637
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 7fc4d2a8b8d58b..2fb6a5c78c838b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -219,6 +219,7 @@
     - id: MedicalTechFabCircuitboard
     - id: MedkitFilled
     - id: RubberStampCMO
+    - id: MedTekCartridge
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 570eb12016692b..8c8339f95a2ea6 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -798,7 +798,7 @@
   id: UplinkBinaryTranslatorKey
   name: uplink-binary-translator-key-name
   description: uplink-binary-translator-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: borg_label }
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: ai_label }
   productEntity: EncryptionKeyBinarySyndicate
   cost:
     Telecrystal: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 9d1ec04b703c30..2a727494e064ee 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -235,6 +235,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - FireHelmet
   - type: HideLayerClothing
     slots:
     - Hair
@@ -267,6 +268,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - FireHelmet
   - type: HideLayerClothing
     slots:
     - Hair
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index 90c648c9d8893e..d8da80611cf83a 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -35,6 +35,8 @@
       - Snout
     - type: UserInterface
       interfaces:
+        enum.ChameleonUiKey.Key:
+          type: ChameleonBoundUserInterface
         enum.VoiceMaskUIKey.Key:
           type: VoiceMaskBoundUserInterface
 
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 8dfc709bc4f1ae..af2af7a4208f47 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -78,3 +78,19 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
+
+- type: entity
+  parent: ClothingNeckBase
+  id: Dinkystar
+  name: star sticker
+  description: A dinky lil star for only the hardest working security officers! It's not even sticky anymore.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/dinkystar.rsi
+    state: icon
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index eb948d299c157b..a7dcf03f28c6a1 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -7,6 +7,10 @@
   components:
   - type: Item
     size: Tiny
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/pins.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/pins.rsi
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -15,14 +19,9 @@
   description: Be gay do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: lgbt
+    state: lgbt
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: lgbt-equipped
+    equippedPrefix: lgbt
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -31,14 +30,9 @@
   description: Be aro do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: aro
+    state: aro
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: aro-equipped
+    equippedPrefix: aro
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -47,14 +41,9 @@
   description: Be ace do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: asex
+    state: asex
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: asex-equipped
+    equippedPrefix: asex
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -63,14 +52,20 @@
   description: Be bi do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: bi
+    state: bi
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: bi-equipped
+    equippedPrefix: bi
+
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckGayPin
+  name: gay pin
+  description: Be gay~ do crime.
+  components:
+  - type: Sprite
+    state: gay
+  - type: Clothing
+    equippedPrefix: gay
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -79,14 +74,9 @@
   description: Be intersex do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: inter
+    state: inter
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: inter-equipped
+    equippedPrefix: inter
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -95,14 +85,9 @@
   description: Be lesbian do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: les
+    state: les
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: les-equipped
+    equippedPrefix: les
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -111,14 +96,9 @@
   description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101"
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: non
+    state: non
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: non-equipped
+    equippedPrefix: non
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -127,14 +107,9 @@
   description: Be pan do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: pan
+    state: pan
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: pan-equipped
+    equippedPrefix: pan
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -143,14 +118,9 @@
   description: Be trans do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: trans
+    state: trans
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: trans-equipped
+    equippedPrefix: trans
  
 - type: entity
   parent: ClothingNeckPinBase
@@ -159,14 +129,9 @@
   description: Be autism do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/autismpin.rsi
-    layers:
-    - state: autism
+    state: autism
   - type: Clothing
-    sprite: Clothing/Neck/Misc/autismpin.rsi
-    clothingVisuals:
-      neck:
-      - state: autism-equipped
+    equippedPrefix: autism
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -175,11 +140,6 @@
   description: Be autism do warcrime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/goldautismpin.rsi
-    layers:
-    - state: goldautism
+    state: goldautism
   - type: Clothing
-    sprite: Clothing/Neck/Misc/goldautismpin.rsi
-    clothingVisuals:
-      neck:
-      - state: goldautism-equipped
+    equippedPrefix: goldautism
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index a6a36e8f35ec75..e641ec7fe84200 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -144,6 +144,7 @@
         - id: ClothingNeckAromanticPin
         - id: ClothingNeckAsexualPin
         - id: ClothingNeckBisexualPin
+        - id: ClothingNeckGayPin
         - id: ClothingNeckIntersexPin
         - id: ClothingNeckLesbianPin
         - id: ClothingNeckNonBinaryPin
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 955ddfd2e3e2cb..54bd58af78f364 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -121,6 +121,7 @@
     cellSlotId: cell_slot
     fitsInCharger: true
   - type: ItemToggle
+    onActivate: false # You should not be able to turn off a borg temporarily.
     activated: false # gets activated when a mind is added
     onUse: false # no item-borg toggling sorry
   - type: ItemTogglePointLight
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 52d2e78650ce9f..1e32adeb27c41d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -111,6 +111,53 @@
   - type: NoSlip
   - type: Insulated
 
+- type: entity
+  parent: MobSiliconBase
+  id: MobFireBot
+  name: firebot
+  description: A little fire extinguishing bot. He looks rather anxious.
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/firebot.rsi
+    state: firebot
+  - type: Construction
+    graph: FireBot
+    node: bot
+  - type: SentienceTarget
+    flavorKind: station-event-random-sentience-flavor-mechanical
+  - type: HTN
+    rootTask:
+      task: FirebotCompound
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 10
+        reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: SolutionRegeneration
+    solution: spray
+    generated:
+      reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: Spray
+    transferAmount: 10
+    pushbackAmount: 60
+    spraySound:
+      path: /Audio/Effects/extinguish.ogg
+    sprayedPrototype: ExtinguisherSpray
+    vaporAmount: 1
+    vaporSpread: 90
+    sprayVelocity: 3.0
+  - type: UseDelay
+    delay: 4
+  - type: InteractionPopup
+    interactSuccessString: petting-success-firebot
+    interactFailureString: petting-failure-firebot
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+
 - type: entity
   parent: MobSiliconBase
   id: MobHonkBot
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index aee26b0776985d..0ab0b687dcf2d7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -117,6 +117,25 @@
   - type: StealTarget
     stealGroup: WantedListCartridge
 
+- type: entity
+  parent: BaseItem
+  id: MedTekCartridge
+  name: MedTek cartridge
+  description: A program that provides medical diagnostic tools.
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Icon
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Cartridge
+      programName: med-tek-program-name
+      icon:
+        sprite: Objects/Specific/Medical/healthanalyzer.rsi
+        state: icon
+    - type: MedTekCartridge
+
 - type: entity
   parent: BaseItem
   id: AstroNavCartridge
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 25d81a6f83c1e0..7393532654dea6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -227,7 +227,7 @@
   - type: Sprite
     layers:
     - state: crypt_silver
-    - state: borg_label
+    - state: ai_label
 
 - type: entity
   parent: [ EncryptionKey, BaseSyndicateContraband ]
@@ -242,7 +242,7 @@
   - type: Sprite
     layers:
     - state: crypt_red
-    - state: borg_label
+    - state: ai_label
 
 - type: entity
   parent: EncryptionKey
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 932e04a9789a88..08ffa4c33c94f8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -131,12 +131,13 @@
   id: BaseMedicalPDA
   abstract: true
   components:
-  - type: ItemToggle
-    onUse: false
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
 
 - type: entity
   parent: BasePDA
@@ -177,7 +178,7 @@
   parent: BaseMedicalPDA
   id: MedicalInternPDA
   name: medical intern PDA
-  description: Why isn't it white? Has a built-in health analyzer.
+  description: Why isn't it white?
   components:
   - type: Pda
     id: MedicalInternIDCard
@@ -592,7 +593,7 @@
   parent: BaseMedicalPDA
   id: CMOPDA
   name: chief medical officer PDA
-  description: Extraordinarily shiny and sterile. Has a built-in health analyzer.
+  description: Extraordinarily shiny and sterile.
   components:
   - type: Pda
     id: CMOIDCard
@@ -608,7 +609,7 @@
   parent: BaseMedicalPDA
   id: MedicalPDA
   name: medical PDA
-  description: Shiny and sterile. Has a built-in health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: MedicalIDCard
@@ -635,7 +636,7 @@
   parent: BaseMedicalPDA
   id: ParamedicPDA
   name: paramedic PDA
-  description: Shiny and sterile. Has a built-in rapid health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: ParamedicIDCard
@@ -928,14 +929,18 @@
   id: ERTMedicPDA
   name: ERT Medic PDA
   suffix: Medic
-  description: Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer.
+  description: Red for firepower, it's shiny and sterile.
   components:
   - type: Pda
     id: ERTMedicIDCard
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
 
 - type: entity
   parent: ERTLeaderPDA
@@ -1042,7 +1047,7 @@
   parent: BaseMedicalPDA
   id: BrigmedicPDA
   name: brigmedic PDA
-  description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer.
+  description: I wonder whose pulse is on the screen? I hope it doesn't stop...
   components:
   - type: Pda
     id: BrigmedicIDCard
@@ -1127,7 +1132,7 @@
   parent: BaseMedicalPDA
   id: SeniorPhysicianPDA
   name: senior physician PDA
-  description: Smells faintly like iron and chemicals. Has a built-in health analyzer.
+  description: Smells faintly like iron and chemicals.
   components:
   - type: Pda
     id: SeniorPhysicianIDCard
@@ -1183,6 +1188,7 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
+      - MedTekCartridge
     cartridgeSlot:
       priority: -1
       name: Cartridge
diff --git a/Resources/Prototypes/Entities/Objects/Misc/dinkystar.yml b/Resources/Prototypes/Entities/Objects/Misc/dinkystar.yml
deleted file mode 100644
index 7703cf2eea07f7..00000000000000
--- a/Resources/Prototypes/Entities/Objects/Misc/dinkystar.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: entity
-  parent: ClothingNeckBase
-  id: Dinkystar
-  name: star sticker
-  description: A dinky lil star for only the hardest working security officers! It's not even sticky anymore.
-  components:
-    - type: Sprite
-      sprite: Clothing/Neck/Misc/dinkystar.rsi
-      state: icon
-    - type: Clothing
-      sprite: Clothing/Neck/Misc/dinkystar.rsi
-      clothingVisuals:
-        neck:
-          - state: star-equipped
-    - type: Item
-      size: Tiny
-    - type: Tag
-      tags:
-        - Trash
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 0389db27ea0365..b306da64421202 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -62,6 +62,9 @@
     - Rolling
     speedModifier: 0.5 # its very big, awkward to use
   - type: Appearance
+  - type: Tag
+    tags:
+      - FireExtinguisher
   - type: GenericVisualizer
     visuals:
       enum.ToggleVisuals.Toggled:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 1e5f2573fda906..90322689589096 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -1286,6 +1286,22 @@
   - type: Stack
     stackType: FloorTileBCircuit
 
+- type: entity
+  name: red circuit floor
+  parent: FloorTileItemBase
+  id: FloorTileItemRCircuit
+  components:
+  - type: Sprite
+    state: rcircuit
+  - type: Item
+    heldPrefix: rcircuit
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorRedCircuit
+  - type: Stack
+    stackType: FloorTileRCircuit
+
 # Circuits stacks
 
 - type: entity
@@ -1304,6 +1320,14 @@
   - type: Stack
     count: 4
 
+- type: entity
+  parent: FloorTileItemRCircuit
+  id: FloorTileItemRCircuit4
+  suffix: 4
+  components:
+  - type: Stack
+    count: 4
+
 # Terrain
 - type: entity
   name: grass tile
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index c7951993f14572..71feb1d4e6ccda 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -65,7 +65,7 @@
       board: [ DoorElectronicsBar ]
 
 - type: entity
-  parent: AirlockServiceLocked
+  parent: AirlockHydroponics
   id: AirlockHydroponicsLocked
   suffix: Hydroponics, Locked
   components:
@@ -531,7 +531,7 @@
       board: [ DoorElectronicsJanitor ]
 
 - type: entity
-  parent: AirlockServiceGlassLocked
+  parent: AirlockHydroponicsGlass
   id: AirlockHydroGlassLocked
   suffix: Hydroponics, Locked
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 3de6555be14404..cf6d5a89dff290 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -40,6 +40,16 @@
   - type: Wires
     layoutId: AirlockCargo
 
+- type: entity
+  parent: Airlock
+  id: AirlockHydroponics
+  suffix: Hydroponics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi
+  - type: Wires
+    layoutId: AirlockService
+
 - type: entity
   parent: Airlock
   id: AirlockMedical
@@ -197,6 +207,16 @@
   - type: Wires
     layoutId: AirlockCargo
 
+- type: entity
+  parent: AirlockGlass
+  id: AirlockHydroponicsGlass
+  suffix: Hydroponics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi
+  - type: Wires
+    layoutId: AirlockService
+
 - type: entity
   parent: AirlockGlass
   id: AirlockMedicalGlass
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index c464c70a15f0be..98508b21bcf9e9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -138,6 +138,25 @@
     sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
     state: "assembly"
 
+#Hydroponics
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyHydroponics
+  suffix: Hydroponics
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyHydroponicsGlass
+  suffix: Hydroponics, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi
+    state: "assembly"
+
 #Maintenance
 - type: entity
   parent: AirlockAssembly
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index e8f000514ae625..9beedb5e494dce 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -9,6 +9,7 @@
     command:     Structures/Doors/Airlocks/Standard/command.rsi
     engineering: Structures/Doors/Airlocks/Standard/engineering.rsi
     freezer:     Structures/Doors/Airlocks/Standard/freezer.rsi
+    hydroponics: Structures/Doors/Airlocks/Standard/hydroponics.rsi
     maintenance: Structures/Doors/Airlocks/Standard/maint.rsi
     medical:     Structures/Doors/Airlocks/Standard/medical.rsi
     science:     Structures/Doors/Airlocks/Standard/science.rsi
@@ -27,6 +28,7 @@
     science:     Structures/Doors/Airlocks/Glass/science.rsi
     engineering: Structures/Doors/Airlocks/Glass/engineering.rsi
     glass:       Structures/Doors/Airlocks/Glass/glass.rsi
+    hydroponics: Structures/Doors/Airlocks/Glass/hydroponics.rsi
     maintenance: Structures/Doors/Airlocks/Glass/maint.rsi
     medical:     Structures/Doors/Airlocks/Glass/medical.rsi
     security:    Structures/Doors/Airlocks/Glass/security.rsi
@@ -74,6 +76,7 @@
     engineering: Engineering
     freezer: Civilian
     glass: Civilian
+    hydroponics: Civilian
     maintenance: Civilian
     medical: Medical
     science: Science
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 5ef0ed77d0c2c0..ab5fe0dab993a6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -444,6 +444,7 @@
     - UniformPrinterMachineCircuitboard
     - FloorGreenCircuit
     - FloorBlueCircuit
+    - FloorRedCircuit
     - MicrowaveMachineCircuitboard
     - ReagentGrinderMachineCircuitboard
     - ElectricGrillMachineCircuitboard
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
index 7ec693de99c65f..f1445c3a53732a 100644
--- a/Resources/Prototypes/GameRules/meteorswarms.yml
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -237,3 +237,11 @@
     - id: ImmovableRodFinFin
       prob: 0.0075
       orGroup: rodProto
+
+- type: entity
+  id: ImmovableFriendSpawn
+  parent: ImmovableRodSpawn
+  components:
+  - type: ImmovableRodRule
+    rodPrototypes:
+    - id: ImmovableRodFinFin
diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml
index b95f5e881d63fc..f8b70053aff562 100644
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -20,6 +20,7 @@
     - id: UnknownShuttleMeatZone
     - id: UnknownShuttleMicroshuttle
     - id: UnknownShuttleSpacebus
+    - id: UnknownShuttleInstigator
 
 - type: entityTable
   id: UnknownShuttlesFreelanceTable
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 8f409a5eaf9632..77ae2288f3abb3 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -1,9 +1,11 @@
 - type: RandomPlantMutationList
   id: RandomPlantMutations
-  mutations:  
-    - name: Bioluminescent
-      baseOdds: 0.036
-      effect: !type:Glow
+  mutations:
+    # disabled until 50 morbillion point lights don't cause the renderer to die
+    #- name: Bioluminescent
+    #  baseOdds: 0.036
+    #  appliesToPlant: false
+    #  effect: !type:Glow
     - name: Sentient
       baseOdds: 0.0072
       appliesToProduce: false
@@ -11,6 +13,7 @@
       effect: !type:MakeSentient # existing effect.
     - name: Slippery
       baseOdds: 0.036
+      appliesToPlant: false
       effect: !type:Slipify
     - name: ChangeSpecies
       baseOdds: 0.036
@@ -176,4 +179,4 @@
     - name: ChangeHarvest
       baseOdds: 0.036
       persists: false
-      effect: !type:PlantMutateHarvest
\ No newline at end of file
+      effect: !type:PlantMutateHarvest
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 076b8bdcfe82c9..87049a1ef7bc73 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -128,6 +128,12 @@
     back:
     - ClothingNeckBisexualPin
 
+- type: loadout
+  id: ClothingNeckGayPin
+  storage:
+    back:
+    - ClothingNeckGayPin
+
 - type: loadout
   id: ClothingNeckIntersexPin
   storage:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 5a43ed4d706109..d5b864057c1709 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -26,6 +26,7 @@
   - ClothingNeckAromanticPin
   - ClothingNeckAsexualPin
   - ClothingNeckBisexualPin
+  - ClothingNeckGayPin
   - ClothingNeckIntersexPin
   - ClothingNeckLesbianPin
   - ClothingNeckNonBinaryPin
diff --git a/Resources/Prototypes/NPCs/firebot.yml b/Resources/Prototypes/NPCs/firebot.yml
new file mode 100644
index 00000000000000..acea6498bdbd8e
--- /dev/null
+++ b/Resources/Prototypes/NPCs/firebot.yml
@@ -0,0 +1,44 @@
+- type: htnCompound
+  id: FirebotCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: DouseFireTargetCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound    
+          
+- type: htnCompound
+  id: DouseFireTargetCompound
+  branches:
+    - tasks:
+        - !type:HTNPrimitiveTask
+          operator: !type:UtilityOperator
+            proto: NearbyOnFire
+
+        - !type:HTNPrimitiveTask
+          operator: !type:SpeakOperator
+            speech: firebot-fire-detected
+            hidden: true  
+
+        - !type:HTNPrimitiveTask
+          operator: !type:MoveToOperator
+            pathfindInPlanning: true
+            removeKeyOnFinish: false
+            targetKey: TargetCoordinates
+            pathfindKey: TargetPathfind
+            rangeKey: InteractRange
+
+        - !type:HTNPrimitiveTask
+          preconditions:
+            - !type:TargetInRangePrecondition
+              targetKey: Target
+              rangeKey: InteractRange
+          operator: !type:InteractWithOperator
+            targetKey: Target
+          services:
+            - !type:UtilityService
+              id: FireService
+              proto: NearbyOnFire
+              key: Target
+
diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index 06bc0a9a9ebe6f..e10a0ed30cd8f3 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -144,6 +144,27 @@
     - !type:TargetAccessibleCon
       curve: !type:BoolCurve
 
+- type: utilityQuery
+  id: NearbyOnFire
+  query:
+    - !type:ComponentQuery
+      components:
+        - type: Flammable
+          # why does Flammable even have a required damage
+          damage:
+            types:
+              burn: 0
+  considerations:
+    - !type:TargetDistanceCon
+      curve: !type:PresetCurve
+        preset: TargetDistance
+    - !type:TargetAccessibleCon
+      curve: !type:BoolCurve
+    - !type:TargetInLOSOrCurrentCon
+      curve: !type:BoolCurve
+    - !type:TargetOnFireCon
+      curve: !type:BoolCurve
+
 - type: utilityQuery
   id: NearbyPuddles
   query:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
new file mode 100644
index 00000000000000..977ffd409333d2
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
@@ -0,0 +1,33 @@
+- type: constructionGraph
+  id: FireBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: FireExtinguisher
+        icon:
+          sprite: Objects/Misc/fire_extinguisher.rsi
+          state: fire_extinguisher_open
+        name: fire extinguisher
+      - tag: FireHelmet
+        icon: 
+          sprite: Clothing/Head/Helmets/firehelmet.rsi
+          state: icon
+        name: fire helmet
+        doAfter: 2
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: borg arm
+        doAfter: 2
+  - node: bot
+    entity: MobFireBot
diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index b6d1993b16acdb..35b3bcfe6b8c5d 100644
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -11,6 +11,19 @@
     sprite: Mobs/Silicon/Bots/cleanbot.rsi
     state: cleanbot
 
+- type: construction
+  name: firebot
+  id: firebot
+  graph: FireBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This bot puts out fires wherever it goes.
+  icon:
+    sprite: Mobs/Silicon/Bots/firebot.rsi
+    state: firebot
+
 - type: construction
   name: honkbot
   id: honkbot
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 64c62765d568a5..d85f0836a3c864 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -206,6 +206,13 @@
   materials:
     Steel: 100
 
+- type: latheRecipe
+  id: FloorRedCircuit
+  result: FloorTileItemRCircuit4
+  completetime: 2
+  materials:
+    Steel: 100
+
 - type: latheRecipe
   id: HandheldStationMap
   result: HandheldStationMapEmpty
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index de03fcba19640d..65fd672e1aa816 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -538,6 +538,12 @@
   spawn: FloorTileItemBCircuit
   maxCount: 30
 
+- type: stack
+  id: FloorTileRCircuit
+  name: red-circuit floor
+  spawn: FloorTileItemRCircuit
+  maxCount: 30
+
 - type: stack
   id: FloorTileGrass
   name: grass floor tile
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 2d552cc33e04b2..c98ee6d582ccc5 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1422,6 +1422,18 @@
   itemDrop: FloorTileItemBCircuit
   heatCapacity: 10000
 
+- type: tile
+  id: FloorRedCircuit
+  name: tiles-red-circuit-floor
+  sprite: /Textures/Tiles/red_circuit.png
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemRCircuit
+  heatCapacity: 10000
+
 # Terrain
 - type: tile
   id: FloorAsphalt
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8a89142987afb2..e2ded71a0b0b16 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -650,6 +650,12 @@
 - type: Tag
   id: FirelockElectronics
 
+- type: Tag
+  id: FireExtinguisher
+
+- type: Tag
+  id: FireHelmet
+
 - type: Tag
   id: Flare
 
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png
index 726643237272c5..6bc5266367f4bf 100644
Binary files a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png
index 6bc5266367f4bf..726643237272c5 100644
Binary files a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json
deleted file mode 100644
index e82672f071cdc3..00000000000000
--- a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-NC-4.0",
-  "copyright": "Terraspark's work",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "autism"
-        },
-        {
-            "name": "autism-equipped",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/star-equipped.png b/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/star-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
index ae8a2141dbddae..0ed35562ca477e 100644
--- a/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/dinkystar.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "icon"
         },
         {
-            "name": "star-equipped",
+            "name": "equipped-NECK",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json
deleted file mode 100644
index 6848744ab8a647..00000000000000
--- a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-NC-4.0",
-  "copyright": "Terraspark's work",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "goldautism"
-        },
-        {
-            "name": "goldautism-equipped",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png
new file mode 100644
index 00000000000000..d5127a021865ca
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png
new file mode 100644
index 00000000000000..580d390fce956c
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index 46b04963997008..0619f962df3fcc 100644
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "PixelTK leaves his mark on upstream",
+  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark",
   "size": {
     "x": 32,
     "y": 32
@@ -11,63 +11,84 @@
             "name": "aro"
         },
         {
-            "name": "aro-equipped",
+            "name": "aro-equipped-NECK",
             "directions": 4
         },
         {
             "name": "asex"
         },
         {
-            "name": "asex-equipped",
+            "name": "asex-equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "autism"
+        },
+        {
+            "name": "autism-equipped-NECK",
             "directions": 4
         },
         {
             "name": "bi"
         },
         {
-            "name": "bi-equipped",
+            "name": "bi-equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "gay"
+        },
+        {
+            "name": "gay-equipped-NECK",
+            "directions": 4
+        },
+        {
+            "name": "goldautism"
+        },
+        {
+            "name": "goldautism-equipped-NECK",
             "directions": 4
         },
         {
             "name": "inter"
         },
         {
-            "name": "inter-equipped",
+            "name": "inter-equipped-NECK",
             "directions": 4
         },
         {
             "name": "les"
         },
         {
-            "name": "les-equipped",
+            "name": "les-equipped-NECK",
             "directions": 4
         },
         {
             "name": "lgbt"
         },
         {
-            "name": "lgbt-equipped",
+            "name": "lgbt-equipped-NECK",
             "directions": 4
         },
         {
             "name": "non"
         },
         {
-            "name": "non-equipped",
+            "name": "non-equipped-NECK",
             "directions": 4
         },
         {
             "name": "pan"
         },
         {
-            "name": "pan-equipped",
+            "name": "pan-equipped-NECK",
             "directions": 4
         },
         {
             "name": "trans"
         },
         {
-            "name": "trans-equipped",
+            "name": "trans-equipped-NECK",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png
rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png
diff --git a/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/firebot.png b/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/firebot.png
new file mode 100644
index 00000000000000..70ee9313d2d62b
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/firebot.png differ
diff --git a/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/meta.json
new file mode 100644
index 00000000000000..e13b42deee7d89
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/Bots/firebot.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/eba0d62005e7754dd8b1c88e45cd949c360774d5",
+  "states": [
+    {
+      "name": "firebot",
+      "delays": [
+        [
+          0.5,
+          0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png
new file mode 100644
index 00000000000000..69be9eb42e1183
Binary files /dev/null and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png differ
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index e7415fe1c271c5..b79f46d08db63f 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav made by ArchRBX (github)",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav, cart-med made by ArchRBX (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -55,6 +55,9 @@
     {
       "name": "cart-m"
     },
+    {
+      "name": "cart-med"
+    },
     {
       "name": "cart-mi"
     },
diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png
new file mode 100644
index 00000000000000..02409127a3fdaf
Binary files /dev/null and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png differ
diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
index 6ae7bca9dda456..a6222e988f7234 100644
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
@@ -35,6 +35,7 @@
     {"name": "sec_label"},
     {"name": "service_label"},
     {"name": "synd_label"},
-    {"name": "borg_label"}
+    {"name": "borg_label"},
+    {"name": "ai_label"}
   ]
 }
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 7db50200ed6890..7562d0f9b11bcb 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -159,6 +159,9 @@
     {
       "name": "bcircuit"
     },
+    {
+      "name": "rcircuit"
+    },
     {
       "name": "carpet-black"
     },
@@ -472,6 +475,14 @@
       "name": "gold-inhand-left",
       "directions": 4
     },
+    {
+      "name": "rcircuit-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "rcircuit-inhand-left",
+      "directions": 4
+    },
     {
       "name": "reinforced-inhand-right",
       "directions": 4
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png
new file mode 100644
index 00000000000000..06a279199c0333
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png
new file mode 100644
index 00000000000000..44703f72f7df66
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png
new file mode 100644
index 00000000000000..be9dc0c20fa637
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png
new file mode 100644
index 00000000000000..f84c6150fdf61f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png
new file mode 100644
index 00000000000000..6857f2a24154b0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png
new file mode 100644
index 00000000000000..65ea6c4f570730
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png
new file mode 100644
index 00000000000000..c78d01c42d084d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png
new file mode 100644
index 00000000000000..567e59aaef1771
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png
new file mode 100644
index 00000000000000..2a71f76d5d0c79
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png
new file mode 100644
index 00000000000000..7c56263f83958a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png
new file mode 100644
index 00000000000000..817f2fb3f95c53
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json
new file mode 100644
index 00000000000000..ed871d3b7e6208
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, hydroponics version made by BackeTako (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png
new file mode 100644
index 00000000000000..667b6bcf003ac8
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png
new file mode 100644
index 00000000000000..084547837bfd45
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png
new file mode 100644
index 00000000000000..84933bd5ed9cd4
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png
new file mode 100644
index 00000000000000..db7be0bc4a0ec0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png
new file mode 100644
index 00000000000000..24eb2aedc2248a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png
new file mode 100644
index 00000000000000..fc90acd637a636
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png
new file mode 100644
index 00000000000000..dd67e88a315f67
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png
new file mode 100644
index 00000000000000..fb5d774588ae44
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png
new file mode 100644
index 00000000000000..f16a028dee5bbe
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png
new file mode 100644
index 00000000000000..630eabb976ecf1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png
new file mode 100644
index 00000000000000..a0040dfdc73fb4
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png
new file mode 100644
index 00000000000000..c0d8c9c7d59d6a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png
new file mode 100644
index 00000000000000..6857f2a24154b0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png
new file mode 100644
index 00000000000000..bba4b8030834c3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png
new file mode 100644
index 00000000000000..c78d01c42d084d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png
new file mode 100644
index 00000000000000..9963ddf614cd1d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png
new file mode 100644
index 00000000000000..2a71f76d5d0c79
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png
new file mode 100644
index 00000000000000..7c56263f83958a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png
new file mode 100644
index 00000000000000..817f2fb3f95c53
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json
new file mode 100644
index 00000000000000..def0b429a270b3
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, hydroponics version made by BackeTako (github) for ss14", 
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png
new file mode 100644
index 00000000000000..667b6bcf003ac8
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png
new file mode 100644
index 00000000000000..81aa75f7a5a943
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png
new file mode 100644
index 00000000000000..84933bd5ed9cd4
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png
new file mode 100644
index 00000000000000..db7be0bc4a0ec0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png
new file mode 100644
index 00000000000000..24eb2aedc2248a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png
new file mode 100644
index 00000000000000..fc90acd637a636
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png
new file mode 100644
index 00000000000000..dd67e88a315f67
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png
new file mode 100644
index 00000000000000..fb5d774588ae44
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png
new file mode 100644
index 00000000000000..f16a028dee5bbe
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png
new file mode 100644
index 00000000000000..630eabb976ecf1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png
new file mode 100644
index 00000000000000..a0040dfdc73fb4
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
index eb81655efaaeef..338d7c8de01ea0 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 6a6f545d1e9fea..652947cb53c094 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -26,7 +26,7 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
+- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "red_circuit.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
   license: "CC-BY-SA-3.0"
   copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
   source: "https://github.com/tgstation/tgstation/"
diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png
index 021c5363d6ece3..0a95b49aa50479 100644
Binary files a/Resources/Textures/Tiles/blue_circuit.png and b/Resources/Textures/Tiles/blue_circuit.png differ
diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png
index 1628c20ae775e1..0638d7bde5c123 100644
Binary files a/Resources/Textures/Tiles/green_circuit.png and b/Resources/Textures/Tiles/green_circuit.png differ
diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png
new file mode 100644
index 00000000000000..44e33bdee31b02
Binary files /dev/null and b/Resources/Textures/Tiles/red_circuit.png differ
diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png
index b7792ef138e88c..e41e7a1804ec88 100644
Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ