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

Security vend #138

Merged
merged 7 commits into from
Aug 7, 2024
Merged

Security vend #138

merged 7 commits into from
Aug 7, 2024

Conversation

RipZoro1
Copy link
Contributor

@RipZoro1 RipZoro1 commented Jul 27, 2024 •
edited
Loading

Описание PR

Медиа

Проверки

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

Изменения

🆑

  • add: Добавлена бола в СБтех
  • add: Добавлена шинель кадета в СБшкаф

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

github-actions bot commented Jul 27, 2024 •
edited
Loading

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

Resources/Textures/ADT/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Edit: diff updated after 57f7330

@1Stepka1 1Stepka1 self-requested a review July 27, 2024 06:58
1Stepka1
1Stepka1 reviewed Jul 27, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Что здесь делают изменения с #136?
Или же сделай все в одном пре или же убери повторяющиеся изменения
Если же это пр идет как отдельное изменение то укажи где-то что должен сначала быть замерджен преведущий пр

@RipZoro1 RipZoro1 enabled auto-merge July 27, 2024 10:21
@RipZoro1 RipZoro1 disabled auto-merge July 27, 2024 10:21
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 6, 2024
@Schrodinger71 Schrodinger71 removed the Status: Awaiting Changes Ожидание изменений label Aug 6, 2024
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 6, 2024 22:27
@Schrodinger71 Schrodinger71 self-requested a review August 7, 2024 00:29
Schrodinger71
Schrodinger71 approved these changes Aug 7, 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 removed the request for review from 1Stepka1 August 7, 2024 00:35
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 7, 2024
Merged via the queue into master with commit d91d821 Aug 7, 2024
13 checks passed
@Schrodinger71 Schrodinger71 deleted the security-vend branch August 7, 2024 00:50
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

@RipZoro1 RipZoro1

Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RipZoro1 @1Stepka1 @Schrodinger71