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

Salvage update & maps changes #2738

Merged
merged 10 commits into from
Nov 4, 2024
Merged

Salvage update & maps changes #2738

merged 10 commits into from
Nov 4, 2024

Conversation

Ko4ergaPunk
Copy link
Collaborator

@Ko4ergaPunk Ko4ergaPunk commented Nov 4, 2024 •
edited
Loading

Почему / Баланс

https://discord.com/channels/919301044784226385/924336321646960640/1302753999610708032
(Руми, добавь пж ссылку выше)

Медиа

image

Требования

Список изменений

🆑 Ko4erga

  • add: Возвращена консоль управления утилизаторского шаттла, как и сам шаттл.
  • tweak: Изменен шаттл утилизаторов.
  • tweak: Со всех карт убрана консоль экспедиций. На (почти) все карты добавлена мензурка с Оппорозидоном и убрана клонирующая машина. Тыквенный спас окончен.

🆑 lzk228

  • tweak: Обновлена карта Pearl.

@github-actions github-actions bot added Changes: No C# Code has not been changed Status: Needs Review This PR requires new reviews before it can be merged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Merge Conflict PR have unsolved merge conflicts labels Nov 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 4, 2024

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

@Ko4ergaPunk
Copy link
Collaborator Author

image

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 4, 2024 •
edited
Loading

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

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
ntmining Modified

Edit: diff updated after a11cd80

@Ko4ergaPunk Ko4ergaPunk requested a review from lzk228 November 4, 2024 00:16
Ko4ergaPunk and others added 2 commits November 4, 2024 03:35
@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Nov 4, 2024
@AwareFoxy
Copy link
Contributor

AwareFoxy commented Nov 4, 2024 •
edited
Loading

не похож чет шаттл на бомжатский

Спасибо мапперы что решили проблему геймдизайна офа который ушел из SS14 я вас люблю!!!!!!!!!

и он не ушел из сс14 а взял отпуск, врунишкинс:tm:

@poeMota
Copy link
Contributor

poeMota commented Nov 4, 2024

Ф за Тарантайку

@Ko4ergaPunk Ko4ergaPunk enabled auto-merge (squash) November 4, 2024 17:27
@Ko4ergaPunk Ko4ergaPunk dismissed lzk228’s stale review November 4, 2024 17:32

не хочу тревожить

@Ko4ergaPunk Ko4ergaPunk merged commit 926ad78 into space-syndicate:master Nov 4, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzk228 lzk228 lzk228 left review comments

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

@Morb0 Morb0 Awaiting requested review from Morb0 Morb0 is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Ko4ergaPunk @AwareFoxy @poeMota @lzk228