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
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Managers	Allow zoom command to ignore zoom limits (#19419)	2023-08-22 19:27:41 +10:00
Systems	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
AdminNameOverlay.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00