Pull upstream to latest-ish master #312
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
* Well i tried this way * New approach (start) * Did it * makes spacelaw available, put it under sec
* Add JobRequirementOverride prototypes * a * invert if * Add override that takes in prototypes directly
* Fixes client having authority over rules popup cvars * Delete duplicate migration * Pre-update * Post-update
Swap InRangeUnobstructed to InRangeUnoccluded Co-authored-by: plykiya <[email protected]>
* ports the singularity values from vgstation * guidebook fix * 5000 energy level 6 singulo
* Update DevourSystem.cs * Update DevourSystem.cs * Update Content.Server/Devour/DevourSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
Improve grammar of various petting message
* Fix flatpacker * a
* Update speech-chatsan.ftl * Update word_replacements.yml * Atm-at the moment * Atm * Update Resources/Locale/en-US/speech/speech-chatsan.ftl * Update Resources/Prototypes/Accents/word_replacements.yml --------- Co-authored-by: metalgearsloth <[email protected]>
MFW same bug twice at 2 layers because I'm stupid.
I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.
This reverts commit ccf93eb.
efcore is awesome now that I know how to use it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pulls upstream to june-ish master