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

Перенос Таяров #114

Merged
merged 17 commits into from
Aug 2, 2024
Merged

Conversation

Lonkuk
Copy link
Contributor

@Lonkuk Lonkuk commented Jul 4, 2024

Перенос расы Таяров

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Jul 4, 2024
Copy link
Contributor

github-actions bot commented Jul 4, 2024

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

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_chest.rsi

State Old New Status
belly1 Added
belly2 Added
belly3 Added
chest Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_facial_hairs.rsi

State Old New Status
beard Added
cheeks Added
mustache Added
mustache_2 Added
mustache_3 Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_hairs.rsi

State Old New Status
bangs Added
bedhead Added
bob Added
braid Added
clean Added
curly Added
eyebrows Added
fingerwave Added
ladiesretro Added
long Added
messy Added
mohawk Added
pigtail Added
plait Added
ponytail Added
rattail Added
shaggy Added
spikey Added
straight Added
victory Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_head.rsi

State Old New Status
eye_stripes_head Added
inears Added
mane_head Added
muzzle Added
muzzleinears Added
nose Added
outears Added
patch_SPONSOR_ONLY Added
raccoon-head Added
star_head Added
tiger_face Added
tiger_head Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_overlay.rsi

State Old New Status
blots_body Added
patch Added
points Added
skeleton_body Added
stripes_body Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_parts.rsi

State Old New Status
gradient_LArm Added
gradient_LHand Added
gradient_LLeg Added
gradient_RArm Added
gradient_RHand Added
gradient_RLeg Added

Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi

State Old New Status
tail_fluffy Added
tail_ring Added
tail_skeleton Added
tail_tip Added
wingler_1 Added
wingler_2 Added
wingler_3 Added

Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi

State Old New Status
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
overlay_husk Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
tail_m Added
tajaran_eyes Added
tajaran_m Added
torso_f Added
torso_m Added

Edit: diff updated after 4860b48

@Schrodinger71 Schrodinger71 linked an issue Jul 5, 2024 that may be closed by this pull request
Copy link
Contributor

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

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 No C# label Jul 29, 2024
@Lonkuk
Copy link
Contributor Author

Lonkuk commented Jul 29, 2024

Всё готово

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

В приницпе, окей

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 2, 2024
Merged via the queue into AdventureTimeSS14:master with commit 11e041d Aug 2, 2024
15 checks passed
@Lonkuk Lonkuk deleted the Tajaran branch August 7, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Перенести Таяр
2 participants