Morb0 43aaffd30b Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Speech/EntitySystems/FrontalLispSystem.cs # Content.Server/Speech/EntitySystems/LizardAccentSystem.cs # Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs # Content.Server/Speech/EntitySystems/MothAccentSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Audio/Announcements/attributions.yml # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Maps/train.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png # Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png		2024-05-07 00:43:11 +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	2024-02-17 12:43:04 +03:00
UI	Added new icons for the emote wheel (#27541)	2024-05-05 20:12:30 -05:00
ChatSystem.cs	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00