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

RSCADD: Roundstart blurb #850

Merged
merged 7 commits into from
Jan 31, 2024
Merged

RSCADD: Roundstart blurb #850

merged 7 commits into from
Jan 31, 2024

Conversation

ImJustKisik
Copy link

Добавил прикольный текст при спавне куклы + оповещение о ребуте сервера.

Changelog

🆑
add: Добавлен текст при спавне персонажа, добавлен текст при ручном перезапуске сервера.
/:cl:

@ImJustKisik ImJustKisik changed the title RSCADD: RSCADD: Roundstart blurb Dec 12, 2023
@ss220bot
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

Wyccstation Main II

Revision

Origin: b25c15b
Pull Request: 9d17c8a
Server: a95053f46f7f1548678915d1bc224fb30d6b0615

Comment

@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Wyccstation Main II

Revision

Origin: 38ad97f
Pull Request: 9d17c8a
Server: 7a155a0355beeccacce956941461581b9f4b45dc

Comment

@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Wyccstation Main II

Revision

Origin: 40dfa51
Pull Request: 9d17c8a
Server: 4e69284269df1873bb9529f72649f0a4d3d91d9f

Comment

@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Wyccstation Main II

Revision

Origin: 0d4d01c
Pull Request: 9d17c8a
Server: ba8ddbdeb24d4a54d57e2ab04a4c4f7b9156c731

Comment

@PhantornRU
Copy link
Collaborator

К нам значит не заливаем т.к. ОФФы доделывают?

Copy link
Collaborator

@PhantornRU PhantornRU left a comment

Choose a reason for hiding this comment

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

Но временно я бы к нам закинул, т.к. ОФФы там доделывают и хотят еще окошки для антагов сделать.
Вот когда доделают через пару недель/месяц/2 месяца/доделаютливообще, тогда перейдем на их.

@Legendaxe Legendaxe force-pushed the master branch 2 times, most recently from e6c58c1 to add632e Compare December 16, 2023 18:44
@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Paradise-main-I

Revision

Origin: f0196ef
Pull Request: 9d17c8a
Server: 4c2e1cfabf73019fb478c2fe131e1c8f7d26fb0b

Comment

@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Paradise-Prime

Revision

Origin: f0196ef
Pull Request: 9d17c8a
Server: 991a82264b1876d7cffd7176942fec2dc9933d3a

Comment

@ss220bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Paradise-Prime

Revision

Origin: f0196ef
Pull Request: 9d17c8a
Server: 3ee0673c5fb76515b09f82cae6e1ea6f31bcd9b3

Comment

@dj-34 dj-34 added the :trollface: Фича Новая функция, фишка или механика. Абсолютно точно новые баги. label Jan 31, 2024
@AyIong AyIong removed the Do Not Merge Не заливать. В ожидании хэда/хоста. Или просто временный тестмерж. label Jan 31, 2024
@github-actions github-actions bot added the Merge Conflict Ну блять... label Jan 31, 2024
@github-actions github-actions bot removed the Merge Conflict Ну блять... label Jan 31, 2024
@Legendaxe Legendaxe merged commit f59a74d into ss220club:master Jan 31, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📜 CL валиден :trollface: Фича Новая функция, фишка или механика. Абсолютно точно новые баги.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants