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.

Sign up for GitHub

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

Jump to bottom

Xeno upgrades #308

Merged
merged 60 commits into from
Oct 3, 2024
Merged

Xeno upgrades #308

merged 60 commits into from
Oct 3, 2024

Conversation

Waselon
Copy link
Collaborator

@Waselon Waselon commented Sep 13, 2024 •
edited
Loading

Добавляет прокачку ксеноморфов.

Добавляет 3 вида построек, которые открывают пути улучшения ксеноморфа:

  • Защита и выживаемость
  • Нападение
  • Разное

Постройки покупаются за пси-поинты.
Количество построек влияет на силу улучшений (максимум 3 постройки одного типа).
Можно выбрать только одно улучшение из категории.
Улучшения стоят биомассу (личные поинты).

  • Добавить постройки
  • Добавить постройки в меню блессингов
  • Добавить спрайты построек
  • Добавить иконки на миникарту
  • Добавить апгрейды
  • Добавить описания апгрейдов
  • Добавить иконки апгрейдов
  • Добавить меню апгрейдов
  • Добавить биомассу и способы её получения

@github-actions github-actions bot added the Merge Conflict ПР конфликтует с базовой веткой label Sep 18, 2024
@LoneAsket
Copy link
Contributor

  1. После хиджака постройки с улучшениями разрушаются?

@Waselon Waselon removed the Merge Conflict ПР конфликтует с базовой веткой label Sep 19, 2024
@Waselon Waselon marked this pull request as ready for review September 19, 2024 16:37
@Waselon Waselon added Xeno Затронута сторона Ксеноморфов. Balance Изменение важных игровых механик. Feature Добавление новых механик и прочего. and removed Balance Изменение важных игровых механик. labels Sep 19, 2024
Helg2
Helg2 reviewed Sep 26, 2024
View reviewed changes
code/modules/mob/living/carbon/xenomorph/xenoprocs.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/xenoprocs.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm Outdated Show resolved Hide resolved
code/__DEFINES/xeno.dm Outdated Show resolved Hide resolved
Helg2
Helg2 reviewed Oct 2, 2024
View reviewed changes
code/__DEFINES/xeno.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm Show resolved Hide resolved
code/datums/status_effects/xeno_buffs.dm Outdated Show resolved Hide resolved
code/datums/status_effects/xeno_buffs.dm Outdated Show resolved Hide resolved
code/datums/status_effects/xeno_buffs.dm Outdated Show resolved Hide resolved
code/datums/status_effects/xeno_buffs.dm Outdated Show resolved Hide resolved
code/datums/status_effects/xeno_buffs.dm Outdated Show resolved Hide resolved
@Helg2 Helg2 requested a review from homexp13 October 2, 2024 19:14
homexp13
homexp13 approved these changes Oct 3, 2024
View reviewed changes
Copy link
Collaborator

@homexp13 homexp13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

можно было бы эффекты в общий подтип вынести но ладно

@Helg2 Helg2 merged commit aa3f6eb into PMC-Unga-Marines:master Oct 3, 2024
6 checks passed
@Runian Runian mentioned this pull request Oct 28, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LoneAsket LoneAsket LoneAsket left review comments

@Helg2 Helg2 Helg2 approved these changes

@homexp13 homexp13 homexp13 approved these changes

Assignees
No one assigned
Labels
Feature Добавление новых механик и прочего. Test Merge Candidate Игроки побудут тестировщиками. Xeno Затронута сторона Ксеноморфов.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Waselon @LoneAsket @homexp13 @Helg2 @Tatarla