[MDB IGNORE] [IDB IGNORE] Upstream Pull 2026-08-21 - #439
Merged
Conversation
## About The Pull Request Title ## Why It's Good For The Game Closes tgstation/tgstation#97514
## About The Pull Request Can't use `path` for the icon it needs to be `asset_id` ## Why It's Good For The Game <img width="726" height="568" alt="image" src="https://github.com/user-attachments/assets/44d457c8-5918-42c3-a876-3ebc8e81bc2b" />
## About The Pull Request Removes the focus reference from Ashen Eyes. ## Why It's Good For The Game Ashen Eyes description no longer states that they are a focus (they are not anymore)
…une system. (#97247) ## About The Pull Request Good viruses go down to stage 1 when you starve but don't go away unless you take spaceacillin. Also, satiety was removed from disease recovery calculations altogether. Required reading: [The Ecology of Game Systems and Virology](https://hackmd.io/@Higgin/HJljdBuNp) ## Why It's Good For The Game The logic behind behind good viruses going away if you didn't maintain them was that doing so would move the interaction of virologist to host from "commensalic" _(one player benefiting another player without getting anything in return)_ to "mutualistic" _(two players benefit each other)_. <img width="927" height="192" alt="Screenshot 2026-07-28 182755" src="https://github.com/user-attachments/assets/60e4629a-8be5-4c19-8904-61b977bb8a59" /> In my opinion, that change not only failed to accomplish its goal, but also severely nerfed positive virology as an _unintended side effect_. When a host maintains their positive virus by eating food and avoiding junk food, the virologist doesn't benefit at all. Eating isn't a multiplayer interaction to begin with, and while I do think virology should require some effort on the part of the host to counter the fact that it's so easy to get a positive virus half the time you don't even need to do anything, fully curing and subsequently _granting full immunity to_ a positive virus is not the reasonable outcome of eating some junk food or just not paying attention to your hunger for a while. Having the virus temporarily stop healing is a much softer outcome that doesn't put a constant (albeit lenient) time pressure on the host to fill their stomach. Secondly, satiety is a very obscure mechanic that simply has no place in deciding if players live or die (unless you're rolling random heart attacks, because nobody cares about dying to a random heart attack). Expecting players to be well fed with high satiety at any specific time (because you can't reasonably predict when a virus outbreak will happen) is only possible with a competent chef, which means all you've done is added a second point of failure to the "waiting-on-the-other-side-of-a-table-for-someone-else-to-finish-their-minigame-before-I-die" problem. Also I don't think most players understand how junk food works or how it affects viruses, so it just widens the knowledge check of self curing. This isn't really a problem in actual rounds because most rounds have food in the kitchen and caramel doesn't count as junk food, but it's still worth removing. ## Changelog :cl: balance: viruses with a positive severity can't be lost by starving balance: satiety has no effect on natural disease recovery /:cl: --------- Co-authored-by: Fghj240 <fakeemail@notrealemail.com>
## About The Pull Request With how CI is split up now all but two tests don't actually produce screenshots to upload, meaning they emit a warning that we don't care about ## Why It's Good For The Game Silence ## Changelog N/A
…x (#97515) ## About The Pull Request Puts a guide explaining how carnivorous blood works in the carnivorous blood kit ## Why It's Good For The Game <img width="149" height="34" alt="image" src="https://github.com/user-attachments/assets/b2855d5d-c09b-45c2-a8c8-f27b06032d9b" /> ## Changelog :cl: qol: Put a guide explaining Carnivorous Blood in the Carnivorous Blood kit /:cl:
## About The Pull Request <img width="468" height="176" alt="image" src="https://github.com/user-attachments/assets/f64852f5-d283-4265-ac9e-bd70509a4ed2" /> Players can select between Short, Average (Normal), and Tall - the three heights indicated in green Other heights are included for reference: - Settlers are still given Shortest height (second height from the left) - Spacers are still given the choice between Taller and Tallest heights (second and first from the right) - Dwarfism is also included for reference (first height from the left) Settlers and Spacers don't have access to the preference (they are locked Shortest or Taller/Tallest) ## Why It's Good For The Game It's a very small detail but I find it adds a lot to the way you see other characters - For instance people will regularly call out Spacers are "freakin' huge" and annoy Settlers over being "tiny as heck". Quirks are a fun way of handing out height changes but there's always been a demand for people to have access to alternate heights without the drastic gameplay changes of quirks (and also to less of an extent). ## Changelog :cl: Melbert add: Adds height preference, allowing you to pick between "Short", "Average", or "Tall". This doesn't override the height of Settlers or Spacers. fix: Fixes height resetting to average from dna swapping shenanigans like transformation sting. /:cl:
## About The Pull Request Fixes #97221 As per the linked issue, Pride's Mirror currently causes those standing on lattices to suffer a normal chasm. This (as indicated by putting a `stack_trace()` before [line 193 of 'code/datums/components/chasm.dm'](https://github.com/tgstation/tgstation/blob/870d29dd56c356bdbfb9353c2009ad5312cd02a3/code/datums/components/chasm.dm#L193)) is caused by `ChangeTurf()` leading to a call of `RemoveLattice()` before the new chasm can have its target set to space. To fix this, I have made the space chasms their own type (so that they _always_ lead to space) and added a check for the possibility of `ChangeTurf()` dropping someone. ## Why It's Good For The Game <details><summary>This fixes a bug. Also:</summary> <img width="200" height="180" alt="Falling_Down_to_Space" src="https://github.com/user-attachments/assets/c5a4eaf5-f9cc-446e-a35f-15ccced81b51" /> </details> ## Changelog :cl: fix: The Pride ruin will no longer cause those standing on latticed chasms to fall down normal chasms. /:cl:
## About The Pull Request Fixed up the code in tgstation/tgstation#97266 Fixes mop interaction with sink. Lets right clicking sink drain the mop/beakers/glasses I don't know if there are certain reagent containers that shouldn't be pourable aside from lidded beakers, but we can pretend you delidded and relidded the beaker I guess. ## Why It's Good For The Game Pretty sure even ss14 has this feature ## Changelog :cl: qol: Right clicking sink with beaker in hand drains it fix: Fixes mop interaction with sink /:cl:
…4.9.0 (#97481) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.8.0 to 4.9.0. <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.9.0</h2> <!-- raw HTML omitted --> <h2>What's Changed</h2> <h3>Bug Fixes 🐝</h3> <ul> <li>fix: use <code>-</code> instead of <code>/</code> in temporary deployment branch name by <a href="https://github.com/JamesIves"><code>@JamesIves</code></a> with <a href="https://github.com/Copilot"><code>@Copilot</code></a> in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1962">JamesIves/github-pages-deploy-action#1962</a></li> </ul> <h3>Build 🔧</h3> <ul> <li>build(deps): bump actions/download-artifact from 7.0.0 to 8.0.1 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1961">JamesIves/github-pages-deploy-action#1961</a></li> <li>build(deps-dev): bump jest-circus from 30.2.0 to 30.3.0 in the jest group by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1959">JamesIves/github-pages-deploy-action#1959</a></li> <li>build(deps): bump webfactory/ssh-agent from 0.9.1 to 0.10.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1960">JamesIves/github-pages-deploy-action#1960</a></li> <li>build(deps): bump actions/setup-node from 6.1.0 to 6.3.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1958">JamesIves/github-pages-deploy-action#1958</a></li> <li>build(deps): bump actions/upload-artifact from 6.0.0 to 7.0.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1956">JamesIves/github-pages-deploy-action#1956</a></li> <li>build(deps): bump lodash from 4.17.21 to 4.17.23 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1948">JamesIves/github-pages-deploy-action#1948</a></li> <li>build(deps): bump actions/checkout from 6.0.1 to 6.0.2 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1949">JamesIves/github-pages-deploy-action#1949</a></li> <li>build(deps): bump flatted from 3.3.1 to 3.4.2 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1964">JamesIves/github-pages-deploy-action#1964</a></li> <li>build(deps): bump codecov/codecov-action from 5.5.2 to 6.0.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1965">JamesIves/github-pages-deploy-action#1965</a></li> <li>build(deps): bump typescript-eslint from 8.52.0 to 8.53.0 in the typescript group by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1945">JamesIves/github-pages-deploy-action#1945</a></li> <li>build(deps): bump js-yaml from 3.13.1 to 3.14.2 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1968">JamesIves/github-pages-deploy-action#1968</a></li> <li>build(deps): bump lodash from 4.17.23 to 4.18.1 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1966">JamesIves/github-pages-deploy-action#1966</a></li> <li>build(deps): bump actions/checkout from 6.0.2 to 7.0.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1992">JamesIves/github-pages-deploy-action#1992</a></li> <li>build(deps): bump undici from 6.24.1 to 6.27.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1994">JamesIves/github-pages-deploy-action#1994</a></li> <li>build(deps): bump <code>@babel/core</code> from 7.24.4 to 7.29.7 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1991">JamesIves/github-pages-deploy-action#1991</a></li> <li>build(deps): bump codecov/codecov-action from 6.0.0 to 7.0.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1988">JamesIves/github-pages-deploy-action#1988</a></li> <li>build(deps): bump js-yaml from 3.14.2 to 3.15.0 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1995">JamesIves/github-pages-deploy-action#1995</a></li> <li>build(deps): bump actions/upload-artifact from 7.0.0 to 7.0.1 by <a href="https://github.com/dependabot"><code>@dependabot</code></a>[bot] in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1977">JamesIves/github-pages-deploy-action#1977</a></li> </ul> <h3>Other Changes</h3> <ul> <li>chore: merge all open Dependabot dependency updates by <a href="https://github.com/JamesIves"><code>@JamesIves</code></a> with <a href="https://github.com/Copilot"><code>@Copilot</code></a> in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1967">JamesIves/github-pages-deploy-action#1967</a></li> <li>Update GitHub SSH known host keys by <a href="https://github.com/safeengineauto"><code>@safeengineauto</code></a> in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1982">JamesIves/github-pages-deploy-action#1982</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/safeengineauto"><code>@safeengineauto</code></a> made their first contribution in <a href="https://redirect.github.com/JamesIves/github-pages-deploy-action/pull/1982">JamesIves/github-pages-deploy-action#1982</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/JamesIves/github-pages-deploy-action/compare/v4...v4.9.0">https://github.com/JamesIves/github-pages-deploy-action/compare/v4...v4.9.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/fa24774553152dd7873cd16ebd8d959b010c5445"><code>fa24774</code></a> Merge remote-tracking branch 'origin/dev' into releases/v4</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/1e0489f3ae06b3cdc87560e94a6919980e6e952d"><code>1e0489f</code></a> fix: use a dedicated RELEASE_PAT for release creation</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/737d5af3bdfe3aa9461e23c4a9da5c38e6ee9179"><code>737d5af</code></a> ci: run sponsors README update twice a week instead of daily</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/5d78d7bd32996c06b684aa4263d40ef61626c17f"><code>5d78d7b</code></a> ci: run integration tests weekly instead of daily</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/36c7ef92c563ceb973ca525551a16b9a5cc7eef6"><code>36c7ef9</code></a> Deploy Production Code for Commit b09969f18cbaf8fd7f336068c0c4d9abfdcbf68a 🚀</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/74a589d30ee852a436ed588a4e1f1c49587c811e"><code>74a589d</code></a> Merge remote-tracking branch 'origin/dev' into releases/v4</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/b09969f18cbaf8fd7f336068c0c4d9abfdcbf68a"><code>b09969f</code></a> style: fix prettier formatting in LFS changes</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/87729a624d294d3c6e33d24b852aa41cbf82bf7d"><code>87729a6</code></a> feat: add Git LFS support for deployment branch</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/cc13712d96402287a984ed2a236ff0d7eff306a9"><code>cc13712</code></a> fix: add missing checkout step to integration-rebase-conflicts-cleanup</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/d86668926acfefdd1153c6b97d98d3efabaca595"><code>d866689</code></a> Merge branch 'dev' of <a href="https://github.com/JamesIves/github-pages-deploy-action">https://github.com/JamesIves/github-pages-deploy-action</a>...</li> <li>Additional commits viewable in <a href="https://github.com/jamesives/github-pages-deploy-action/compare/v4.8.0...v4.9.0">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 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## About The Pull Request adds a chance for an apple to have a worm inside (dependant on tray's pest level) (skyrockets to 80% if grown on wormy soil) ## Why It's Good For The Game ~~worms like apples~~ a way to get worms without lavaland or cargo (also a funny interaction) ## Changelog :cl: add: Sometimes there is a worm inside an apple. /:cl: --------- Co-authored-by: MelokGleb <99420088+MelokGleb@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com>
## About The Pull Request Bloodworm's stat panel entry lists the HP of the worm, how much growth they have, and how much blood they have consumed Maturity has been moved to the action button pretty 1:1 to tgstation/tgstation#97456 - However this already had feedback if you tried to use the button anyways so this is just a compliment to that <img width="737" height="631" alt="image" src="https://github.com/user-attachments/assets/aa2f6f9e-ba8d-4514-bfea-69c588fb91bc" /> The rest has been moved to a status alert that Bloodworms have listing information when you hover over it. I considered putting it in their antag panel but from discussion, antag panel was something we wished to avoid to not obfuscate the information. <img width="211" height="189" alt="image" src="https://github.com/user-attachments/assets/e04da68b-21c3-4fc5-ba81-d818bed2efea" /> ## Why It's Good For The Game Primarily for https://hackmd.io/443_dE5lRWeEAp9bjGcKYw?view We're 3 mobs away from being done with stat panel entries and although I've never played blood worm before, I think this is a fine alternative. ## Changelog :cl: qol: Deleted Bloodworm's stat panel entry and instead moved it to their action button & a new screen alert. /:cl:
…nds (#97498) ## About The Pull Request The code was explicitly throwing away `min_antag_cap` and `max_antag_cap` for midrounds , but some rulesets (Mass Traitors and Mass Changelings) use them. ~~I'm not sure why they were thrown away at all and someone smarter than me should probably chime in on why this is the case before this is merged.~~ Also the config tags for Mass Traitors and Mass Changelings were typoed, that's already been fixed on the real config. ## Changelog :cl: PapaMichael fix: The server should obey the config's `min_antag_cap` and `max_antag_cap` for midround rulesets now. /:cl:
## About The Pull Request Tin, this was a flaky CI failure that came up frequently ish. Sleeping proc stuff. It now uses a self-deleting timer that should not longer hang a ref once the turret has been deleted. ## Why It's Good For The Game Bugfix ## Changelog Not player-facing
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
## About The Pull Request Nothing excluded.
## About The Pull Request Just a simple repath, because datums for alien nodes went through a rename. Should remove alien techs from being available roundstart as well as bing back some of Nova specific alien things ## How This Contributes To The Nova Sector Roleplay Experience Bugfix ## Proof of Testing <details> <summary>Screenshots/Videos</summary> i replaced screenshot in my clipboard with some irrelevant one and now im too lazy to take a new one, sorry 😔 </details> ## Changelog :cl: fix: Alien technodes no longer available roundstart /:cl:
## About The Pull Request Closes #97540 Fixes #93654 It seems like doing 2 `animate(time = 0)` in a row breaks looping animations completely for reasons that I don't quite understand.
## About The Pull Request Editing a newly created color filter would bluescreen Filterrific as it would not have any matrix values set, which would cause an error as undefined cannot be stringified by our number inputs
…f sight (#97214) Co-authored-by: Lucy <lucy@absolucy.moe>
## About The Pull Request Every SSeconomy fire (5 minutes) 2-4 random exports get their prices boosted to 3 times the normal amount, then return to normal the next fire as 2-4 new exports are picked. ## Why It's Good For The Game Idea came from Arcane on discord, adds something for cargo players to do to spice their gameplay loop, experimenting with possible high value exports selling them off bit by bit rather than all at once to possibly hit a jackpot and get a bunch of cash by dumping them all while the price is high. ## Changelog :cl: add: Every 5 minutes 2-4 random cargo exports get tripled in price, lets go gambling! /:cl:
…97577) ## About The Pull Request Title. Currently, an istype in the proc that handles cable usage for repairing limbs & sensors using cables returns out early when not wearing a jumpsuit (or something not of that type), despite most of the proc not being affected by said condition. This corrects said check to only block the part of the proc it is supposed to block. ## Why It's Good For The Game Bugs getting fixed tends to be good for the game. ## Changelog :cl: fix: Cable-based robotic limb repairs are no longer impossible while not wearing an uniform. /:cl:
## About The Pull Request Nothing excluded. --------- Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: Iajret <8430839+Iajret@users.noreply.github.com> Co-authored-by: Lucy <lucy@absolucy.moe> Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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
Why it's Good for the Game
Proof of Testing
Screenshots/Videos
Changelog
🆑
/:cl: