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

Mk47 #55867

Merged
merged 11 commits into from
Apr 22, 2022
Merged

Mk47 #55867

merged 11 commits into from
Apr 22, 2022

Conversation

RedMisao
Copy link
Contributor

@RedMisao RedMisao commented Mar 6, 2022

Summary

Content "Add Mk47 Mutant"

Purpose of change

Added a new 7.62x39mm gun, the Mk47 Mutant, including the spawn data
(at the end of the groups guns_rifle_common, guns_rifle_common_display, guns_survival from /data/json/itemgroups/Weapons_Mods_Ammo/guns.json and spider from /data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json)

Testing

Installed cdda version 2c922b0, downloaded the edited branch .zip, moved the branch's 762.json, guns.json and monster_drops_lairs.json files to the proper folders of the 2c922b0 version of the game, created a new world and then a random new character without errors
2nd pull request

@github-actions github-actions bot added Json astyled astyled PR, label is assigned by github actions labels Mar 6, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2022

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • The CMMG Mk47 Mutant is a burst-fire assault rifle, natively chambered for 7.62x39mm ammo. Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Mar 6, 2022
Copy link
Contributor

@TheShadowFerret TheShadowFerret left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As police in America don't use 7.62x39, there wouldn't be full auto versions available.

data/json/items/gun/762.json Show resolved Hide resolved
data/json/items/gun/762.json Outdated Show resolved Hide resolved
data/json/items/gun/762.json Outdated Show resolved Hide resolved
data/json/items/gun/762.json Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2022

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • The CMMG Mk47 Mutant is an American rifle, natively chambered for 7.62x39mm ammo. Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

RedMisao and others added 3 commits March 6, 2022 15:30
Added migration for Generic Guns mod
@github-actions github-actions bot added the Mods: Generic Guns Anything to do with Generic Guns label Mar 6, 2022
removed reload_noise_volume
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 6, 2022
@RedMisao RedMisao marked this pull request as ready for review March 6, 2022 20:30
@BrettDong BrettDong removed the Json label Mar 12, 2022
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves labels Mar 17, 2022
@stale
Copy link

stale bot commented Apr 17, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@stale stale bot added the stale Closed for lack of activity, but still valid. label Apr 17, 2022
@bombasticSlacks bombasticSlacks merged commit 2f27bd9 into CleverRaven:master Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Generic Guns Anything to do with Generic Guns stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants