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 17.08.2024 #55

Merged
merged 230 commits into from
Aug 17, 2024
Merged

Upstream 17.08.2024 #55

merged 230 commits into from
Aug 17, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

DrSmugleaf and others added 30 commits August 10, 2024 11:08
Revert "Make hotplate and grill anchorable on table part 2 (#29454)"

This reverts commit 268cab9.
* Entity table code

* entity table examples

* fix dat shit

* access

* tests tests tests

* sloth review
* chem

* re-check

* re-check. again

* checks just die. last try

* re-check :blessrng:
…eviathan-use channel (#30851)

cant test this because the documentation sucks ass but fuck it we ball
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
Infer type for EntSelector.cs
* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
* Fix some locales

* forgor
kneecaps links while we're at it
* uhhh fix stuff maybe

* - added a fax machine
- made botany slightly bigger to accommodate a nutrimax vending machine
- added air alarms, scrubbers and a waste pipe network
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

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

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <[email protected]>
TokenStyle and others added 26 commits August 16, 2024 22:09
* seed screams now SoundCollectionSpecifier
More types of scream sounds

* plants scream mutation have 10+ scream types

* plant scream reduce scream volume
And scream powerness get's from yml instead of hardcode, so from prototypes could be changed pretty much easilly

* plants review change
remove obsolete functions from radiation
…lots (#30744)

* Fix bluespace

* filter all containers
* anonymize salvage wrecks

* display wreck size
* Make printing from ore procecssors slightly more bearable

* Update sheet.yml
* updated cog and increased popcap to 80

* back to 70 cap
Either VSCode's integrated shell or dotnet has a default behaviour where it inserts newlines into stdout/stderr to make the lines wrap at the console width. Since msCompile works based on lines this makes it fail to detect build warnings correctly. Depending on where the line break occurs this can result in a truncated error message, a correct error message with a truncated filepath for the error, or the errror just straight up missing.
Adding 'ForceNoAlign' to the logging parameters for dotnet build disables this behaviour and gives msCompile actually useful input to sift for errors. End result is all the errors are detected and listed with the correct error messages and filepaths.
* Add croissant recipe

* comma

* fix description

* fix merge error
@doublechest0 doublechest0 merged commit 9b84b72 into master Aug 17, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.