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

Demon #126

Merged
merged 6 commits into from
Jul 13, 2024
Merged

Demon #126

merged 6 commits into from
Jul 13, 2024

Conversation

nixsilvam404
Copy link
Contributor

@nixsilvam404 nixsilvam404 commented Jul 10, 2024 •
edited
Loading

Описание PR

перенос Аркан

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

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

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

Resources/Textures/ADT/Mobs/Demon/custom.rsi

State Old New Status
cow_ears Added
cow_horns Added
cow_spots Added
deer_antlers_horns Added
demon_ears Added
demon_tail Added
goatee Added
guards_stripes Added
lines_emperos Added
long Added
queen_lines Added
small_horns Added
tree_lines Added
trinity_spots Added
up Added

Resources/Textures/ADT/Mobs/Demon/parts.rsi

State Old New Status
full_f Added
full_m Added
full_t Added
head_f Added
head_m Added
head_t Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
tail Added
torso_f Added
torso_m Added
torso_t Added

Edit: diff updated after ccbba99

@nixsilvam404 nixsilvam404 requested a review from 1Stepka1 July 10, 2024 13:43
@nixsilvam404 nixsilvam404 self-assigned this Jul 10, 2024
Ratyyy
Ratyyy approved these changes Jul 13, 2024
View reviewed changes
Copy link
Collaborator

@Ratyyy Ratyyy left a comment

Choose a reason for hiding this comment

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

вроде, всё хорошо

@Ratyyy Ratyyy added this pull request to the merge queue Jul 13, 2024
Merged via the queue into AdventureTimeSS14:master with commit 6c67b8e Jul 13, 2024
15 checks passed
@Schrodinger71 Schrodinger71 mentioned this pull request Jul 26, 2024
Closed
Schrodinger71
Schrodinger71 reviewed Jul 26, 2024
View reviewed changes
Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl
@@ -10,3 +10,11 @@ metabolizer-type-dwarf = Дварф
metabolizer-type-moth = Ниан
metabolizer-type-arachnid = Арахнид
metabolizer-type-drask = Драск
metabolizer-type-demon = Аркана
metabolizer-type-novakid = Новакид
metabolizer-type-shark = Акула
Copy link
Collaborator

Choose a reason for hiding this comment

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

По моему тут много лишнего

Resources/Locale/ru-RU/ADT/Species/kobolt.ftl
@@ -0,0 +1 @@
species-name-kobolt = Кобольд
Copy link
Collaborator

Choose a reason for hiding this comment

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

Мгм

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

@Schrodinger71 Schrodinger71 Schrodinger71 left review comments

@Ratyyy Ratyyy Ratyyy approved these changes

@1Stepka1 1Stepka1 Awaiting requested review from 1Stepka1

Assignees

@1Stepka1 1Stepka1

@Schrodinger71 Schrodinger71

@Ratyyy Ratyyy

Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nixsilvam404 @Schrodinger71 @Ratyyy @1Stepka1