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

Add new Corvax's pins #2385

Merged
merged 50 commits into from
Jul 16, 2024
Merged

Add new Corvax's pins #2385

merged 50 commits into from
Jul 16, 2024

Conversation

MureixloI
Copy link
Contributor

@MureixloI MureixloI commented Jul 6, 2024 •
edited
Loading

Описание PR

В игру добавлены уникальные нагрудные значки логотипов серверов Corvax, а также с самим логотипом его.
Для того, чтобы получить значки есть два способа: взять в стартовом снаряжении в лобби или же с шансом найти в комоде.
Медиа

image

Изменения

🆑 MureixloL

  • add: Добавлены аксессуары!

@MureixloI MureixloI requested a review from Morb0 as a code owner July 6, 2024 11:41
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design and removed Status: Needs Review This PR requires new reviews before it can be merged labels Jul 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

RSI Diff Bot; head commit 128ac33 merging into 8dce3db
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi

State Old New Status
ath-equipped-NECK Added
ath Added
cor-equipped-NECK Added
cor Added
echo-equipped-NECK Added
echo Added
ely-equipped-NECK Added
ely Added
main-equipped-NECK Added
main Added
neb-equipped-NECK Added
neb Added
nova-equipped-NECK Added
nova Added
sol-equipped-NECK Added
sol Added
wl-equipped-NECK Added
wl Added

Edit: diff updated after 128ac33

@lzk228
Copy link
Collaborator

lzk228 commented Jul 6, 2024

это всё таки ООС иконки и в неком смысле являются метой

@NotSoDana
Copy link
Contributor

это всё таки ООС иконки и в неком смысле являются метой

А в чём мета то?

@Morb0
Copy link
Member

Morb0 commented Jul 6, 2024

это всё таки ООС иконки и в неком смысле являются метой

Вспомним про постеры? :trollface:

@lzk228
Copy link
Collaborator

lzk228 commented Jul 6, 2024

Вспомним про постеры? :trollface:

а что с ними?

@lzk228 lzk228 added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged label Jul 7, 2024
@NotSoDana
Copy link
Contributor

А в одном коммите слабо делать?

@lzk228
Copy link
Collaborator

lzk228 commented Jul 8, 2024

так вебедит же

@MureixloI
Copy link
Contributor Author

MureixloI commented Jul 8, 2024 •
edited
Loading

сами названия пнг сменить ath-equipped > ath-equipped-NECK и по кодовой части одобрено

готово

@MureixloI
Copy link
Contributor Author

🫨

@MureixloI
Copy link
Contributor Author

Я детей

@MureixloI
Copy link
Contributor Author

Завтра удалят СС14

@Verslebas
Copy link
Contributor

Завтра удалят СС14

Наконец-то

@MureixloI
Copy link
Contributor Author

Сейчас бы скинуть стикер с сервера визардов

@MureixloI
Copy link
Contributor Author

Кстати Облако Оорта

@Verslebas
Copy link
Contributor

Ты обязательно добьешься мерджа, я в тебя верю!

@MureixloI

This comment was marked as off-topic.

Sign in to view
@MureixloI

This comment was marked as off-topic.

Sign in to view
@Morb0 Morb0 merged commit c3f4f40 into space-syndicate:master Jul 16, 2024
15 checks passed
@MureixloI
Copy link
Contributor Author

ПОБЕДА!!!!!!!!!!!!

@MureixloI
Copy link
Contributor Author

Пойду праздновать

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Morb0 Morb0 Morb0 approved these changes

@lzk228 lzk228 lzk228 left review comments

Assignees
No one assigned
Labels
Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MureixloI @lzk228 @NotSoDana @Morb0 @Verslebas