Тюрьма #150
Merged
Тюрьма #150
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
github-actions
bot
added
Status: Needs Review
Changes: Sprites
and removed
Status: Needs Review
labels
|
RSI Diff Bot; head commit d00bc0a merging into d7a37e7 Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi
Resources/Textures/_Sunrise/Clothing/Back/Backpacks/guard.rsi
Resources/Textures/_Sunrise/Clothing/Back/Duffels/guard.rsi
Resources/Textures/_Sunrise/Clothing/Back/Satchels/guard.rsi
Resources/Textures/_Sunrise/Clothing/Belt/prison_guardian.rsi
Resources/Textures/_Sunrise/Clothing/Head/Hats/cap.rsi
Resources/Textures/_Sunrise/Clothing/Head/Hats/prisonguard.rsi
Resources/Textures/_Sunrise/Clothing/Head/Hats/prisonguard_beret.rsi
Resources/Textures/_Sunrise/Clothing/Shoes/Boots/prisoner.rsi
Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/guard.rsi
Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/prisoner.rsi
Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/guard.rsi
Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/prisoner.rsi
Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi
Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi
Resources/Textures/_Sunrise/Objects/pda.rsi
|
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
VigersRay
added a commit
that referenced
this pull request
Jul 12, 2024
* Тюрьма (#150) * Prison Init * Новая карта для планетарных тюрем * Готовая планетарная тюрьма * Незначительное изменение тайлов --------- Co-authored-by: Vigers Ray <[email protected]> * Космическая тюрьма и всё остальное говно * фиксы * фикс PrisonlDoctor * фикс PrisonDoctor * день длится 20 минут --------- Co-authored-by: SplikZerys <[email protected]>
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.
Надо доделать тюрьму до 29 числа (это дедлайн-дедлайновый) по хорошему 28