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

ФИКС томатов убийц #2441

Merged
merged 4 commits into from
Jan 7, 2025
Merged

ФИКС томатов убийц #2441

merged 4 commits into from
Jan 7, 2025

Conversation

Tris0r
Copy link

@Tris0r Tris0r commented Jan 1, 2025

Описание PR

fix: #2252

Медиа

Проверки

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

Изменения
no cl

@github-actions github-actions bot added the Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" label Jan 1, 2025
Tris0r
Tris0r commented Jan 1, 2025
View reviewed changes
Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
price: 400
Copy link
Author

Choose a reason for hiding this comment

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

тут я ничего не делал

Copy link
Collaborator

Choose a reason for hiding this comment

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

ты пустую строку удалил, верни

Copy link
Author

@Tris0r Tris0r Jan 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

ничоу я не удалял.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Удалил, в конце файла

Copy link
Author

Choose a reason for hiding this comment

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

Ты меня троллишь?

@Tris0r Tris0r requested a review from stalengd January 4, 2025 20:23
stalengd
stalengd reviewed Jan 5, 2025
View reviewed changes
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml Outdated
Comment on lines 151 to 155
#ss220 fix start
# - type: HTN
# rootTask:
# task: SimpleHostileCompound
#ss220 fix end
Copy link
Collaborator

Choose a reason for hiding this comment

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

Это зачем?

Copy link
Author

Choose a reason for hiding this comment

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

Чтобы рантайм не атаковал первый

Copy link
Collaborator

Choose a reason for hiding this comment

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

А это не помешает ему охотиться на мышей?

Copy link
Author

Choose a reason for hiding this comment

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

помешает

Copy link
Collaborator

Choose a reason for hiding this comment

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

Значит надо по-другому

@Tris0r Tris0r requested a review from stalengd January 6, 2025 22:33
@stalengd stalengd merged commit 762d379 into SerbiaStrong-220:master Jan 7, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stalengd stalengd stalengd approved these changes

Assignees
No one assigned
Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Томаты убийцы и животные
2 participants
@Tris0r @stalengd