Morb0 fe48e6deda Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # SpaceStation14.sln		2024-02-26 15:14:44 +03:00
..
UI	Make department / job list sorting consistent. (#25486)	2024-02-23 15:04:44 +11:00
CrewManifestEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
CrewManifestSystem.cs	Use ECS prototype-reload events (#22613)	2023-12-23 01:13:45 +11:00
CrewManifestUi.xaml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-06 06:33:32 +03:00
CrewManifestUi.xaml.cs	Crew manifest as a PDA cartridge program (#18498)	2023-08-05 10:37:08 +02:00