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

..

alerts.yml

Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync

2025-06-23 16:37:22 +03:00

categories.yml

Remove AlertType and AlertCategory (#27933)

2024-05-23 22:43:04 -04:00

magboots.yml

Minor alert locale (#22926)

2023-12-24 14:13:02 -05:00

ninja.yml

ninja 2 electric boogaloo (#15534)

2023-09-10 16:20:27 +10:00

revenant.yml

Content changes for entity categories PR (#27232)

2024-06-02 14:08:15 +10:00

rooted.yml

Add Diona rooting (#32782)

2025-06-04 12:52:59 +02:00