# Conflicts: # Content.Client/Humanoid/MarkingPicker.xaml.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Shaders/shaders.yml |
||
|---|---|---|
| .. | ||
| Commands | ||
| Components | ||
| Systems | ||
| ObjectivesSystem.cs | ||
# Conflicts: # Content.Client/Humanoid/MarkingPicker.xaml.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Shaders/shaders.yml |
||
|---|---|---|
| .. | ||
| Commands | ||
| Components | ||
| Systems | ||
| ObjectivesSystem.cs | ||