[MDB IGNORE] [IDB IGNORE] Upstream mirror #420

psychonaut-ci · 2024-12-07T15:20:03Z

This is an automated pull request to merge the latest changes from the upstream repository.

The following files have conflicts:

.github/workflows/generate_documentation.yml - deleted by us - diff - origin - upstream
code/__DEFINES/mobs.dm - 1 - diff - origin - upstream
code/game/data_huds.dm - 1 - diff - origin - upstream
code/modules/cargo/packs/service.dm - 1 - diff - origin - upstream
code/modules/events/anomaly/anomaly_bioscrambler.dm - 1 - diff - origin - upstream
code/modules/research/designs/mechfabricator_designs.dm - 1 - diff - origin - upstream
code/modules/shuttle/emergency.dm - binary file - diff - origin - upstream
html/changelogs/archive/2024-11.yml - 1 - diff - origin - upstream

…rk (#88281) ## About The Pull Request Detemination gives you TRAIT_ANALGESIA, so if you take ***too much*** damage you'll be unable to see it as well. Plus linking blunt overlay hiding to reagents isn't very good practice as it can cause flickering if you microdose. (Also fixed incorrect trait sources on the quirk and kept it for the nocrit deathmatch modifier) Closes #88278 ## Changelog :cl: fix: Fixed damage overlays hiding themselves or flickering when you get wounded. /:cl:

…t for effects set to "Curse of Mundanity" (and missing IDs) (#88240) ## About The Pull Request Fixes a lot of status effects having the default alert, adds a unit test to check that status effects don't forget to change it I chose a test rather than just making the default "no alert" because I think people making status effects should think about whether it should have an alert Also I added a test for effects which did not set an ID because that's kind of important, I applied the same mindset here to account for abstract types but admittedly less sold on this one. ## Changelog :cl: Melbert fix: You should be afflicted by the "Curse of Mundanity" far, far less /:cl:

## About The Pull Request I have... questions, to previous self. Yeah. ## Changelog :cl: fix: Fixed projectile parrying /:cl:

## About The Pull Request Aquarium kits can now be printed from service, cargo, science protolathes and the autolathe too, from half a sheet of metal. You still need the other materials to set it up but it should be fairy simple if you can access a proto/autolathe. The 'Growth/Reproduction' setting for aquariums has been renamed to "Safe Mode", which, on top of disabling features such as growth, reproduction, evolution, power generation etc etc, will also disable the water, temperature and food requirements for keeping the fish alive. Useful if you want a purely ornamental aquarium or you have to skidaddle somewhere else for a while. The lawyer, as well as prefilled aquariums start with 'Safe Mode' enabled. The 'Aggressive' fish trait has been replaced with 'Territorial', which is exactly the same but the fish won't lash out unless the aquarium is populated by five fishes or more. No more angelfish viciously attacking the guppy and goldfish in prefilled aquariums. Tweaked a couple values around hunger and fish health loss when starving or in a bad environment to cause slightly less damage. Lastly, added screentips to the aquarium component, which is something I've forgot to do in the PR that brought it. ## Why It's Good For The Game Aquariums may be a complex feature, but as far as I can tell, I had been neglecting the possibility of aquariums as simple room decoration for a while (outside of the beauty-related mechanics), and the constant maintenance (and perhaps a bit of knowhow) they require makes them awful at that. Also, the "growth/reproduction" setting really didn't have a reason to be before, since it didn't offer any tangible benifit to turn it off, so I had to revamped it. Also it's been proven by now that keeping aquariums as cargo-orderable stuff is just bad. As for the fish trait change, it just sucks to see the angelfish shank the goldfish with no way to solve it other than removing the hyper-aggressive killer fish from san diego fella. ## Changelog :cl: balance: Aquarium kits can now be printed from cargo, service, science protolathes as well as the autolathe. They no longer have to be ordered from cargo. balance: Revamped the "Growth/Reproduction" setting for aquarium to "Safe Mode", which also disables the food, temperature and water requiremenets of aquariums, making it useful for purely decorative aquariums. balance: Replaced the "Aggressive" fish trait with "Territorial". No more angelfish shanking the goldfish and guppy in prefilled aquariums with less than 5 fishes. qol: Added screentips to aquariums. /:cl:

Co-authored-by: SmArtKar <[email protected]>

…s (#88267)

## About The Pull Request Fixes some eyes to have standartized naming ## Why It's Good For The Game Bugfix good ## Changelog :cl: fix: Printed Moth X-Ray eyes are now correctly named, instead of being just "robotic eyes" /:cl:

## About The Pull Request Closes #88255 It ***was*** the refactor's fault ## Changelog :cl: fix: Fixed plasmamen envirosuits being unrepairable /:cl:

…8270) ## About The Pull Request Closes #88268 ## Changelog :cl: fix: Fixed cargo ticket and pet adventure drone loot pools not working /:cl:

## About The Pull Request Last night I was experimenting with hooking up different chemicals to a shower and discovered that blood didn't really do anything other than have red mist and particles. Your characters clothes were still cleaned. The mood boost was still happy. So I reworked it a bit. Blood now: - Gives a negative mood, disgust, and status effect when showering with it (unless you are morbid, evil, or undead, then it's considered positive) - Has an icon alert for bloody showers - Covers a mob's clothing with blood when showering (or any objects on the tile) - Tossing or spraying a container full of blood now covers objects/mobs in blood - The revenant defile spell now affects showers by removing all water recyclers and reagents that gets replaced with blood Showers now: - Require 70% of water to clean and get mood/status effects - Require 70% of blood to get mood/status effects - Require 20% of radioactive reagents to stop radiation removal effects So it's possible to have a clean water shower that is secretly radioactive. Since radioactive reagents do nothing on `TOUCH`, all this achieves is preventing the water from washing off the radiation. I did have to refactor some of the reagent code to support method types for objects since I was experiencing hazmat issues when I was testing. Whenever I would inject blood from a syringe into a beaker, it would cover the beaker in blood on the outside. This would have been extremely hazardous for viruses. So I needed to make sure we are only applying it to the methods for `VAPOR|TOUCH` Also improved the mood typecasting for owner to allow checking of mob biotypes. (so we can check `UNDEAD` for mood) ## Why It's Good For The Game Blood effects and interactions are now more consistent. The code for objects is refactored to support method interactions with reagents. Evil/Morbid people now get some unique interactions that fit their theme. Last we get a cool new ability to let revenant's make their defiled areas something out of a horror movie. ## Changelog :cl: add: The revenant defile spell now affects showers by removing all water recyclers and reagents that gets replaced with blood. add: Showering in clean water (+70%) results in positive mood/regen/stamina effects. It will wash off the mob. add: Showering in dirty water results in negative mood effects and disgust. It will NOT wash off the mob. add: Showering with radioactive reagents (+20%) results in the preventing the shower from washing off the radiation. add: Showering in blood (+70%) results in severe negative mood effects and disgust. (unless you are morbid, evil, or undead then it's considered positive) It will cover the mob in blood. add: Water effects that interact with a mob from touch or vapor (showering/spray bottles/etc.) will now heal sleep, unconsciousness, confusion, drowsiness, jitters, dizziness, and drunkenness. fix: Fix bloody showers not covering objects in blood. fix: Tossing or spraying a container full of blood now covers objects/mobs in blood fix: Fix wrong status effect for watery tile image: Add new alert icons for bloody/dirty showers code: Refactored some expose_obj reagent code to support method types. code: Improved mood typecasting for owner to allow checking of mob biotypes. /:cl: --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Ghom <[email protected]>

## About The Pull Request According to Kapu, RscFile() is a hash operation and thus is relatively slow. Having dozens of them ran every tick by atmos tanks is not ideal. There's more uncached icons in filters to tackle but the only one relatively impactful is status display init mask - however our filter code is mildly fucked to say the least, as icon() is ran ***regardless of whenever a filter is cached or not*** because we pass them as lists, not actual filter objects - and filter() seems to call one internally regardless of what its passed, so every update_filters fetches an icon for anything with an alpha/displacement filter. This doesn't actually do much on its own, but is nice to have so that future contributors don't make the same mistake by copypasting code. ## Changelog :cl: SmArtKar, Kapu fix: Atmospheric tanks no longer fetch icons every tick /:cl:

## About The Pull Request Fixes printed advanced robotic right leg name, instead of it being "heavy" ## Why It's Good For The Game Bugfix good ## Changelog :cl: fix: Printed advanced robotic right leg now has correct name, instead of being "heavy" /:cl:

## About The Pull Request So, as you might know, megacells made it that etherials gained charge really slowly. I changed this to be proportional again, but forgot to make it that said charge decreases the same, leading to an overcharge lasting 30+ minutes and the toxin damage killing you before said overcharge wore off. Also I realized I screwed up a value on the charge gain from booze when i took one sip of a telepole and instantly spewed lightning everywhere, so thats been decreased. ## Why It's Good For The Game Because slowly dying over 30 minutes cause you drank a single sip of wine is not fun. ## Changelog :cl: fix: Etherials no longer lose overcharge really slowly. fix: Etherial Wine/Telepole no longer overcharges etherials with one sip. /:cl:

## About The Pull Request changeling last resort works if youre a monkey or animal any reasonably organic animal that is (golems included) so no constructs, no spirits (shades, etc), no deathmatch/bitrunning body and also not a headslug ## Why It's Good For The Game for a "last resort" ability you cant use it if you got monkified which is something that can happen fucking you over which is not great or perhaps due to some foul magicks you became a rat or whatever youre basically fucked because you cant do anything and all you can do is bumrush people this fixes both ## Changelog :cl: balance: changeling last resort works as a monkey or animal /:cl:

## 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:

# Conflicts: # .github/workflows/generate_documentation.yml # code/__DEFINES/mobs.dm # code/game/data_huds.dm # code/modules/cargo/packs/service.dm # code/modules/events/anomaly/anomaly_bioscrambler.dm # code/modules/research/designs/mechfabricator_designs.dm # code/modules/shuttle/emergency.dm # html/changelogs/archive/2024-11.yml

SmArtKar and others added 30 commits November 29, 2024 15:32

Automatic changelog for PR #88281 [ci skip]

6fa9dc5

Automatic changelog for PR #88240 [ci skip]

55fdc79

[NO GBP] Fixes projectile parrying (#88269)

da9d492

## About The Pull Request I have... questions, to previous self. Yeah. ## Changelog :cl: fix: Fixed projectile parrying /:cl:

Automatic changelog for PR #88269 [ci skip]

b9a17e9

Fix admin local sound (#88214)

f60f5b8

Automatic changelog for PR #88214 [ci skip]

0b45aec

[no gbp] attribution mishaps (#88246)

c9099d0

Automatic changelog for PR #88068 [ci skip]

546254e

Icemoon lavaloops now look different. (#88235)

192f235

Co-authored-by: SmArtKar <[email protected]>

Automatic changelog for PR #88235 [ci skip]

4a1c1c8

Resprites all the Fannypack worn sprites to match their object sprite…

118cc27

…s (#88267)

Automatic changelog for PR #88267 [ci skip]

832a0e9

Automatic changelog compile [ci skip]

dfa11f5

fix cyber eyes names (#88271)

3e3a6f5

## About The Pull Request Fixes some eyes to have standartized naming ## Why It's Good For The Game Bugfix good ## Changelog :cl: fix: Printed Moth X-Ray eyes are now correctly named, instead of being just "robotic eyes" /:cl:

Automatic changelog for PR #88271 [ci skip]

1548bda

[NO GBP] Fixes plasmamen envirosuits being unrepairable (#88263)

fa3166a

## About The Pull Request Closes #88255 It ***was*** the refactor's fault ## Changelog :cl: fix: Fixed plasmamen envirosuits being unrepairable /:cl:

Automatic changelog for PR #88263 [ci skip]

956f69b

Fixes cargo ticket and pet adventure drone loot pools not working (#8…

4924de7

…8270) ## About The Pull Request Closes #88268 ## Changelog :cl: fix: Fixed cargo ticket and pet adventure drone loot pools not working /:cl:

Automatic changelog for PR #88270 [ci skip]

a4f23a4

Fix advanced leg name (#88273)

9d237ae

## About The Pull Request Fixes printed advanced robotic right leg name, instead of it being "heavy" ## Why It's Good For The Game Bugfix good ## Changelog :cl: fix: Printed advanced robotic right leg now has correct name, instead of being "heavy" /:cl:

Automatic changelog for PR #87747 [ci skip]

9cf6b2f

Automatic changelog for PR #88264 [ci skip]

402f81d

Automatic changelog for PR #88273 [ci skip]

bc12a4d

mc-oofert and others added 6 commits December 7, 2024 00:16

Automatic changelog for PR #88322 [ci skip]

345f113

Automatic changelog compile [ci skip]

3f80d29

Automatic changelog for PR #88047 [ci skip]

45c4edc

psychonaut-ci bot requested a review from Seefaaa as a code owner December 7, 2024 15:20

psychonaut-ci bot added the mirror Upstream mirror label Dec 7, 2024

psychonaut-ci bot mentioned this pull request Dec 7, 2024

[MDB IGNORE] [IDB IGNORE] Upstream mirror #419

Closed

5 tasks

Seefaaa force-pushed the mirror-a63316b4ded branch from 5f7fba5 to 206ce81 Compare December 7, 2024 15:41

Seefaaa added 3 commits December 7, 2024 18:44

Resolve conflicts

6342aa7

Mirror workflow fix

3d444b3

Update autowiki url

df24ee0

Seefaaa force-pushed the mirror-a63316b4ded branch from 206ce81 to df24ee0 Compare December 7, 2024 15:45

Seefaaa approved these changes Dec 7, 2024

View reviewed changes

Seefaaa added this pull request to the merge queue Dec 7, 2024