Upstrem #10
Merged
Upstrem #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: cfif126 <[email protected]>
Co-authored-by: lapatison <[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]>
* NanoChat * cleanups * lastbutnotfast
Added to support map in corvax next Co-authored-by: lzk <[email protected]>
…ate#153)" (space-syndicate#154)" This reverts commit b72d322.
Флаги разных государств
This reverts commit 4a803db.
…4-revert-153-PDAChat Revert "Revert "[PORT] Система обмена сообщениями в КПК""
Co-authored-by: kvant8 <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]>
Биржевая торговля
micro-upstream #6
* :) * 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]>
* SmartCringe * JustCringe
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: Sprites
Changes: UI
Changes: Shaders
Changes: Localization
Changes: Map
and removed
S: Merge Conflict
size/XL
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Почему / Баланс
Ссылка на ветку
Технические детали
Медиа
Критические изменения
Список изменений