-
Notifications
You must be signed in to change notification settings - Fork 618
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream sync #2198
Merged
Merged
Upstream sync #2198
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
* Try syncing powered state to client For some reason the client is not receiving the ApcPowerReceiverComponentState, so it's not working. * Fix powered state not syncing to client The client PowerReceiverSystem was abstract, which prevented it from running initialize. * Flip check so that it runs bigger checks first PowerDisabled skips the others. NeedsPower skips the receiving check. * Disallow changing Powered manually * Move Powered update to PowerReceiverSystem * Move appearance to event subscription * Move metadata component to AllEntityQuery * Cleanup * Move Powered update back to PowerNetSystem It's easier to use the EntityQueries and it dosen't need to be updated anywhere else. * Put appearance updating back * Move IsPowered to shared * Simplify IsPowered * Cleanup * Remove duplicate PowerChangedEvent PowerChangedEvent on ProviderChanged doesn't seem to be needed PowerChangedEvent gets raised by in update if the power state changes after a new provider is connected
A lot of BUIs aren't going to handle the state coming in cleanly but we can fix em as we find em.
* localize tip * localizzedDataset
Converted story generation to use LocalizedDatasets
* Convert advertisements to use LocalizedDatasets * File consolidation * Arcade machines too
Co-authored-by: moonheart08 <[email protected]>
…#27839) * Fix TryGetActionData error triggering when run on deleting entities * Only get metadata once
If it's an extra category we leave it in its default spot.
* Fix latejoin antag preferences not being respected * thank fuck for tests
* Only auto-enable internals when necessary * Add toxic gas check * Rename Any -> AnyPositive
* Make tests automatically reset modified cvars * Fix bad return * A * Try Fix tests * clarify comment * update eng
Fix Identity.Name exception
* Replace obsolete whitelist is valid with whitelist system * Consistency * Fix logic * Bork * I figured out how to get whitelists on the client lol * test fail * woops * HELP ME FUNCTIONS * Fix errors * simplify --------- Co-authored-by: plykiya <[email protected]>
* PJB's cool table control (it probably doesn't work) * ok wait wrong file * Guidebook Tables
Replace Matrix3 with Matrix3x2
* Content changes for entity categories PR * Poke tests * Why are tests suddenly working?
fix issue Co-authored-by: plykiya <[email protected]>
…ream-sync # Conflicts: # Resources/Prototypes/GameRules/events.yml
…to master) (#26639) fixed finally yay
github-actions
bot
added
Status: Needs Review
This PR requires new reviews before it can be merged
Changes: Map
Can be reviewed or fixed by people who are knowledgeable with mapping
Changes: UI
Can be reviewed or fixed by people who are knowledgeable with UI design
Changes: Localization
Can be reviewed or fixed by people who are knowledgeable with translation
labels
Jun 2, 2024
lzk228
added a commit
that referenced
this pull request
Jun 5, 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
Labels
Changes: Localization
Can be reviewed or fixed by people who are knowledgeable with translation
Changes: Map
Can be reviewed or fixed by people who are knowledgeable with mapping
Changes: UI
Can be reviewed or fixed by people who are knowledgeable with UI design
Status: Needs Review
This PR requires new reviews before it can be merged
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
Медиа
Проверки
Изменения