faint 076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/LateJoin/LateJoinGui.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png # RobustToolbox		2023-07-10 07:03:24 +03:00
..
AudioTab.xaml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-05-31 03:26:01 +03:00
AudioTab.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-05-31 03:26:01 +03:00
GraphicsTab.xaml	New indicators for combat mode (#15427)	2023-05-06 15:06:42 +10:00
GraphicsTab.xaml.cs	New indicators for combat mode (#15427)	2023-05-06 15:06:42 +10:00
KeyRebindTab.xaml	Add scroll zooming for admins and ghosts (#14061)	2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
NetworkTab.xaml	Add new PVS options slider (#12146)	2022-10-26 14:19:11 +11:00
NetworkTab.xaml.cs	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00