2024/03/05 merge master #937
Merged
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
Update food-component.ftl why was I the only one that noticed it (cherry picked from commit 39a2ff5)
(cherry picked from commit 786ecd9)
(cherry picked from commit 84fff93)
(cherry picked from commit 51caf3b)
…ial infected in zombie mode (#25529) Remove the ability for command to be initial infected in zombie mode (cherry picked from commit 5806401)
(cherry picked from commit c52820a)
(cherry picked from commit 34a6f12)
add (cherry picked from commit 531d722)
* add * ya * add (cherry picked from commit 9a4c10c)
(cherry picked from commit e52ebe0)
The collision layer check doesn't work and I don't have time to fix it. (cherry picked from commit ec5edc3)
This reverts commit dc56c59.
(cherry picked from commit 51acebd)
* Before SharedItemSystem * Fixes mispredict, removed unused * Fix physics (cherry picked from commit 902198d)
(cherry picked from commit 6f3893a)
(cherry picked from commit a440ccf)
* Toggleable items now can change their shape depends on toggle state * Update Content.Shared/Item/SharedItemSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 1a5f7c3)
* Juice that makes you Weh! * Remove dupe * updated the localization files * try to fix error (cherry picked from commit 1de102d)
* Added logic for ContainerSpawnPoint checks * Improved with template function * fixed nullable * hehe * hehe T? * added type check before cast * another nullable fix * and another one * return to old code (found typo) * Code cleanup --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 87def40)
(cherry picked from commit 4613c9d)
IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work. (cherry picked from commit ad29dbe)
fix (cherry picked from commit 7ba6765)
(cherry picked from commit 4e16034)
(cherry picked from commit de36ebe)
Turns out this is not what serverid was for... i guess you can find server familys with this so im not gonna remove it. Best we get for server name is the admin logs server name. (cherry picked from commit 3ef4e83)
* Panic bunker fix I admin * tired (cherry picked from commit b26acc9)
* Implemented contents display for dispenser UI * Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs Co-authored-by: Nemanja <[email protected]> * Resolve the netent into a euid first --------- Co-authored-by: Nemanja <[email protected]> (cherry picked from commit 100ece2)
(cherry picked from commit 02be78b)
OnPiecePressed (cherry picked from commit 7d6e4b1)
(cherry picked from commit 4228305)
Removed all obsolete, non-ECS method calls to BatteryComponent (cherry picked from commit 2935e5b)
(cherry picked from commit e5536e0)
Added FitsInDispenser to FlaskBase (cherry picked from commit 56454b6)
(cherry picked from commit 6da4009)
* fix(emag): Emagging a lock properly unlocks the component Fixes #24860 * fix(emag): Emagging a lock no longer duplicates the unlock sound (cherry picked from commit 370a79f)
* clown mask real * Update masks.yml (cherry picked from commit 2c2be09)
This reverts commit 02b1352.
github-actions
bot
added
S: Needs Review
Changes: C#
|
Yaml linter passed locally, thats the only test I ran |
|
i thought deltav still uses brig access for lawyers |
No. we have a Lawyer access for that. |
|
All tests are now green locally |
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description This significantly improves the quality of the language system by fixing the mistakes I've made almost a year ago while developing it. Mainly, this throws away the old half-broken way of networking in favor of the component state system provided by RT. Language speaker comp is now shared with SendOnlyToOwner = true, and its state is handled manually. In addition to that, this brings the following changes: - UniversalLanguageSpeaker and LanguageKnowledge are now server-side - DetermineLanguagesEvent and LanguagesUpdateEvent are now shared (so that future systems can be built in shared, if needed) - Everything now uses the ProtoId<LanguagePrototype> type instead of raw strings (god, I hated those so much) - The server-side language system now accepts Entity<T?> arguments instead of EntityUid + T - UniversalLanguageSpeaker is now based on DetermineEntityLanguagesEvent and gets an Enabled field, which allows to turn it off. This may have some use in the future. - Some minor cleanup <!-- TODO MEDIA <details><summary><h1>Media</h1></summary> <p>  </p> </details> --> # Changelog No cl --------- Co-authored-by: VMSolidus <[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.
Untested, unfinished. Theres other commits still up for grabs and the trading post still needs to be partially copied due to missing out on a lot of content because of it.
Most notably, the shuttle ui refactor is missing, due to trading post FTL changes. I may still take care of that, but ehh.
I also dont believe tests will pass, and thats fine. If they do, great, otherwise I'll fix them whenever I feel like it.