# Conflicts: # Content.Client/Humanoid/MarkingPicker.xaml.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Shaders/shaders.yml |
||
|---|---|---|
| .. | ||
| Managers | ||
| TypingIndicator | ||
| UI | ||
| ChatSystem.cs | ||
| CollectiveMindChatUpdateSystem.cs | ||
# Conflicts: # Content.Client/Humanoid/MarkingPicker.xaml.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Shaders/shaders.yml |
||
|---|---|---|
| .. | ||
| Managers | ||
| TypingIndicator | ||
| UI | ||
| ChatSystem.cs | ||
| CollectiveMindChatUpdateSystem.cs | ||