Up september #46
Merged
Up september #46
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
* Dialog windows now grab the keyboard focus * Comment
* unbuckle if the target is buckled * better way to do it
…(#32264) * Add glasslocks to the Contiguous Fland Hallway Volume * Fix up the firelocks, hopefully!
no more cockroach and mothroach damage
more convenient cheeseem
make mailing better
…2320) Make small clamp user 2% battery instead of recharge 2% battery. Co-authored-by: JIPDawg <[email protected]>
* Add Fancy Chairs * Update chairs.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
…rs-14#2018) * the return of fireaxe prying (new-frontiers-14#1700) * bullshit * fixed the fucking typo!!! * Add a maintenance jack for prying up plating * maintenance jack swing angle * Maintenance jack: huge, not ginormous --------- Co-authored-by: Milon <[email protected]>
* initial commit * boots * bountyvend POI * combat gloves as C1 * fffffix * mercenary colors --------- Co-authored-by: Dvir <[email protected]>
No resizing character editor Co-authored-by: Eoin Mcloughlin <[email protected]>
* rolebanlist command opens ui * removed commented out section
* bag of holding consistency * Fix 1-frame bag of holding animation lengths * fix ore bag animation lengths * Learn to count. --------- Co-authored-by: Dvir <[email protected]>
* Don't flush disposals immediately on power-on * Update Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs --------- Co-authored-by: Eoin Mcloughlin <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Move tank harness to outer clothing * Valet outer clothing fixes * Fix valet outer clothing * outerclothing, not jumpsuit * Fix pirate outer clothing * tank: hideEffects, not effects * Fix mercenary loadouts: remove tank harness --------- Co-authored-by: Dvir <[email protected]>
* Fixup * Update launchers.yml * Update launchers.yml
…m-merge September '24 Upstream Merge
…2113) * dock floors and correct doors * Techmaint under doors on Frontier Outpost --------- Co-authored-by: Arimah <[email protected]>
github-actions
bot
added
FTL
C#
UI
Map-Bluespace
Map-Dungeon
Map-Outpost
Map-Shuttle
Map-POI
Docs
Map-Admin
labels
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.
Upstream