Merge upstream 2024-11-30 #19
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
* baby proof the terminal * Make a couple exceptions for items that you might take with you. * alwayspoweredlights * Uncuttable cables since cablecomp is a snowflake construction system * chairs and vendors * rerun heisentests * rerun tests again
* babyproof arrivals shuttle * always powered lights * uncuttable cables from terminal PR. --------- Co-authored-by: slarticodefast <[email protected]>
* dropdown shares margin width with children * removed dependency that rider added for some reason * reduced vertical margin from 8 to 2
* proof of concept * full implementation * I commited a crime * t * min players increase
* Make shuttle airlocks not snapcardinals * Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: Winkarst <[email protected]> Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: dylanstrategie <[email protected]~>
* clear mindrole on component shutdown * let it go
…Ghost test failures (#33593)
remove burnt tiles
* o7 * - * oppenhopper v2 * Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml * Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml --------- Co-authored-by: slarticodefast <[email protected]>
fix fixing the version thing in meta json for electril grill textures Co-authored-by: Arthur Kustenko <[email protected]>
Fix uniform printer sprites rotating the wrong way
Gives knives a thrown angle
…559) Update Content.PatreonParse to use net8.0 targetframework
Nik told me to not name this "nya"
Co-authored-by: Alpha-Two <[email protected]>
Can be retargetted to stable if preferred, which will then be a hotfix
* rename nitrogen internals crate * nitrogen internals crate description * migrate CrateNitrogenInternals ID
* Cleanup `ScrubberControl.xaml.cs` * Minor cleanups * Another pile of minor cleanups * Apply requested changes * Rename "which" into "bound". Add whitespace after "if"
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked Co-authored-by: aa5g21 <[email protected]>
* adjust min blindness back to 0 when PermanentBlindnessComponent is removed * mapinit changes * remove OnRemove, move changes to OnShutdown * goodbye event * dependency removal * final adjustment --------- Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
* Fixes the TEG airlock on marathon * Fixes the atmos external airlock on cog
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.
No description provided.