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

Плюшевая акула с заказа и замена ?? в чате #235

Merged
merged 7 commits into from
Aug 14, 2024
Merged

Плюшевая акула с заказа и замена ?? в чате #235

merged 7 commits into from
Aug 14, 2024

Conversation

ne4t02
Copy link
Contributor

@ne4t02 ne4t02 commented Aug 14, 2024 •
edited by Schrodinger71
Loading

No cl, no fun

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

github-actions bot commented Aug 14, 2024 •
edited
Loading

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

Resources/Textures/ADT/Objects/Fun/sharkplushie.rsi

State Old New Status
black-inhand-left Added
black-inhand-right Added
black Added

Resources/Textures/Objects/Fun/sharkplush.rsi

State Old New Status
mopbucket_shark_black Added

Edit: diff updated after 272926a

@ne4t02 ne4t02 requested a review from 1Stepka1 August 14, 2024 14:17
PyotrIgn
PyotrIgn approved these changes Aug 14, 2024
View reviewed changes
Copy link
Contributor

@PyotrIgn PyotrIgn left a comment

Choose a reason for hiding this comment

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

ну я ничего предосудительного не вижу

1Stepka1
1Stepka1 requested changes Aug 14, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

ну у ItemMapper я не нашел примера или поля для двух спрайтов так что оставляем
А вот сам и спрайты игрушки могут спокойно находится в нашей папке,так что их надо перенести туда

@ne4t02 ne4t02 requested a review from 1Stepka1 August 14, 2024 15:57
@ne4t02 ne4t02 added this pull request to the merge queue Aug 14, 2024
Merged via the queue into AdventureTimeSS14:master with commit 49cd3d3 Aug 14, 2024
16 checks passed
@ne4t02 ne4t02 deleted the plushieShark branch August 14, 2024 16:07
@Lonkuk Lonkuk mentioned this pull request Aug 14, 2024
Closed
@1Stepka1 1Stepka1 linked an issue Aug 16, 2024 that may be closed by this pull request
микро-макро добавка замены "??" на "вопросительно смотрит". (679 PR) #95
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PyotrIgn PyotrIgn PyotrIgn approved these changes

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Status: Needs Review
Projects
None yet
Milestone
No milestone
3 participants
@ne4t02 @1Stepka1 @PyotrIgn