Skip to content

Conversation

@GuardianDll
Copy link
Member

Summary

None

Purpose of change

Was surprised military used 5 round shotgun m1014; cursory search pointed they do not, their m1014 is 7+1, when our, despite the name, is actually civilian m4 version

Describe the solution

Add M4 as a separate item, integrate

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map Code: Tests Measurement, self-control, statistics, balancing. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Generic Guns Anything to do with Generic Guns Items: Armor / Clothing Armor and clothing astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 4, 2026
@github-actions github-actions bot added [Python] Code made in Python Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Jan 4, 2026
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @jbytheway

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 5, 2026
@Maleclypse Maleclypse merged commit 1408bd8 into master Jan 7, 2026
30 of 49 checks passed
@Maleclypse Maleclypse deleted the benelli_m4 branch January 7, 2026 06:26
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 Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing [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 [Python] Code made in Python Spawn Creatures, items, vehicles, locations appearing on map

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants