Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

alerts.yml

Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync

2025-08-25 16:22:32 +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

Fix texture sprite specifiers to RSI PNGs (#39783)

2025-08-22 22:21:23 +02:00

rooted.yml

Add Diona rooting (#32782)

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