Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-09-13 16:51:52 +03:00
..
UI	Crew manifest as a PDA cartridge program (#18498)	2023-08-05 10:37:08 +02:00
CrewManifestEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
CrewManifestSystem.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10: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