forked from Vault-Overseers/nuclear-14
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Nc rmediccrname #1
Open
troytroy400
wants to merge
10,000
commits into
mob_changes
Choose a base branch
from
NCRmediccrname
base: mob_changes
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
This reverts commit a639165e07f4ee9ca46e44aaefb41073297e6d45.
…b blacklist. (Vault-Overseers#462) * DwellersAlwaysDwellers * Add to BoS too
* Fixed NCR loadouts and security role loadouts. NCR now all start with filled backpacks NCR MP and Vault Security now start with their batons on their hip and handcuffs in pockets Gave Sheriff a bigger Iron. * Even bigger iron
…values (Vault-Overseers#460) * Balances some SPECIAL numbers and adds doafter functionality to agility * small fix
This reverts commit a2c8aa4.
Submitted by: ODJ
- Adjust default preset to extended to avoid server failing to start round. - Remove a few development overrides to make development environment start in a configuration closer to the actual server.
This reverts commit 4fc9d9f.
* BiomeSpawner * Update * Less random * Now it's working! * fix linter * strange
Add files via upload
* initial push * rolling back file * fix for radios * Update radio.yml * removing * removing more radio to commit on another branch * Update RadioSpeakerComponent.cs * more adjustments * Update radio.yml * Update radio.yml * Update radio.yml
* First Commit * Fix Playtime Tracker, adjust armor stats again
* added some magazine related items and a nuke silo * added Magazine to the tags yml * added magazines
* Recipes, cutlets, and reagents updated * WEIRD bugs coming up now. * Feature complete, creating PR for easier review/testing * Kebabs removed * McRib fix. I wish YAML showed multiple errors but that's life * Did you know we just didn't have our own popcorn entity? My bad. * Bun fixed * Human burger out * Weedbutter fix * Missing entity fixed * Now we're making real headway. * Bacon tweak * Pizza problem * Ready to roll - pizza problem deferred * Finished & Migration check is good! * Minor nutrient tweak for fun * Some tweaks have been made * If this doesn't work someone else has to help me fix it. Deal? Deal
* making WBoS numbers in line with MBoS * Revert "making WBoS numbers in line with MBoS" This reverts commit 86924de. * WBoS role-slot fix * commander 20 hours --------- Co-authored-by: the-adom <[email protected]>
* Add files via upload * radio station edits and additions * removed unnecessary code block was an artifact of previous coding trial * Update RadioSpeakerComponent.cs * Update RadioDeviceSystem.cs removed unneeded code block as requested by notafet * Update Content.Server/Radio/Components/RadioSpeakerComponent.cs Co-authored-by: Partmedia <[email protected]> * Update Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml Co-authored-by: Partmedia <[email protected]> * removed nuclear 14 comments * Mic adjustments and FTL string for PBS channel * changed sprite names to reflect states better, attempt at power lights, not working --------- Co-authored-by: Partmedia <[email protected]>
Vault-Overseers#678) * moved draw depth of new sprites to overmob, bumped offset for mic and onair sign * Update beds.yml
* Add files via upload * Add files via upload
* Update overseer.yml * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultengineer.yml * Update vaultsecurity.yml * Update overseer.yml * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultsecurity.yml * Update vaultengineer.yml * Update overseer.yml drastic measures. Directly under requirements. * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultengineer.yml * Update vaultsecurity.yml * Update vaultsecurity.yml * Update vaultdoctor.yml * Update vaultsecurity.yml * Update vaultengineer.yml * Update overseer.yml * Update vaultdweller.yml * Update vaultsecurity.yml * Update overseer.yml * Update vaultengineer.yml
* fix master * update patrons * remove door migrations
* Recipes, cutlets, and reagents updated * WEIRD bugs coming up now. * Feature complete, creating PR for easier review/testing * Kebabs removed * McRib fix. I wish YAML showed multiple errors but that's life * Did you know we just didn't have our own popcorn entity? My bad. * Bun fixed * Human burger out * Weedbutter fix * Missing entity fixed * Now we're making real headway. * Bacon tweak * Pizza problem * Ready to roll - pizza problem deferred * Finished & Migration check is good! * Minor nutrient tweak for fun * Some tweaks have been made * If this doesn't work someone else has to help me fix it. Deal? Deal * Fixed bun error, burgers work again --------- Co-authored-by: Peptide90 <[email protected]>
Move timed despawn to SetCartridgeSpent() instead of EjectCartridge(), because EjectCartridge() is called in several other code paths that don't involve the cartridge being spent. For example, ejecting all cartridges from a revolver mark the cartridges for despawning even though they were never fired. Guns whose cartridges disappear while loaded appear to "jam".
Update medicine.yml bitterdrink
* Update radio_channels.yml Changes radio colors. WOO!! * Update radio_channels.yml
* Update raiders_ranged.yml * Update raiders_ranged.yml --------- Co-authored-by: Peptide90 <[email protected]>
* Added yaml First go around see how it goes * added dead version of plant yup * clean up deleted some things, added somethings * updated stats improved health, range and damage * Spawner Added a spawner for the spore plant * fix problem * added back the mob spawns Still may cause an issue, if so, ill fix this in another PR * try this * Hurray Should have fixed it now
* Introducing the Blue Line Caravan Company * small tweaks * fix and adding vest * silly stuff * yet more silliness arises * silliness in bounds * silly silly silly --------- Co-authored-by: the-adom <[email protected]>
Update modifier_sets.yml
* Update nuka.yml * Update nuka.yml --------- Co-authored-by: Peptide90 <[email protected]>
* Update modifier_sets.yml * Update basemob.yml * Update modifier_sets.yml
* Update spear.yml * Update spear.yml
Co-authored-by: the-adom <[email protected]>
* training sword a training sword for practice dueling * wood increase slightly more cost * 32x32 -> 64x64 I found the issue, it was an exporting error when I was spriting * Update baton-club.yml * removal of .png yipee * Update baton-club.yml * Update baton-club.yml * Update weapons.yml --------- Co-authored-by: Peptide90 <[email protected]>
* 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 * fix: tradestation components * Revert "fix: tradestation components" This reverts commit bd86370. * feat: starting ballance 500 * feat: cargo console spesos text to caps --------- Co-authored-by: Peptide90 <[email protected]>
* Update lighters.yml * Update lighters.yml * Update lighters.yml * Update lighters.yml I'm bad at formatting.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
None yet
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.
Description
Description.
Media
# ChangelogMedia
🆑