Ed
b581f5d132
Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
# Conflicts:
# .github/workflows/check-trailing-whitespace.yml
# Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
# Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Resources/Prototypes/Damage/modifier_sets.yml
# Resources/Prototypes/Maps/Pools/default.yml
2025-06-23 16:37:22 +03:00
..
2023-12-25 15:12:22 +11:00
2025-05-09 23:49:05 -04:00
2024-05-06 17:27:36 -07:00
2025-06-23 16:37:22 +03:00
2025-04-29 21:10:00 +01:00