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

Added Slime analogue of cat ears for slimepeople #795

Merged
merged 4 commits into from
Feb 1, 2023
Merged

Added Slime analogue of cat ears for slimepeople #795

merged 4 commits into from
Feb 1, 2023

Conversation

mhamsterr
Copy link
Contributor

Описание PR

  • PR добавляет в редактор персонажа несколько видов кошачьих (и лисьих) ушек и хвостов из слизи специально для слаймолюдов, что позволяет спонсорам 4+ выделяться, даже играя на слаймолюдах (это правда очень важно, да да).
  • Ушки и хвосты из слизи всё ещё являются sponsorOnly вещами.
  • Ушки и хвосты из слизи имеют те же возможности для цветовой настройки (внутренняя и внешняя часть уха, полосы на хвосте), что и оригинальные версии.
    Медиа

Обычные кошачьи ушки

Рассечённые кошачьи ушки

Завитые кошачьи ушки

Короткие кошачьи ушки

Проверки

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

Изменения

🆑 mhamster

  • add: Добавлены аналоги ушек и хвостов из слизи специально для спонсоров-слаймолюдов. Теперь все смогут понять насколько великий слаймолюд прямо сейчас бегает по станции.

@mhamsterr
added slime analogue of sponsor cat-ears
ba30694 
Добавление файлов для Кошачьих ушек из слизи, Лисьих ушек из слизи, Кошачьих хвостов из слизи, созданных как аналог спонсорским ушкам для слаймолюдов
@mhamsterr
Update slime.yml
5ccfffa 
Возвращение забытого при копировании файла, жалко его
@mhamsterr mhamsterr requested a review from Morb0 as a code owner February 1, 2023 18:13
@github-actions github-actions bot added Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: No C# Code has not been changed Status: Needs Review This PR requires new reviews before it can be merged labels Feb 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Feb 1, 2023 •
edited
Loading

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

Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi

State Old New Status
ears_slime_cat_inner Added
ears_slime_cat_outer Added
ears_slime_curled_inner Added
ears_slime_curled_outer Added
ears_slime_stubby_inner Added
ears_slime_stubby_outer Added
ears_slime_torn_inner Added
ears_slime_torn_outer Added
slime_tail_cat Added
slime_tail_cat_wag Added
slime_tail_cat_wag_stripes_prime Added
slime_tail_cat_wag_stripes_second Added

Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi

State Old New Status
ears_slime_fox_inner Added
ears_slime_fox_outer Added

Edit: diff updated after 6a27935

@Morb0 Morb0 merged commit d473150 into space-syndicate:master Feb 1, 2023
AverageNotDoingAnythingEnjoyer pushed a commit to AverageNotDoingAnythingEnjoyer/corvax-next that referenced this pull request Nov 15, 2024
@whateverusername0 @Piras314 @AverageNotDoingAnythingEnjoyer
Heretics update part 4 (space-syndicate#795)
bb25fd9 
* i got that dawg in me

* dasasdsaddas

* jhkhkjj

* my lazy ass is not doing the rest

* finally.

* finally.

* jesus christ 1

* help me

* jesus christ 2

* UAAAAWHGHHGG BUABHAUBHAUBHHGH

* jesus christ 3

* sdfjsdkghjdfkljbhsfuobd

* 1984

* ash lore update

* THE CURSE OF 220

* ultra violencce

* fart

* fdgfdgbfdbf

* fgbdfgndfgn

* it's raw propheting time

* blbkblbkglbgkbgbgbgdfbfgbbb AAAAAAAAAAAAAAAAAAAAAAAAA

* fdbfsgbybdf

* bkbgkblkgbgbngfkb

* void path part 1

* REAL!!!!!!

* it is working

* ok looks good to me

* random influence spawn

* hey shitass, wanna see me bypass yaml linter?

* RAAAAAAAAAAGH

* dghgdfbsfdgbsdf

* dfvsfvavsd

* help

* help

* bbnvbnvmvbnmvbnmvbn

* guiedbook

* fhfdsghfgdhdfgh

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* please

* fucking
die

* vlkblvkbbgjhjfbhnbkvbnf A

* i am malding

* 6666 lines

* FUCK

* GOD SAVE MY SOUL!!

* revert store shitassery

* dfvdfgdf

* Reapply "Uplink discounts (space-syndicate#580)"

This reverts commit 55540db.

* more uplink shittery revert

* FUCK

* based

* dvsfv

* dghfgghfgh

* blnkbnbknlbnklb

* :finnadie:

* finally. :finnadie:

* yeah

* bnbnmbvnm

* vblknknvblnkvblknklvbn

* fuck

* gaming

* bnkb,nkvbnklvbknvb

* final fixez

* I AM GOING TO KILL MYSELF

* finally

* yay guidebook

* ugh

* fuck

* fuck

* bruh.

* guidebook

* bruh

* source

* f-

* n lvjbl nvb;nkvb;lnkvl;bn

* GACK

* WHAT

* g

* gaming 2

* gaming 2

* docks

* attribushions

* balls

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Piras314 <[email protected]>
KommissarRed pushed a commit to KommissarRed/space-station-14-next-komred that referenced this pull request Jan 19, 2025
@whateverusername0 @Piras314
Heretics update part 4 (space-syndicate#795)
3ef5ed8 
* i got that dawg in me

* dasasdsaddas

* jhkhkjj

* my lazy ass is not doing the rest

* finally.

* finally.

* jesus christ 1

* help me

* jesus christ 2

* UAAAAWHGHHGG BUABHAUBHAUBHHGH

* jesus christ 3

* sdfjsdkghjdfkljbhsfuobd

* 1984

* ash lore update

* THE CURSE OF 220

* ultra violencce

* fart

* fdgfdgbfdbf

* fgbdfgndfgn

* it's raw propheting time

* blbkblbkglbgkbgbgbgdfbfgbbb AAAAAAAAAAAAAAAAAAAAAAAAA

* fdbfsgbybdf

* bkbgkblkgbgbngfkb

* void path part 1

* REAL!!!!!!

* it is working

* ok looks good to me

* random influence spawn

* hey shitass, wanna see me bypass yaml linter?

* RAAAAAAAAAAGH

* dghgdfbsfdgbsdf

* dfvsfvavsd

* help

* help

* bbnvbnvmvbnmvbnmvbn

* guiedbook

* fhfdsghfgdhdfgh

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* please

* fucking
die

* vlkblvkbbgjhjfbhnbkvbnf A

* i am malding

* 6666 lines

* FUCK

* GOD SAVE MY SOUL!!

* revert store shitassery

* dfvdfgdf

* Reapply "Uplink discounts (space-syndicate#580)"

This reverts commit 55540db.

* more uplink shittery revert

* FUCK

* based

* dvsfv

* dghfgghfgh

* blnkbnbknlbnklb

* :finnadie:

* finally. :finnadie:

* yeah

* bnbnmbvnm

* vblknknvblnkvblknklvbn

* fuck

* gaming

* bnkb,nkvbnklvbknvb

* final fixez

* I AM GOING TO KILL MYSELF

* finally

* yay guidebook

* ugh

* fuck

* fuck

* bruh.

* guidebook

* bruh

* source

* f-

* n lvjbl nvb;nkvb;lnkvl;bn

* GACK

* WHAT

* g

* gaming 2

* gaming 2

* docks

* attribushions

* balls

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Piras314 <[email protected]>
KommissarRed pushed a commit to KommissarRed/space-station-14-next-komred that referenced this pull request Jan 19, 2025
Automated changelog update (space-syndicate#795)
ac0b914
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

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation 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.
2 participants
@mhamsterr @Morb0