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

[РЕШАЮ КОНФЛИКТЫ]Blobb #694

Closed
wants to merge 18 commits into from
Closed

[РЕШАЮ КОНФЛИКТЫ]Blobb #694

wants to merge 18 commits into from

Conversation

Darkiich
Copy link
Contributor

Описание PR

Проверки

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

Изменения

🆑

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

Copy link
Contributor

github-actions bot commented May 14, 2024

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

Resources/Textures/Effects/chemsmoke.rsi

State Old New Status
chemsmoke Modified

Resources/Textures/Interface/Alerts/blob_health.rsi

State Old New Status
point0 Added
point1 Added
point10 Added
point11 Added
point12 Added
point13 Added
point14 Added
point15 Added
point16 Added
point17 Added
point18 Added
point19 Added
point2 Added
point20 Added
point3 Added
point4 Added
point5 Added
point6 Added
point7 Added
point8 Added
point9 Added

Resources/Textures/Interface/Alerts/blob_resource.rsi

State Old New Status
point0 Added
point1 Added
point10 Added
point11 Added
point12 Added
point13 Added
point14 Added
point15 Added
point16 Added
point2 Added
point3 Added
point4 Added
point5 Added
point6 Added
point7 Added
point8 Added
point9 Added

Resources/Textures/Mobs/Aliens/blob.rsi

State Old New Status
blank_blob Added
blob Added
blobPod-equipped-HELMET Added
blob_core Added
blob_core_glow Added
blob_core_overlay Added
blob_damaged Added
blob_factory Added
blob_factory_glow Added
blob_glow Added
blob_glow_damaged Added
blob_head Added
blob_idle_glow Added
blob_node Added
blob_node_glow Added
blob_node_overlay Added
blob_nuke_overlay Added
blob_resource Added
blob_resource_glow Added
blob_shield Added
blob_shield_damaged Added
blob_spore_temp Added
blobbernaut Added
blobbernaut_dead Added
blobbernaut_death Added
blobbernaut_produce Added
blobpod Added
block Added
block2 Added
corehealth Added
marker Added
nautdamage Added
nauthealth Added
ui_blobbernaut Added
ui_chemswap Added
ui_factory Added
ui_help Added
ui_node Added
ui_resource Added
ui_split Added
ui_swap Added
ui_tocore Added
ui_tonode Added

Edit: diff updated after a0c83b1

This reverts commit c17fc8b.
@Darkiich Darkiich closed this by deleting the head repository May 16, 2024
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.

2 participants