Up060824 #2
Merged
Up060824 #2
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
* Investigator (Update) * changed consoles, removed shutter * Update Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml Co-authored-by: Whatstone <[email protected]> --------- Co-authored-by: Whatstone <[email protected]>
* FuelVend, rough draft * FuelVend fixes * FuelVend pt 2 * Infinite vending supplies * Infinite tank dispenser inventory * syntax fix * Revert EngiVend, gas dispensor, youtool, fuel pack * FuelVend costs for plasma, uranium, AME jars * Add welding fuel to the FuelVend, revalue uranium * fix VendPrice field * FuelVend cleanup * meta whitespace, remove CostType enum * Fix FuelVend license * rewrite VendingMachineSystem infinite comment * Plasma, uranium values, override if vend present * Fix vend order (prefer staticprice vs. stackprice) * Cleanup * Update frontier.yml * Update flatpackvend.yml * Update vending_machines.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]> Co-authored-by: Dvir <[email protected]>
* papers, please * forms_sr.yml: paperwork revisions * SR Form rewrite, new contraband amnesty form * Fix pipes colors --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]>
* Computer YAML cleanup * ATMs: inheritance order * computers.yml: cargo order computer has no board
* Adds loadout options and a new hat * Hamster stc cap, stc loadout order, hamster wear --------- Co-authored-by: Whatstone <[email protected]>
* Pirate Bounties The start of a probably long PR for the pirate bounty system. Not at all complete. * Changed Components to ID's Awaiting further checkiessssssssssss * added additional bounties Added gold ore/ingots and Vending Machines * Fixed ID names Everything was Captain, NO LONGER * ID Whitelist, move pirate bounties to _NF folders * Balance Pass Balanced a couple thing Leander Suggested. * Pirate bounty components & systems, ROUGH DRAFT. * Pirate bounty/pallet console UI (ROUGH DRAFT * Pirate UI (WIP, quarter-baked at best) * Pirate UI cleanup, first pass * Booty Crate Sprites Thanks Schbingus * Crate fix dumb * Pirate vessels inherit from pirate vessel class * Pirate bounty consoles and pad YEEEEEEEEEEEEEEEEEEEEEEEEE * FIX AAAAAAAAA * Should work -- Console FTL's Pls work * Sector service POC, pirate bounty service * Pirate bounty system: use sector service * SectorServicePrototype: fix namespace includes * SectorServicePrototype: yet more namespace include * namespace includes, pt 3 * CargoSystem: fix obsolete code * Add pirate bounty and redemption WIP computers * Pirate bounties: fix whitelist, add blacklist * SectorServicePrototype: add serializable attribute * SectorServicePrototype: default name * SectorServicePrototype to shared * YAML linter fixes, no service serialization * ProtoIdWhitelist: use List, adjust bounty values * PirateBounty: use existing Bounty name ID group * global service: station component, bounty system * Redundant functions, generics * SectorServiceSystem: interface woes * PirateBounty component work * PirateBounty: more sector service fixes * yet more pirate bounty & sector service system * SectorService: revert to GetServiceEntity for now * CargoSystem.PirateBounty.cs: restore entity UIDs * partial problems require partial components * Remove Cargo UI key, add a few debug prints * pirate bounty console and pallet FTL * Pirate bounty console UI * PirateBounty: compilation fixes * PirateBounty * Summon chest WIP * More pirate bounty stuff * PirateBountyEntry: access button rewrite * cancel vs. skip, spawning fixes * Undupe pirate-pallet strings * 30 minute cancel * pirate bounty chest and reminder descriptions * Rough pirate contraband console * Pirate contraband exchange * Add pirate appraisal tool * "black market" * Half of a bounty redemption algo * Pirate bounty redemption, part 2 * Pirate bounty redemption: first rough version? * closer to compilation * Compilation fixes * Bounty redemption UI * Pirate bounty redemption fixes * Set up label on pirate bounty, fix whitelist check * Id whitelist * ID whitelist fixes * Fix crate IDs used for lookup * fix bounty whitelisting, bounty chests, prices * Fix up bounties, fluent entries for bounties * Bah * Update cove.yml * pirate bounty consoles, unshaded pad, cove pads * piratebounty.png: fix one bad pixel * Revert the mark of the beast * humility * Pirate Bounty cleanup * cleanup contraband.png pixels * fix pirate logo * Polish: noises, UI updates & strings * Pirate Bounty: redemption text * Fix spawn chest sound * Update cove.yml * Update cove.yml * Update pirate.yml --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
…iers-14#1730) * Random corpses aren't entirely fresh * Update corpses.yml No more SalvRestrictions
* ATM fixes (restore netSync, noRot for standing) * netSync->netsync
* VesselList: don't deselect if prev selection valid * VesselListControl: better filtering & selection * Check job requirements when setting button enabled --------- Co-authored-by: Dvir <[email protected]>
…s-14#1709) * blood moon invis walls, syndie intercept loose pipe and walls * buffed loot * better visuals for invisible cult wall
* Gestio Re-balance * fix * Update ammo.yml * Update Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml Co-authored-by: Whatstone <[email protected]> * Update ammo.yml * minAngle nerf: bring in line with other wieldables --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]>
…4#1725)" (new-frontiers-14#1791) This reverts commit 71a213f.
* Fix Broken Grid Names * Fix 2 * Fix 3 * Conflicts
* Add the SR shipyard console to Frontier Outpost Co-authored-by: Tych0 <[email protected]> * bottleneck: add SR access * Update frontier.yml --------- Co-authored-by: Tych0 <[email protected]> Co-authored-by: Dvir <[email protected]>
* Fix two minor POI bugs (Tinnia's, Trade) * Update fax_machine.yml --------- Co-authored-by: Dvir <[email protected]>
* Food * Update boxes.yml
* RCD: vend prices * Update shipyard_rcd.yml * Update tools.yml --------- Co-authored-by: Dvir <[email protected]>
* Reduce magboots staticPrice to 200 * magboots: bad comment
github-actions
bot
added
Map-Bluespace
Map-Dungeon
Map-Outpost
Map-Shuttle
Map-POI
Sprites
Docs
and removed
YML
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