diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
index bd5879408e..fd5a7bb161 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
@@ -26,7 +26,7 @@
             Text="{Loc 'news-read-ui-next-text'}"
             ToolTip="{Loc 'news-read-ui-next-tooltip'}"/>
     </BoxContainer>
-    <controls:StripeBack Name="АrticleNameContainer">
+    <controls:StripeBack Name="ArticleNameContainer">
         <PanelContainer>
             <Label Name="PageNum" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,0,0"/>
             <Label Name="PageName" Align="Center"/>
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 5771e0f06c..b08f774271 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -248,14 +248,14 @@ await server.WaitPost(() =>
                     var jobs = new HashSet<ProtoId<JobPrototype>>(comp.SetupAvailableJobs.Keys);
 
                     var spawnPoints = entManager.EntityQuery<SpawnPointComponent>()
-                        .Where(x => x.SpawnType == SpawnPointType.Job)
-                        .Select(x => x.Job!.Value);
+                        .Where(x => x.SpawnType == SpawnPointType.Job && x.Job != null)
+                        .Select(x => x.Job.Value);
 
                     jobs.ExceptWith(spawnPoints);
 
                     spawnPoints = entManager.EntityQuery<ContainerSpawnPointComponent>()
-                        .Where(x => x.SpawnType == SpawnPointType.Job)
-                        .Select(x => x.Job!.Value);
+                        .Where(x => x.SpawnType is SpawnPointType.Job or SpawnPointType.Unset && x.Job != null)
+                        .Select(x => x.Job.Value);
 
                     jobs.ExceptWith(spawnPoints);
 
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index d4a3a0d5fa..59ef08402e 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -76,7 +76,7 @@ private void OnPowerChanged(Entity<AnomalySynchronizerComponent> ent, ref PowerC
         if (!TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
             return;
 
-        DisconneсtFromAnomaly(ent, anomaly);
+        DisconnectFromAnomaly(ent, anomaly);
     }
 
     private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEvent args)
@@ -125,7 +125,7 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
 
     //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
-    private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
+    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
     {
         if (ent.Comp.ConnectedAnomaly == null)
             return;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 2c9a358755..fbe74cbab7 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -152,6 +152,7 @@ private void OnPacketRecv(EntityUid uid, AtmosMonitorComponent component, Device
                 }
 
                 _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload);
+                Alert(uid, component.LastAlarmState);
                 break;
         }
     }
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 5f49557bed..57239ee8c1 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -215,9 +215,10 @@ private void OnRoundEnd(Entity<NukeopsRuleComponent> ent)
 
         var diskAtCentCom = false;
         var diskQuery = AllEntityQuery<NukeDiskComponent, TransformComponent>();
-        while (diskQuery.MoveNext(out _, out var transform))
+        while (diskQuery.MoveNext(out var diskUid, out _, out var transform))
         {
             diskAtCentCom = transform.MapUid != null && centcomms.Contains(transform.MapUid.Value);
+            diskAtCentCom |= _emergency.IsTargetEscaping(diskUid);
 
             // TODO: The target station should be stored, and the nuke disk should store its original station.
             // This is fine for now, because we can assume a single station in base SS14.
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 0b86383faa..9b94d6024e 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -11,6 +11,7 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Spawners.Components;
+using Content.Server.Spawners.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
 using Content.Server.Station.Systems;
@@ -69,11 +70,6 @@ public sealed class ArrivalsSystem : EntitySystem
     /// </summary>
     public bool Enabled { get; private set; }
 
-    /// <summary>
-    /// Flags if all players must arrive via the Arrivals system, or if they can spawn in other ways.
-    /// </summary>
-    public bool Forced { get; private set; }
-
     /// <summary>
     /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal.
     /// </summary>
@@ -95,6 +91,8 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: new []{ typeof(ContainerSpawnPointSystem), typeof(SpawnPointSystem)});
+
         SubscribeLocalEvent<StationArrivalsComponent, StationPostInitEvent>(OnStationPostInit);
 
         SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);
@@ -112,11 +110,9 @@ public override void Initialize()
 
         // Don't invoke immediately as it will get set in the natural course of things.
         Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
-        Forced = _cfgManager.GetCVar(CCVars.ForceArrivals);
         ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals);
 
         _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
-        _cfgManager.OnValueChanged(CCVars.ForceArrivals, b => Forced = b);
         _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b);
 
         // Command so admins can set these for funsies
@@ -339,7 +335,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
             return;
 
         // Only works on latejoin even if enabled.
-        if (!Enabled || !Forced && _ticker.RunLevel != GameRunLevel.InRound)
+        if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
             return;
 
         if (!HasComp<StationArrivalsComponent>(ev.Station))
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index e670445745..8da7aaa641 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -118,7 +118,7 @@ private void OnStationPostInit(ref StationPostInitEvent ev)
                 continue;
             }
 
-            TryAddFTLDestination(gridXform.MapID, true, out _);
+            TryAddFTLDestination(gridXform.MapID, true, false, false, out _);
         }
     }
 
diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index e213f29d07..ef0ece524c 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -15,6 +15,12 @@ public sealed class ContainerSpawnPointSystem : EntitySystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PlayerSpawningEvent>(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) });
+    }
+
     public void HandlePlayerSpawning(PlayerSpawningEvent args)
     {
         if (args.SpawnResult != null)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 21510aed68..342d4c1483 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -56,27 +56,11 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
 
     private bool _randomizeCharacters;
 
-    private Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>> _spawnerCallbacks = new();
-
     /// <inheritdoc/>
     public override void Initialize()
     {
         base.Initialize();
         Subs.CVar(_configurationManager, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
-
-        _spawnerCallbacks = new Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>>()
-        {
-            { SpawnPriorityPreference.Arrivals, _arrivalsSystem.HandlePlayerSpawning },
-            {
-                SpawnPriorityPreference.Cryosleep, ev =>
-                {
-                    if (_arrivalsSystem.Forced)
-                        _arrivalsSystem.HandlePlayerSpawning(ev);
-                    else
-                        _containerSpawnPointSystem.HandlePlayerSpawning(ev);
-                }
-            }
-        };
     }
 
     /// <summary>
@@ -98,33 +82,7 @@ public override void Initialize()
 
         var ev = new PlayerSpawningEvent(job, profile, station);
 
-        if (station != null && profile != null)
-        {
-            // Try to call the character's preferred spawner first.
-            if (_spawnerCallbacks.TryGetValue(profile.SpawnPriority, out var preferredSpawner))
-            {
-                preferredSpawner(ev);
-
-                foreach (var (key, remainingSpawner) in _spawnerCallbacks)
-                {
-                    if (key == profile.SpawnPriority)
-                        continue;
-
-                    remainingSpawner(ev);
-                }
-            }
-            else
-            {
-                // Call all of them in the typical order.
-                foreach (var typicalSpawner in _spawnerCallbacks.Values)
-                {
-                    typicalSpawner(ev);
-                }
-            }
-        }
-
         RaiseLocalEvent(ev);
-
         DebugTools.Assert(ev.SpawnResult is { Valid: true } or null);
 
         return ev.SpawnResult;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 4d1ba39a3e..95fb7bd692 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1478,12 +1478,6 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> ArrivalsReturns =
             CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY);
 
-        /// <summary>
-        /// Should all players be forced to spawn at departures, even on roundstart, even if their loadout says they spawn in cryo?
-        /// </summary>
-        public static readonly CVarDef<bool> ForceArrivals =
-            CVarDef.Create("shuttle.force_arrivals", false, CVar.SERVERONLY);
-
         /// <summary>
         /// Should all players who spawn at arrivals have godmode until they leave the map?
         /// </summary>
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 50905610d4..b3ef8b210b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,108 +1,4 @@
 Entries:
-- author: K-Dynamic
-  changes:
-  - message: Added witch robes and witch hat to the AutoDrobe.
-    type: Add
-  id: 6735
-  time: '2024-06-15T02:19:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28965
-- author: Plykiya
-  changes:
-  - message: You can no longer insert duplicates of the same module into a cyborg.
-    type: Tweak
-  id: 6736
-  time: '2024-06-15T02:58:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28943
-- author: Vermidia
-  changes:
-  - message: Nukie planet now has an improved Donk co. microwave, which cooks twice
-      as fast but is more likely to explode. It can't handle id cards without exploding.
-    type: Add
-  - message: Made microwave explosions destroy the machine board and spit out the
-      machine parts.
-    type: Tweak
-  id: 6737
-  time: '2024-06-15T03:00:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28951
-- author: robertGN
-  changes:
-  - message: Using a welder on vending machines now correctly repairs the vending
-      machine.
-    type: Fix
-  id: 6738
-  time: '2024-06-15T03:13:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28920
-- author: Brandon-Huu
-  changes:
-  - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant
-      box.
-    type: Remove
-  id: 6739
-  time: '2024-06-15T03:23:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28999
-- author: EmoGarbage404
-  changes:
-  - message: Revamped meteors. Meteors now crash through several walls before exploding.
-      They can still come in a weaker "space dust" form where they don't break through
-      structures.
-    type: Add
-  - message: Meteor and space dust events now occur on regular intervals during a
-      round rather than being tied to station events. Expect to see more of them during
-      a round.
-    type: Add
-  id: 6740
-  time: '2024-06-15T03:38:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28974
-- author: EmoGarbage404
-  changes:
-  - message: Added Moon Boots! This science research item allows you to move like
-      you're in zero-gravity.
-    type: Add
-  id: 6741
-  time: '2024-06-15T03:43:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29009
-- author: EmoGarbage404
-  changes:
-  - message: Attempting to uncuff oneself while being pulled will now take twice as
-      long.
-    type: Tweak
-  - message: Reduced cooldown after attempting to uncuff oneself back to previous
-      values.
-    type: Tweak
-  id: 6742
-  time: '2024-06-15T04:01:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29008
-- author: EmoGarbage404
-  changes:
-  - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly
-      opening and closing.
-    type: Fix
-  id: 6743
-  time: '2024-06-15T05:20:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29010
-- author: Flareguy
-  changes:
-  - message: Replaced RelayStation with a more fair ruin.
-    type: Remove
-  id: 6744
-  time: '2024-06-15T06:02:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28971
-- author: metalgearsloth
-  changes:
-  - message: Fix the character profile sometimes thinking there's changes to save
-      even if the loadouts haven't changed.
-    type: Fix
-  id: 6745
-  time: '2024-06-15T06:52:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28737
-- author: EmoGarbage404
-  changes:
-  - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks
-      disappearing.
-    type: Fix
-  id: 6746
-  time: '2024-06-15T13:19:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29006
 - author: ShadowCommander
   changes:
   - message: Added a red light to firelocks when their warning lights are active.
@@ -3860,3 +3756,91 @@
   id: 7234
   time: '2024-08-28T09:43:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29055
+- author: saintmuntzer
+  changes:
+  - message: Riot helmet now matches security helmet colors.
+    type: Fix
+  id: 7235
+  time: '2024-08-28T11:27:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31530
+- author: coolboy911
+  changes:
+  - message: wide-spectrum anomaly locator is now included in cyborg's anomaly module
+    type: Add
+  id: 7236
+  time: '2024-08-28T12:36:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31427
+- author: deltanedas
+  changes:
+  - message: You can now build carp statues with luxury materials.
+    type: Add
+  id: 7237
+  time: '2024-08-28T13:08:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31261
+- author: PopGamer46
+  changes:
+  - message: Fixed shuttles not being able to FTL onto the station
+    type: Fix
+  id: 7238
+  time: '2024-08-28T13:22:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31569
+- author: themias
+  changes:
+  - message: Defibs batteries no longer drain when switched off
+    type: Fix
+  id: 7239
+  time: '2024-08-28T17:31:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31593
+- author: themias
+  changes:
+  - message: Fixed the nuke disk being marked 'left behind' when escaping with it
+      on the shuttle
+    type: Fix
+  id: 7240
+  time: '2024-08-28T20:05:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31602
+- author: Beck Thompson
+  changes:
+  - message: Gold and silver ring, gold and silver diamond ring, gold and silver gem
+      ring. They all can be obtained in salvage loot pools.
+    type: Add
+  id: 7241
+  time: '2024-08-28T20:48:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31372
+- author: RumiTiger
+  changes:
+  - message: Cherry has been added to the game!
+    type: Add
+  - message: The recipe for cherry pie has been reintroduced to the game!
+    type: Add
+  id: 7242
+  time: '2024-08-29T01:30:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28962
+- author: SlamBamActionman, Graded
+  changes:
+  - message: Added administration glasses to Captain and HoP lockers!
+    type: Add
+  id: 7243
+  time: '2024-08-29T01:58:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30447
+- author: osjarw
+  changes:
+  - message: Fix air alarms not checking sensor states upon power returning.
+    type: Fix
+  id: 7244
+  time: '2024-08-29T02:43:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29857
+- author: Winkarst-cpu
+  changes:
+  - message: Now railings render over tables.
+    type: Tweak
+  id: 7245
+  time: '2024-08-29T03:04:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31589
+- author: metalgearsloth
+  changes:
+  - message: Fix storage UI being buggy.
+    type: Fix
+  id: 7246
+  time: '2024-08-29T03:23:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31616
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 879bbb8812..eb6a43c1b4 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -123,6 +123,7 @@ flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle
 flavor-complex-vegetables = like vegetables
+flavor-complex-cherry = like cherries
 # use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl
index 2295a9ba9d..51a0345bc6 100644
--- a/Resources/Locale/en-US/job/department.ftl
+++ b/Resources/Locale/en-US/job/department.ftl
@@ -5,5 +5,5 @@ department-Engineering = Engineering
 department-Medical = Medical
 department-Security = Security
 department-Science = Science
-department-Silicon = Silicons
+department-Silicon = Silicon
 department-Specific = Station specific
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 0da77b7bc7..672b0a0e7a 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -72,6 +72,7 @@ food-sequence-content-suppermatter = suppermatter
 food-sequence-content-capfruit = capfruit
 food-sequence-content-berries = berries
 food-sequence-content-spacemans-trumpet = spacemans trupmet
+food-sequence-content-cherry = cherry
 
 # BURGERS
 
@@ -117,4 +118,4 @@ food-sequence-taco-gen = taco with {$content}
 
 # SKEWER
 
-food-sequence-skewer-gen = {$content} kebab
\ No newline at end of file
+food-sequence-skewer-gen = {$content} kebab
diff --git a/Resources/Locale/en-US/paper/story-generation.ftl b/Resources/Locale/en-US/paper/story-generation.ftl
index 98a9c9d036..c9bead45ca 100644
--- a/Resources/Locale/en-US/paper/story-generation.ftl
+++ b/Resources/Locale/en-US/paper/story-generation.ftl
@@ -109,7 +109,7 @@ story-gen-book-character-trait11 = poor
 story-gen-book-character-trait12 = popular
 story-gen-book-character-trait13 = absent-minded
 story-gen-book-character-trait14 = stern
-story-gen-book-character-trait15 = сharismatic
+story-gen-book-character-trait15 = charismatic
 story-gen-book-character-trait16 = stoic
 story-gen-book-character-trait17 = cute
 story-gen-book-character-trait18 = dwarven
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
index daa54bc3b1..b9fd54bc13 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
@@ -42,3 +42,6 @@ reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomat
 
 reagent-name-juice-watermelon = water melon juice
 reagent-desc-juice-watermelon = The delicious juice of a watermelon.
+
+reagent-name-juice-cherry = cherry juice
+reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 72b88ea3c5..138d3c9914 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -130,3 +130,5 @@ seeds-pyrotton-name = pyrotton
 seeds-pyrotton-display-name = pyrotton plant
 seeds-capfruit-name = capfruit
 seeds-capfruit-display-name = capfruit tree
+seeds-cherry-name = cherry
+seeds-cherry-display-name = cherry tree
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 27ecdc98f0..b84202a291 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -438,7 +438,7 @@ uplink-barber-scissors-name = Barber Scissors
 uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself.
 
 uplink-backpack-syndicate-name = Syndicate backpack
-uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods
+uplink-backpack-syndicate-desc = Lightweight explosion-proof a backpack for holding various traitor goods
 
 uplink-combat-bakery-name = Combat Bakery Kit
-uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
\ No newline at end of file
+uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
diff --git a/Resources/Maps/Shuttles/escape_pod_small.yml b/Resources/Maps/Shuttles/escape_pod_small.yml
index 4746f0d297..d0670f3991 100644
--- a/Resources/Maps/Shuttles/escape_pod_small.yml
+++ b/Resources/Maps/Shuttles/escape_pod_small.yml
@@ -121,7 +121,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,0.5
       parent: 29
-- proto: AtmosDeviceFanDirectional
+- proto: AtmosDeviceFanTiny
   entities:
   - uid: 9
     components:
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index b8666fdb3c..c1a902173f 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -5561,6 +5561,7 @@ entities:
             id: WarnLineGreyscaleN
           decals:
             3475: 44,-9
+            4189: 33,-17
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleN
@@ -5613,6 +5614,11 @@ entities:
             2336: 4,-1
             2337: -4,-1
             2338: 0,-1
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleS
+          decals:
+            4188: 33,-21
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleS
@@ -12126,11 +12132,6 @@ entities:
     - type: Transform
       pos: 1.5,-21.5
       parent: 60
-  - uid: 13738
-    components:
-    - type: Transform
-      pos: 18.5,-18.5
-      parent: 60
   - uid: 13869
     components:
     - type: Transform
@@ -12180,11 +12181,6 @@ entities:
     - type: Transform
       pos: -26.5,22.5
       parent: 60
-  - uid: 16171
-    components:
-    - type: Transform
-      pos: 18.5,-17.5
-      parent: 60
   - uid: 17568
     components:
     - type: MetaData
@@ -28168,11 +28164,6 @@ entities:
     - type: Transform
       pos: -58.5,20.5
       parent: 60
-  - uid: 17403
-    components:
-    - type: Transform
-      pos: -58.5,19.5
-      parent: 60
   - uid: 17404
     components:
     - type: Transform
@@ -32183,6 +32174,11 @@ entities:
     - type: Transform
       pos: -54.5,16.5
       parent: 60
+  - uid: 24815
+    components:
+    - type: Transform
+      pos: 0.5,-53.5
+      parent: 60
 - proto: CableApcStack
   entities:
   - uid: 9517
@@ -62357,6 +62353,28 @@ entities:
     - type: Transform
       pos: 51.475224,-22.209888
       parent: 60
+- proto: CurtainsRedOpen
+  entities:
+  - uid: 23090
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 60
+  - uid: 23091
+    components:
+    - type: Transform
+      pos: 21.5,-21.5
+      parent: 60
+  - uid: 24816
+    components:
+    - type: Transform
+      pos: 22.5,-21.5
+      parent: 60
+  - uid: 24817
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 60
 - proto: CurtainsWhiteOpen
   entities:
   - uid: 21250
@@ -109119,6 +109137,11 @@ entities:
     - type: Transform
       pos: 47.487705,-12.25134
       parent: 60
+  - uid: 23089
+    components:
+    - type: Transform
+      pos: 43.51102,-1.4624498
+      parent: 60
 - proto: MedkitBurnFilled
   entities:
   - uid: 5675
@@ -116403,34 +116426,32 @@ entities:
     - type: Transform
       pos: -57.5,29.5
       parent: 60
-- proto: RadiationCollector
+- proto: RadiationCollectorFullTank
   entities:
   - uid: 8211
     components:
     - type: Transform
-      pos: 5.5,38.5
+      pos: 4.5,38.5
       parent: 60
-  - uid: 16160
+  - uid: 11527
     components:
     - type: Transform
-      pos: 6.5,38.5
+      pos: -4.5,38.5
       parent: 60
-  - uid: 16411
+  - uid: 13738
     components:
     - type: Transform
       pos: -3.5,38.5
       parent: 60
-  - uid: 17479
+  - uid: 16160
     components:
     - type: Transform
-      pos: 4.5,38.5
+      pos: 6.5,38.5
       parent: 60
-- proto: RadiationCollectorFullTank
-  entities:
-  - uid: 11527
+  - uid: 16171
     components:
     - type: Transform
-      pos: -4.5,38.5
+      pos: 5.5,38.5
       parent: 60
   - uid: 16384
     components:
@@ -124246,6 +124267,21 @@ entities:
         21755:
         - On: Open
         - Off: Close
+  - uid: 24818
+    components:
+    - type: MetaData
+      name: light switch
+    - type: Transform
+      pos: 21.5,-14.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        1209:
+        - On: On
+        - Off: Off
+        1210:
+        - On: On
+        - Off: Off
 - proto: SignAnomaly
   entities:
   - uid: 9496
@@ -134894,6 +134930,11 @@ entities:
     - type: Transform
       pos: -51.5,-19.5
       parent: 60
+  - uid: 7071
+    components:
+    - type: Transform
+      pos: 18.5,-16.5
+      parent: 60
   - uid: 7077
     components:
     - type: Transform
@@ -134954,6 +134995,11 @@ entities:
     - type: Transform
       pos: -31.5,-4.5
       parent: 60
+  - uid: 16411
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 60
 - proto: TobaccoSeeds
   entities:
   - uid: 3263
@@ -152274,11 +152320,6 @@ entities:
     - type: Transform
       pos: 15.5,-25.5
       parent: 60
-  - uid: 2910
-    components:
-    - type: Transform
-      pos: 18.5,-16.5
-      parent: 60
   - uid: 3347
     components:
     - type: Transform
@@ -152344,11 +152385,6 @@ entities:
     - type: Transform
       pos: 14.5,12.5
       parent: 60
-  - uid: 7071
-    components:
-    - type: Transform
-      pos: 18.5,-19.5
-      parent: 60
   - uid: 7719
     components:
     - type: Transform
@@ -156479,6 +156515,11 @@ entities:
       parent: 60
 - proto: WoodDoor
   entities:
+  - uid: 2910
+    components:
+    - type: Transform
+      pos: 18.5,-18.5
+      parent: 60
   - uid: 3637
     components:
     - type: Transform
@@ -156503,6 +156544,11 @@ entities:
     - type: Transform
       pos: -18.5,19.5
       parent: 60
+  - uid: 17479
+    components:
+    - type: Transform
+      pos: 18.5,-17.5
+      parent: 60
 - proto: Wrench
   entities:
   - uid: 1556
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 80f9ba58b9..974e6e00ba 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -11015,7 +11015,7 @@ entities:
       pos: -20.5,-5.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -25025.113
+      secondsUntilStateChange: -25052.139
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -118879,6 +118879,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-0.5
       parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Sec Med Office
   - uid: 21283
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index a6671ff099..0a24240e7d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -34,7 +34,7 @@
     sprite: Objects/Specific/Hydroponics/apple.rsi
     state: seed
   product: CrateHydroponicsSeeds
-  cost: 550
+  cost: 600
   category: cargoproduct-category-name-hydroponics
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index c0d8a422f2..85b635289e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -91,3 +91,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: CherrySeeds
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 8a1223dc6c..6261884ebe 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -50,6 +50,7 @@
     - id: RubberStampCaptain
     - id: SpaceCash1000
     - id: WeaponDisabler
+    - id: ClothingEyesGlassesCommand
 
 # No laser table + Laser table
 - type: entityTable
@@ -132,6 +133,7 @@
     - id: RubberStampDenied
     - id: RubberStampHop
     - id: WeaponDisabler
+    - id: ClothingEyesHudCommand
     - id: BoxPrinter # Stories
 
 - type: entity
@@ -377,4 +379,4 @@
     - id: JetpackBlue
     - id: SpaceCash1000
     - id: BeachBall
-    - id: BikeHorn
\ No newline at end of file
+    - id: BikeHorn
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index d625d42743..bd0990050b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -9,6 +9,7 @@
     CarrotSeeds: 5
     CabbageSeeds: 5
     ChanterelleSeeds: 5
+    CherrySeeds: 5
     ChiliSeeds: 5
     CocoaSeeds: 3
     CornSeeds: 5
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 41e89eef61..2201504b26 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -612,7 +612,7 @@
 - type: entity
   parent: ClothingBeltSecurity
   id: ClothingBeltSecurityWebbing
-  name: security webbing
+  name: security carrier
   description: Unique and versatile chest rig, can hold security gear.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 90d792e0f2..acc007415e 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -158,7 +158,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband]
+  parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband]
   id: ClothingEyesGlassesSecurity
   name: security glasses
   description: Upgraded sunglasses that provide flash immunity and a security HUD.
@@ -184,6 +184,27 @@
   - type: IdentityBlocker
     coverage: EYES
 
+- type: entity
+  parent: [ClothingEyesBase, BaseCommandContraband]
+  id: ClothingEyesGlassesCommand
+  name: administration glasses
+  description: Upgraded sunglasses that provide flash immunity and show ID card status. 
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/commandglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/commandglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: ShowJobIcons
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesMercenary
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index e627cffc74..9e881bf9c2 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -49,7 +49,7 @@
     - HudMedical
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband]
+  parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband]
   id: ClothingEyesHudSecurity
   name: security hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
@@ -62,6 +62,18 @@
     tags:
     - HudSecurity
 
+- type: entity
+  parent: [ClothingEyesBase, BaseCommandContraband]
+  id: ClothingEyesHudCommand
+  name: administration hud
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/command.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/command.rsi
+  - type: ShowJobIcons
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesHudBeer
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index c1a53ccf6e..da0011e1cc 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -48,3 +48,16 @@
   - type: Fiber
     fiberMaterial: fibers-synthetic
   - type: FingerprintMask
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: RingBase
+  components:
+    - type: Clothing
+      slots: [ gloves, neck ]
+    - type: Item
+      size: Tiny
+    - type: Tag
+      tags:
+      - Ring
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
new file mode 100644
index 0000000000..e88ee81fee
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
@@ -0,0 +1,104 @@
+- type: entity
+  parent: RingBase
+  id: GoldRing
+  name: gold ring
+  description: A precious ring.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+    - type: StaticPrice
+      price: 300
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: SilverRing
+  name: silver ring
+  description: Looks slightly less valuable than a gold one.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+    - type: StaticPrice
+      price: 275
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: GoldRingDiamond
+  name: gold diamond ring
+  description: Made from ethically mined space diamonds.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+        - state: gem
+          color: "#c1ffff"
+    - type: StaticPrice
+      price: 1500
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: SilverRingDiamond
+  name: silver diamond ring
+  description: Made from ethically mined space diamonds.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+        - state: gem
+          color: "#c1ffff"
+    - type: StaticPrice
+      price: 1400
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: GoldRingGem
+  name: gold gem ring
+  description: Shiny and valuable!
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+        - state: gem
+          map: [ "gemColor" ]
+    - type: StaticPrice
+      price: 2100
+    - type: Appearance
+    - type: RandomSprite
+      getAllGroups: true
+      available:
+        - gemColor:
+            gem: Rainbow
+
+- type: entity
+  parent: RingBase
+  id: SilverRingGem
+  name: silver gem ring
+  description: Shiny and not quite as valuable!
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+        - state: gem
+          map: [ "gemColor" ]
+    - type: StaticPrice
+      price: 2000
+    - type: Appearance
+    - type: RandomSprite
+      getAllGroups: true
+      available:
+        - gemColor:
+            gem: Rainbow
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
index 0105c948c7..feee3cfbfd 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -139,6 +139,9 @@
       - id: FoodCocoaBeans
         amount: !type:RangeNumberSelector
           range: 1, 5
+      - id: FoodCherry
+        amount: !type:RangeNumberSelector
+          range: 1, 5
     #rare
     - !type:GroupSelector
       children:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 61b3d10817..1ee0f123ef 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -114,6 +114,8 @@
         range: 4, 7
     - id: SpaceCash1000
     - id: WristwatchGold
+    - !type:NestedSelector
+      tableId: RingTableCommon
 
 - type: entityTable
   id: SalvageTreasureRare
@@ -145,6 +147,8 @@
           weight: 14
         - id: SpaceCash10000
           weight: 1
+    - !type:NestedSelector
+      tableId: RingTableRare
 
 - type: entityTable
   id: SalvageTreasureLegendary
@@ -157,6 +161,10 @@
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5
+    - !type:NestedSelector
+      tableId: RingTableRare
+      rolls: !type:RangeNumberSelector
+        range: 2, 3
 
 # Equipment: Tools and things used by salvagers. Quote unquote "Gamer Loot"
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml
new file mode 100644
index 0000000000..17f83b28a5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml
@@ -0,0 +1,21 @@
+- type: entityTable
+  id: RingTableCommon
+  table: !type:GroupSelector
+    children:
+    - id: SilverRing
+      weight: 0.55
+    - id: GoldRing
+      weight: 0.45
+
+- type: entityTable
+  id: RingTableRare
+  table: !type:GroupSelector
+    children:
+    - id: GoldRingDiamond
+      weight: 0.1
+    - id: SilverRingDiamond
+      weight: 0.1
+    - id: GoldRingGem
+      weight: 0.35
+    - id: SilverRingGem
+      weight: 0.45
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index e1348c7b38..1425531282 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -242,7 +242,6 @@
   suffix: Job spawn
   components:
   - type: ContainerSpawnPoint
-    spawnType: Job
     containerId: station_ai_mind_slot
     job: StationAi
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 23c22e3bef..7a6f40fab6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2573,3 +2573,75 @@
     - CottonBoll
   - type: Extractable
     grindableSolutionName: food
+
+- type: entity
+  name: cherry
+  parent: FoodProduceBase
+  id: FoodCherry
+  description: Juicy red cherry with a pit inside.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cherry
+  - type: Food
+    trash:
+    - TrashCherryPit
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 3
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+  - type: Produce
+    seedId: cherry
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceCherry
+        Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-cherry
+      taco:
+        name: food-sequence-content-cherry
+
+- type: entity
+  name: cherry pit
+  parent: FoodInjectableBase
+  id: TrashCherryPit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    state: pit
+  - type: Item
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    heldPrefix: pit
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Toxin
+          Quantity: 1
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Seed
+    seedId: cherry
+  - type: SpaceGarbage
+  - type: BadFood
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index c9c372e277..56692f13cd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -672,3 +672,13 @@
   components:
     - type: Seed
       seedId: fakeCapfruit
+
+- type: entity
+  parent: SeedBase
+  name: packet of cherry seeds
+  id: CherrySeeds
+  components:
+    - type: Seed
+      seedId: cherry
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index 2d06ed0f1d..7b5ba23fe3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -47,6 +47,7 @@
     - type: GuideHelp
       guides:
       - Medical Doctor
+    - type: ToggleCellDraw
 
 - type: entity
   id: Defibrillator
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index a49f08e28f..062e261dc5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -411,6 +411,7 @@
     items:
     - AnomalyScanner
     - AnomalyLocatorUnpowered
+    - AnomalyLocatorWideUnpowered
     - RemoteSignaller
     - Multitool
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 91ac7b049a..ba20a7b0cd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -200,6 +200,7 @@
       - ClothingHeadHatWelding
       - WetFloorSign
       - ClothingHeadHatCone
+
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
index 2f58e5caea..17920565ef 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
@@ -57,8 +57,54 @@
   description: A statue of one of the brave carp that got us where we are today. Made with real teeth!
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Specific/carp_statue.rsi
     layers:
     - state: statue
-    - state: unshaded
+    - state: eyes
+    - state: eyes_unshaded
       shader: unshaded
+    - state: teeth_unshaded
+      shader: unshaded
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: CarpStatue
+    node: statue
+
+- type: entity
+  parent: CarpStatue
+  id: CarpStatueEmpty
+  suffix: Empty
+  description: A lump of precious metals, soon to be a brilliant carp statue.
+  components:
+  - type: Sprite
+    layers:
+    - state: statue
+  - type: Construction
+    node: empty
+
+- type: entity
+  parent: CarpStatue
+  id: CarpStatueEyes
+  suffix: Eyes
+  description: A statue of one of the brave carp that got us where we are today. This one needs a dentist...
+  components:
+  - type: Sprite
+    layers:
+    - state: statue
+    - state: eyes
+    - state: eyes_unshaded
+      shader: unshaded
+  - type: Construction
+    node: eyes
diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index a23c559aba..ace34a8052 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -5,7 +5,7 @@
   description: Basic railing meant to protect idiots like you from falling.
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: SmallObjects
     sprite: Structures/Walls/railing.rsi
     state: side
   - type: Icon
@@ -60,7 +60,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
 
 - type: entity
   parent: BaseStructure
@@ -69,7 +69,7 @@
   description: Basic railing meant to protect idiots like you from falling.
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: SmallObjects
     sprite: Structures/Walls/railing.rsi
     state: corner
   - type: Icon
@@ -133,7 +133,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
 
 - type: entity
   parent: BaseStructure
@@ -142,7 +142,7 @@
   description: Basic railing meant to protect idiots like you from falling.
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: SmallObjects
     sprite: Structures/Walls/railing.rsi
     state: corner_small
   - type: Icon
@@ -197,8 +197,8 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
-    
+    fx: EffectRCDDeconstruct2
+
 - type: entity
   parent: BaseStructure
   id: RailingRound
@@ -206,7 +206,7 @@
   description: Basic railing meant to protect idiots like you from falling.
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: SmallObjects
     sprite: Structures/Walls/railing.rsi
     state: round
   - type: Physics
@@ -276,4 +276,4 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 0e98b0a803..f48a12de33 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -507,6 +507,76 @@
   - type: Icon
     sprite: Structures/Walls/plastitanium_diagonal.rsi
     state: state0
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 2000
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalSlam
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:ChangeConstructionNodeBehavior
+        node: girder
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  id: WallPlastitaniumDiagonalIndestructible
+  name: plastitanium wall
+  suffix: diagonal, indestructible
+  description: Keeps the air in and the greytide out.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: Tag
+    tags:
+    - Wall
+  - type: Sprite
+    drawdepth: Walls
+    sprite: Structures/Walls/plastitanium_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: walls
+    base: state
+  - type: Icon
+    sprite: Structures/Walls/plastitanium_diagonal.rsi
+    state: state0
+  - type: Physics
+    bodyType: Static
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
 
 - type: entity
   parent: BaseWall
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index cb05f80cd1..2134cfe892 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -1,19 +1,77 @@
 - type: entity
-  id: PlastitaniumWindow
+  id: PlastitaniumWindowBase
+  parent: BaseStructure
+  abstract: true
   name: plastitanium window
-  parent: Window
+  description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: WallMount
+    arc: 360 # interact despite grilles
+  - type: Tag
+    tags:
+      - ForceFixRotations
+      - Window
+  - type: Physics
+    bodyType: Static
+  - type: ExaminableDamage
+    messages: WindowMessages
+  - type: InteractionPopup
+    interactSuccessString: comp-window-knock
+    messagePerceivedByOthers: comp-window-knock
+    interactSuccessSound:
+      path: /Audio/Effects/glass_knock.ogg
+  - type: Appearance
+  - type: StaticPrice
+    price: 100
+  - type: BlockWeather
+
+- type: entity
+  id: PlastitaniumWindowSquareBase
+  abstract: true
+  name: plastitanium window
+  parent: PlastitaniumWindowBase
   components:
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/plastitanium_window.rsi
   - type: Icon
     sprite: Structures/Windows/plastitanium_window.rsi
-  - type: Repairable
-    fuelCost: 15
-    doAfterDelay: 3
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: RGlass
+    state: full
+  - type: IconSmooth
+    key: windows
+    base: ptwindow
+  - type: Airtight
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+
+- type: entity
+  id: PlastitaniumWindowIndestructible
+  name: plastitanium window
+  parent: PlastitaniumWindowSquareBase
+  suffix: indestructible
+
+- type: entity
+  id: PlastitaniumWindow
+  name: plastitanium window
+  parent: PlastitaniumWindowSquareBase
+  components:
   - type: Destructible
     thresholds:
     - trigger:
@@ -39,38 +97,37 @@
             max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: IconSmooth
-    base: ptwindow
-  - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
     damageDivisor: 28
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
-  - type: StaticPrice
-    price: 100
+  - type: Repairable
+    fuelCost: 15
+    doAfterDelay: 3
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
 
 - type: entity
-  parent: ShuttleWindow
-  id: PlastitaniumWindowDiagonal
+  id: PlastitaniumWindowDiagonalBase
+  abstract: true
+  name: plastitanium window
+  parent: PlastitaniumWindowBase
   suffix: diagonal
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Window
   components:
   - type: Sprite
     drawdepth: WallTops
     sprite: Structures/Windows/plastitanium_window_diagonal.rsi
     state: state0
+  - type: Icon
+    sprite: Structures/Windows/plastitanium_window_diagonal.rsi
+    state: state0
   - type: IconSmooth
     mode: Diagonal
     key: windows
     base: state
-  - type: Icon
-    sprite: Structures/Windows/plastitanium_window_diagonal.rsi
-    state: state0
   - type: Fixtures
     fixtures:
       fix1:
@@ -89,6 +146,53 @@
     airBlockedDirection:
     - South
     - East
+
+- type: entity
+  id: PlastitaniumWindowDiagonalIndestructible
+  name: plastitanium window
+  parent: PlastitaniumWindowDiagonalBase
+  suffix: diagonal, indestructible
+
+- type: entity
+  id: PlastitaniumWindowDiagonal
+  name: plastitanium window
+  parent: PlastitaniumWindowDiagonalBase
+  suffix: diagonal
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassReinforced:
+            min: 1
+            max: 2
+          PartRodMetal:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
   - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 28
+    trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Repairable
+    fuelCost: 15
+    doAfterDelay: 3
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 44966e32a7..f1d3e194ac 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1108,3 +1108,8 @@
   id: paintthinner
   flavorType: Complex
   description: flavor-complex-paint-thinner
+
+- type: flavor
+  id: cherry
+  flavorType: Complex
+  description: flavor-complex-cherry
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index bff2c019c1..7407a6b75f 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1799,3 +1799,29 @@
       Min: 4
       Max: 8
       PotencyDivisor: 30
+
+- type: seed
+  id: cherry
+  name: seeds-cherry-name
+  noun: seeds-noun-seeds
+  displayName: seeds-cherry-display-name
+  plantRsi: Objects/Specific/Hydroponics/cherry.rsi
+  packetPrototype: CherrySeeds
+  productPrototypes:
+    - FoodCherry
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 5
+  potency: 10
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 40
diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml
index a0d6752c1f..0824e31775 100644
--- a/Resources/Prototypes/Maps/reach.yml
+++ b/Resources/Prototypes/Maps/reach.yml
@@ -30,5 +30,6 @@
             Musician: [ 1, 1 ]
             AtmosphericTechnician: [ 1, 1 ]
             StationEngineer: [ 1, 2 ]
+            Scientist: [ 1, 1 ]
             Passenger: [ -1, -1 ]
 
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
index b9baf395d3..ff07c341d8 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -161,3 +161,12 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+
+- type: reagent
+  id: JuiceCherry
+  name: reagent-name-juice-cherry
+  parent: BaseJuice
+  desc: reagent-desc-juice-cherry
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cherry
+  color: "#84031a"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
index 5c67d3936e..4810a34e04 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
@@ -27,3 +27,62 @@
               doAfter: 5
             - tool: Welding
               doAfter: 5
+
+- type: constructionGraph
+  id: CarpStatue
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: empty
+      completed:
+      - !type:SnapToGrid
+        southRotation: true
+      steps:
+      - material: Silver
+        amount: 15
+        doAfter: 7
+  - node: empty
+    entity: CarpStatueEmpty
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: IngotSilver1
+        amount: 15
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Welding
+        doAfter: 5
+    - to: eyes
+      steps:
+      - material: Diamond
+        amount: 2
+        doAfter: 2
+  - node: eyes
+    entity: CarpStatueEyes
+    edges:
+    - to: empty
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialDiamond1
+        amount: 2
+      steps:
+      - tool: Prying
+        doAfter: 2
+    - to: statue
+      steps:
+      - material: SpaceCarpTooth
+        amount: 5
+        doAfter: 3
+  - node: statue
+    entity: CarpStatue
+    edges:
+    - to: eyes
+      completed:
+      - !type:SpawnPrototype
+        prototype: MaterialToothSpaceCarp1
+        amount: 5
+      steps:
+      - tool: Prying
+        doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index a273f66740..5278c1b45e 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1644,6 +1644,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: carp statue
+  id: CarpStatue
+  graph: CarpStatue
+  startNode: start
+  targetNode: statue
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: A statue of one of the brave carp that got us where we are today. Made with real teeth!
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/Specific/carp_statue.rsi
+    state: icon
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   name: bananium clown statue
   id: BananiumClownStatue
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index ce38125627..4c1080c135 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -996,15 +996,15 @@
     FoodBerries: 3
     FoodPlateTin: 1
 
-#- type: microwaveMealRecipe
-#  id: RecipeCherryPie
-#  name: cherry pie recipe
-#  result: FoodPieCherry
-#  time: 15
-#  solids:
-#    FoodDoughPie: 1
-#    FoodCherry: 3 #cherries don't exist yet
-#    FoodPlateTin: 1
+- type: microwaveMealRecipe
+  id: RecipeCherryPie
+  name: cherry pie recipe
+  result: FoodPieCherry
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodCherry: 5
+    FoodPlateTin: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrostyPie
diff --git a/Resources/Prototypes/Stories/Entities/Mobs/Player/ascendance.yml b/Resources/Prototypes/Stories/Entities/Mobs/Player/ascendance.yml
index d52a06b9e9..f215b1cd2e 100644
--- a/Resources/Prototypes/Stories/Entities/Mobs/Player/ascendance.yml
+++ b/Resources/Prototypes/Stories/Entities/Mobs/Player/ascendance.yml
@@ -4,6 +4,7 @@
   parent:
   - BaseMob
   - MobDamageable
+  - MobPolymorphable
   description: Если вы его видите, то вам следует бежать
   components:
   - type: Shadowling
diff --git a/Resources/Prototypes/Stories/Entities/Mobs/Species/shadowling.yml b/Resources/Prototypes/Stories/Entities/Mobs/Species/shadowling.yml
index dc74b6c897..4940e68f4d 100644
--- a/Resources/Prototypes/Stories/Entities/Mobs/Species/shadowling.yml
+++ b/Resources/Prototypes/Stories/Entities/Mobs/Species/shadowling.yml
@@ -5,6 +5,7 @@
   - BaseMob
   - MobDamageable
   - MobCombat
+  - MobPolymorphable
   id: BaseMobShadowling
   abstract: true
   components:
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index bece1fb479..d823f93d9d 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1090,6 +1090,9 @@
 - type: Tag
   id: RifleStock
 
+- type: Tag
+  id: Ring
+
 - type: Tag
   id: RipleyCentralControlModule
 
diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json
index 9171e1f882..48b2471e0c 100644
--- a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by лазік#7305",
+  "copyright": "Made by lzk228(discord 455630609641897984)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
index cfc3b30141..b1ac557ad1 100644
--- a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, tweak by @mureixlol",
+  "copyright": "Made by DieselMohawk for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png
new file mode 100644
index 0000000000..50a6975e4c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..63da1b6fe5
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png
new file mode 100644
index 0000000000..ade2bdf6b6
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png
new file mode 100644
index 0000000000..da427e836c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png
new file mode 100644
index 0000000000..d7236d6429
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json
new file mode 100644
index 0000000000..c84ee21407
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "equipped-EYES-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
index 36eed5db12..2b8717faa2 100644
--- a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by lzk228(discord 455630609641897984)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..851e7b216d
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png
new file mode 100644
index 0000000000..a9e76ff75a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png
new file mode 100644
index 0000000000..a9f04628f9
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png
new file mode 100644
index 0000000000..0190c6a518
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json
new file mode 100644
index 0000000000..149220d0e4
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by SlamBamActionman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png
new file mode 100644
index 0000000000..fcfbce6b75
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png differ
diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json
new file mode 100644
index 0000000000..44edc26823
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by Beck Thompson for SS14",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "ring"
+      },
+      {
+        "name": "gem"
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png
new file mode 100644
index 0000000000..bb8bfac62e
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
index 5539c0fb7a..bd9fd6d24a 100644
--- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by lzk228(discord 455630609641897984). equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png
index 1f6b8adceb..4d192145eb 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
index 55eaa9ed57..f5a3a7218f 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
index cd3dc7f557..42af25fec6 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
index f4d5994c9e..fc05bc9fc7 100644
--- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14; colors tweaked by saintmuntzer",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json
index e5a67c14e4..e9b30b5437 100644
--- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state",
+  "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json
index 07d399a7b1..b486fbbc86 100644
--- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state",
+  "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json
index 0f5f121242..2a9b8dfba7 100644
--- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
+  "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
index c8aeeba939..8936db03da 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305, resprite by mureixlol",
+  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by lzk228(discord 455630609641897984)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
index 3fe5263164..519a0332d0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by лазік#7305",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhand sprites by lzk228(discord 455630609641897984)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png
new file mode 100644
index 0000000000..d5667d2721
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png
new file mode 100644
index 0000000000..16a55ee65f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
new file mode 100644
index 0000000000..35c8da9203
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and remade by RumiTiger",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    },
+    {
+        "name": "pit"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png
new file mode 100644
index 0000000000..12219e5067
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png
new file mode 100644
index 0000000000..9d48f86f86
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png
new file mode 100644
index 0000000000..b246d45d84
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png
new file mode 100644
index 0000000000..21053aed96
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png
new file mode 100644
index 0000000000..8073923cd6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png
new file mode 100644
index 0000000000..09a351404e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png
new file mode 100644
index 0000000000..8256962328
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png
new file mode 100644
index 0000000000..038eff2fb2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png
new file mode 100644
index 0000000000..5bd86228a2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png differ
diff --git a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json
index e56c72ad43..017d14881f 100644
--- a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by лазік#7305",
+    "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by lzk228(discord 455630609641897984)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
index 8ec571a40b..39303046bb 100644
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by лазік#7305",
+  "copyright": "Homegrown by @ninruB#7795, inhand sprites by lzk228(discord 455630609641897984)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png
new file mode 100644
index 0000000000..7cc6ffccf1
Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png differ
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png
new file mode 100644
index 0000000000..83f80290eb
Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png differ
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png
new file mode 100644
index 0000000000..c5d6bd20e5
Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json
index 5c8d12c6c6..fb1ed6a3ef 100644
--- a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json
@@ -11,7 +11,16 @@
       "name": "statue"
     },
     {
-      "name": "unshaded"
+      "name": "icon"
+    },
+    {
+      "name": "eyes"
+    },
+    {
+      "name": "eyes_unshaded"
+    },
+    {
+      "name": "teeth_unshaded"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png
index 2030067540..4dbbc1b6db 100644
Binary files a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png and b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png differ
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png
new file mode 100644
index 0000000000..73acc87e0d
Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png differ
diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png
deleted file mode 100644
index a5ee7e88a9..0000000000
Binary files a/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png and /dev/null differ
diff --git a/RobustToolbox b/RobustToolbox
index ec3a74d268..f659b2b58c 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit ec3a74d26868f9640ac06170bdf1c2557d19a063
+Subproject commit f659b2b58c7d0784f3582b93ba368a529558d3fd
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
index bcd013b598..0e00fe5b12 100644
--- a/SpaceStation14.sln
+++ b/SpaceStation14.sln
@@ -133,6 +133,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA
 		RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -444,6 +446,14 @@ Global
 		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
 		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -476,6 +486,7 @@ Global
 		{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
 		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
 		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
+		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}