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

Очередные Фиксы #68

Merged
merged 19 commits into from
Sep 6, 2024

Conversation

SpicyDarkFox
Copy link
Collaborator

@SpicyDarkFox SpicyDarkFox commented Sep 4, 2024

VIVA LA LOST PARADISE!

image

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

Я просто "обожаю" фиксить все эти ошибки до 3 часов ночи каждый день

Медиа

Проверки

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

Изменения

🆑 Инари

  • fix: Исправлены декали букв
  • fix: Исправлены множественные ошибки в сборке

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

This comment was marked as resolved.

@Lost-Paradise-Bot

This comment was marked as resolved.

@SpicyDarkFox SpicyDarkFox added Статус: Не мержить НЕ МЕРЖИТЬ! Статус: Нужна очистка Требуется переработка кода Тип: Очистка Очистка кода Тип: Изменение Создание или внесение существенных изменений в код labels Sep 4, 2024
@Lost-Paradise-Bot

This comment was marked as resolved.

@Lost-Paradise-Bot

This comment was marked as resolved.

@Lost-Paradise-Bot

This comment was marked as resolved.

@SpicyDarkFox SpicyDarkFox linked an issue Sep 5, 2024 that may be closed by this pull request
@Lost-Paradise-Bot

This comment was marked as resolved.

@Lost-Paradise-Bot

This comment was marked as duplicate.

@Lost-Paradise-Bot Lost-Paradise-Bot added the Статус: Конфликт Ожидает починки. label Sep 6, 2024
@Lost-Paradise-Bot
Copy link
Contributor

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

@Lost-Paradise-Bot Lost-Paradise-Bot removed the Статус: Конфликт Ожидает починки. label Sep 6, 2024
@Lost-Paradise-Bot

This comment was marked as resolved.

@Lost-Paradise-Bot

This comment was marked as duplicate.

@Evgencheg Evgencheg merged commit f95f8ba into Lost-Paradise-Project:master Sep 6, 2024
7 of 10 checks passed
@Lost-Paradise-Bot
Copy link
Contributor

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

Resources/Textures/_LostParadise/Clothing/Back/Duffels/loneMercenary.rsi

State Old New Status
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/syndhos.rsi

State Old New Status
equipped-EYES Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Eyes/HUD/synsec.rsi

State Old New Status
equipped-EYES Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/loneMercenary-syndicate_helmet.rsi

State Old New Status
icon-flash Removed
icon Removed
off-equipped-HELMET Removed
off-inhand-left Removed
off-inhand-right Removed
on-equipped-HELMET Removed
on-inhand-left Removed
on-inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Head/Winterhood/hood_syndicate.rsi

State Old New Status
equipped-HELMET Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Head/Winterhood/hood_syndicates.rsi

State Old New Status
equipped-HELMET Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Mask/Bandage/merc.rsi

State Old New Status
equipped-MASK Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi

State Old New Status
equipped-MASK Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/zulie_syndicate.rsi

State Old New Status
equipped-NECK Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
equipped-OUTERCLOTHING-shark Removed
equipped-OUTERCLOTHING-tajaran Removed
equipped-OUTERCLOTHING-vulpkanin Removed
equipped-OUTERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/loneMercenary-syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/mercenary.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
equipped-OUTERCLOTHING-shark Removed
equipped-OUTERCLOTHING-tajaran Removed
equipped-OUTERCLOTHING-vulpkanin Removed
equipped-OUTERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/mercenaryhelm.rsi

State Old New Status
icon-flash Removed
icon Removed
off-equipped-HELMET-reptilian Removed
off-equipped-HELMET-shark Removed
off-equipped-HELMET-tajaran Removed
off-equipped-HELMET-vulpkanin Removed
off-equipped-HELMET Removed
off-inhand-left Removed
off-inhand-right Removed
on-equipped-HELMET-reptilian Removed
on-equipped-HELMET-shark Removed
on-equipped-HELMET-tajaran Removed
on-equipped-HELMET-vulpkanin Removed
on-equipped-HELMET Removed
on-inhand-left Removed
on-inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Back/Backpacks/syndicate.rsi

State Old New Status
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Back/Satchels/syndicate.rsi

State Old New Status
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Head/Hats/beret_cap.rsi

State Old New Status
equipped-HELMET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Head/Hats/capcap.rsi

State Old New Status
equipped-HELMET-hamster Removed
equipped-HELMET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Head/Hats/caphat.rsi

State Old New Status
equipped-HELMET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Head/Hats/captain.rsi

State Old New Status
equipped-HELMET-hamster Removed
equipped-HELMET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Neck/Cloaks/cap.rsi

State Old New Status
equipped-NECK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Neck/Mantles/capmantle.rsi

State Old New Status
equipped-NECK Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/OuterClothing/Coats/captain.rsi

State Old New Status
equipped-OUTERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Uniforms/Jumpskirt/capformaldress.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Removed
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Uniforms/Jumpskirt/captain.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Removed
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Uniforms/Jumpsuit/capformal.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Removed
equipped-INNERCLOTHING-reptilian Removed
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/Captain/Uniforms/Jumpsuit/captain.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Removed
equipped-INNERCLOTHING-reptilian Removed
equipped-INNERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Syndicate/hopcloakformal.rsi

State Old New Status
equipped-NECK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/_LostParadise/Clothing/Uniforms/Cargo/qmsynd.rsi

State Old New Status
equipped-INNERCLOTHING Removed
icon Removed

Resources/Textures/_LostParadise/Clothing/Uniforms/Engineering_department/atmos/qmsynd.rsi

State Old New Status
equipped-INNERCLOTHING Removed
icon Removed

Lost-Paradise-Bot added a commit that referenced this pull request Sep 6, 2024
@SpicyDarkFox SpicyDarkFox removed Статус: Не мержить НЕ МЕРЖИТЬ! Статус: Нужна очистка Требуется переработка кода labels Sep 7, 2024
@SpicyDarkFox SpicyDarkFox self-assigned this Sep 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Изменения: YML Изменяет какие-либо файлы .yml Изменения: Локализация Изменяет какие-либо файлы .ftl Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Тип: Изменение Создание или внесение существенных изменений в код Тип: Очистка Очистка кода
Projects
None yet
Development

Successfully merging this pull request may close these issues.

фикс всех багов в тестах
3 participants