Merge upstream 06.12.24 #848
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
…4.7.2 (tgstation#88359) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.1 to 4.7.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/jamesives/github-pages-deploy-action/releases">JamesIves/github-pages-deploy-action's releases</a>.</em></p> <blockquote> <h2>v4.7.2</h2> <!-- raw HTML omitted --> <h2>What's Changed</h2> <h3>Bug Fixes 🐝</h3> <ul> <li>fix: enable rsync mkpath to be backwards compatible with older Ubuntu versions by <a href="https://github.com/JamesIves"><code>@JamesIves</code></a> in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1757">JamesIves/github-pages-deploy-action#1757</a></li> </ul> <h3>Build 🔧</h3> <ul> <li>build(deps): bump the misc group across 1 directory with 2 updates by <a href="https://github.com/dependabot"><code>@dependabot</code></a> in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1756">JamesIves/github-pages-deploy-action#1756</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/JamesIves/github-pages-deploy-action/compare/v4.7.1...v4.7.2">https://github.com/JamesIves/github-pages-deploy-action/compare/v4.7.1...v4.7.2</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/15de0f09300eea763baee31dff6c6184995c5f6a"><code>15de0f0</code></a> Deploy Production Code for Commit d5dce9b90a6d5a8ff3cf3d2d8e6762aeddcc8026 🚀</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/d5dce9b90a6d5a8ff3cf3d2d8e6762aeddcc8026"><code>d5dce9b</code></a> Merge branch 'dev' into releases/v4</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/389b85feff74538faf374f5fbf429aac582396c1"><code>389b85f</code></a> fix: enable rsync mkpath to be backwards compatible (<a href="https://redirect.github.com/jamesives/github-pages-deploy-action/issues/1757">#1757</a>)</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/12622a23d5246ff5656e6c2a16ce5b36e9e801a5"><code>12622a2</code></a> build(deps): bump the misc group across 1 directory with 2 updates (<a href="https://redirect.github.com/jamesives/github-pages-deploy-action/issues/1756">#1756</a>)</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/588d83fdf6b8f851e5dff99dc0086ad4e6242f05"><code>588d83f</code></a> Release 4.7.1 📣</li> <li>See full diff in <a href="https://github.com/jamesives/github-pages-deploy-action/compare/v4.7.1...v4.7.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## About The Pull Request Recovered crew no longer show up on roundend report, they are technically antags, but they are not antags  ## Why It's Good For The Game Too easy to get greentexts. we don't want players to feel accomplished too often ## Changelog :cl: fix: Recovered crew no longer show up on roundend report /:cl:
## About The Pull Request - Fixes tgstation#88351 An examine proc used bitflags to determine the contents of a bottle despite whatever reagents are inside. I went and changed the examine message to use `The label says it contains` instead of `It is` which is more appropriate. Also the empty bottle parent type was listed as `ALCOHOL` despite spawning with no reagents. A lot of alcohol subtypes relied on this to give them the correct bitflag. ## Why It's Good For The Game Drink consistency. ## Changelog :cl: fix: Fix drink labels for alcohol bottles /:cl:
## About The Pull Request Closes tgstation#87423 ## Why It's Good For The Game The sound this produces when AI states laws on a non-common frequency is highly jarring and shouldn't be spammed every time someone from command asks AI to state laws (or security uses a tape recorder in the interrogation room). ## Changelog :cl: qol: AI laws and tape recorders no longer cause radio blips /:cl:
## About The Pull Request - Moves borg inducer to the same file as other inducers for easy maintainence - Compressed code for its `get_cell()` proc - Fixes examines & screentips for borg inducer ## Changelog :cl: code: slightly improved code for borg inducer spellcheck: fixes examines & screentips for borg inducer /:cl: --------- Co-authored-by: AMyriad <[email protected]>
## About The Pull Request refer to title No code changes were made here, i just copypasted code around The only real difference is that I removed a pretty useless define that depended on TESTING because it got in my way of splitting emergency.dm tbh i didnt want a 50k line refactor pr that nobody is going to review so im getting it out of the way in a separate PR ## Why It's Good For The Game Shuttle code is literally all over the place please help me oh gosh ## Changelog Nothing player facing or developer facing (at least I really hope so)
github-actions
bot
added
the
🙏 Слияние с восходящим потоком
|
This PR causes following conflicts on translate branch: code/modules/shuttle/emergency.dm |
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.
About The Pull Request
мерге