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
..
CCVars.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-14 00:39:46 +03:00