Skip to content
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

feat(content): new gun Moriarti MA-357Sig-167, fixes. #4843

Merged
merged 3 commits into from
Jun 21, 2024

Conversation

Lamandus
Copy link
Contributor

@Lamandus Lamandus commented Jun 20, 2024

Checklist

Required

Optional

Purpose of change

Niche filling .357 rifle, using glock magazines.

Describe the solution

  1. Fix Glock 31 magazines spawning with the wrong ammo.
  2. Fix: Add Banshee and Guard to Gunstore spawnlist.
  3. Add gun Moriarti AR .357sig
  4. Add to itemgroups
  5. Add to spawngroup
  6. Add to merge list

Describe alternatives you've considered

Testing

grafik

Additional context

@github-actions github-actions bot added JSON related to game datas in JSON format. mods PR changes related to mods. labels Jun 20, 2024
Copy link
Contributor

autofix-ci bot commented Jun 20, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@chaosvolt chaosvolt merged commit eeb33ca into cataclysmbnteam:main Jun 21, 2024
10 checks passed
@Lamandus Lamandus deleted the AR-.357-Sig branch September 4, 2024 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants