Up110824 #13
Merged
Up110824 #13
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
* Move banners to _NF + add correct attribution * Fix goblin banner icon path
* Cleaning up and editing the numbers per new ones * Fixup * Market rate prints --------- Co-authored-by: Whatstone <[email protected]>
…-14#1816) * Round start: respect overflow job time reqs * Changing job weights, pirate supervisors --------- Co-authored-by: Dvir <[email protected]>
* AbsorbentSystem only works with water, no vomit * Update SharedPuddleSystem.Evaporation.cs * Add holywater to the list of moppable reagents * AbsorbentSystem: IsMoppable function, reagent list * Remove HolyWater (nyano, unused), consistency --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
…4#1766) * Make shuttle deeds inspectable + show on PDA * Don't change title to 'Captain' when buying a ship * Fix shuttle deed stuff after review * Revert "Don't change title to 'Captain' when buying a ship" This reverts commit 7dafbb0. --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Checkraze <[email protected]>
* Stamp cleanup, bureaucracy loadouts * Squiggly pen signatures, more loadouts * Remove doctor folder from contractor fun loadouts --------- Co-authored-by: Dvir <[email protected]>
* Holy hell * Rest of the mess * Fixup * Fixup * Fixup * Fixup * Fixup * Update Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Locale/en-US/_NF/interaction/interaction-popup-component.ftl Co-authored-by: Whatstone <[email protected]> * harpy/vulpkanin compromise * Wrench, crowbar, multitool sprites & attribution * Restore reinforced diagonal walls, U/wood to state * WebCocoon: description rewrite * Restore cocoon sounds --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Update debug.yml * debug jobs * Update dev_map.yml --------- Co-authored-by: Whatstone <[email protected]>
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.
About the PR
Why / Balance
How to test
Media
Breaking changes
Changelog