Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream sync #482

Merged
merged 102 commits into from
Feb 21, 2024
Merged

Upstream sync #482

merged 102 commits into from
Feb 21, 2024

Conversation

KayzelW
Copy link
Collaborator

@KayzelW KayzelW commented Feb 21, 2024

No description provided.

ArchPigeon and others added 30 commits February 17, 2024 16:33
* Add Flammable Touch Reaction for liquid tritium

* Stop tail wagging action on crit

* Revert "Add Flammable Touch Reaction for liquid tritium"

This reverts commit 41be57b058a0cdee0cecfc51eb1c4a25631e62f3.
add (un)equip sounds to EVA helms
fixes

makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues.
* added more foodstuff breakdowns

* Calcium doesn't exist; moved phosphorus to protein

* tested reactions- some should be centrifuged

* more testing tweaks
* Increase printing price

* Update clothing.yml
* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace
* Emote sounds, accent & doorbump

* Oops

* Only non-brains can't talk
* Bump nixpkgs revision

* Update nix-direnv

* Remove extra nix functionalities

Both nix-direnv and legacy command nix-shell fail. Reverting to
flakes-only commands.

* Pin nixpkgs per suggestion

See space-wizards/space-station-14#25361 (comment)

* Revert nix-direnv removal

* Add python3 to shell.nix
* Added support for fill levels to metamorphic glasses

* Fix warnings and cleanup

* Don't break non-metamorphic fills!
* Convert to fancy window + added footer + add list spacing

* margin add
Make metamorphic glasses use empty sprite for the last solution they contained.
* Update toys.yml

* fix

* New sound of eating

* Increased eating time

* New sounds+sorting
* Make pills colorful and labeled

* Inherit pill sprites from parent
Emisse and others added 22 commits February 20, 2024 23:36
* train update

* argh

* forgor
The Radioisotope Thermoelectric Generator (RTG) isa power source that
players may encounter in the game that doesn't have an entry in the
guidebook yet. This commit fixes that.
- Not mentioned anywhere ingame.
- Stupid.
* trumpet + lily +polypy

* trumbet
* Blacklist Acidifier from Nukie Uplink and Increase Price to 4tc

* Removing Category to just disappear it from uplinks while keeping the item?

* Price 4, Nukie Uplink Only

* Update uplink_catalog.yml

* Added one backspace
* Add option for admins to disable bwoink

In a vain attempt to get people to ahelp more, provide the possibility
for admins to not play the bwoink sound if they don't want to scare the
player.

* Add silent indicator to discord relay

* Use string interpolation
* Fixed length check, added attempt event, added popups on failure

* Fixed file name typo, fixed description

* Converted to else-if
Removed Chef counter windoors, added RD dresser, put bedsheets in all head dressers except captain's
…tate in UI (#25109)

* fix: cryo pod now uses health-analyzer system to update body state in UI

* refactor: use EntityEventRefHandler instead ComponentEventRefHandler in CryoPodComponent subscribe on EntRemovedFromContainerMessage

---------

Co-authored-by: pa.pecherskij <[email protected]>
@KayzelW KayzelW requested a review from Rxup as a code owner February 21, 2024 15:29
@Kirillcas Kirillcas merged commit a0c1d06 into master Feb 21, 2024
7 checks passed
@KayzelW KayzelW deleted the upstream-sync branch February 22, 2024 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.