From c65d0a8d788bb2b883eee8b3eaa6832266e039d4 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 10 Dec 2023 21:43:06 +1100 Subject: [PATCH 1/5] Update submodule to 190.0.0 (#22289) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 5069b0ccf94..b9130bf2363 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 5069b0ccf9430654f5d80a47d9070f779ffac4e1 +Subproject commit b9130bf23638f61faa3d69d04d28dbc133e1460a From 4b35e6e263bc9a5dad8cd2e7cac561795565da63 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 10 Dec 2023 05:44:10 -0500 Subject: [PATCH 2/5] Automatic changelog update --- Resources/Changelog/Changelog.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2893361a9d8..47a01f5d39f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/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' From 88de2e840703a97d2b990b1c7dcd53ca452eafb4 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 10 Dec 2023 22:19:26 +1100 Subject: [PATCH 3/5] Fix MapPainter (#22290) --- Content.IntegrationTests/PoolManager.Cvars.cs | 4 ++-- Content.MapRenderer/Painters/MapPainter.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Content.IntegrationTests/PoolManager.Cvars.cs b/Content.IntegrationTests/PoolManager.Cvars.cs index dfdbddd9230..327ec627f52 100644 --- a/Content.IntegrationTests/PoolManager.Cvars.cs +++ b/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(); await instance.WaitPost(() => @@ -67,4 +67,4 @@ private static void SetDefaultCVars(RobustIntegrationTest.IntegrationOptions opt options.CVarOverrides[cvar] = value; } } -} \ No newline at end of file +} diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs index 8a87a93744c..94d58b35a00 100644 --- a/Content.MapRenderer/Painters/MapPainter.cs +++ b/Content.MapRenderer/Painters/MapPainter.cs @@ -3,6 +3,8 @@ 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; @@ -10,6 +12,7 @@ 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> 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().DefaultMap; grids = sMapManager.GetAllGrids(mapId).ToArray(); foreach (var (uid, _) in grids) From f6b47b3945ebaf6309aa485dea492de9cbab25d9 Mon Sep 17 00:00:00 2001 From: Morb <14136326+Morb0@users.noreply.github.com> Date: Sun, 10 Dec 2023 15:36:53 +0300 Subject: [PATCH 4/5] Fix set target zoom data field for ContentEye (#22292) --- Content.Shared/Movement/Systems/SharedContentEyeSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs index d5dcaf0cbf4..207f14a258a 100644 --- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs +++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs @@ -109,7 +109,7 @@ private void OnContentEyeStartup(EntityUid uid, ContentEyeComponent component, C if (!TryComp(uid, out var eyeComp)) return; - component.TargetZoom = eyeComp.Zoom; + _eye.SetZoom(uid, component.TargetZoom, eyeComp); Dirty(uid, component); } From c93c3074febe9a4274f7a4456fe55290f03f9d57 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Sun, 10 Dec 2023 17:05:17 +0300 Subject: [PATCH 5/5] Update locale --- .../prototypes/corvax/entities/mobs/species/vulpkanin.ftl | 2 +- .../prototypes/corvax/entities/mobs/player/vulpkanin.ftl | 2 +- .../prototypes/entities/clothing/shoes/base_clothingshoes.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl index 5376ef826c8..a55ddf6eea6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl +++ b/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. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl index 2462d20d658..bf4fc07f911 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl +++ b/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 } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl index c5e9c47abb7..1efb8d1ae80 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/base_clothingshoes.ftl +++ b/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 }