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

upstream #11

Closed
wants to merge 78 commits into from
Closed

upstream #11

wants to merge 78 commits into from

Conversation

Mor-Dast
Copy link
Owner

No description provided.

lzk228 and others added 30 commits December 10, 2024 16:48
Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: cfif126 <[email protected]>
* Hoba

* Delete Resources/Locale/ru-RU/_CorvaxNext directory
* Translate Upstream space-syndicate#2748 (space-syndicate#2837)

Co-authored-by: lapatison <[email protected]>

* Перевод Upstream space-syndicate#2830  (space-syndicate#2836)

Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: cfif126 <[email protected]>

* translate borer names (space-syndicate#2835)

* [Localize] Poster 52 (space-syndicate#2840)

* Translate new diona names (space-syndicate#2839)

Co-authored-by: lapatison <[email protected]>

* [Resprite] Medical uniforms & rollerbeds (space-syndicate#2802)

* Automatic changelog update

---------

Co-authored-by: lzk <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: cfif126 <[email protected]>
Co-authored-by: MureixloI <[email protected]>
Co-authored-by: IanComradeBot <[email protected]>
Added to support map in corvax next
Co-authored-by: lzk <[email protected]>
Флаги разных государств
…4-revert-153-PDAChat

Revert "Revert "[PORT] Система обмена сообщениями в КПК""
Morb0 and others added 19 commits December 16, 2024 15:38
* :)

* Delete Resources/Locale/ru-RU/_CorvaxNext directory
* Labeler

* fix comment

* make it happen

* Update Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/Components/ReagentDispenserComponent.cs

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update ReagentDispenserSystem.cs

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* last and fast

* Update Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs

Co-authored-by: FN <[email protected]>

* Update ReagentDispenserSystem.cs

---------

Co-authored-by: 60093633 <[email protected]>
Co-authored-by: FN <[email protected]>
Copy link

Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git

Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду git branch <название_ветки> и сбросив измененив в master-ветке.

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.