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

Ursus #159

Merged
merged 19 commits into from
Aug 7, 2024
Merged

Ursus #159

merged 19 commits into from
Aug 7, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jul 31, 2024

Проверки

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

Изменения

Перенос урсов, правил также отсортировал некоторые файлы

no cl

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

github-actions bot commented Jul 31, 2024

RSI Diff Bot; head commit 15ebf0e merging into 365c78d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/OuterClothing/Coats/urs_coat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/ADT/Mobs/Customization/Ursus/custom.rsi

State Old New Status
Muzzle Added
Muzzle2 Added
arrow Added
big_heart Added
braided_cone Added
braided_side Added
braided_side2 Added
braids_on_the_side Added
braids_on_the_side2 Added
breadwinner Added
cardigan Added
cardigan2 Added
collector Added
cone Added
ears Added
ears2 Added
embarrassment Added
eyeliner Added
fallen_cone Added
fluffiness Added
fluffiness2 Added
fluffiness3 Added
foot_left Added
foot_right Added
forest_style Added
forest_style2 Added
gorgon Added
gradientfoot_left Added
gradientfoot_left2 Added
gradientfoot_right Added
gradientfoot_right2 Added
gradienthand_left Added
gradienthand_left2 Added
gradienthand_right Added
gradienthand_right2 Added
grizzly_necklace Added
grizzly_necklace2 Added
grizzly_necklace3 Added
hand_left Added
hand_right Added
kiss Added
left_eye Added
neat Added
nose Added
panda Added
rigth_eye Added
short_hedgehog Added
short_hedgehog2 Added
soft_belly Added
soft_belly2 Added
soft_waves Added
soft_waves2 Added
space_bear Added
spots Added
spots_left Added
spots_right Added
star Added
surface_river Added
tail_big_dipper Added
tattoo_leader Added
third_eye Added
valkyries_scythe Added
valkyries_scythe2 Added
warrior Added
warrior2 Added
warriors_scythe Added
whip Added
whip2 Added
young_boy Added

Resources/Textures/ADT/Mobs/Species/Ursus/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
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added
urs_f Added
urs_m Added

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

State Old New Status
plushie_ursus Added

Resources/Textures/Clothing/Head/Hats/urs_hat.rsi

State Old New Status
equipped-HELMET-urs Added
equipped-HELMET Added
icon Added

Edit: diff updated after 15ebf0e

@Schrodinger71 Schrodinger71 marked this pull request as ready for review July 31, 2024 23:29
@Schrodinger71
Copy link
Collaborator Author

Покажи тесты пж

@Schrodinger71 Schrodinger71 marked this pull request as draft July 31, 2024 23:48
Copy link
Contributor

github-actions bot commented Aug 3, 2024

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

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

github-actions bot commented Aug 6, 2024

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

@Schrodinger71 Schrodinger71 marked this pull request as ready for review August 6, 2024 20:21
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 6, 2024 20:21
Copy link
Contributor

github-actions bot commented Aug 7, 2024

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

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.

Я разочарован. Надеюсь ты исправишься

Resources/Textures/ADT/Mobs/Ursus/custom.rsi/Muzzle2.png Outdated Show resolved Hide resolved
Resources/Textures/ADT/Mobs/Ursus/parts.rsi/full.png Outdated Show resolved Hide resolved
Resources/Audio/ADT/Ursus/cry1.ogg Outdated Show resolved Hide resolved
@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 7, 2024
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 7, 2024 09:59
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Aug 7, 2024
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 7, 2024
Merged via the queue into master with commit 4301274 Aug 7, 2024
15 checks passed
@Schrodinger71 Schrodinger71 deleted the urss branch August 7, 2024 10:12
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#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Перенести Урсов
3 participants