Merge Stable 16/12/24 #502
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
…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
* Fix for over-cuffing someone * comment
Actually inspect entity in hands
* Fix borgs not getting names on roundstart * Glory to the NT * Allow riggable to take in multiple reagents * Revert --------- Co-authored-by: Winkarst <[email protected]>
* Add MeleeRequiresWield component * Prevent world activation
Fix makeghostroleraffle command with 4 arguments
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit c23b314 merging into 4a1429f Resources/Textures/Mobs/Customization/gauze.rsi
Resources/Textures/Structures/Machines/uniform_printer.rsi
Resources/Textures/Interface/Misc/ai_hud.rsi
Resources/Textures/Mobs/Animals/reindeer_buck.rsi
Resources/Textures/Mobs/Animals/reindeer_doe.rsi
Resources/Textures/Mobs/Silicon/chassis.rsi
Resources/Textures/Objects/Devices/gates.rsi
Resources/Textures/Objects/Materials/hide.rsi
Resources/Textures/Objects/Materials/materials.rsi
Resources/Textures/Objects/Materials/ore.rsi
Resources/Textures/Objects/Materials/parts.rsi
Resources/Textures/Objects/Materials/silk.rsi
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi
Resources/Textures/Structures/Wallmounts/posters.rsi
|
* 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
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.
Decently late. Apologies.