Upstream sync #502
Merged
Upstream sync #502
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
* Lathe-able Welding Masks * Fix Composition Tests
fland update
origin update
Lower Volume
europa
* refactor ops * inherit dna and fiber when fish hydrated ** kid named finger *
…tial infected in zombie mode #25529 (#25785) * fix(antags): respects canBeAntag = true * updated more * includeAllJobs = False?????????? * fixed comma placement * removed unused dependencies
Only thing that even triggers it atm is escape pods.
fix: sane keybindings?
Branch moment.
Actually enforce max/min temperatures server side
* sprites something something strength and certainty of steel (except this is brass) * test1 * commas it was commas * commas and brackets * LET THERE BE BRASS * brass-glass-etc-windows-thindows-floors-lattice * ALL THE STRUCTURES!! "Which structures did you add?" "all." * buyable brass and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe * Update windoor.yml i forgor 💀 * Update tiles.ftl * i hate random capital letters * linter fix 1 whew, thank god for linters * fix 2 * maybe this shot in the dark, idk what the hell i'm doing hopefully this fixes it? * fix attempt 1 weather to true, maybe the thingy got confused? * remove clockwork lattice it's fixed the test fail... but at what cost? * changes 1 * fix clockwork windoor * FLOORS HAHAHA LET THERE BE FLOORS * try linter fix 1 i love linters they find things i'd never catch myself * tweaks fixes 1 fixes merge conflict and does more stuff part two later because i'm tired * tweaks fixes 2 i should probably do this stuff during the day when i have more energy but eh * Update assembly.yml * Update chairs.yml * fix door sprites somehow the deny_unlit was broken for all the clockwork doors * fix glass.yml
Update lathe+clothing.yml
Glowstick now garbo
Added prediction to labels
* Revert "Change keybindings for paper (#25853)" This reverts commit 4b56996. * Add a save button to the paper editing UI instead.
Separate Walls
* update * rename tank to pool. bigger arbitrary #. remove bad copy paste part.
* penis * done
* Added appropriate wideAnimationRotation fields to items that needed it * Modified some wideAnimationRotation
the fog is coming
* Clothing sprites & meta * Changing prototypes & sprites Rename sprites folder, edit prototypes and meta * Hair_sprites_&_prototype Add hair sprites and change prototype * Update meta.json * Rename added hair * Revert "Changing prototypes & sprites" This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98. * Revert "Clothing sprites & meta" This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
readmin debugcoords
Was too lazy to fix and forgot.
* Added SharedPopupSystem.PopupPredicted * Documentation improvement
bald update Co-authored-by: Kadeo64 <[email protected]>
Removed all obsolete, non-ECS method calls to BatteryComponent
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.
No description provided.