Merge branch 'space-syndicate:master' into upstream-translate1

Content.IntegrationTests/PoolManager.Cvars.cs

@@ -35,7 +35,7 @@ private static readonly (string cvar, string value)[] TestCvars =
         (CVars.NetBufferSize.Name, "0")
     };
 
-    public static async Task  SetupCVars(RobustIntegrationTest.IntegrationInstance instance, PoolSettings settings)
+    public static async Task SetupCVars(RobustIntegrationTest.IntegrationInstance instance, PoolSettings settings)
     {
         var cfg = instance.ResolveDependency<IConfigurationManager>();
         await instance.WaitPost(() =>
@@ -67,4 +67,4 @@ private static void SetDefaultCVars(RobustIntegrationTest.IntegrationOptions opt
             options.CVarOverrides[cvar] = value;
         }
     }
-}
+}

Content.MapRenderer/Painters/MapPainter.cs

@@ -3,13 +3,16 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.IntegrationTests;
+using Content.Server.GameTicking;
+using Content.Server.Maps;
 using Robust.Client.GameObjects;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
@@ -29,7 +32,8 @@ public static async IAsyncEnumerable<RenderedGridImage<Rgba32>> Paint(string map
                 DummyTicker = false,
                 Connected = true,
                 Fresh = true,
-                Map = map
+                // Seriously whoever made MapPainter use GameMapPrototype I wish you step on a lego one time.
+                Map = map,
             });
 
             var server = pair.Server;
@@ -73,7 +77,7 @@ await server.WaitPost(() =>
                     sEntityManager.DeleteEntity(playerEntity.Value);
                 }
 
-                var mapId = sMapManager.GetAllMapIds().Last();
+                var mapId = sEntityManager.System<GameTicker>().DefaultMap;
                 grids = sMapManager.GetAllGrids(mapId).ToArray();
 
                 foreach (var (uid, _) in grids)

Content.Shared/Movement/Systems/SharedContentEyeSystem.cs

@@ -109,7 +109,7 @@ private void OnContentEyeStartup(EntityUid uid, ContentEyeComponent component, C
         if (!TryComp<EyeComponent>(uid, out var eyeComp))
             return;
 
-        component.TargetZoom = eyeComp.Zoom;
+        _eye.SetZoom(uid, component.TargetZoom, eyeComp);
         Dirty(uid, component);
     }
 

Resources/Changelog/Changelog.yml

@@ -1,9 +1,4 @@
 Entries:
-- author: Morb0
-  changes:
-  - {message: Added indicator near SSD players, type: Add}
-  id: 4801
-  time: '2023-09-11T05:52:56.0000000+00:00'
 - author: mirrorcult
   changes:
   - {message: 'Jetpacks, being weightless, and flying mobs can now pass over lava
@@ -2905,3 +2900,9 @@ Entries:
   - {message: Updated the crew monitoring console user interface, type: Tweak}
   id: 5300
   time: '2023-12-10T05:38:51.0000000+00:00'
+- author: ElectroJr
+  changes:
+  - {message: 'Add color picker to color selection, e.g. for character colors.', type: Add}
+  - {message: Fix drag-drop interaction outline not updating properly., type: Fix}
+  id: 5301
+  time: '2023-12-10T10:43:06.0000000+00:00'

Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl

@@ -1,4 +1,4 @@
 ent-BaseMobVulpkanin = Urist McVulp
-    .desc = { ent-BaseMobOrganic.desc }
+    .desc = { ent-BaseMobSpeciesOrganic.desc }
 ent-MobVulpkaninDummy = Urist McHands
     .desc = A dummy vulpkanin meant to be used in character setup.

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl

@@ -1,2 +1,2 @@
 ent-MobVulpkanin = Urist McVulp
-  .desc = { ent-BaseMobVulpkanin.desc }
+    .desc = { ent-BaseMobVulpkanin.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl

@@ -2,5 +2,5 @@ ent-ClothingShoesBase = { ent-Clothing }
     .desc = { ent-Clothing.desc }
 ent-ClothingShoesBaseButcherable = { ent-ClothingShoesBase }
     .desc = { ent-ClothingShoesBase.desc }
-ent-ClothingShoesStorageBase = { ent-ClothingShoesBase }
+ent-ClothingShoesMilitaryBase = { ent-ClothingShoesBase }
     .desc = { ent-ClothingShoesBase.desc }