Upstream sync #2547
Merged
Upstream sync #2547
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
* Work on abstracting out chargeup functionality/ui from grav gen * Work on station anchor * Finish implementing station anchors * uhh yeah * ok. * fix tests * whoops * Get the last extraneous yaml fail * PJB review * beast mode... ACTIVATE! --------- Co-authored-by: Ed <[email protected]> Co-authored-by: EmoGarbage404 <[email protected]>
* Remove fake centcom stuff * forgor * bruh * FUCK TOOLBOX * weh??
make trading outposty stationary
* fixes #31469 * removed medbelts from lockers. Empty belts found in vending machine now.
* Salvage Equipment Rebalance * oh yeah! * make fire extinguisher 100%
* initial commit * VSCodium is being dumb I don't know why vscodium thinks I modified this whitespace when this is infact how I wrote it in the first place, but it's being dumb and I think if I reset in order to put it in the initial commit I'll have to rebase again so :P. go go gadget single byte commit * but wait, there's more! * missing newline
Co-authored-by: PJBot <[email protected]>
This is the content analogue of space-wizards/RobustToolbox#5412 Made Content.Tests run tests parallelized, which doesn't really seem to matter much. I tried to make Content.IntegrationTest more aggressively parallelized but ran into dotnet/runtime#107197 so we need to shelve that. Added a comment explaining as such.
* Update StackSystem and add SpawnMultiple targeting EntityUid * Update Content.Server/Stack/StackSystem.cs * Update Content.Server/Stack/StackSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Remove FormattedMessage obsolete methods * Oops
* replace obsolete * weh
…eam-sync # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Stations/base.yml
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Sep 2, 2024
Co-authored-by: lapatison <[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.
Описание PR
Медиа
Проверки
Изменения