Merge upstream 14.11.24 #715
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.6.9 (tgstation#87859) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.8 to 4.6.9. <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.6.9</h2> <!-- raw HTML omitted --> <h2>What's Changed</h2> <h3>Dependencies 🤖</h3> <ul> <li>chore(deps): mass bump dependencies</li> <li>chore(deps): switch to using <code>.node-version</code> instead of <code>.nvmrc</code> for Node dependency management.</li> <li>chore(deps): updated node version to 22.11.0 for development</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/JamesIves/github-pages-deploy-action/compare/v4...v4.6.9">https://github.com/JamesIves/github-pages-deploy-action/compare/v4...v4.6.9</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/62fec3add6773ec5dbbf18d2ee4260911aa35cf4"><code>62fec3a</code></a> Deploy Production Code for Commit 22a67fe04db392cf0d0389db3c6255007d3c990e 🚀</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/22a67fe04db392cf0d0389db3c6255007d3c990e"><code>22a67fe</code></a> Merge branch 'dev' into releases/v4</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/bbb99d2d81e10cc53f7db1b4f6b9e3c5caec0dcc"><code>bbb99d2</code></a> chore(deps): update dependencies (<a href="https://redirect.github.com/jamesives/github-pages-deploy-action/issues/1732">#1732</a>)</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/c1a0a351fcb5782d6f4f7152406c4d66da2c90c3"><code>c1a0a35</code></a> Deploying to dev from @ JamesIves/github-pages-deploy-action@6a8a7d7510756d38...</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/6a8a7d7510756d386004456b8c81fb691cad2dcf"><code>6a8a7d7</code></a> Deploying to dev from @ JamesIves/github-pages-deploy-action@42468f8ad8f6ca9c...</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/42468f8ad8f6ca9c1f286ec06b105a8c828b9c76"><code>42468f8</code></a> build(deps): bump codecov/codecov-action from 4.5.0 to 4.6.0 (<a href="https://redirect.github.com/jamesives/github-pages-deploy-action/issues/1710">#1710</a>)</li> <li><a href="https://github.com/JamesIves/github-pages-deploy-action/commit/1adc62d1b379786e12186a7ed5593ab43c90f636"><code>1adc62d</code></a> Release 4.6.8 📣</li> <li>See full diff in <a href="https://github.com/jamesives/github-pages-deploy-action/compare/v4.6.8...v4.6.9">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>
closes tgstation#87572 ## About The Pull Request usr does not necessarily mean owner for screen alerts, thanks Observe ## Why It's Good For The Game shouldn't be teleporting other ghosts around
## About The Pull Request - Fixes tgstation#87539 Racks, bags & basically anything that stores stuff will interact with all holosign creator's correctly ## Changelog :cl: fix: holosign creators interact with storage items correctly /:cl:
## About The Pull Request Sass was warning about deprecated APIs in our codebase. Went through and fixed them Used sass-migrator tool as much as I could, some were by hand ### Updated: Sass would no longer let you run functions on hex color codes so I went through and HSL'd them all, how cool! If you have a simpler way to approach this, let me know Adds a tool to convert hex to HSL ## Why It's Good For The Game None of this  ## Changelog N/A
…gstation#87828) ## About The Pull Request See name, makes it consistent with all the other printing machines. For some reason we have three different paths for all of them but refactoring is out of scope for me. Comes with updatepaths too ## Why It's Good For The Game No more confusion with how to change the direction, it's the same as all the other ones now. ## Changelog :cl: qol: mech fabricator output direction can now be changed with a drag pull /:cl: --------- Co-authored-by: SyncIt21 <[email protected]>
## About The Pull Request Closes tgstation#87861 Merge skew my beloved ## Changelog :cl: fix: Fixed ayylmao's brain examine lines /:cl:
## About The Pull Request closes tgstation#87330 ## Changelog :cl: grungussuss sound: party popper no longer makes reagent sloshing sounds /:cl:
## About The Pull Request This stops people from using chairs to create free metal. It was possible to pick up a chair or place it down and it would lose it's hologram status since a new object is created. Now anyone that attempts to place down or pick up a chair will have it vanish. ## Why It's Good For The Game No more free metal. ## Changelog :cl: fix: Fix using chairs in holodeck to create infinite metal /:cl:
## About The Pull Request Does as the title says, cleans up the code a bit and modernizes it, as well as making it call its parent. ## Why It's Good For The Game It's more readable this way, plus it properly calls its parent proc now.
## About The Pull Request Stingbangs (and much rarer rotfrags) used their disassembled sprite until primed this entire time. Yeah. ## Why It's Good For The Game Handle appearing out of nowhere looks very jarring
## About The Pull Request Closes tgstation#87809
## About The Pull Request This reduces the bounty size of the crayon civilian pack. Instead of 24 crayons, it only needs 8. Same payout, less quantity. ## Why It's Good For The Game Crayons are not easily produced or scavenged. Even if a map contains 2 full crayon packs in the Library, it still isn't enough to fulfill a single bounty for crayons. This new deal will get you a full payout with a full pack plus one _mystery crayon._ Go rob the clown or detective or something if you need the last one. Get that money!
…t + need boot out for ai to move (tgstation#87726) ## About The Pull Request so there is a problem of: if 2 modsuit modules were to apply the same trait and 1 were removed, shit would break so now all instances of mod_trait applied to the modsuit wearer are refs instead, with mod_trait used for stuff added to items as that isnt likely to have the same thing also qdeleted modsuits delete their parts apparently accidentally removed at some point. the previous time they did it caused qdel loops but this time it doesnt makes boots need to be out for an ai to move someone in a modsuit improves the ui, non-standard cores now have unique colors for the charging bar, and you can extend/retract things from ui, also adds a configurable button to config menu so that the tether doesnt repurpose the pin function made for circuits redoes modsuit balloon alerts to use simpler language makes the weapon recall module make you pick up the weapon if its on your tile as throws dont work on same tile  ## Why It's Good For The Game futureproofing (also technically presentproofing, if you wear something like infiltrator and normal back modsuit and both have ai control they both will give you a trait) also ai movement doesnt have any checks currently, i think it makes sense that it would require your boots to be out so that the ai has something to move fix stuff change break boom wack
## About The Pull Request Includes the map_vote.txt config file created in tgstation#86788 so that it gets read when the server starts. ## Why It's Good For The Game Reads whatever value is set in the config file.
## About The Pull Request fixes tgstation#87844
## About The Pull Request  Didn't manage to processs the last suggestion under tgstation#87576 by @Iamgoofball Even though it was so obvious and brilliant idea. Now no need to have a separate highlight color for buttons on PH color mode. ## Why It's Good For The Game Nice UI ## Changelog :cl: qol: Chem dispenser UI droplets now have a shadow to not blend with the background /:cl:
## About The Pull Request closes tgstation#87538 ## Changelog :cl: grungussuss sound: shoes pickup volume is louder now /:cl:
## About The Pull Request - Moves remote materials attack chain to item interaction level. Another step in moving away from `attackby()` - Fixes tgstation#40070. Though the timer subsystem maybe affected by FPS, round start trigger is always done after everything is set up which is now used by remote materials ## Changelog :cl: fix: silo connection on some machines won't time out when changing FPS settings code: improved attack chain code for silo connection /:cl:
## About The Pull Request existance doesnt exist so i changed it to existence ## Why It's Good For The Game existance dosent exist ## Changelog :cl: spellcheck: spellecheck: existence not existance /:cl:
…nctioning (tgstation#87816) ## About The Pull Request Closes tgstation#87542 ## Changelog :cl: fix: Fixed scanner gates saying both bypass and detection lines when malfunctioning /:cl:
## About The Pull Request fixes seedling AI's getting stuck when trying to refill water from water tanks that have been emptied! ## Why It's Good For The Game fixes seedling ai getting stuck ## Changelog :cl: fix: fixes seedling ai getting stuck when trying to refill water from emptied water tanks /:cl:
github-actions
bot
added
Документация
|
This PR causes following conflicts on translate branch: code/game/machinery/scanner_gate.dm++<<<<<<< HEAD
+ bypassed = TRUE
++||||||| 3d5db26311d
++ say("[detected_thing] detection bypassed.")
++=======
+ say("Отмена сканирования на [detected_thing].")
++>>>>>>> origin/translate
code/modules/antagonists/heretic/influences.dm++<<<<<<< HEAD
+ to_chat(human_user,span_danger("You pull your hand away from the hole as the eldritch energy flails, trying to latch onto existence itself!"))
++||||||| 3d5db26311d
++ to_chat(human_user,span_danger("You pull your hand away from the hole as the eldritch energy flails, trying to latch onto existance itself!"))
++=======
+ to_chat(human_user,span_danger("Вы отдергиваете руку от отверстия, когда мистическая энергия бьется, пытаясь зацепиться за этот мир!"))
++>>>>>>> origin/translate
code/modules/antagonists/heretic/magic/space_crawl.dm++<<<<<<< HEAD
+ desc = "Allows you to phase in and out of existence while in space or misc tiles."
++||||||| 3d5db26311d
++ desc = "Allows you to phase in and out of existance while in space or misc tiles."
++=======
+ desc = "Позволяет вам появляться и исчезать, находясь на космическом или схожему ему тайле."
++>>>>>>> origin/translate
code/modules/mod/modules/modules_ninja.dm++<<<<<<< HEAD
+ balloon_alert(mod.wearer, "no linked weapon!")
++||||||| 3d5db26311d
++ balloon_alert(mod.wearer, "can't locate weapon!")
++=======
+ balloon_alert(mod.wearer, "не удается найти оружие!")
++>>>>>>> origin/translate
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💾 Изменение конфига
Ф-ф-фуриор...?
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Некоторые просто любят писать тонну текста, которую никто не будет читать.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов
🔉 Звук
Нам скорее всего нравится как это звучит.
TGUI
Добавление или изменение существующего интерфейса на базе фреймворка TGUI
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
Документация
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
Мерге апстрим