Upstream sync #2008
Merged
Upstream sync #2008
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
… shared (#25813) * Moved abstract spill methods to shared; added prediction to spill container verb. * Rerun tests * Requested changes * Note Client behavior in Spill method docs
The rounding at 0,0 got memed.
* combine same-tile explosions in the same tick * ! --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Fix atmos deserialization
This increases the probability for the following effects caused by Ion Storms: Chance to affect a Station Borg: 50% -> 80% Chance to replace a Law: 10% -> 20% Chance to remove a Law: 10% -> 20% Chance to shuffle Laws: 10% -> 20%
The FTL UI on the shuttle console would reset the FTL progress bar every time you open it. This is because the server only sends "time until completion", not a start/end time. The FTL code now uses a separate start/end time so the exact same progress bar can be preserved. For convenience, I made a StartEndTime record struct that stores the actual tuple. This is now used by the code and has some helpers.
* Revert "Fix scram implant's teleportation out of containers (#24827)" This reverts commit d4434db. * Remove EntityQuery<T> pass-ins
Split GasTileOverlaySystem update over ticks
* all work done * adress whitespace * millions must factorio * conflict fix * i forgot
* Update base_clothingouter.yml * Update coats.yml * Change Flipped to Opened * labcoat * coat * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * cmo * gene * rd * robo * sci * viro * Locale zip-unzip * Missing meta * Fix wrong sprites
Fix itemslots prediction
* Fixed pulled items spinning when moved * edited out others issues * more reverts * requested fix * Removed "Optional:"
* Hyposprays Draw from Jugs * Fix last onlyMobs usage in yml * Some Suggested Changes * Remove unnecessary datafield name declarations * Remove unnecessary dirtying of component * Same line parentheses * Added client-side HypospraySystem * Cache UI values and only updates if values change * empty line * Update label * Label change * Reimplement ReactionMixerSystem * Remove DataField from Hypospray Toggle Mode * Change ToggleMode from enum to Bool OnlyAffectsMobs * Add DataField required back since it's required for replays...? * update EligibleEntity and uses of it * Add user argument back * Adds newline Co-authored-by: metalgearsloth <[email protected]> * Guard for dirty entity * Adds summary tag --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Balancing? Balancing!!! * Additional changes
* Atmos device performance improvements * AtmosDirection perf improvements * Fix errors * Add GasTileOverlayComponent arguments * Make excite no longer invalidate a tile
hardbomb tweaks
* up stimulants (no sleep) * Update SharedSleepingSystem.cs
* Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <[email protected]>
* drinks round 1 saving my progress before my hard drive explodes * test 2 please work * name fixes whoops * Update drinks.yml * various fixes am dumb * add sol dry to vends more fixes and changes, yippee! * more fixes & ingame testing shrimple tests * last fixesshould be ready for pr now * Update soda.yml sate thirst
* ERT Chaplain * Make BibleUser * It was not intended * reword my poor words * 1984 a comment that I decided was unnecessary. * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* Added pages to chemical categories The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml". * Update guides.ftl * Update chemicals.yml Changed the guide entry's ID for the medical tab from Medicine to Medicinal. Hope this works... * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml Co-authored-by: exincore <[email protected]> * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml Co-authored-by: exincore <[email protected]> * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml Co-authored-by: exincore <[email protected]> * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml Co-authored-by: exincore <[email protected]> * Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml Co-authored-by: exincore <[email protected]> * Fixed a few errors and stuff! A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore. If there's more problems, please do tell so I can fix it! * Update settings.json * Fix? --------- Co-authored-by: exincore <[email protected]>
* Added new anomaly particle * Add basic anomaly behaviour * +2 parametres * add functional to new particle * add components to behaviours * big content * add shuffle, moved thing to server * clean up * fixes * random pick redo * bonjour behavioUr * fix AJCM * fix * add some new behaviours * power modifier behaviour * rmeove timer * new event for update ui fix * refactor! * fixes * enum * Fix mapinit * Minor touches --------- Co-authored-by: metalgearsloth <[email protected]>
* Add scrollbars to lathe material list when necessary * Fix bug where shrinking window would cause elements to overlap --------- Co-authored-by: Eoin Mcloughlin <[email protected]>
* Adds a new slider to the misc tab in options that lets the player set chat window transparency * Tweaked variable names * Fixed order to match UI * Renamed set chat window transparency function * Changed and refactored to opacity instead of transparency * Remove unnecessary int to float conversions Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points. * Round the value to two decimal points * Remove rounding for now * Rename * Unhardcode chat color by moving to stylesheet * Fix indent * Make opacity slider only change opacity --------- Co-authored-by: Your Name <[email protected]> Co-authored-by: ShadowCommander <[email protected]>
* setup text data * roundstart reshuffling keywords with gibberish words * saved data categorized * add book with hints * start redrawing books * +4 book design * +books +random visual upgrade * finish first file * finish lore file * finish with books.rsi now authorbooks.rsi... * aurora! and some fix * nuke author books * speelbuke update * finish respriting work * fix scientist guide visual * setup datasets * setup stupid funny random story * restore author books, upgrade hint generation * add variety to story generator * add learning system * minor textgen edit * file restruct, hint count variation * more restruct * more renaming add basis learning system logic. Spears locked for special book for test. * nuke all systems, for splitting PR gods * typo fix * update migration with deleted books * add random story books to maint * Update construction-system.ftl * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: Hrosts <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: chromiumboy <[email protected]> * typo fix * interchangeably * final * Update Resources/Prototypes/Datasets/Names/books.yml Co-authored-by: Hrosts <[email protected]> * "." * Update Content.Server/Paper/PaperRandomStorySystem.cs Co-authored-by: Hrosts <[email protected]> * Ubazer fix * inadequate * localized * Update meta.json * fuck merge conflicts * fix jani book --------- Co-authored-by: chromiumboy <[email protected]> Co-authored-by: Hrosts <[email protected]>
* Make the advanced treatment modules beakers explosion-proof. * undo changes * Epic rename fail * Explosion recursion data field * Logic for data field
# Conflicts: # Resources/Audio/Machines/attributions.yml # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png # Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json # Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png # Resources/Textures/Objects/Misc/books.rsi/book0.png # Resources/Textures/Objects/Misc/books.rsi/book1.png # Resources/Textures/Objects/Misc/books.rsi/book2.png # Resources/Textures/Objects/Misc/books.rsi/book3.png # Resources/Textures/Objects/Misc/books.rsi/book4.png # Resources/Textures/Objects/Misc/books.rsi/book5.png # Resources/Textures/Objects/Misc/books.rsi/book6.png # Resources/Textures/Objects/Misc/books.rsi/book7.png # Resources/Textures/Objects/Misc/books.rsi/book8.png # Resources/Textures/Objects/Misc/books.rsi/book_bar.png # Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png # Resources/Textures/Objects/Misc/books.rsi/book_borg.png # Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png # Resources/Textures/Objects/Misc/books.rsi/book_cooking.png # Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png # Resources/Textures/Objects/Misc/books.rsi/book_detective.png # Resources/Textures/Objects/Misc/books.rsi/book_engineering.png # Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png # Resources/Textures/Objects/Misc/books.rsi/book_fish.png # Resources/Textures/Objects/Misc/books.rsi/book_hacking.png # Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png # Resources/Textures/Objects/Misc/books.rsi/book_infections.png # Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png # Resources/Textures/Objects/Misc/books.rsi/book_origami.png # Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png # Resources/Textures/Objects/Misc/books.rsi/book_space_law.png # Resources/Textures/Objects/Misc/books.rsi/meta.json
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Apr 4, 2024
Co-authored-by: lzk <[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.
Описание PR
Медиа
Проверки
Изменения