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

Centcom rework #624

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Centcom rework #624

wants to merge 21 commits into from

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Nov 7, 2024

  • Консоль контроля станции
  • Консоль контроля поставок
  • Мапа ЦК

Кратное описание

По какой причине

Медиа(Видео/Скриншоты)

🆑 pacable

  • add: Добавлена консоль Центрального Командования.
  • add: Добавлена консоль поставок Центрального Командования.

Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
Signed-off-by: pacable <[email protected]>
@mithail
Copy link

mithail commented Nov 8, 2024

Я ждал это 3.. Нет. 5 тысяч лет!

Copy link
Contributor

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

Copy link
Contributor

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

@pxc1984 pxc1984 marked this pull request as ready for review November 16, 2024 07:25
@pxc1984 pxc1984 requested a review from VigersRay as a code owner November 16, 2024 07:25
@pxc1984
Copy link
Contributor Author

pxc1984 commented Nov 18, 2024

схуя тут тег "Merge Conflict", тогда как тут нет конфликта

@kaworu177
Copy link

Круто
Я жду
Ура
О боже
Как круто

@pxc1984
Copy link
Contributor Author

pxc1984 commented Dec 1, 2024

image

не понимаю схуя линтер падает, все на месте

@CatBackGround
Copy link
Contributor

/Prototypes/_Sunrise/Entities/Structures/Machines/Computers/computers.yml(-1,-1) File not found. (/Audio/_Sunrise/Announcements/centcomm.ogg)
Тут пизданулся звук.

Copy link
Contributor

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

@mithail
Copy link

mithail commented Dec 16, 2024

Когда нибудь

1 similar comment
@azbuca
Copy link

azbuca commented Jan 12, 2025

Когда нибудь

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.

5 participants