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.

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

Cleaned up SS220\Entities\Clothing #1771

Closed
wants to merge 10 commits into from

Conversation

chell4592
Copy link

Описание PR

Навёл порядок в прототипах SS220\Entities\Clothing

Проверки

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

Изменения

@github-actions github-actions bot added the Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" label Sep 6, 2024
@DexlerXD DexlerXD requested a review from Surani1 September 6, 2024 18:59
Copy link

@DexlerXD DexlerXD left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link

@Surani1 Surani1 left a comment

Choose a reason for hiding this comment

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

В целом, внести лицензии для красоты. FTL нужен будет, но можно позже.

@@ -1,4 +1,13 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
Copy link

Choose a reason for hiding this comment

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

Вернуть назад

@@ -1,3 +1,27 @@
- type: entity
Copy link

Choose a reason for hiding this comment

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

Лицензия

@@ -1,3 +1,13 @@
# secboots
Copy link

Choose a reason for hiding this comment

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

Лицензия

@@ -0,0 +1,1487 @@
# Сервис
Copy link

Choose a reason for hiding this comment

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

Лицензия

Copy link

@Ady4ik Ady4ik left a comment

Choose a reason for hiding this comment

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

Просьба добавить лицензии в начале каждого файла.

Copy link

github-actions bot commented Sep 7, 2024

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

@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Sep 7, 2024
@chell4592 chell4592 closed this Sep 7, 2024
@chell4592 chell4592 deleted the subbotnik branch September 7, 2024 19:14
@chell4592 chell4592 restored the subbotnik branch September 9, 2024 06:57
@chell4592 chell4592 reopened this Sep 9, 2024
@chell4592
Copy link
Author

добавил везде лицензию

@Kirus59
Copy link
Collaborator

Kirus59 commented Sep 9, 2024

Конфликтики

# Conflicts:
#	Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml
#	Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml
#	Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml
@github-actions github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 9, 2024
@chell4592
Copy link
Author

@Ady4ik лицензии добавлены

Copy link

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

@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Sep 10, 2024
Copy link

@Surani1 Surani1 left a comment

Choose a reason for hiding this comment

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

@Ady4ik @DexlerXD как только пофиксит мерж конфликты - залить первым делом. Очень важный PR

@chell4592 chell4592 closed this Sep 11, 2024
@DexlerXD
Copy link

да зачем пры-то при любом конфликте закрывать?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Merge Conflict Some content has conflicts.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants