Skip to content

Броня НКР#344

Merged
Patrioy merged 30 commits intoForge-Station:masterfrom
ktrss1315:ncr-armor-resprite
Mar 30, 2026
Merged

Броня НКР#344
Patrioy merged 30 commits intoForge-Station:masterfrom
ktrss1315:ncr-armor-resprite

Conversation

@ktrss1315
Copy link
Copy Markdown

@ktrss1315 ktrss1315 commented Mar 16, 2026

Ссылка на задание.
Переделка брони НКР.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 17, 2026

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

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml Outdated
equipment:
jumpsuit: N14ClothingUniformNCRDesert # Corvax-Change
outerClothing: N14ClothingOuterNCRPouchedVestDesert # Forge-Change
jumpsuit: N14ClothingUniformNCR # Corvax-Change
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

Forge-Change pls

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml Outdated
id: NCRSoldierGear
equipment:
head: N14ClothingHeadHatNCRHelmetMetalDesert # Corvax-Change
head: N14ClothingHeadHatNCRHelmet # Corvax-Change
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

и тут

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml Outdated
back: N14ClothingBackpackNCR # Corvax-Change
jumpsuit: N14ClothingUniformNCRDesert # Corvax-Change
outerClothing: N14ClothingOuterNCRVestDesert # Forge-Change
jumpsuit: N14ClothingUniformNCR # Corvax-Change
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

и тут

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml Outdated
pocket1: NCRwsloadoutkits
id: N14IDNCRDogtagWS
innerClothingSkirt: N14ClothingUniformNCRDesert # Corvax-Change
innerClothingSkirt: N14ClothingUniformNCR # Corvax-Change
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

и тут

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread ...urces/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2Snow.rsi/meta.json Outdated
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "taken from BigIron github",
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

are you sure?

Copy link
Copy Markdown
Collaborator

@MrLopLop MrLopLop Mar 19, 2026

Choose a reason for hiding this comment

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

тут тоже самое

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Comment thread Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/NCRuniformSnow.rsi/meta.json
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "sprite by @baohe (discord)",
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

наши спрайты кидать в наш путь это выбор сильнейших тип?

Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 19, 2026

Choose a reason for hiding this comment

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

Не совсем просто понимаю.

Copy link
Copy Markdown
Author

@ktrss1315 ktrss1315 Mar 19, 2026

Choose a reason for hiding this comment

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

что, я тоже не понимаю что ты написал

Copy link
Copy Markdown
Collaborator

@MrLopLop MrLopLop Mar 19, 2026

Choose a reason for hiding this comment

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

на путь спрайта посмотри.
ты закинул его не в нашу папку

Copy link
Copy Markdown
Collaborator

@MrLopLop MrLopLop Mar 19, 2026

Choose a reason for hiding this comment

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

наши спрайты кидать в наш путь это выбор сильнейших тип?

а ты, если делаешь ревью, пиши нормально и указывай на проблему, а не говори загадками

Copy link
Copy Markdown
Collaborator

@MrLopLop MrLopLop Mar 19, 2026

Choose a reason for hiding this comment

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

что, я тоже не понимаю что ты написал

наша папка если что Corvax, ну на крайняк можно и в _Forge

Patrioy
Patrioy reviewed Mar 19, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy left a comment

Choose a reason for hiding this comment

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

Чо.

@ktrss1315 ktrss1315 requested a review from Patrioy March 19, 2026 17:25
@MrLopLop
Copy link
Copy Markdown
Collaborator

MrLopLop commented Mar 23, 2026

всё доделал что хотел?

Patrioy
Patrioy reviewed Mar 26, 2026
View reviewed changes
Comment thread Resources/Textures/Corvax/Clothing/OuterClothing/Armor/InquisitorArmor.rsi/meta.json Outdated
"name": "icon"
"version": 1,
"license": "All Rights Reserved",
"copyright": "sprite by @baohe (discord)",
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 26, 2026

Choose a reason for hiding this comment

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

"londorondondon - for Corvax Forge", - не бао делал инквизитор армор.

Patrioy
Patrioy reviewed Mar 26, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy left a comment

Choose a reason for hiding this comment

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

шлем докинь кста зимний пж.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 28, 2026

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

@Patrioy
Copy link
Copy Markdown
Collaborator

Patrioy commented Mar 29, 2026

Позже фулл гляну.

Patrioy
Patrioy reviewed Mar 29, 2026
View reviewed changes
Comment thread Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy Mar 29, 2026

Choose a reason for hiding this comment

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

Шлема то ты добавил спрайты, но из-за мёржей у тебя шлем зимний щас с дефолтным спрайтом. Давай исправляй и проверь всё фулл пж.

@ktrss1315 ktrss1315 requested a review from Patrioy March 30, 2026 09:06
Patrioy
Patrioy approved these changes Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Patrioy Patrioy left a comment

Choose a reason for hiding this comment

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

Устроит.

@Patrioy Patrioy merged commit 1ab9c4f into Forge-Station:master Mar 30, 2026
8 checks passed
@ktrss1315 ktrss1315 deleted the ncr-armor-resprite branch March 30, 2026 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MrLopLop MrLopLop MrLopLop left review comments

@Patrioy Patrioy Patrioy approved these changes

Assignees

No one assigned

Labels

🎨 Спрайты 🎨 🐤 YML 🐤 📄 Локализация 📄

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ktrss1315 @MrLopLop @Patrioy