Upstream 30.10.2024 #101
Merged
Upstream 30.10.2024 #101
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
* First step - just add sprites * adds radhog, start of pigrat. Revival of Vonshant PR. * Adds pigrat meat and cooking * adds new geckos and spawners * adds a bunch of ms13 medical sprites and aloe salve * remove duplicate ID --------- Co-authored-by: Vonsant <[email protected]>
* adds ID printing machines * adds vault ID printing * fix dupe * fix caravan * add localisation for lathe category
* feat: add TradeStation component * feat: adds value to bottlecaps * feat: adjusts values to NCR dollar + prewar money * feat: change appraisal tool from spesos to caps * refactor: NcrCredit material name * feat: cash component to NCR dollar * feat: cargo sales outputs caps * feat: adds crates steel, plastic, wood, mechanic parts * feat: adhesives crate * feat: remove old cargo products * feat: stimpak crate * feat: desc to N14 crates * feat: crates - rations, rifles, water * feat: entity 20 lead bars * feat: gunpowder 20 entity * feat: crates - nuka cola, gunpowder and lead bars * feat: cargo products steel, plastic, glass, wood * feat: cargo product stimpak * feat: cargo products - gunpowder, lead bar * feat: cargo products - mechanic parts, adhesives * feat: cargo products livestock * feat: cargo product varmint rifle * feat: cargo products - rations, water, cigarrets, nuka cola * feat: abraxo cleaner crate and cargo product * feat: adjusts caps income cargo * fix: varmint rifle crate * feat: adjusts materials selling prices * feat: adjusts weapons selling prices * feat: adjusts batteries pricings * feat: adjusts silver, iron and gold ingot prices * feat: adjusts rifles prices * feat: adds pricing to stimpaks * feat: adjusts lead and gold pricing * feat: adjusts ammo price * feat: adjusts tools pricing * feat: adjusts bandages and radaway pricing * fix: varming rifles crate product * feat: orders access to caravan * feat: remove caps maxCount * fix: varmint crate * Update currency.yml * fix: ncrCredit material icon --------- Co-authored-by: Peptide90 <[email protected]>
Revert "Crimson Caravan Cargo System (Vault-Overseers#628)" This reverts commit 59b793e.
* Rename Jobs, New Job Description, Sunnyvale 2 min NCOs, 3 max * Remove MP and QM from Sunnyvale * Rename Jobs, Fix Loadouts, Remove MPs and QM * Fixes for Doctor -> Medic * Rename job files * WS and Engineer Jobs * Fix Dupe IDs * Fix a missed TODO item * Rename Officer and NCO Access, Remove MP access, Move MP access doors to NCO * Fix Typo * Rename Job Spawners (This will cause test fails) * Migrations per Peptide Request
* Add files via upload * Add files via upload
Fixes Saw damage type
* Fixing this issues Vault-Overseers#546
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