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.

Sign up for GitHub

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

Jump to bottom

Update Avrit #1516

Merged
merged 5 commits into from
Oct 22, 2023
Merged

Update Avrit #1516

merged 5 commits into from
Oct 22, 2023

Conversation

JustArt1m
Copy link
Contributor

@JustArt1m JustArt1m commented Oct 21, 2023 •
edited
Loading

Описание PR

Небольшие обновления и фиксы карты Аврит.

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
🆑 Just_Art

  • add: Добавлена шляпа тыквы и одеждоМат ботаникам на карте Аврит!
  • tweak: Немного расширен бар на карте Аврит!
  • tweak: Немного изменён инженерный отдел на карте Аврит!
  • fix: Исправлены аварийные лампы в обычных лампах на карте Аврит!

@JustArt1m JustArt1m requested a review from Morb0 as a code owner October 21, 2023 06:59
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Merge Conflict PR have unsolved merge conflicts labels Oct 21, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: No C# Code has not been changed labels Oct 21, 2023
@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Oct 21, 2023
Morb0
Morb0 requested changes Oct 22, 2023
View reviewed changes
Copy link
Member

@Morb0 Morb0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SERVER: 45,225s [ERRO] map: Error in map file: found local entity UID '0' which does not exist.
:Cat_Despair:

@JustArt1m
Revert "Update Avrit"
273b3a8 
This reverts commit c89619e.
@github-actions github-actions bot removed the Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping label Oct 22, 2023
Morb0

This comment was marked as outdated.

Sign in to view

@Morb0 Morb0 merged commit 89f74d0 into space-syndicate:master Oct 22, 2023
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Morb0 Morb0 Morb0 requested changes

Assignees
No one assigned
Labels
Changes: No C# Code has not been changed Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JustArt1m @Morb0