Conversation
fenndragon
added a commit
that referenced
this pull request
May 21, 2026
* Merge pull request #3 from AU-14/weapons M41 + Smartgun * Merge pull request #39 from troytroy400/equipment-rework PvE Hat/Helmet Ports * Merge pull request #43 from troytroy400/pvearmor PvE Marine Armor * Merge pull request #44 from troytroy400/evenmoreclothing Port PvE Clothing * Merge pull request #45 from troytroy400/goggles Port PvE Goggles * Merge pull request #47 from troytroy400/glasses Port PvE Glasses * rmc weapons * bezoar * fix * Update Bezoar.yml * Update Bezoar.yml * Update base_pistol.yml * Update base_sniper.yml * Update base_gun.yml * Update Bezoar.yml * fix * fixes * Update tags.yml * tweak * damage rebalance * Update grenades.yml --------- Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com> Co-authored-by: Orion <58231741+troytroy400@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
adjusted mercvend prices and gave MC to mercs on roundstart