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

IPC #171

Merged
merged 17 commits into from
Aug 5, 2024
Merged

IPC #171

merged 17 commits into from
Aug 5, 2024

Conversation

nixsilvam404
Copy link
Contributor

@nixsilvam404 nixsilvam404 commented Aug 2, 2024

Описание PR

Медиа

Проверки

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

Изменения

no cl

Copy link
Contributor

github-actions bot commented Aug 2, 2024

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

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

github-actions bot commented Aug 2, 2024

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

Resources/Textures/ADT/Interface/Alerts/charge.rsi

State Old New Status
charge-empty Added
charge0 Added
charge1 Added
charge2 Added
charge3 Added
charge4 Added

Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi

State Old New Status
ipc_antenna_antlers Added
ipc_antenna_crowned Added
ipc_antenna_cyberhead Added
ipc_antenna_droneeyes Added
ipc_antenna_light Added
ipc_antenna_lightb Added
ipc_antenna_sidelights Added
ipc_antenna_tesla Added
ipc_antenna_towers Added
ipc_antenna_tv Added

Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi

State Old New Status
ipc_screen_blank Added
ipc_screen_blue Added
ipc_screen_breakout Added
ipc_screen_bsod Added
ipc_screen_console Added
ipc_screen_ecgwave Added
ipc_screen_eight Added
ipc_screen_exclaim Added
ipc_screen_eyes Added
ipc_screen_eyesangry Added
ipc_screen_eyestall Added
ipc_screen_frown Added
ipc_screen_glider Added
ipc_screen_goggles Added
ipc_screen_heart Added
ipc_screen_l Added
ipc_screen_loading Added
ipc_screen_monoeye Added
ipc_screen_nature Added
ipc_screen_orange Added
ipc_screen_pink Added
ipc_screen_question Added
ipc_screen_rainbowdiag Added
ipc_screen_rainbowhoriz Added
ipc_screen_redtext Added
ipc_screen_rgb Added
ipc_screen_ring Added
ipc_screen_scroll Added
ipc_screen_shower Added
ipc_screen_sinewave Added
ipc_screen_smile Added
ipc_screen_squarewave Added
ipc_screen_stars Added
ipc_screen_static Added
ipc_screen_tetris Added
ipc_screen_textdrop Added
ipc_screen_tv Added
ipc_screen_windowsxp Added
ipc_screen_yellow Added

Resources/Textures/ADT/Mobs/Species/IPC/organs.rsi

State Old New Status
brain-inhand-left Added
brain-inhand-right Added
brain Added
ears Added
eyeball-l Added
eyeball-r Added
heart-off Added
heart-on Added
microcell Added
tongue Added

Resources/Textures/ADT/Mobs/Species/IPC/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

Resources/Textures/ADT/Structures/Machines/borgcharger.rsi

State Old New Status
HV Added
LV Added
MV Added
base Added
borgcharger_1 Added
borgcharger_2 Added
borgcharger_active_unlit Added
borgcharger_closed_unlit Added
borgcharger_open_unlit Added
borgcharger_panel Added
borgcharger_unlit Added
closed Added
icon Added
open Added

Edit: diff updated after f62493a

@1Stepka1 1Stepka1 marked this pull request as draft August 3, 2024 19:24
@Schrodinger71 Schrodinger71 linked an issue Aug 3, 2024 that may be closed by this pull request
@nixsilvam404 nixsilvam404 marked this pull request as ready for review August 3, 2024 20:51
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/Locale/ru-RU/ADT/Voice/emotes.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/Species/ipc.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Damage/ADTmodifiers.yml Outdated Show resolved Hide resolved
@1Stepka1
Copy link
Collaborator

1Stepka1 commented Aug 4, 2024

Так впринципе работает ходит там делает заряжается лечится и тому подобное, каких-то ошибок не выдавало(у меня по крайней мере)

Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

@Schrodinger71 Schrodinger71 dismissed their stale review August 5, 2024 18:07

Исправлено

@nixsilvam404 nixsilvam404 dismissed 1Stepka1’s stale review August 5, 2024 21:09

Исправлено

@Darkiich Darkiich self-requested a review August 5, 2024 21:20
@Darkiich
Copy link
Contributor

Darkiich commented Aug 5, 2024

Все окей

@Darkiich Darkiich added this pull request to the merge queue Aug 5, 2024
Merged via the queue into AdventureTimeSS14:master with commit 5d84f93 Aug 5, 2024
16 checks passed
@nixsilvam404 nixsilvam404 linked an issue Aug 5, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Перенести шейдеры Перенести КПБ.
4 participants