Up16112024 #83
Merged
Up16112024 #83
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
* Update Frontier.yml * changelog suggestions * Fix PlantMutateExudeGases and PlantMutateConsume --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* Pirate bounty fix WIP * More pirate bounty fixes, stack amounts
* base items * recyclable outer clothes * recycle books * more random items * instruments and flags * encryption keys, cartons * fix * ammo boxes * gun magazines * nades * tabletop games, dropper, pickaxe * monkey cubes, pills, lighters * traffic key (take that STC) * biomass from plants * flatpacks * cards, bullets, ame jar * reclaimer magnet radius, revert bullets * more tags for recycler * fix cards.yml * more fixes * floor tiles * tmp * upd --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
* of biogenerator and biofabricator * biofab redacted * research * circuit imprinter * cloning price went up, small critters cost more * Update Content.Server/Cloning/CloningSystem.cs Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * BiomassRequirementMultiplier = 5 * biowood, biopapersheet * bioplastic * condiments, meat, soil bed * soiled * could be clean up * a bit of clean up * Biomass requirement fix * Update Resources/Prototypes/_NF/Recipes/Lathes/sheet.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * upped plant bed price and print time --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com>
* Stashes * AnchorableStorage comp/sys, backpack fixes * Requested edits from MilonPL * hate linq --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
* Condenser Power Adjustment * Update unary.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Add mass scanner and radar telescreens * Wallmount construction, tabletop fixes * Remove unused (and undefined!) tags --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
* Fix roundstart janitor access, no maid smite * revert maid PDA change
* xeno spawn markers * Fixed xeno spawner, less cult --------- Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* DeltaV Code * Fixups * stinky * Delete SharedFelinid.cs * yml * capitalize all markings * dragon hatch sound --------- Co-authored-by: Whatstone <whatston3@gmail.com>
…#2317) * explosive bolts are back * shrapnel bolt --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
…4#2400) * Drop events for dependent slot contents * Fix comments
* Eorg * Update DCCVars.cs * add the no EORG popup (new-frontiers-14#2070) ONE MORE PR TODAY * add the no EORG popup (new-frontiers-14#2070) * EORG rewrites * refactor eorg popup * comment on margin changes --------- Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com>
* Updates the announcement regarding the bluespace events Syndicate Cache and NT Vault to include information about a no fly zone in the announcement. * Minor spelling correction * Minor spelling fixes * Update Resources/Locale/en-US/_NF/bluespace-events/events.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Locale/en-US/_NF/bluespace-events/events.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Replaced tiny fans with directional fans, Added a sink to the mess area * Resolved conflicts * Revert "Replaced tiny fans with directional fans, Added a sink to the mess area" This reverts commit e411492. * Grammar pass, merge review * Update Resources/Locale/en-US/_NF/bluespace-events/events.ftl * revised vault announcement, remunerated to paid * what is grammar? --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com>
* Update debug.yml * Mail Test * ERT Mail * Cards hand sprite * How did I fuck this up? * funny * abstract * Update MachineBoardTest.cs * telapad * Update cargo_telepad.yml * Update bowl.yml * Cleanup * Update crossbow_bolts.yml * Update warp_point.yml * Update computers_shuttle_records.yml * Update backpacks.yml
* Cleanup comps from dead AI * Update SalvageMobRestrictionsSystem.cs * Update SalvageMobRestrictionsSystem.cs * Move to comps * Update mob_hostile_base.yml * Fixed missing comment * Restore AdvertiseComponent --------- Co-authored-by: Whatstone <whatston3@gmail.com>
github-actions
bot
added
FTL
C#
UI
Map-Bluespace
Map-Dungeon
Map-Outpost
Map-Shuttle
Map-POI
Sprites
Docs
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.
Апстрим