Ed 7d26a26547 Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	LICENSE.TXT
#	Resources/Locale/ru-RU/administration/commands/babyjail.ftl
#	Resources/Maps/Shuttles/emergency_elkridge.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-01-22 13:46:46 +03:00

..

commands

Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream

2025-01-22 13:46:46 +03:00

managers

…

ui

locale (#491)

2024-10-15 16:21:07 +03:00

admin-alerts.ftl

locale (#491)

2024-10-15 16:21:07 +03:00

admin-verbs.ftl

locale (#491)

2024-10-15 16:21:07 +03:00

antag.ftl

locale (#491)

2024-10-15 16:21:07 +03:00

bwoink.ftl

locale (#491)

2024-10-15 16:21:07 +03:00

smites.ftl

localization upstream (#213)

2024-06-04 20:14:51 +03:00