Up13012025 #110
Merged
Up13012025 #110
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
* Disable AI on protected grids WIP * Check if faction is hostile * Kill hostile AI on protected grids * 2024 12 06 hostile ai on grid suggestions (new-frontiers-14#2524) * Cleanup! * ProtectedGrid: default KillHostileMobs to false * Remove comment --------- Co-authored-by: Whatstone <[email protected]> * Run NPC deletion code on entity parent change evt * Remove unused HTNSystem dependencies * NPCDeletionSystem: add startup function --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]> Co-authored-by: Checkraze <[email protected]>
* Add Charon shuttle * Change to a manufacturer name whose acronym has less potential for confusion * Add BecomesStation component * Update sell price since a bunch of tile prices just got changed * Remove some duplicate objects, move around some emergency gear * Reference correct guidebook page in ship yml * Hide my network configurator sins * Move waste vent to a cleaner spot, add wall cabinet to bathroom * Add vacuum atmos helper markers. Change plating to lattice under engines + fix a few other platings. * Make some spicy windows mild, also update price and tile count * Update based on lastest round of feedback * More decals, tweak supplies * Equipment, ship price, and decor adjustments * Replace wall fuel tank with a portable one --------- Co-authored-by: eidolon <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Checkraze <[email protected]>
* WIP: science revalue, no tech disks & anom sync * inner anomalies generate cores, no phasing effect * Remove tech disk references * comments * Added info about points earned in scanner * Unhardcode anomaly assessment values * Remove anomalous nerd smash --------- Co-authored-by: Dvir <[email protected]>
* New shade for 100k bills * Cash sprite consistency --------- Co-authored-by: Whatstone <[email protected]>
…frontiers-14#2418) * Add notes, restore upstream numbers * Update disk.yml * Remove all disk printing fully * Update salvage_loot.yml * comments, $200 for a 1k pt research disk * tech disk terminal board: nospawn * no research point disk comments (inaccurate) * tech disk value comment * tech disk, rare tech disk: nospawn --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
…s-14#2538) * BuckleSystem: only set handled to true if handled * Handle buckles when handling buckles * Remove unused frontier code --------- Co-authored-by: Dvir <[email protected]>
* job whitelists panel !!! (new-frontiers-14#1678) * make JobPrototype.Whitelisted respect blanket whitelist, make jobs use it * add jobwhitelists command and ui * add job whitelist button to player panel --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Fixup * Update JobWhitelistManager.cs * Update JobRequirementsManager.cs * job whitelist panel presets (new-frontiers-14#1717) * SHIT -> GOLD * the label looks like shit * make jobs that dont use whitelist greyed out on whitelist panel (new-frontiers-14#1718) Co-authored-by: deltanedas <@deltanedas:kde.org> * Update whitelist_tiers.yml * FTL * Update departments.yml * Update departments.yml * Whitelist panel suggestions --------- Co-authored-by: deltanedas <[email protected]> Co-authored-by: Milon <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Restore AutoWakeUpComponent function * AutoWakeUp: cure drowsiness
* Fix Empress Double Thruster * Yet Another Double Thruster
* chem dispenser: upgradable # slots * Comment dependencies * Make soda/booze dispenser upgradeable * Uncomment output slot creation --------- Co-authored-by: Dvir <[email protected]>
* Bluespace jug, WIP * Missing bluespace jug recipes, fix anomalous icon * Move bluespace jug defn, med. steel to plastic --------- Co-authored-by: Dvir <[email protected]>
* Add an auto-labeller to the chem dispenser * "auto-labeler" for en-US spelling * darkgreen text --------- Co-authored-by: Dvir <[email protected]>
* Return upstream unused maps to upstream level * Wreck Cleanup Part 1 * Cleanup * Update salvage.yml * WreckLoot suggestions * Update salvage.yml * Breaks yml * Update ignoredPrototypes.yml * Yml * Update migration.yml * Remove missing spawner from cave_factory * Remove missing prototype from North Pole * Update salvage.yml * Added rooms * Update wreck.yml * Big wrecks * Brass Wreck * Brass --------- Co-authored-by: Whatstone <[email protected]>
…rs-14#2528) * Add the syringe gun as research (new-frontiers-14#2169) * Tech added * Added recipes and made printable * Tech added * Added recipes and made printable * Should solve the conflict * Should solve the merge conflict * Emagged protolathe * Nerf "mini" syringes (new-frontiers-14#2249) Update chemistry.yml * Nerf "mini" syringes * Force transfer, max transfer amount to 5u * 0.5u on collide, 0.5u per injection, 2s per inject --------- Co-authored-by: Radezolid <[email protected]> Co-authored-by: Stop-Signs <[email protected]> Co-authored-by: Dvir <[email protected]>
…я фикса фикса после фикса фикса после фикса того фикса, что фиксит фикс
…сы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы
…иксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы фиксы" This reverts commit 6804996.
… fixed fix will not fixed by fix after fixing the fixed fix
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