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

Хотфикс бригмедика #349

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from

Conversation

AnderFan
Copy link
Contributor

Убран халат бригмедика, вместо него есть бронехалат.
Добавлен в консоль заказов шкаф бригмедика

@github-actions github-actions bot added No C# Changes: Localization Изменение локализации labels Aug 25, 2024
Comment on lines 64 to 75
- type: entity
parent: ClothingOuterCoatLab
id: ADTClothingOuterCoatLabPathologist
name: pathologist's lab coat
description: A suit that protects against minor chemical spills. But still a bit too white for blood stains.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi
state: icon-open
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi

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
Contributor

Choose a reason for hiding this comment

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

parent: ClothingOuterStorageBase
id: ClothingOuterCoatLabSecurityMedic
name: security medic labcoat
description: A suit that protects against minor chemical spills.
Copy link
Contributor

@Bolper Bolper Aug 25, 2024

Choose a reason for hiding this comment

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

Я б покомментил Корваксов а не рубил с чистой руки.

@@ -0,0 +1 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

Эмэ кажется тут должно что то быть

Copy link
Contributor

@Bolper Bolper 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
Contributor

@Bolper Bolper 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
Contributor

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

Copy link
Collaborator

@FaDeOkno FaDeOkno left a comment

Choose a reason for hiding this comment

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

Ченджлоги не трогать

@Bolper Bolper added the In progress В процессе выполнения label Aug 30, 2024
Copy link
Contributor

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

@Schrodinger71
Copy link
Collaborator

Чейнжлоги ни трогай, просто скопируй как в мастере и всё

Если что-то в них нужно поправить пиши мне

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
Collaborator

Choose a reason for hiding this comment

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

Убери пустой файл

@Schrodinger71 Schrodinger71 marked this pull request as draft September 6, 2024 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации In progress В процессе выполнения Merge Conflict No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants