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
..
AdminbusTab	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
AdminTab	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-02 02:18:19 +03:00
AtmosTab	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
ObjectsTab	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
PanicBunkerTab	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00
PlayerTab	Fix context menu for admin menu (#20030)	2023-09-12 14:34:20 +10:00
RoundTab.xaml	Ghost roles create new minds, better tracking of roles at round end screen (#5175)	2021-11-15 11:14:34 -07:00
RoundTab.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
ServerTab.xaml	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00
ServerTab.xaml.cs	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00