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

Респрайт унатхов без переводов и поправок кода #84

Closed
wants to merge 3 commits into from

Conversation

CovidDoctor
Copy link

@CovidDoctor CovidDoctor commented Sep 7, 2024

VIVA LA LOST PARADISE!

image

Описание обновления:

Медиа

Проверки

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

Изменения

🆑 Клоун

  • add: Добавлено веселье!
  • remove: Убрано веселье!
  • tweak: Изменено веселье!
  • fix: Исправлено веселье!

@Lost-Paradise-Bot Lost-Paradise-Bot added Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Изменения: YML Изменяет какие-либо файлы .yml labels Sep 7, 2024
@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/Mobs/Customization/reptilian_parts.rsi

State Old New Status
body_backspikes Removed
body_tiger Removed
body_underbelly Removed
frills_aquatic Removed
frills_axolotl Removed
frills_big Removed
frills_divinity Removed
frills_hood_primary Removed
frills_hood_secondary Removed
frills_short Removed
frills_simple Removed
head_tiger Removed
horns_angler Removed
horns_argali Removed
horns_ayrshire Removed
horns_bighorn Removed
horns_curled Removed
horns_double Removed
horns_floppy_kobold_ears Removed
horns_kobold_ears Removed
horns_myrsore Removed
horns_ram Removed
horns_short Removed
horns_simple Removed
l_arm_tiger Removed
l_leg_tiger Removed
r_arm_tiger Removed
r_leg_tiger Removed
snout_round Removed
snout_roundlight Removed
snout_sharp Removed
snout_sharplight Removed
tail_dtiger Removed
tail_dtiger_behind Removed
tail_dtiger_front Removed
tail_dtiger_wagging Removed
tail_large Removed
tail_large_behind Removed
tail_large_front Removed
tail_ltiger Removed
tail_ltiger_behind Removed
tail_ltiger_front Removed
tail_ltiger_wagging Removed
tail_smooth Removed
tail_smooth_behind Removed
tail_smooth_behind_primary Removed
tail_smooth_behind_secondary Removed
tail_smooth_front Removed
tail_smooth_primary Removed
tail_smooth_secondary Removed
tail_smooth_wagging_primary Removed
tail_smooth_wagging_secondary Removed
tail_spikes Removed
tail_spikes_behind Removed
tail_spikes_front Removed
tail_spikes_wagging Removed

@SpicyDarkFox
Copy link
Collaborator

SpicyDarkFox commented Sep 7, 2024

не забудь поправить свой 🆑, а то так и будешь Клоуном отмечен)
Ты проверял сборку на ошибки?
если нет, то хотябы обнови свой репозиторий, чтобы тесты прогнать можно было

@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/Mobs/Customization/reptilian_parts.rsi

State Old New Status
body_backspikes Removed
body_tiger Removed
body_underbelly Removed
frills_aquatic Removed
frills_axolotl Removed
frills_big Removed
frills_divinity Removed
frills_hood_primary Removed
frills_hood_secondary Removed
frills_short Removed
frills_simple Removed
head_tiger Removed
horns_angler Removed
horns_argali Removed
horns_ayrshire Removed
horns_bighorn Removed
horns_curled Removed
horns_double Removed
horns_floppy_kobold_ears Removed
horns_kobold_ears Removed
horns_myrsore Removed
horns_ram Removed
horns_short Removed
horns_simple Removed
l_arm_tiger Removed
l_leg_tiger Removed
r_arm_tiger Removed
r_leg_tiger Removed
snout_round Removed
snout_roundlight Removed
snout_sharp Removed
snout_sharplight Removed
tail_dtiger Removed
tail_dtiger_behind Removed
tail_dtiger_front Removed
tail_dtiger_wagging Removed
tail_large Removed
tail_large_behind Removed
tail_large_front Removed
tail_ltiger Removed
tail_ltiger_behind Removed
tail_ltiger_front Removed
tail_ltiger_wagging Removed
tail_smooth Removed
tail_smooth_behind Removed
tail_smooth_behind_primary Removed
tail_smooth_behind_secondary Removed
tail_smooth_front Removed
tail_smooth_primary Removed
tail_smooth_secondary Removed
tail_smooth_wagging_primary Removed
tail_smooth_wagging_secondary Removed
tail_spikes Removed
tail_spikes_behind Removed
tail_spikes_front Removed
tail_spikes_wagging Removed

Resources/Textures/_LostParadise/Mobs/Customization/allreptil.rsi

State Old New Status
body_lilis Removed
body_plates_asymetric Removed
body_plates_heavy Removed
body_plates_heavy_symetric Removed
body_plates_hips Removed
body_plates_scales Removed
body_plates_snake Removed
body_plates_symetric Removed
body_spots_dark Removed
body_spots_mix Removed
ear_devoted Removed
ear_pointed Removed
ear_raised Removed
ear_simple Removed
head_f_second_colour_long Removed
head_f_second_colour_short Removed
head_lilis Removed
head_m_second_colour_long Removed
head_m_second_colour_short Removed
head_plate_asymetric Removed
head_plate_front Removed
head_plate_heavy_asymetric Removed
head_plate_heavy_symetric Removed
head_plate_scales Removed
head_plate_symetric Removed
head_spots Removed
head_third_colour Removed
l_arm_lilis Removed
l_arm_spots_bright Removed
l_arm_spots_dark Removed
l_arm_spots_mix Removed
l_leg_lilis Removed
l_leg_spots_bright Removed
l_leg_spots_dark Removed
l_leg_spots_mix Removed
r_arm_lilis Removed
r_arm_spots_bright Removed
r_arm_spots_dark Removed
r_arm_spots_mix Removed
r_leg_lilis Removed
r_leg_spots_bright Removed
r_leg_spots_dark Removed
r_leg_spots_mix Removed
snout_big Removed
snout_long Removed
snout_long2 Removed
snout_short Removed
torso_breast_big Removed
torso_breast_flat Removed
torso_f_second_colour Removed
torso_m_second_colour Removed
torso_third_colour Removed

@Lost-Paradise-Bot
Copy link
Contributor

RSI Diff Bot; head commit 1667abb merging into 9d20ba1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/reptilian_parts.rsi

State Old New Status
body_backspikes Removed
body_tiger Removed
body_underbelly Removed
frills_aquatic Removed
frills_axolotl Removed
frills_big Removed
frills_divinity Removed
frills_hood_primary Removed
frills_hood_secondary Removed
frills_short Removed
frills_simple Removed
head_tiger Removed
horns_angler Removed
horns_argali Removed
horns_ayrshire Removed
horns_bighorn Removed
horns_curled Removed
horns_double Removed
horns_floppy_kobold_ears Removed
horns_kobold_ears Removed
horns_myrsore Removed
horns_ram Removed
horns_short Removed
horns_simple Removed
l_arm_tiger Removed
l_leg_tiger Removed
r_arm_tiger Removed
r_leg_tiger Removed
snout_round Removed
snout_roundlight Removed
snout_sharp Removed
snout_sharplight Removed
tail_dtiger Removed
tail_dtiger_behind Removed
tail_dtiger_front Removed
tail_dtiger_wagging Removed
tail_large Removed
tail_large_behind Removed
tail_large_front Removed
tail_ltiger Removed
tail_ltiger_behind Removed
tail_ltiger_front Removed
tail_ltiger_wagging Removed
tail_smooth Removed
tail_smooth_behind Removed
tail_smooth_behind_primary Removed
tail_smooth_behind_secondary Removed
tail_smooth_front Removed
tail_smooth_primary Removed
tail_smooth_secondary Removed
tail_smooth_wagging_primary Removed
tail_smooth_wagging_secondary Removed
tail_spikes Removed
tail_spikes_behind Removed
tail_spikes_front Removed
tail_spikes_wagging Removed

Resources/Textures/_LostParadise/Mobs/Customization/allreptil.rsi

State Old New Status
body_lilis Removed
body_plates_asymetric Removed
body_plates_heavy Removed
body_plates_heavy_symetric Removed
body_plates_hips Removed
body_plates_scales Removed
body_plates_snake Removed
body_plates_symetric Removed
body_spots_dark Removed
body_spots_mix Removed
ear_devoted Removed
ear_pointed Removed
ear_raised Removed
ear_simple Removed
head_f_second_colour_long Removed
head_f_second_colour_short Removed
head_lilis Removed
head_m_second_colour_long Removed
head_m_second_colour_short Removed
head_plate_asymetric Removed
head_plate_front Removed
head_plate_heavy_asymetric Removed
head_plate_heavy_symetric Removed
head_plate_scales Removed
head_plate_symetric Removed
head_spots Removed
head_third_colour Removed
l_arm_lilis Removed
l_arm_spots_bright Removed
l_arm_spots_dark Removed
l_arm_spots_mix Removed
l_leg_lilis Removed
l_leg_spots_bright Removed
l_leg_spots_dark Removed
l_leg_spots_mix Removed
r_arm_lilis Removed
r_arm_spots_bright Removed
r_arm_spots_dark Removed
r_arm_spots_mix Removed
r_leg_lilis Removed
r_leg_spots_bright Removed
r_leg_spots_dark Removed
r_leg_spots_mix Removed
snout_big Removed
snout_long Removed
snout_long2 Removed
snout_short Removed
torso_breast_big Removed
torso_breast_flat Removed
torso_f_second_colour Removed
torso_m_second_colour Removed
torso_third_colour Removed

@KashRas2
Copy link

KashRas2 commented Sep 7, 2024

Я тебе горло перережу

Upd
Ладно, не перережу

@Evgencheg Evgencheg added the Статус: Не мержить НЕ МЕРЖИТЬ! label Sep 8, 2024
@github-actions github-actions bot added the Статус: Конфликт Ожидает починки. label Sep 9, 2024
Copy link
Contributor

github-actions bot commented Sep 9, 2024

В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР.

@Evgencheg Evgencheg closed this Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Изменения: YML Изменяет какие-либо файлы .yml Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Статус: Конфликт Ожидает починки. Статус: Не мержить НЕ МЕРЖИТЬ!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants