Morb0 6f6cbb14af Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/Changelog/ChangelogManager.cs # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # SpaceStation14.sln		2023-10-14 00:39:46 +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-14 00:39:46 +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