Skip to content
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 106 commits into from
Jun 2, 2024
Merged

Upstream sync #2198

merged 106 commits into from
Jun 2, 2024

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Jun 2, 2024

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

Partmedia and others added 30 commits May 29, 2024 20:34
* 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
…#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
Plykiya and others added 21 commits June 1, 2024 23:10
* 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
* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
…ream-sync

# Conflicts:
#	Resources/Prototypes/GameRules/events.yml
@Morb0 Morb0 requested a review from ficcialfaint as a code owner June 2, 2024 21:45
@github-actions 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
@Morb0 Morb0 merged commit 0113332 into master Jun 2, 2024
11 checks passed
lzk228 added a commit that referenced this pull request Jun 5, 2024
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.