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.
Summary
None
Purpose of change
Continue work of #46814
Describe the solution
Remove the Glock 40 and replace it with a variant of the Glock 20. Genericize guns and magazines for the rest of the 10mm lot.
Describe alternatives you've considered
Some of the generic names could make be looked at (Colt Delta Elite, EAA Witness in particular could be different), but I think they're fine.
Testing
Spawn in all of the 10mm firearms, without this applied, load the same save with it applied.
![image](https://user-images.githubusercontent.com/42699974/124504476-6bd90500-dd7c-11eb-9f69-65f42878c408.png)
Additional context
I am not sure what I need to do, but the name in variants does not accept plural forms, so I needed to convert the 610 to use just 'str'.
@Qrox If you have any advice about the above, I would appreciate it.