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
..
Managers	Update radio prefix parsing (#13777)	2023-02-19 04:27:56 +11:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-02-05 03:01:05 +03:00
UI	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
ChatSystem.cs	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00