Merge upstream 11.12.24 #864
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
## About The Pull Request **1. Code Improvement** - Moved global pipe crafting recipe list into `code/__DEFINES/globalvars/list` folder because its a global list & it should belong there. Reduces size of RPD file - Moved `datum/pipe_info` into `code/__DEFINES/globalvars` folder because it's used by both RPD & crafting recipe so its a global var. Reduces size of RPD file - Replaced a bunch of `usr` with the proper user variable when available - Autodoc for procs & vars **2. Refactor** - Attack chain for RPD has been refactored to `interact_with_atom()` & `interact_with_atom_secondary()` ## Changelog :cl: refactor: improved attack chain code for rapid pipe dispenser code: organized lists & global vars for rapid pipe dispenser into their own respective files & improved a bunch of code /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request https://github.com/user-attachments/assets/8700ba46-b505-4f8b-8977-c20472c72ceb https://github.com/user-attachments/assets/954b5f3b-7fe4-4ade-9e67-e3ac9bad6550 A collaborative work between sadboysuss/grungussuss and Sothanforax adds a hiss emote to humans and gives sounds to: - [X] Lizard - [X] Ethereal - [X] Human - [X] Monkey - [X] Felinid ~~[ ] Moff get real~~ <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game  <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: grungussuss and Sothanforax add: hiss emote sound: hissssssing sounds /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: Sothanforax <[email protected]>
…tuff (tgstation#88288) Adds a mail sorting unit! The unit accepts mail, stores it and sorts it per department. It can also search for individual envelopes, change it's output tile and be VERY loud. At the meantime, this PR also adds two flatpack subtypes - flatpacker subtype and mail sorter subtype. The first one is intended to be used by mappers to have a flatpacker be accessible roundstart, and the second one is now sold at cargo wardrobes to make the mail sorter also available roundstart.
## About The Pull Request We don't check if the loop is actually queued as we attempt to remove, fire and queue it, which makes our loop potentially run in parallel with a higher priority loop, which (for some reason specifically on during engiborg tests and specifically on wawa) was causing a flaky CI failure. Closes tgstation#88400 ## Changelog :cl: /:cl:
…gstation#88398) ## About The Pull Request Since tgstation#87866 PostTransfer now has it's parent set to nil, and instead has a `datum/new_parent` argument supplied to it. Why does the ***post*** transfer proc not have it's parent set yet? Not sure, but some procs (and the documentation) haven't been adjusted yet and this PR fixes that also: fixes tgstation#88156 fixes tgstation#88325 ## Why It's Good For The Game Fix man good... ## Changelog :cl: fix: /datum/component/PostTransfer() procs that didn't have their new_parent arguments have now been fixed fix: This means that turning into a Domain gondola shouldn't RR people anymore /:cl:
## About The Pull Request Makes the dimensional shifter relic not delete global data. ## Why It's Good For The Game We need those. Please don't delete those. ## Changelog :cl: fix: Dimensional shifter relics work more reliably. /:cl:
## About The Pull Request ~~This adds a new test for the CI/CD so that we can load all space ruins instead of it being RNG.~~ Adds more robust logging for ruins so we can see when they fail/succeed and how many are placed on a map. This also removes a deprecated CI config setting. It prevented ALL ruins from spawning during CI tests which is bad. The config setting was made redundant in: - tgstation#87910 ## Why It's Good For The Game More robust CI/CD. ## Changelog :cl: code: Add better logging for ruins /:cl:
…same direction (tgstation#88409) ## About The Pull Request multitile airlock assemblies from a broken multitile airlock are the same direction ## Why It's Good For The Game fixes tgstation#81406 ## Changelog :cl: fix: multitile airlock assemblies from a broken multitile airlock are the same direction /:cl:
…nt CI fails (tgstation#88413) ## About The Pull Request Fixes tgstation#71092 ## Why It's Good For The Game Flaky tests bad, fixman good... ## Changelog :cl: fix: Pubby's whiteship no longer breaks when it tries to dock /:cl:
…station#88387) ## About The Pull Request fixes tgstation#88383 ## Why It's Good For The Game fixes tgstation#88383 ## Changelog :cl: fix: The Men in Grey may no longer access birdshots engineering via a certain maintenance airlock /:cl:
## About The Pull Request  ## Why It's Good For The Game Its nice to not go bald when wearing a wintercoat since you can still see some of your supposed-to-be-hairy-head ## Changelog :cl: image: Wintercoat hoods now show a bit of your hair! /:cl:
## About The Pull Request Closes tgstation#88327 - if a carbon has their hands blocked or missing, they will instead try to point with their legs with probability to fail - if they have the freerunning trait they get a lower probability to fail - if they have 1 leg they get higher probability to fail - if they have no shoes on they will point with their toes - if they have no legs - they will `gives meaningful glance at %t!` - if they have no eyes - they will motion with their tongue - if they have no tongue - they will bump their head on the floor towards the target, getting brain damage <details> https://github.com/user-attachments/assets/9363e184-64dc-4890-9673-5d9fe9cc1b7e https://github.com/user-attachments/assets/192b2503-887f-43ee-afa9-80b49060e9c2 https://github.com/user-attachments/assets/ed54dc4a-0308-4088-ada4-fc343cbe6844 https://github.com/user-attachments/assets/b88f2bc8-4762-4cd7-b60b-0ac039e52853 https://github.com/user-attachments/assets/a248d0af-09ec-498a-9c46-50ab2611b62b https://github.com/user-attachments/assets/d65e9674-ffc7-4263-89b4-0d743b0a7f2d </details> ## Why It's Good For The Game  also for the balance change, I think it's silly that you can't point while cuffed, I don't think it'll impact powergaming much at all ## Changelog :cl: grungussuss add: pointing now has interactions with the amount of limbs/organs you have balance: you can now point while restrained sound: pointing with your head makes a sound /:cl:
## About The Pull Request The code for running the *me emote was in the `can_run_emote` proc, which the *help emote uses to see if you can use an emote closes tgstation#88323 ## Changelog :cl: grungussuss fix: fixed *me emote being called when using the *help emote /:cl:
…#88410) ## About The Pull Request Adds a check if there should be light_state overlay present. It was adding an empty overlay `lights_`. Found by adding a "no_name" error icon_state for overlays. ## Why It's Good For The Game Bug fixing good
…'s production in line with the megacell rework. ## About The Pull Request The durand's shield and the mech plasma generator never got their values adjusted with the power rework. this led to 15 shots (a mag from a laser smg) instantly draining the cell if it hits the durand's shield, ten times more than normal. Also, the plasma generator's power never got increased proportionally, meaning every second it recharged a tenth of what it was meant to. ## Why It's Good For The Game Fixes yet another thing broken by making the base power unit ten times higher than previously. ## Changelog :cl: WebcomicArtist fix: Durand shield now uses proper amount of power upon taking damage fix: Mech plasma generator now produces the correct amount of charge, previously bugged to be 10% of intended. /:cl:
## About The Pull Request closes tgstation#88312 ## Changelog :cl: grungussuss fix: fixed being unable to remove bar seating holograms /:cl:
…er slip you off (tgstation#88430) ## About The Pull Request - buckled to a raptor: raptor slips, you stay - buckled to a cyborg: don't care - buckled to a wheelchair: you slip ## Why It's Good For The Game it doesn't make sense to slip off a mount when traversing over slippery surfaces ## Changelog :cl: grungussuss fix: you will no longer slip off your mount when traversing slippery surfaces /:cl: --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Ghom <[email protected]>
## About The Pull Request pr that touched slipping was merged without tests passing ## Changelog :cl: grungussuss fix: fixed an error with slipping /:cl:
## About The Pull Request Adds suicides to fish. Like, a lot of suicides. Almost all of them very unique. I'm too lazy to make a video, but they've been thoroughly tested. Improves the go_away status effect to have no timer - but delete you on z-level change. Adds a trait that prevents combat mode changes. ## Why It's Good For The Game I want to kill myself with fish - and terrify bystanders in the process. ## Changelog :cl: add: Adds suicides to fish. Like, a lot of suicides. Almost all of them very unique. I'm too lazy to make a video, but they've been thoroughly tested. /:cl: --------- Co-authored-by: Ben10Omintrix <[email protected]> Co-authored-by: MrMelbert <[email protected]>
…8191) ## About The Pull Request Island Brawl bitrunning domain had sand decals hidden underneath some of its walls (presumably due to copypaste), resulting in a very ugly look (because those are only meant to be used on floor tiles)
## About The Pull Request This is very ugly but we're trading in-loop angle setting/refreshing and animates in favor of out-loop ones, doing so should cut down on the amount of animates we're calling which are all sent to clients which ramps up their ping into thousands and lags them clientside to all hell. I've also significantly (x3) increased the delay between shots, since they move so slow the distance between them won't get large enough for you to squeeze through in a tiny arena, which should also help with lag massively. Ideally we should get rid of projectiles here and make it use some other way, maybe dust clouds? https://github.com/user-attachments/assets/0480cd3a-4e82-4d80-833c-a2ca4eefed53 Downside of this approach: the attack now looks significantly jankier The upside of this approach: You can somewhat clearly see which tile the projectile is on ## Why It's Good For The Game It lags everyone who sees it Closes tgstation#88395 ## Changelog :cl: fix: Made wendigo's bullet hell lag less, at cost of its visuals. /:cl:
github-actions
bot
added
Документация
|
This PR causes following conflicts on translate branch: code/datums/quirks/negative_quirks/chronic_illness.dm++<<<<<<< HEAD
+ name = "Eradicative Chronic Illness"
+ desc = "You have an anomalous chronic illness that requires constant medication to keep under control, or else causes timestream correction."
++||||||| 9974e2f2b3f
++ name = "Chronic Illness"
++ desc = "You have a chronic illness that requires constant medication to keep under control."
++=======
+ name = "Chronic Illness"
+ desc = "У вас хроническое заболевание, которое требует постоянное медикаментозное лечение."
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ gain_text = span_danger("You feel like you are fading away...")
+ lose_text = span_notice("You suddenly feel more substantial.")
+ medical_record_text = "Patient has an anomalous chronic illness that requires constant medication to keep under control."
++||||||| 9974e2f2b3f
++ gain_text = span_danger("You feel a bit off today.")
++ lose_text = span_notice("You feel a bit better today.")
++ medical_record_text = "Patient has a chronic illness that requires constant medication to keep under control."
++=======
+ gain_text = span_danger("Сегодня вы чувствуете себя немного не в своей тарелке.")
+ lose_text = span_notice("Сегодня вы чувствуете себя немного лучше.")
+ medical_record_text = "Пациент страдает хроническим заболеванием, которое требует постоянное медикаментозное лечение."
++>>>>>>> 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
мерге моё любимое