Arthur Asimov 3da699ad32 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json		2023-12-05 07:42:45 +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-08-13 05:40:29 +03:00
UI	Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999)	2023-12-04 16:10:49 -07:00
ChatSystem.cs	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00