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

Merge #1723

Merged
merged 6 commits into from
Dec 28, 2023
Merged

Merge #1723

merged 6 commits into from
Dec 28, 2023

Conversation

SuhEugene
Copy link

No description provided.

LordNest and others added 6 commits December 27, 2023 23:38
bugfix: Убрал возможность быть мерчантами у ГБСов и Адхерантов, так как те не понимают, как работает рынок.
tweak: Добавил офицерам в шкафы тазеры.
rscadd: Вернул потерянные очки айтишника
maptweak: Добавил на карту очки, добавил на карту новый ящик в чекпоинт РнД.
balance: Добавил ГККшному набору ниндзи паверфист как модуль. Его нужно запихнуть в ИКС.
@SuhEugene SuhEugene requested a review from a team as a code owner December 28, 2023 07:59
@@ -779,6 +779,10 @@ About the new airlock wires panel:
data["electrified"] = round(electrified_until > 0 ? max(electrified_until - world.time, 0) / 10 : electrified_until, 1)
data["open"] = !density

// [SIERRA-ADD] - NTNet gimmics
Copy link
Author

Choose a reason for hiding this comment

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

@LordNest это требует фикса однозначно по возможности

Choose a reason for hiding this comment

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

Да пофиксим
Потом

@SuhEugene SuhEugene merged commit b84f764 into master-sierra Dec 28, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants