Merge Stable 8/10/24 #439
Merged
Merge Stable 8/10/24 #439
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
Co-authored-by: PJBot <[email protected]>
* ai core upgrades * fix distro color
* when tryInsertBlueprint is called it now also calls UpdateMaterialWhitelist on the ent so that it can accept new materials if needed. * Changed the previous commit to now just have sharedMaterialStorageSystem subscribe to TechnologyDatabaseModifiedEvent which will call UpdateMaterialWhitelist. * Empty-Commit
* remove picking up stack on quick swap * better
Added LV cables to SMES room, powering light and computers.
* spriting done * yml hydro updates * Named wrong thing and forgot it inherets
* red circuit added * index colour begone
* initial commit * adds cartridge to cmo's locker * tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too * fixes ert medic pda not having it preinstalled * adds attribution * removes redundant dependencies * fix agent pda --------- Co-authored-by: archrbx <[email protected]>
prevented the bioluminescent and slippery effects from being applied to the plant (and thus the plant tray)
* cleanup dinky star * fix * oh
* Cleanup pins.yml * oh my * forgor
Co-authored-by: deltanedas <@deltanedas:kde.org>
Fix spammable paper save issue
|
RSI Diff Bot; head commit 848d98e merging into 92f87a2 Resources/Textures/Clothing/Head/Bandanas/blue.rsi
Resources/Textures/Structures/Walls/solid.rsi
Resources/Textures/Clothing/Neck/Misc/pins.rsi
Resources/Textures/Objects/Devices/cartridge.rsi
Resources/Textures/Objects/Tiles/tile.rsi
Resources/Textures/Structures/Doors/Airlocks/Glass/hydroponics.rsi
Resources/Textures/Structures/Doors/Airlocks/Standard/hydroponics.rsi
|
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.
This is up until stable stopped being updated. I believe I'll also have to merge next week, but then it'll be a biweekly thing.