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 39a2ff5c0ab428b40e1e2800395e0b2fdeaffcdc)
(cherry picked from commit 786ecd961a5af4865281f6e3ae32d13fe26f028c)
(cherry picked from commit 84fff930c26897120baf66f9dbf91400e6e6e585)
(cherry picked from commit 51caf3b5199954bc459167b92d69a10a96b63cda)
…ial infected in zombie mode (#25529) Remove the ability for command to be initial infected in zombie mode (cherry picked from commit 580640150285e1f90f25ca014991c09f2fed3cdc)
(cherry picked from commit c52820a4b65a8ea147934e16bcf39027e2f067d5)
(cherry picked from commit 34a6f12ce65deb5381c315523e075310e76759d3)
add (cherry picked from commit 531d722c13138ad2f1d1176e1c2aadac13a5bcd6)
* add * ya * add (cherry picked from commit 9a4c10cc892e8e07c777b7351deec3efb673556a)
(cherry picked from commit e52ebe0ebd138bc12ec4427dfcc686efedd2a6fc)
The collision layer check doesn't work and I don't have time to fix it. (cherry picked from commit ec5edc362656440373cba7aa8ef63c87af85911b)
This reverts commit dc56c59.
(cherry picked from commit 51acebd2322f0952fa5a6fdb2e6c391fa83fdb83)
* Before SharedItemSystem * Fixes mispredict, removed unused * Fix physics (cherry picked from commit 902198d7e0c85f62ac91a0ff2cd275c0e7e77d56)
(cherry picked from commit 6f3893a0e0a976566a0795ab52ae5cfe46cc50b6)
(cherry picked from commit a440ccfc7c0d9dcaa68a419cac50f71bde1e42a1)
* Toggleable items now can change their shape depends on toggle state * Update Content.Shared/Item/SharedItemSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit 1a5f7c39b2a2c244d5d947d8ff8f09250f21450b)
* Juice that makes you Weh! * Remove dupe * updated the localization files * try to fix error (cherry picked from commit 1de102d08e93c8e5de0bfedf05d4dc02dfbee8a6)
* 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 <comedian_vs_clown@hotmail.com> (cherry picked from commit 87def406bc2cb3121888d162c8fe707ff937dd6f)
(cherry picked from commit 4613c9dabc5bd4aee29895486e4afae297be5520)
IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work. (cherry picked from commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46)
fix (cherry picked from commit 7ba6765a6af09e060f539d8b6fa847de9512c4c9)
(cherry picked from commit 4e1603424008c0323972207d7699653570fd1912)
(cherry picked from commit de36ebe2dfbcba11866b61a69d46c2d27077ee76)
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 3ef4e835583b99b020c0bb317be99cb06ade2ec9)
* Panic bunker fix I admin * tired (cherry picked from commit b26acc95475a9ae2000fddcfb2bee7d058b4122c)
* Implemented contents display for dispenser UI * Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Resolve the netent into a euid first --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit 100ece2e2078ab2fe99f4ce1ab36b2cd05319772)
(cherry picked from commit 02be78b062fe727aa444bf4b19bc6610b984ec05)
OnPiecePressed (cherry picked from commit 7d6e4b164d6013257423afe02b3f06447e37bec3)
bald update Co-authored-by: Kadeo64 <108914677+Kadeo64@users.noreply.github.com> (cherry picked from commit 974c4b92197452ffac0d11730a8045b1f4eb936b)
(cherry picked from commit 4228305b12fb1302de74b578318f46b8c1887827)
Removed all obsolete, non-ECS method calls to BatteryComponent (cherry picked from commit 2935e5bd780d6cd08897521ba0b54adccb3fd0da)
(cherry picked from commit e5536e0652ab3605701627474d6450f0884a079c)
Added FitsInDispenser to FlaskBase (cherry picked from commit 56454b6c167b0cac055b3b2eeb654018fb45c4f0)
(cherry picked from commit 6da400980b72c146c8401b7981e5eadb71c94e68)
* 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 370a79fbc847c75aca4d733e1cac2bb56a19776b)
* clown mask real * Update masks.yml (cherry picked from commit 2c2be09956e5221cec4835aae6c38981e525e112)
This reverts commit 02b1352.
github-actions
bot
added
Status: 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 |
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.