Upstream merge 63 #1979
Merged
Upstream merge 63 #1979
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
…pace-wizards#32264) * Add glasslocks to the Contiguous Fland Hallway Volume * Fix up the firelocks, hopefully!
no more cockroach and mothroach damage
…ards#32181) more convenient cheeseem
make mailing better
…ace-wizards#32320) Make small clamp user 2% battery instead of recharge 2% battery. Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
No resizing character editor Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
* rolebanlist command opens ui * removed commented out section
* added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again
made security clown masks security contraband.
* SodaWater and Vodka recipes * Changed crystals recipe in fun.yml * plasma is now a catalyst to create crystals * Revert "plasma is now a catalyst to create crystals" This reverts commit 1002d99. * Revert "Changed crystals recipe in fun.yml" This reverts commit 30b6b60. * Stir to make Vodka * Shake to make soda water * fix
…1879) * hide spriteview from health analyzer while inactive * add out of range indicator if analyzer becomes inactive * hide out of range icon if there is no patient data
* Added directory to station maps * Add null checks to map directory sorting/filtering * Reworked station map directory to be more readable and responsive
…s#32348) change that one line so i never think about this again
* content * Update meta.json * Update mobspawn.yml * Update mobspawn.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml * Update Resources/Prototypes/Entities/Effects/mobspawn.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
fix description, fix scams
* rat kings can butcher things * minor organization * fix * important comma
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 1b0e418 merging into 5e76d81 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi
Resources/Textures/Interface/Actions/actions_ai.rsi
|
|
чат, это такой апстрим |
|
пока не мержить, ждём когда обновления движка подтянут, там для фичи одной нужно... |
|
Чат, это такой upstream |
|
@gogenych пока бы попросить кого-нибудь затестить работу маски, изменяющей голос, я всё не потрогал, но, возможно, она сломалась |
5 tasks
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…ation-14 into upstream-merge-63
|
ready |
TheArturZh
approved these changes
Oct 1, 2024
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
мёрж апстрима
Медиа
Проверки
Изменения
no cl