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

command turtlenecks | corrected PR #2306

Merged
merged 21 commits into from
Jun 21, 2024
Merged

command turtlenecks | corrected PR #2306

merged 21 commits into from
Jun 21, 2024

Conversation

Deenkaide
Copy link
Contributor

@Deenkaide Deenkaide commented Jun 20, 2024 •
edited
Loading

Описание PR

Допиливание водолазок

Медиа
гифки

Проверки

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

Изменения
🆑 Deenkaide

  • add: Водолазки в принтер одежды
  • add: Перевод водолазкам
  • tweak: Костюм НРа переименован в классический

@github-actions github-actions bot added 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 Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Jun 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 20, 2024 •
edited
Loading

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

Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING-reptilian Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING-reptilian Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi

State Old New Status
equipped-INNERCLOTHING Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi

State Old New Status
icon Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi

State Old New Status
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Modified
equipped-INNERCLOTHING Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi

State Old New Status
icon Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-INNERCLOTHING-monkey Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi

State Old New Status
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Removed
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/rd_classical.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 96fb09a

@Deenkaide
Copy link
Contributor Author

Вот это уже понятнее, где проблемы =)

@lzk228 lzk228 self-requested a review June 20, 2024 13:52
@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged label Jun 20, 2024
@Deenkaide Deenkaide marked this pull request as ready for review June 20, 2024 14:10
@Deenkaide
Copy link
Contributor Author

оно решило всё отвалиться =)
в черновик пока верну, надо отдохнуть, чуть позже перетыкаю это всё

@Deenkaide Deenkaide marked this pull request as draft June 20, 2024 15:16
@Deenkaide Deenkaide marked this pull request as ready for review June 20, 2024 17:42
@Deenkaide
одежда в принтере
d6dee0e 
мне казалось я добавлял
@Deenkaide Deenkaide marked this pull request as draft June 21, 2024 07:32
@Deenkaide Deenkaide marked this pull request as ready for review June 21, 2024 08:08
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Jun 21, 2024
@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Jun 21, 2024
@Deenkaide
сказали свыше
96fb09a 
я не знаю что здесь делает английский текст)
@Deenkaide
Copy link
Contributor Author

опять ошибки...
Водолазки прокляты!

@Deenkaide
Copy link
Contributor Author

сука... как детектив вокс крашит мой ПР, в котором я туда даже не смотрел!!!

@lzk228 lzk228 merged commit 2dda21a into space-syndicate:master Jun 21, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzk228 lzk228 lzk228 left review comments

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

@Morb0 Morb0 Awaiting requested review from Morb0 Morb0 is a code owner

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
@Deenkaide @lzk228