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

йохохо и бутылка молока #857

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

йохохо и бутылка молока #857

wants to merge 36 commits into from

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Nov 29, 2024 •
edited
Loading

Описание PR

добавила пиратов мидраунд ивентом

Yar har fiddle de de
Being a pirate is alright with me
Do what you want 'cause a pirate is free
You are a pirate
Yo ho ahoy and avast
Being a pirate is really badass
Hang the black flag at the end of the mast
You are a pirate

Почему / Баланс

разнообразие в мидраунд

Медиа

Требования

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

Чейнджлог

🆑 Ratyyy

  • add: На часть секторов заметно участились нападения космических пиратов!

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации labels Nov 29, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 29, 2024 •
edited
Loading

RSI Diff Bot; head commit 28c09f5 merging into 2b6fe4a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Objects/Specific/piastra.rsi

State Old New Status
piastra_0 Added
piastra_1 Added
piastra_10 Added
piastra_2 Added
piastra_3 Added
piastra_4 Added
piastra_5 Added
piastra_6 Added
piastra_7 Added
piastra_8 Added
piastra_9 Added

Resources/Textures/ADT/Structures/Specific/yarrostore.rsi

State Old New Status
icon Added

Edit: diff updated after 28c09f5

Inconnu1337
Inconnu1337 suggested changes Nov 29, 2024
View reviewed changes
Copy link
Contributor

@Inconnu1337 Inconnu1337 left a comment

Choose a reason for hiding this comment

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

ъ

Resources/Prototypes/ADT/GameRules/events.yml Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Specific/pirate_store.yml Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml Show resolved Hide resolved
Resources/Locale/ru-RU/store/currency.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl Show resolved Hide resolved
Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Status: Awaiting Changes Ожидание изменений label Nov 29, 2024
Unlumy
Unlumy reviewed Nov 29, 2024
View reviewed changes
Copy link
Contributor

@Unlumy Unlumy left a comment

Choose a reason for hiding this comment

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

Я сделал небольшой ревью на локальку в основном, потому что не то что бы сильно хочу делать ревью на остальное, ибо мало что выкупаю в остальном.

Resources/Locale/ru-RU/ADT/Ghost/Roles/ghost-role-component.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl Show resolved Hide resolved
Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl Show resolved Hide resolved
jungarikjan
jungarikjan reviewed Dec 1, 2024
View reviewed changes
Copy link
Contributor

@jungarikjan jungarikjan left a comment

Choose a reason for hiding this comment

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

Классная обнова, спасибо
Локаль перепроверил, вроде замечаний больше нет

Только от @Inconnu1337 увидел не измененные требования, а просто Resolved. Мб у меня гит лагает, хз

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 3, 2024

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

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jungarikjan jungarikjan jungarikjan left review comments

@Unlumy Unlumy Unlumy left review comments

@Filokini Filokini Filokini requested changes

@Inconnu1337 Inconnu1337 Inconnu1337 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Merge Conflict size/XL Status: Awaiting Changes Ожидание изменений
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Ratyyy @Filokini @Unlumy @jungarikjan @Inconnu1337 @KashRas2