Upstream merge 59.5 #1524
Merged
Upstream merge 59.5 #1524
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
Adds robotics console to Meta
No Fun Allowed
Removes Grilles from around atmos miners
Removes grilles from atmos gas miners on Fland
Co-authored-by: plykiya <[email protected]>
* First commit * Added Network and access
…rds#30022) * Gets rid of all leftover usages of CurrentMap * args works * reverty * skill issue --------- Co-authored-by: plykiya <[email protected]>
…e-wizards#30646) no more evac sleeper agents
* Fix warnings in ShuttleSystem.GridFill.cs * remove the thingie --------- Co-authored-by: metalgearsloth <[email protected]>
* Fix paper system late localization * IS THIS WHAT YOU WANT * well I guess this is happening now * fix the BUI * did that even do anything before? * again with the escapeformatting... * Dirtying * Move dirty to function * Rename PaperSystem to PaperVisualizerSystem * Fix namespace * how many namespace changes must I suffer through * SetContent is for Setting Content * minor shuffling * review --------- Co-authored-by: plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* refactor JobRequirements * add profile support * fix * Update quartermaster.yml * sloth fixes * inport 30208 * Update DepartmentPrototype.cs * species restriction * left tweak stick * stringbuilder is cool!
* Restore the long traitor briefing * highlights
* De-duplicate loadout gear Needs supporting code, probably with an interface with StartingGearPrototype which would also use it, but I regexed the yaml. * Code updates * Remaining yaml * Fix automatic naming * raiseEvent * Don't code when tired kids
…pective threshold levels (space-wizards#30563) * Debug command to set either your hunger or thirst to one of their respective threshold levels * code updates * code + loc changes
* Fix random unused field warnings Not many but it counts. * caught * Field
…er (space-wizards#30446) * Initial commit * more like bYE * Fix exception during test
* TemperatureSpeed component * temperature slowdown prediction (done right) * remove unnecessary changes * that too * get in line * make it readonly * auto pause
…ce-wizards#30591) refactor the hungry debug command to be in line with thirsty Co-authored-by: metalgearsloth <[email protected]>
* Fix verb sub Mapping casualty, verbs are weird. * also this
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 882bae9 merging into 441a94e Resources/Textures/Clothing/Mask/sadmime.rsi
Resources/Textures/Clothing/Mask/scaredmime.rsi
|
|
ready |
|
теперь точно ready |
TheArturZh
approved these changes
Aug 5, 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
Мини-апстрим на 40 коммитов. Попросили, потому что там были изменения, решающие проблему с редактором карт и verb'ами. Также сразу подкрутил новые лодауты под консоль криминальных записей и систему джобок от оффов.
Медиа
Проверки
Изменения
no fun allowed