Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Managers	Add support for multiple changelog files, add admin changelog (#20849)	2023-10-12 15:45:04 -07:00
Systems	Move view variables verb to the top of the list with no category and localize it (#20546)	2023-09-30 13:22:07 -07:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +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