Merge wizden up to 02/12 - Part 2 #501
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
Co-authored-by: Pieter-Jan Briers <[email protected]>
Power moment
* mining-doors * mining-tiles * mining-window * Change copyright in meta.json * Change license in attributions.yml
…1914) * Move hardcoded pirates gamerule prototype ids to validated consts * Rename
**
Co-authored-by: Rainfall <[email protected]>
* add MalfunctionWhitelist * whitelist a few things * locutus of borg * support blacklist --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* add ConvertedCount field to role * make objectives roundend title logic reusable * change rev system + use GetTitle --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
- Show if an anomaly is attached when examining - Add verb for attaching anomaly - Add popup messages for when you try to attach when machine isn't powered, or when no anomaly is in range. - Use anomaly threshold values from anomaly comp, instead of hardcoded **and incorrect** values - Use Entity<T> - Formatting fixes and other misc code cleanup
* Add whitelist to food carts and anti-rot to cold cart * Remove whitelist --------- Co-authored-by: Jeff <[email protected]>
* Fixes jani items not being storable on jani trolley * Let's see if it likes this better * Ok, then, that'll do --------- Co-authored-by: Jeff <[email protected]>
* Food/Bev updates and fixes * Remove some unnessesary * Indentation oops * No forensics on null item * Missing whole ass file :) * Oh, found it * Remove redundant -type: drink * Adds more hot cocoa --------- Co-authored-by: Jeff <[email protected]>
…reshold is the same (#21863)
* added Sodium Polyacrylate chemical/recipe * added new lines to appease the linter * Update Resources/Prototypes/Reagents/chemicals.yml Co-authored-by: Vasilis <[email protected]> --------- Co-authored-by: Vasilis <[email protected]>
…sertion (#21785) * refactor names for clarity * remove check adding entity to deaggro queue twice * merge loops * remove unused queue * add back check for terminating or deleted entities * trigger workflow
* Chem 1984 phase 1 * Chem 1984 phase 2 * Notification on species mutation * Plant yml balancing * Better localization * First version of reagent list * Revert "Better localization" nvm This reverts commit bab87cb1bd58523164d306dccaefc1ac5c6b64ad. * cooler reagents and no more popups *
added Dark Green Jumpsuits and Jumpskirts to the Clothesmate. It's a weird inconsistency to have blue be the only jumpsuit in the dispenser with an alternate color.
* fix anom scanner doafter check * no break on move, damage
* Looks like shit frfr * White for sure * New icon --------- Co-authored-by: coolmankid12345 <[email protected]>
github-actions
bot
added
S: Needs Review
Changes: C#
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description Cherry-picks DeltaV-Station#1145 All credit goes to the original author of the PR. Original description is: "adds carriable component to a lot of animals that didn't have it" --- # Why ## Renault my beloved!!! --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Froffy025 - add: You can now carry most of the station pets. --------- Signed-off-by: Froffy025 <[email protected]> Co-authored-by: Froffy025 <[email protected]>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
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.