Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new goal and tweak others #2673

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

lzk228
Copy link
Collaborator

@lzk228 lzk228 commented Oct 14, 2024

добавление новой цели на простое выживание, которая попадается если меньше 40-ка игроков
изменения сложных целей чтобы попадаться при онлайне больше чем 15 (некоторые 10) игроков

@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged No C# Code has not been changed Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Oct 14, 2024
@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Oct 30, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@lzk228
Copy link
Collaborator Author

lzk228 commented Oct 30, 2024

сука я ебал этот движок, как он пробирается в мёрж мастер

@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Oct 30, 2024
Copy link
Contributor

github-actions bot commented Nov 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Nov 4, 2024
@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation No C# Code has not been changed Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants