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

[Sponsor] Augment markings #1517

Merged
merged 11 commits into from
Oct 21, 2023
Merged

[Sponsor] Augment markings #1517

merged 11 commits into from
Oct 21, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Oct 21, 2023

Описание PR

Медиа

augments

Проверки

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

Изменения

🆑 Morty

  • add: Добавлены киберпротезы как внешние черты

@Morb0 Morb0 requested a review from ficcialfaint as a code owner October 21, 2023 17:51
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged 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 labels Oct 21, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 21, 2023

RSI Diff Bot; head commit 7dfe4a3 merging into 5539ef1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/nanotrasen.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi

State Old New Status
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Edit: diff updated after 7dfe4a3

# Conflicts:
#	Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/nanotrasen.rsi/r_arm.png
#	Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/nanotrasen.rsi/r_hand.png
@Morb0 Morb0 merged commit e6da3aa into master Oct 21, 2023
11 of 12 checks passed
@Morb0 Morb0 deleted the augment-markings branch October 21, 2023 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

1 participant