Merge Stable 21/1/25 #538
Merged
Merge Stable 21/1/25 #538
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
change return to continue Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: PJB3005 <[email protected]>
changed the command checkpoint to a reporters room.
added high capacity water tank
* Darkened Service job interface icons for better contrast * Fixed Botanist job interface icon dark handle hole * Change to new, darker, service color in all resource yml files * Revert Map file service color changes * Use new darker service color on id cards * Revert Service color change in mapping_actions.yml * Revert salvage difficulties service color * Redo service ID and job colors to match advanced palette * Revert all service color yml file changes * Switch icons to use existing service pallete colors from advanced pallete * Update meta.json for darkened service icons --------- Co-authored-by: Erskin Cherry <[email protected]>
* Moved all vents around, made some small changes * Finished work * Removed insuls spawner since they're not merged yet
* Added insuls spawner, time to test * adjusted whitespace since that was causing issues * Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
* resprited manual valves to be colourblind friendly * Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json Co-authored-by: Errant <[email protected]> --------- Co-authored-by: Errant <[email protected]>
… to match monkey. (#34409) kobold ops have 100 health
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * APE dragging exploit fix
… (#34045) * Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes * Update Content.Shared/Doors/Systems/SharedDoorSystem.cs Clarifies comment of how the mask is used Co-authored-by: Centronias <[email protected]> --------- Co-authored-by: Centronias <[email protected]>
* fixed jazz midi program byte * swapped around jazz and clean in instrumentList
* Pride-O-Mat (#1322) * Added Pride-O-Mat * Yep * Updated license to the correct one * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory * Removed bunny ears, fixed typo * Made requested changes Webedit lmao --------- Co-authored-by: Dorragon <[email protected]>
* balance oasis power as a stopgap * change waste color to proper waste color
Co-authored-by: Pieter-Jan Briers <[email protected]>
* craftable pet carrier * epic integration test fail * Update Resources/Prototypes/Recipes/Crafting/improvised.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml Co-authored-by: slarticodefast <[email protected]> * extra tab begone * epic linter fail * how did linter not see this??? --------- Co-authored-by: slarticodefast <[email protected]>
* Make important change (#7) This is to help julian test his bot * Omnibus * Remove random test file from testing a gh bot * Add pin to vendor, spawners and loadout --------- Co-authored-by: nikthechampiongr <[email protected]>
github-actions
bot
added
Changes: Sprites
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.
Lot of new maps, is the primary thing.