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

И снова фантом #188

Closed
wants to merge 14 commits into from
Closed

Conversation

FaDeOkno
Copy link
Collaborator

@FaDeOkno FaDeOkno commented Aug 7, 2024

Описание PR

Третья ветка с фантомом. Большинство ошибок исправлены, но он ещё не до конца готов выйти в свет.

Медиа

Проверки

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

Изменения

🆑

  • add: Новый антагонист - Фантом!
  • add: Новая роль - полтергейст.
  • add У священника появилась мана, а так же возможность набирать последователей.

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

github-actions bot commented Aug 7, 2024

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

Resources/Textures/ADT/Clothing/Eyes/HUD/phantom_hud.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/OuterClothing/Misc/psi-shield.rsi

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

Resources/Textures/ADT/Interface/Actions/actions_chaplain.rsi

State Old New Status
hand_of_wololo Added
holy_touch Added
saint_fist Added

Resources/Textures/ADT/Interface/Actions/actions_phantom.rsi

State Old New Status
MS_broke Added
PDA_news Added
bloodbath Added
breakdown Added
breath_in_back Added
cleansing Added
fant_disarm Added
fant_harm Added
fant_help Added
freedom Added
freedom_cuffs Added
ghost_claws Added
ghost_injury Added

Edit: diff updated after 28a9b35

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.

@FaDeOkno FaDeOkno marked this pull request as ready for review August 9, 2024 05:43
@FaDeOkno
Copy link
Collaborator Author

FaDeOkno commented Aug 9, 2024

не люблю гитхаб

@FaDeOkno FaDeOkno closed this Aug 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant