МиниАпстрим #71
Merged
МиниАпстрим #71
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
* rules v5 * more changes to the rules * Apply suggestions from code review Applying suggested changes since they do look really good. Co-authored-by: Kei Shin <misterkeishin@gmail.com> * missing m and extra a * extra pirate rule * another pirate rule * more edits * as --> for the * Rules suggestions * Rules rewrites * antag, PvP, pirates * Numbering * Rewrite pirate rule link * Use bold text for emphasis * Remove French spacing * paint voice chat red just to send the message * fix typos * removing uncool rule --------- Co-authored-by: Kei Shin <misterkeishin@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com>
* Fix older files * Restore code to support vg roids * Update RoomFillComponent.cs * Update base.yml * Fix unused BaseStationShuttles from outpost * SpawnableFrontierOutpost<RecordsFrontierOutpost --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* GodHelpMe * Update migration.yml * MapMigrationSystem: use fixed list --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* Rosy Mothcloak * Removes Rosy Cloak from Contractor Loadouts. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
* WIP medical bounties - init component w/ damage * medical corpses, visitor corpse loadout, redeem fn * medical bounty redemption UI * MedicalPriceGun system/component * WIP, reduce visitor loadouts * Sanitize NF corpse startingGear sets * Add HideSpawnMenu * Add HideSpawnMenu categories to medical corpses * Map body retrieval unit in Frontier medbay * Remove commented out line from base corpse * Body redemption sprite, UI rework * Add living checks (WIP) * Medical bounty damage rejig, remove HOS/HOP gear * Reduce redund. visitor loadout defns * Fix dupe Asphyxiation key * "Genetic"->"Cellular", TryChangeDamage * boxer outfits with tank tops * Emergency medical pods, spawner finagling * suit sensors, appraisal recipe, pod freq * comment emergency pod construction graph * Map a second medical bounty redemption machine * medical bounty guidebook page * Use Erhard's emergency pod sprites, better analyzr --------- Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
…ew-frontiers-14#2339) * Remove world loader from outpost STC terminals * Disables world loader on the bus
* remove mass hallucinations * Make the event not repeat after 45 mins * Make the cave event actually spawn too * Update events.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
* Honey changes intial * Fixes for metamorphic drinks and flavour honey * Removed extra images and fixed meatslice and honey definition * Dead honey bee tree and bee jar with animation * change the nutriment in honeycomb to honey * Cleanup, honey apple streusel pie, honeycomb png * printable seed data, jar of bees that releases bz * honey bun tastes like honey and bun * Add the Apple Strudel Bites --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* lathe recipes clean up * small fix * clothing * Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Recipes/Lathes/storage.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
* Update CCVars.cs * CVAR Cleanups * Update CCVars.cs * NFCCVars Fixup * Update CCVars.cs * Tips * touch up the tips * Revert expedition_cooldown change, frontier cmnts * Bluespace crate generation param --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* Goblin Posters * small fixes * more fixes * meta * meta * grammar pass --------- Co-authored-by: Whatstone <whatston3@gmail.com>
…iers-14#2354) * Review sale precondition check order * Frontier pets shouldn't be sold * Push dead mob check above recursive chunk
* bedrolls * mchobo * suffixes * spawner * revert mchobo changes * small tweaks * darker stains * Update bedroll.yml * sprite mover, stain diluter * alpha, slight bedsheet offset --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* First * Cleanup 1 * cleanup * Here we go * Works * Getting closer * Update dungeons.yml * Update ShuttleSystem.GridFill.cs * Update dungeons.yml * Update basic.yml * Update GridSpawnComponent.cs * Update basic.yml * Update OwnedDebrisComponent.cs * Update ShuttleSystem.GridFill.cs * Update ShuttleSystem.GridFill.cs * Replace events spawner code * Update GridSpawnComponent.cs * Update GridSpawnComponent.cs * fixups * fixup * Edits * FTL, Working warnings * comp * Fix this please * Update BluespaceErrorRule.cs * Support multi grids * Add radio support * Rename files * Update nf_bluespace_grids_events.yml * Event Mc * Cleanup * Update nf_bluespace_dungeons_events.yml * Temp Restore space dungeon * Update StationEventComponent.cs * Update StationEventSystem.cs * WIP: bluespace event random order * position fix * assign to WithPosition * Warning fluent entries, bluespace dungeon comments * BluespaceErrorRuleComponent cleanup --------- Co-authored-by: Whatstone <whatston3@gmail.com>
* Fix for goblinbane pilots Removed ability for goblinbanes to pilot shuttles and take over the galaxy * Added comment for modified line * Remove complex interaction line entirely (nf file) --------- Co-authored-by: Whatstone <whatston3@gmail.com>
github-actions
bot
added
FTL
C#
UI
Map-Bluespace
Map-Dungeon
Map-Outpost
Map-Shuttle
Sprites
Docs
labels
Merged
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.
Ну и все, что ещё сказать