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

Борги #107

Merged
merged 5 commits into from
Dec 7, 2024
Merged

Борги #107

merged 5 commits into from
Dec 7, 2024

Conversation

kanopus952
Copy link
Collaborator

@kanopus952 kanopus952 commented Dec 5, 2024

Кратное описание

Пофиксил боргов, добавил спрайты некоторым другим боргам

По какой причине

Медиа(Видео/Скриншоты)

Uploading 2024-12-07 09-55-48.mp4…

Проверки

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

Changelog

🆑 kanopus7

  • fix: Боргам возвращены спрайты.
  • tweak: Боевой киборг СБ, миротворец, клоун борг и охранный борг получили новые спрайты.

Copy link
Contributor

github-actions bot commented Dec 5, 2024

RSI Diff Bot; head commit 18d6aa7 merging into 6251da1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Lust/Mobs/Silicon/chassis.rsi

State Old New Status
engineer_e Modified
engineer_e_r Modified
engineer_l Modified
robot Modified
robot_e Modified
robot_e_r Modified
robot_l Modified
clown Added
clown_e Added
clown_e_r Added
clown_l Added
clown_rest Added
clown_tipped Added
clown_wreck Added
peace Added
peace_e Added
peace_e_r Added
peace_l Added
peace_rest Added
peace_tipped Added
peace_wreck Added
robot_rest Added
robot_tipped Added
sec Added
sec_e Added
sec_e_r Added
sec_l Added
sec_mk2 Added
sec_mk2_e Added
sec_mk2_e_r Added
sec_mk2_l Added
sec_mk2_rest Added
sec_mk2_tipped Added
sec_mk2_wreck Added
sec_rest Added
sec_tipped Added
sec_wreck Added

Resources/Textures/_Lust/Mobs/Silicon/chassis_icons.rsi

State Old New Status
clown_tipped_icon Added
peace_tipped_icon Added
robot_tipped_icon Added
sec_mk2_tipped_icon Added
sec_tipped_icon Added

Edit: diff updated after 18d6aa7

@github-actions github-actions bot added the size/L label Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 2024

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

@Esco-dev
Copy link
Contributor

Esco-dev commented Dec 6, 2024

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

Косяяяяк @kanopus952

@kanopus952
Copy link
Collaborator Author

Та знаю. Хз, получится ли решить, ибо мне прям чёт совсем хуево, простуда ебашит

@Esco-dev
Copy link
Contributor

Esco-dev commented Dec 6, 2024

Та знаю. Хз, получится ли решить, ибо мне прям чёт совсем хуево, простуда ебашит

Я попробую в субботу починить но мож пак быстрее решит

@kanopus952
Copy link
Collaborator Author

валидатор не я ложил

@kanopus952
Copy link
Collaborator Author

емае..

@pxc1984 pxc1984 merged commit 0f67a49 into space-sunrise:master Dec 7, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants