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

майор РХБЗЗ #213

Merged
merged 14 commits into from
Aug 9, 2024
Merged

майор РХБЗЗ #213

merged 14 commits into from
Aug 9, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Aug 9, 2024 •
edited by Schrodinger71
Loading

Описание PR

Этот ПР переносит Майор РХБЗЗ. Отдуваемся за зоро
Медиа

Проверки

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

Изменения
add: Добавлен майор РХБЗЗ

image

@github-actions github-actions bot added No C# Changes: Localization Изменение локализации labels Aug 9, 2024
@Darkiich Darkiich self-assigned this Aug 9, 2024
@Darkiich Darkiich linked an issue Aug 9, 2024 that may be closed by this pull request
ERT роль Майор РХБЗЗ (728 PR) #98
Closed
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 9, 2024
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов and removed No C# labels Aug 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 9, 2024 •
edited
Loading

RSI Diff Bot; head commit a3c7e27 merging into 0c618a8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Structures/Power/industrial_smes.rsi

State Old New Status
smes-oc0 Removed
smes-oc1 Removed
smes-oc2 Removed
smes-og1 Removed
smes-og2 Removed
smes-og3 Removed
smes-og4 Removed
smes-og5 Removed
smes-op0 Removed
smes-op1 Removed
smes-op2 Removed
smes-open Removed
smes Removed

Edit: diff updated after a3c7e27

@Darkiich Darkiich requested a review from Schrodinger71 August 9, 2024 16:13
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Aug 9, 2024
Schrodinger71
Schrodinger71 previously requested changes Aug 9, 2024
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Зачем удалять эти системы
image

@Darkiich
Revert "ревью"
caa7939 
This reverts commit 5b84e2a, reversing
changes made to f053392.
@github-actions github-actions bot added No C# and removed Changes: Sprites Изменение спрайтов labels Aug 9, 2024
Darkiich
Darkiich commented Aug 9, 2024
View reviewed changes
Copy link
Contributor Author

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

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

ревью сделан

@Darkiich Darkiich requested a review from Schrodinger71 August 9, 2024 17:59
Schrodinger71
Schrodinger71 reviewed Aug 9, 2024
View reviewed changes
Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/humanoid.ftl Outdated
@@ -47,3 +47,6 @@ ent-ADTRandomHumanoidSpawnerERTMedicalEVA = ОБР офицер сб
ent-ADTRandomHumanoidSpawnerERTMedicalEVARiot = ОБР офицер сб
.suffix = Броня EVA riot, против бунтов
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }

ent-ADTRandomHumanoidSpawnerCBURNUnit = капитан РХБЗЗ
.desc = { "" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Подпиши суffикс РХБЗЗ ^-^, с тебя горячий арт

Schrodinger71
Schrodinger71 reviewed Aug 9, 2024
View reviewed changes
Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml Outdated
@@ -419,3 +419,39 @@
settings: short
- type: Loadout
prototypes: [ ADTERTMedicalGearEVARiot ]

# start Майор РХБЗЗ
Copy link
Collaborator

Choose a reason for hiding this comment

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

Поменяй коммент, это Капитан РХБЗЗ

Schrodinger71
Schrodinger71 requested changes Aug 9, 2024
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Правь

@Darkiich Darkiich requested a review from Schrodinger71 August 9, 2024 20:26
Schrodinger71
Schrodinger71 approved these changes Aug 9, 2024
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Гуд

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 9, 2024
Merged via the queue into AdventureTimeSS14:master with commit 37ceffa Aug 9, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 left review comments

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

Assignees

@Darkiich Darkiich

Labels
Changes: Localization Изменение локализации No C# Status: Needs Review
Projects
None yet
Milestone
Перенос контента прототипов со старог...
Development

Successfully merging this pull request may close these issues.

ERT роль Майор РХБЗЗ (728 PR)
3 participants
@Darkiich @1Stepka1 @Schrodinger71