3 Commits

Author	SHA1	Message	Date
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
Ed	a83d6f0d87	locale (#491) ... * locale * delete ss14 items generated locales	2024-10-15 16:21:07 +03:00
Ed	2b6e12898b	Corvax ctrl+c ctrl+v Russian localization (#135) ... * Corvax ru localization * remove Corvax stuff * adventurer	2024-05-05 00:44:03 +03:00