From de9df5386fc0e0611eca04d15d0a687c6bd256ca Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 23 Jul 2022 11:08:11 +0200 Subject: [PATCH 001/135] Compat for Result Analyzer engine PR (#9966) --- .../Tests/DoAfter/DoAfterServerTest.cs | 8 +++++++- Content.Server/DoAfter/DoAfter.cs | 2 ++ Content.Server/GameTicking/GameTicker.RoundFlow.cs | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index a4d3cf1f31..3fe35dc9a7 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -42,7 +42,10 @@ namespace Content.IntegrationTests.Tests.DoAfter }); await server.WaitRunTicks(1); + Assert.That(task.Status, Is.EqualTo(TaskStatus.RanToCompletion)); +#pragma warning disable RA0004 Assert.That(task.Result == DoAfterStatus.Finished); +#pragma warning restore RA0004 await pairTracker.CleanReturnAsync(); } @@ -69,7 +72,10 @@ namespace Content.IntegrationTests.Tests.DoAfter }); await server.WaitRunTicks(3); - Assert.That(task.Result == DoAfterStatus.Cancelled, $"Result was {task.Result}"); + Assert.That(task.Status, Is.EqualTo(TaskStatus.RanToCompletion)); +#pragma warning disable RA0004 + Assert.That(task.Result, Is.EqualTo(DoAfterStatus.Cancelled), $"Result was {task.Result}"); +#pragma warning restore RA0004 await pairTracker.CleanReturnAsync(); } diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs index 05c927ff35..61f4e009ae 100644 --- a/Content.Server/DoAfter/DoAfter.cs +++ b/Content.Server/DoAfter/DoAfter.cs @@ -22,7 +22,9 @@ namespace Content.Server.DoAfter public EntityCoordinates TargetGrid { get; } +#pragma warning disable RA0004 public DoAfterStatus Status => AsTask.IsCompletedSuccessfully ? AsTask.Result : DoAfterStatus.Running; +#pragma warning restore RA0004 // NeedHand private readonly string? _activeHand; diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 14e44bcebc..6c0357e5c0 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -156,11 +156,13 @@ namespace Content.Server.GameTicking // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here. // This whole setup logic should be made asynchronous so we can properly wait on the DB AAAAAAAAAAAAAH +#pragma warning disable RA0004 RoundId = Task.Run(async () => { var server = await _db.AddOrGetServer(serverName); return await _db.AddNewRound(server, playerIds); }).Result; +#pragma warning restore RA0004 var startingEvent = new RoundStartingEvent(RoundId); RaiseLocalEvent(startingEvent); From 5d0e73ed4e0c30f0e05090319f7dbb505ffd65a0 Mon Sep 17 00:00:00 2001 From: Moony Date: Sat, 23 Jul 2022 09:26:06 -0500 Subject: [PATCH 002/135] Fix pulling cancelling randomly. (#9982) --- Content.Server/Physics/Controllers/PullController.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs index b8a7d81040..4254b6cc3d 100644 --- a/Content.Server/Physics/Controllers/PullController.cs +++ b/Content.Server/Physics/Controllers/PullController.cs @@ -31,6 +31,9 @@ namespace Content.Server.Physics.Controllers // Velocity change of -LinearVelocity * frameTime * this private const float SettleShutdownMultiplier = 20.0f; + // How much you must move for the puller movement check to actually hit. + private const float MinimumMovementDistance = 0.005f; + [Dependency] private readonly SharedPullingSystem _pullableSystem = default!; // TODO: Move this stuff to pullingsystem @@ -64,6 +67,10 @@ namespace Content.Server.Physics.Controllers UpdatePulledRotation(uid, pullable.Owner); + if (args.NewPosition.EntityId == args.OldPosition.EntityId && + (args.NewPosition.Position - args.OldPosition.Position).LengthSquared < MinimumMovementDistance * MinimumMovementDistance) + return; + if (TryComp(pullable.Owner, out var physics)) physics.WakeBody(); From 2c56f0a4ebfac5fe786d8f701c4c320be317354c Mon Sep 17 00:00:00 2001 From: Myctai <108953437+Myctai@users.noreply.github.com> Date: Sat, 23 Jul 2022 14:26:19 +0000 Subject: [PATCH 003/135] Fix thrusters using generic Burn damage group instead of Heat type (#9972) Getting high temperature, electric and frostbite burns at once is silly. --- .../Prototypes/Entities/Structures/Shuttles/thrusters.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index ddd22a5aff..28303ab9b3 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -16,8 +16,8 @@ rotateWhileAnchored: true - type: Thruster damage: - groups: - Burn: 40 + types: + Heat: 40 - type: InteractionOutline - type: Sprite netsync: false From 99c9345589231299893b6e5c10b0186aef92c06b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 23 Jul 2022 10:27:23 -0400 Subject: [PATCH 004/135] Automatic changelog update --- Resources/Changelog/Changelog.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e67a5a21b6..98a1ca5c20 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Veritius - changes: - - {message: Removed drones as ghost roles for the time being, type: Remove} - id: 1496 - time: '2022-05-10T06:50:54.0000000+00:00' -- author: lapatison - changes: - - {message: 'Orderable from cargo `kitchen supplies crate`, that stores several - bags of milk and flour and other supplements.', type: Add} - id: 1497 - time: '2022-05-10T08:03:13.0000000+00:00' - author: Tomeno changes: - {message: Atmos yeets should make a lot more sense now, type: Tweak} @@ -2951,3 +2940,14 @@ Entries: - {message: Introduced a bunch of admin "tricks" for common tasks., type: Add} id: 1995 time: '2022-07-21T22:30:00.0000000+00:00' +- author: moony + changes: + - {message: You no longer need to give yourself carpal tunnel to move something + you're pulling. (Fixed ctrl+click pulling), type: Fix} + id: 1996 + time: '2022-07-23T14:26:07.0000000+00:00' +- author: Myctai + changes: + - {message: Thrusters now kill you with Heat type damage specifically., type: Fix} + id: 1997 + time: '2022-07-23T14:26:19.0000000+00:00' From 61378038914b63ecfee2d3ec4f5276479560e189 Mon Sep 17 00:00:00 2001 From: Rinkashikachi <15rinkashikachi15@gmail.com> Date: Sat, 23 Jul 2022 21:44:45 +0300 Subject: [PATCH 005/135] Various localization fixes (#9860) --- .../Administration/UI/AdminAnnounceWindow.xaml | 8 ++++---- .../UI/AdminAnnounceWindow.xaml.cs | 4 ++-- .../UI/Tabs/AdminTab/AdminTab.xaml | 16 ++++++++-------- .../UI/CommunicationsConsoleMenu.cs | 2 +- .../UI/SignalPortSelectorMenu.xaml | 6 +++--- .../administration/ui/admin-announce-window.ftl | 10 ++++++---- .../ui/tabs/admin-tab/player-actions-window.ftl | 8 ++++++++ .../communications-console-component.ftl | 1 + .../en-US/machine-linking/port-selector.ftl | 3 +++ Resources/Prototypes/Access/cargo.yml | 3 +++ Resources/Prototypes/Access/command.yml | 2 ++ Resources/Prototypes/Access/engineering.yml | 4 +++- Resources/Prototypes/Access/external.yml | 3 ++- Resources/Prototypes/Access/maintenance.yml | 1 + Resources/Prototypes/Access/medical.yml | 2 ++ Resources/Prototypes/Access/research.yml | 1 + Resources/Prototypes/Access/security.yml | 3 +++ Resources/Prototypes/Access/service.yml | 7 +++++++ Resources/Prototypes/Recipes/Lathes/tools.yml | 3 --- 19 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 Resources/Locale/en-US/machine-linking/port-selector.ftl diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml index bb5c29bc78..a703a7f5e6 100644 --- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml +++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml @@ -1,15 +1,15 @@ - + - + -