This repository has been archived by the owner on Nov 1, 2024. It is now read-only.
Рыжий ап #294
Closed
Рыжий ап #294
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
Co-authored-by: Dvir <[email protected]>
* RevolverAmmoProvider transfer, add TakeAmmo intent * SimulateInsertAmmo conditions, revolver cleanup * Speedloader fix * speedloader condition: add frontier comment * Remove unneeded changes, comment scope, container * Revolver fillDelay to 0.7s, use target delay --------- Co-authored-by: Dvir <[email protected]>
* Gun * More items to spawners * weapon case icon fix, diluted filled containers with empty * small fix * weapon spawners rework * weapon spawners * dungeon updates * salvage outpost theme * some tweaks * missing tag * fix * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml Co-authored-by: Whatstone <[email protected]> * weapon cases touch up * Fixup * Update WeaponCaseInsertable.cs * A bit less syndicate stuff, but still keep some * ftl cleanp * sprite * Update contrabandappraisal.yml * Add to vending * Update bountyvend.yml * Update Resources/Locale/en-US/_NF/cargo/price-gun-component.ftl Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/Security/ContrabandGunSystem.cs Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/Security/ContrabandGunSystem.cs Co-authored-by: Whatstone <[email protected]> * Update Content.Server/_NF/Security/ContrabandGunSystem.cs Co-authored-by: Whatstone <[email protected]> * Whatstone's suggested changes --------- Co-authored-by: steinhauer.erhard <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Add support for multiple grid paths in BluespaceErrorRule * Meh, it was needed for testing * fix * fix 2
…guns. (#1498) * OniSystem: compensate for wield bonus * OniSystem: inaccuracy to a const, 10% buff * OniSystem: call RefreshModifiers (net consistency) * OniSystem: remove TODOs
* faith injector, holywater reaction needs BibleUser * Curly brace on newline, not same line * Remove suffix from faith implanter * BibleUserImplantComponent: newline at EOF, comment * Add Pious trait, remove vendor/loadout faith impl. * Cleanup, remove PacifiedUser variable * Add bible to Contractor tools * tools.yml: fix faith implanter location * Bible: T2 contractor gear * tools.yml: add name, description, bible preview * Bible: name, description, preview, 5k spesos
* new dragon egg * dragon omelette * new sprites * mind transfer and animations * port dragon's breath from wizden * dragon egg update * baby dragon update * fix JSONs * fix baby dragon YML * no clue how this broke * Update dragon.yml * fix issues * dragon update last fixes * dragon update last fixes v2 * dungeon dragon egg --------- Co-authored-by: deltanedas <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* Pirate Uplink and New Drip. Adds in a fully operational pirate coconut uplink, as well as new drippy drip. Listed as draft as awaiting updated icon sprites. * Added fixed textures. Drip is good, uplink is FUBAR. * Fix? Added tags and currency yml? FIX * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Uplink is working now. * aaaaaaaaaaaaaaaaaa * Test Test * test test * Fix? Fix? * AAAAAA AAAAAA fixed * Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl Co-authored-by: Whatstone <[email protected]> * Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Crates/antag.yml Co-authored-by: Whatstone <[email protected]> * Update meta.json * Update meta.json * Update meta.json * Update pirate_uplink_catalog.yml * Update Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml Co-authored-by: Whatstone <[email protected]> * Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml Co-authored-by: Whatstone <[email protected]> * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Blinky pirate uplink * Pirate HardSuit->Pirate Hardsuit * Mofuckin Yeet This ish is done. GG no RE * pirate cleanup (spelling, slugs, and s-grammar) * Pirate uplink: rework text, use lethal shells * Fix lethal shotgun entity ID --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]> Co-authored-by: Whatstone <[email protected]>
* Ammo icons, first pass * Ammo icons, continued * Fix copyright in ammo/box RSI metadata; humility * Fix anti-materiel metadata * Add icons for speedloaders and rubber ammo
Updated the hardsuit to have just a bit better armor value. More in line with NFSD suits.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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