Upstream #45
Closed
Upstream #45
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
* 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
* added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again
* BankSystem: cache bank accounts * BankSystem: fix cache lookup player * BankSystem rewrite * BankSystem: no-ent functions, spawn event sessions * fix delta-v/frontier comments * Additional frontier session comments * BankSystem: ComponentInit function * New event for preferences being loaded --------- Co-authored-by: Dvir <[email protected]>
* fix old piping + directional fans * replaces exterior waste air vent with a passive vent * Update vagabond.yml * Update vagabond.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* initial POI and dev test quick setup * finalize * Update edison.yml * Map Fixups * Cleanup * Last fixup + NoSpawn --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
made security clown masks security contraband.
* initial commit * bolts * hand crossbows, additional functionality for bolts * fixes * tweaks * shootable plunger and bread * mail capsule * attack options for crossbows, bread * wooden stake changes * tag bloat (fucking bs) * sponge * fixes * quiver fix * broadhead bolt * parenting and small fix * moving things around * Update belts_crossbow_quiver.yml * Fixup * Update weapons.yml * EMP * Update crossbow.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* Avocado and Cucumber plants, with foods This PR adds avocado and cucumber, in addition to several new foods and drinks to make use of them. * Remove pit * Olive oil rebranding and fixes. Updates seed sprites to more contemporary forms. Uh, Olive Oil is now... Vegetable oil. Worked with Whatstone on this one. It seemed preferable to adding "avocado oil" or other redundant vegetable based oils in addition to providing a renewable way of producing oil for frying and kitchen use. Addressed issues with bad nutritional values and iffy meat tag. * Revert "Olive oil rebranding and fixes." This reverts commit 6bbe4fd. * Reverts olive oil to vegetable oil changes. Retains "oil" reagent for avocado. * Cucumber slice color, longer cukes, recipe amounts * Cucumber water cucumber colour (cucumber) * Add vegetable oil * Add the forgotten cucumber sprite * fix avocado oil, description is small --------- Co-authored-by: Whatstone <[email protected]>
* SodaWater and Vodka recipes * Changed crystals recipe in fun.yml * plasma is now a catalyst to create crystals * Revert "plasma is now a catalyst to create crystals" This reverts commit 1002d9927a3597f7a02611071ef3f706cd056a41. * Revert "Changed crystals recipe in fun.yml" This reverts commit 30b6b602228ec1b11a46e390c6a5868494e2b61f. * Stir to make Vodka * Shake to make soda water * fix
* Make ptech great again * Cleanup * Content * Update vending_machine_restock.yml * Remove pens from SR PTech, add sr/nfsd forms * Brown and green PAL folders with docs --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]>
* hide spriteview from health analyzer while inactive * add out of range indicator if analyzer becomes inactive * hide out of range icon if there is no patient data
Add Hauler guidebook entry
…-station-14 into barge-guidebook
Barge Guidebook Entry
* Rats * Update NamingSystem.cs * Fixup * Update rodentia.yml * Update rodentia.yml * Update mouth_storage.yml * Update SharedRatKingSystem.cs * What rats? * Rummager cooldown (30s), goblin guidebook rewrite --------- Co-authored-by: portfiend <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Admin-only warp points * Remove unused admin dependency
* Add GitHub auto-label for database migrations * Update labeler.yml * Yelp --------- Co-authored-by: Dvir <[email protected]>
* CrewMonitoringNavMapControl fix * Remove unneeded dependencies
* Corrects bugged floor plating. * Corrects pipe routing with electrical change. * Re-orientates chem lab shelf to original config. * Remove invalid configurator refs --------- Co-authored-by: Whatstone <[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.
About the PR
Why / Balance
How to test
Media
Breaking changes
Changelog