Skip to content

Commit

Permalink
New guns, calibres, and conversion kits, fixed PR. (#64934)
Browse files Browse the repository at this point in the history 
* adds the files in the items/ammo folder.

* adds the files in the items/armour folder.

* adds the files in the items/book folder.

* adds the files in the items/container folder.

* adds the files in the items/generic folder.

* adds the files in the items/gun folder.

* adds the files in the items/gunmod folder.

* adds the files in the items/magazine folder.

* adds asorted files in the items folder.

* adds the conversions folder in the itemgroups/Weapons_Mods_Ammo folder.

* adds files in the itemgroups/Weapons_Mods_Ammo/arsenal folder.

* adds the files in the itemgroups/Weapons_Mods_Ammo folder.

* adds files in the itemgroups folder.

* adds files in the itemgroups/SUS folder.

* adds files in the uncraft/ammo folder.

* adds files in the requirements folder.

* adds files in the recipes folder.

* adds files in the json folder.

* adds files in the mods/Generic_Guns folder.

* last tweeks.

* fixes a typo in the disc for the AI .308 10-round magazine.

* general damage tweeks.

* fixes merge errors.

* fixes merge errors.

* starts fixing bugs.

* fixes bugs.

* hooks up the ammo with the new barrel length system. still needs to add the barrel lengths to the guns themselves.

* adds the barrel lengths to the .223 guns.

* Update data/json/items/ammo/338lapua.json

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>

* Update data/json/items/ammo/450bushmaster.json

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>

* Update data/json/items/ammo/50_beowulf.json

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>

* Update data/json/items/ammo/338lapua.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Adds a 20-inch conversion .223 kit for AR-15 rifles, representing those found on M16s. also adds in all the barrel-lengths for weapons in .300, .308, .30-06, and 12.3ln.

* Commits suggested changes.

* fixes the, "last," bug. I hope. please God.

* Does a broad stroke to get gun migrations underway. Hope this doesn’t break… everything
.

* fixes pointed out bugges.

* actualy fixes the shotgun bug.

* lints, lints, lints, and lints some more.

* Fixes the solitary erroneous file.

* fixes more bugs.

* retrigger checks

* tweeks and bug fixes, makes the long version of the ar15 upper findable on guns and usable in crafts/ weapon mods.

* Adds/ fixes gun entries in generic guns.

* adds the last gun to generic guns.

* look at that, more bug fixes.

* adds more values for .223 barrel lengths and removes ranged damage entries from the conversions. they were causing errors, and the new barrel length system should make them unneeded anyhow.

* Adds name plural forms for the conversion kits which need them.

* Gives the prepped patriot a leg bag for storage.

* adds no turret flags to all the guns which need it.

* fixes a tiny bug.

* the M231 wasn't lacking an ammo entry. No. I didn't forget that. this commit doesn't add that entry.

* retrigger checks

* retrigger checks

* Update data/json/items/magazine/762.json

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>

* Removes the redundant ranged damage entry.

* fixes blacklist errors and adds the post-2000 guns (i.e. all the guns) to the classic zombies blacklist.

---------

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com>
  • Loading branch information
@DoctorBoomstick @GuardianDll
@github-actions @TheShadowFerret @bombasticSlacks
5 people committed May 23, 2023
1 parent 3d1627d commit e565014
Show file tree
Hide file tree
Showing 107 changed files with 5,450 additions and 309 deletions.
2 changes: 1 addition & 1 deletion data/json/ascii_art/gun_ascii.json
View file
Expand Up @@ -1428,7 +1428,7 @@
},
{
"type": "ascii_art",
"id": "m4a1",
"id": "modular_m4a1",
"picture": [
" ",
" ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/effect_on_condition.json
View file
Expand Up @@ -124,7 +124,7 @@
"type": "effect_on_condition",
"id": "get_m4_carbine",
"global": true,
"effect": { "u_spawn_item": "m4_carbine" }
"effect": { "u_spawn_item": "modular_m4_carbine" }
},
{
"type": "effect_on_condition",
Expand Down
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/furniture-graves.json
View file
Expand Up @@ -109,7 +109,7 @@
"flags": [ "EASY_DECONSTRUCT", "TRANSPARENT", "MOUNTABLE" ],
"deconstruct": {
"items": [
{ "item": "m4_carbine", "count": 1, "charges": 0, "variant": "m4a1" },
{ "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" },
{ "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] },
{ "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] }
]
Expand All @@ -120,7 +120,7 @@
"sound": "thump.",
"sound_fail": "whack.",
"items": [
{ "item": "m4_carbine", "count": 1, "charges": 0, "variant": "m4a1" },
{ "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" },
{ "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] },
{ "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] }
]
Expand Down
36 changes: 35 additions & 1 deletion data/json/itemgroups/Clothing_Gear/clothing.json
View file
Expand Up @@ -1469,6 +1469,8 @@
[ "collarpin", 10 ],
[ "undershirt", 70 ],
[ "boxer_shorts", 50 ],
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
[ "briefs", 40 ],
[ "boxer_briefs", 45 ],
[ "swim_briefs", 10 ],
Expand All @@ -1479,6 +1481,8 @@
[ "bikini_bottom_short", 5 ],
[ "panties", 70 ],
[ "boy_shorts", 25 ],
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" },
[ "gown", 1 ],
[ "long_glove_white", 1 ],
[ "veil_wedding", 1 ],
Expand Down Expand Up @@ -1521,6 +1525,8 @@
[ "tophat", 10 ],
[ "bowhat", 10 ],
[ "cowboy_hat", 10 ],
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 2 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" },
[ "bullwhip", 1 ],
[ "10gal_hat", 3 ],
[ "glasses_monocle", 2 ],
Expand Down Expand Up @@ -1920,6 +1926,8 @@
[ "tophat", 50 ],
[ "bowhat", 50 ],
[ "cowboy_hat", 100 ],
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 5 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 150, "event": "independence_day" },
[ "10gal_hat", 10 ],
[ "kufi", 10 ],
[ "kippah", 30 ],
Expand Down Expand Up @@ -2085,6 +2093,8 @@
"items": [
[ "panties", 70 ],
[ "boy_shorts", 50 ],
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" },
[ "bikini_bottom", 5 ],
[ "bikini_bottom_short", 1 ],
{ "item": "bikini_bottom", "variant": "flag_bikini_bottom", "prob": 70, "event": "independence_day" }
Expand All @@ -2100,6 +2110,8 @@
"id": "male_underwear_bottom",
"items": [
[ "boxer_shorts", 70 ],
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
[ "briefs", 30 ],
[ "boxer_briefs", 50 ],
[ "long_underpants", 20 ],
Expand Down Expand Up @@ -2127,6 +2139,8 @@
{ "item": "tophat", "prob": 5 },
{ "item": "bowhat", "prob": 10 },
{ "item": "cowboy_hat", "prob": 10 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 1 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" },
{ "item": "boots_western", "prob": 8 },
{ "item": "glasses_monocle", "prob": 2 },
{ "item": "pants_leather", "prob": 60 },
Expand All @@ -2144,6 +2158,8 @@
{ "item": "bra", "prob": 30 },
{ "item": "undershirt", "prob": 30 },
{ "item": "boxer_shorts", "prob": 30 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 2 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
{ "item": "briefs", "prob": 15 },
{ "item": "boxer_briefs", "prob": 20 },
{ "item": "swim_briefs", "prob": 10 },
Expand All @@ -2154,6 +2170,8 @@
{ "item": "bikini_bottom_short", "prob": 5 },
{ "item": "panties", "prob": 30 },
{ "item": "boy_shorts", "prob": 25 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" },
{ "item": "sweatshirt", "prob": 75 },
{ "item": "sweater", "prob": 75 },
{ "item": "turtleneck", "prob": 25 },
Expand Down Expand Up @@ -3424,6 +3442,8 @@
[ "bra", 30 ],
[ "undershirt", 30 ],
[ "boxer_shorts", 30 ],
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 2 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
[ "briefs", 15 ],
[ "boxer_briefs", 20 ],
[ "swim_briefs", 10 ],
Expand All @@ -3434,6 +3454,8 @@
[ "bikini_bottom_short", 5 ],
[ "panties", 30 ],
[ "boy_shorts", 25 ],
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" },
[ "sweatshirt", 75 ],
[ "sweater", 75 ],
[ "turtleneck", 40 ],
Expand Down Expand Up @@ -3565,8 +3587,12 @@
"items": [
[ "bandana", 25 ],
[ "boxer_shorts", 25 ],
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
[ "boxer_briefs", 25 ],
[ "boy_shorts", 25 ],
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" },
[ "bra", 25 ],
[ "socks", 45 ],
[ "socks_ankle", 30 ],
Expand Down Expand Up @@ -3644,6 +3670,8 @@
{ "item": "fedora", "prob": 40 },
{ "item": "hat_newsboy", "prob": 5 },
{ "item": "cowboy_hat", "prob": 20 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 2 },
{ "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" },
{ "item": "straw_fedora", "prob": 5 },
{ "item": "hat_golf", "prob": 15 },
{ "item": "straw_hat", "prob": 15 },
Expand Down Expand Up @@ -3777,6 +3805,8 @@
{ "item": "bikini_bottom", "prob": 30 },
{ "item": "bikini_bottom_short", "prob": 10 },
{ "item": "boy_shorts", "prob": 30 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 },
{ "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 100, "event": "independence_day" },
{ "item": "bra", "prob": 60 },
{ "item": "panties", "prob": 70 },
{ "item": "bikini_top", "prob": 30 },
Expand All @@ -3803,6 +3833,8 @@
"items": [
{ "item": "boxer_briefs", "prob": 30 },
{ "item": "boxer_shorts", "prob": 50 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 },
{ "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
{ "item": "briefs", "prob": 50 },
{ "item": "trunks", "prob": 10 },
{ "item": "swim_briefs", "prob": 5 },
Expand Down Expand Up @@ -3941,8 +3973,10 @@
{ "item": "ammo_satchel", "prob": 10 },
{ "item": "ammo_pouch", "prob": 10 },
{ "item": "chestrig", "prob": 20 },
{ "item": "chestrig", "variant": "flag_chestrig", "prob": 2 },
{ "item": "dive_bag", "prob": 50 },
{ "item": "petpack", "prob": 50 }
{ "item": "petpack", "prob": 50 },
{ "item": "chestrig", "variant": "flag_chestrig", "prob": 70, "event": "independence_day" }
],
"prob": 30
},
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/SUS/gunstore.json
View file
Expand Up @@ -48,6 +48,7 @@
{ "group": "guns_common_display", "prob": 80 },
{ "group": "mags_common_gunstore", "prob": 80 },
{ "group": "gunmod_common", "prob": 15 },
{ "group": "conversion_kits", "prob": 15 },
{ "group": "book_gunmags", "prob": 60 },
{ "group": "SUS_gunstore_gear", "prob": 60 },
{ "group": "ammo_parts", "prob": 80 },
Expand Down Expand Up @@ -78,6 +79,7 @@
{ "group": "guns_common_display", "prob": 5, "damage": [ 0, 2 ] },
{ "group": "mags_common", "prob": 10, "damage": [ 0, 2 ] },
{ "group": "gunmod_common", "prob": 5, "damage": [ 0, 2 ] },
{ "group": "conversion_kits", "prob": 5, "damage": [ 0, 2 ] },
{ "group": "book_gunmags", "prob": 10, "damage": [ 0, 2 ] },
{ "group": "ammo_parts", "prob": 10, "damage": [ 0, 2 ] },
{ "group": "SUS_gunstore_gear", "prob": 10, "damage": [ 0, 2 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/SUS/lodge.json
View file
Expand Up @@ -21,7 +21,7 @@
"//": "items found in a rifle hunting space",
"subtype": "collection",
"entries": [
{ "item": "ar15", "prob": 150, "charges-min": 0, "charges-max": 30 },
{ "item": "modular_ar15", "prob": 150, "charges-min": 0, "charges-max": 30 },
{ "item": "marlin_9a", "prob": 20, "charges-min": 0, "charges-max": 19 },
{ "item": "remington700_270", "prob": 10, "charges-min": 0, "charges-max": 4 },
{ "item": "remington_700", "prob": 40, "charges-min": 0, "charges-max": 4 },
Expand Down
64 changes: 38 additions & 26 deletions data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
View file
Expand Up @@ -318,7 +318,13 @@
{ "item": "762_m87", "prob": 25 },
{ "item": "8mm_civilian", "prob": 15 },
{ "item": "300blk", "prob": 15 },
{ "item": "300blk_ss", "prob": 10 }
{ "item": "300blk_ss", "prob": 10 },
{ "item": "50beowulf_xtp", "prob": 15 },
{ "item": "50beowulf_penetrator", "prob": 10 },
{ "item": "450_ftx", "prob": 20 },
{ "item": "450_penetrator", "prob": 15 },
{ "item": "338lapua_hpbt", "prob": 15 },
{ "item": "338lapua_fmjbt", "prob": 5 }
]
},
{
Expand All @@ -342,7 +348,13 @@
{ "item": "300blk", "prob": 20 },
{ "item": "762_54R", "prob": 35 },
{ "item": "762_m43", "prob": 20 },
{ "item": "300blk_ss", "prob": 15 }
{ "item": "300blk_ss", "prob": 15 },
{ "item": "50beowulf_xtp", "prob": 15 },
{ "item": "50beowulf_penetrator", "prob": 10 },
{ "item": "450_ftx", "prob": 20 },
{ "item": "450_penetrator", "prob": 15 },
{ "item": "338lapua_hpbt", "prob": 15 },
{ "item": "338lapua_fmjbt", "prob": 15 }
]
},
{
Expand All @@ -361,7 +373,12 @@
{ "item": "300_winmag", "prob": 25 },
{ "item": "4570_sp", "prob": 25 },
{ "item": "4570_pen", "prob": 25 },
{ "item": "4570_low", "prob": 25 }
{ "item": "4570_low", "prob": 25 },
{ "item": "50beowulf_xtp", "prob": 15 },
{ "item": "50beowulf_penetrator", "prob": 10 },
{ "item": "450_ftx", "prob": 25 },
{ "item": "450_penetrator", "prob": 15 },
{ "item": "338lapua_hpbt", "prob": 15 }
]
},
{
Expand Down Expand Up @@ -391,7 +408,9 @@
{ "item": "8mm_inc", "prob": 20 },
{ "item": "8mm_jhp", "prob": 10 },
{ "item": "300blk", "prob": 15 },
{ "item": "300blk_ss", "prob": 10 }
{ "item": "300blk_ss", "prob": 10 },
{ "item": "338lapua_fmjbt", "prob": 15 },
{ "item": "338lapua_api", "prob": 15 }
]
},
{
Expand Down Expand Up @@ -433,10 +452,15 @@
{ "item": "reloaded_762_51_incendiary", "prob": 5 },
{ "item": "reloaded_762_54R", "prob": 40 },
{ "item": "reloaded_762_m43", "prob": 20 },
{ "item": "reloaded_300blk", "prob": 10 },
{ "item": "reloaded_50beowulf_xtp", "prob": 10 },
{ "item": "reloaded_50beowulf_penetrator", "prob": 5 },
{ "item": "reloaded_450_ftx", "prob": 10 },
{ "item": "reloaded_450_penetrator", "prob": 5 },
{ "item": "reloaded_338lapua_hpbt", "prob": 5 },
{ "item": "reloaded_303", "prob": 20 },
{ "item": "reloaded_303sp", "prob": 5 },
{ "item": "reloaded_303fmj", "prob": 5 },
{ "item": "reloaded_300blk", "prob": 10 }
{ "item": "reloaded_303fmj", "prob": 5 }
]
},
{
Expand Down Expand Up @@ -739,6 +763,9 @@
{ "item": "50_casing", "prob": 60 },
{ "item": "500_casing", "prob": 60 },
{ "item": "545_casing", "prob": 60 },
{ "item": "50beowulf_casing", "prob": 45 },
{ "item": "450_casing", "prob": 45 },
{ "item": "338lapua_casing", "prob": 45 },
{ "item": "57mm_casing", "prob": 60 },
{ "item": "700nx_casing", "prob": 40 },
{ "item": "762_casing", "prob": 80 },
Expand All @@ -754,18 +781,17 @@
},
{
"id": "ammo_casings_milspec",
"//": "Casings for setpieces implying military shootouts by CQB folks. Weirdness thrown in to account for trying to kill XEDRA/Extradimensionals. No vehicular only stuff.",
"//": "Casings for setpieces implying military shootouts",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "9mm_casing", "prob": 50, "count": [ 1, 8 ] },
{ "item": "46mm_casing", "prob": 10, "count": [ 1, 50 ] },
{ "item": "40x46mm_m118_casing", "prob": 5, "count": [ 1, 2 ] },
{ "item": "46mm_casing", "prob": 10, "count": [ 1, 8 ] },
{ "item": "223_casing", "prob": 300, "count": [ 1, 30 ] },
{ "group": "nested_casing_223", "prob": 75, "count": [ 1, 100 ] },
{ "item": "3006_casing", "prob": 50, "count": [ 1, 3 ] },
{ "item": "762_51_casing", "prob": 25, "count": [ 1, 30 ] },
{ "group": "nested_casing_308", "prob": 15, "count": [ 1, 50 ] },
{ "item": "50_casing", "prob": 5, "count": [ 1, 3 ] },
{ "item": "762_casing", "prob": 25, "count": [ 1, 30 ] },
{ "item": "50_casing", "prob": 25, "count": [ 1, 3 ] },
{ "item": "shot_hull", "prob": 50, "count": [ 1, 3 ] }
]
},
Expand Down Expand Up @@ -804,20 +830,6 @@
[ "30carbine_casing", 40 ]
]
},
{
"id": "nested_casing_223",
"type": "item_group",
"//": "SAW casing and linkage.",
"subtype": "collection",
"entries": [ { "item": "ammolink223" }, { "item": "223_casing" } ]
},
{
"id": "nested_casing_308",
"type": "item_group",
"//": "GPMG casings and linkage.",
"subtype": "collection",
"entries": [ { "item": "ammolink308" }, { "item": "762_51_casing" } ]
},
{
"id": "ammo_casings_bulk",
"type": "item_group",
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json
View file
Expand Up @@ -36,13 +36,13 @@
"id": "nested_m4_carbine_no_ammo",
"type": "item_group",
"subtype": "collection",
"items": [ { "item": "m4_carbine" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
"items": [ { "item": "modular_m4_carbine" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
},
{
"id": "nested_m27_assault_rifle_no_ammo",
"type": "item_group",
"subtype": "collection",
"items": [ { "item": "m27_assault_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
"items": [ { "item": "modular_m27_assault_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
},
{
"id": "stanag_mags",
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json
View file
Expand Up @@ -35,13 +35,13 @@
"type": "item_group",
"id": "ammo_can_300_full",
"container-item": "ammunition_can_30",
"items": [ { "group": "ammo_box_308", "count": 15 } ]
"items": [ { "group": "ammo_box_300", "count": 15 } ]
},
{
"type": "item_group",
"id": "ammo_can_300_part",
"container-item": "ammunition_can_30",
"items": [ { "group": "ammo_box_308", "count": [ 1, 5 ] } ]
"items": [ { "group": "ammo_box_300", "count": [ 1, 5 ] } ]
},
{
"type": "item_group",
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json
View file
Expand Up @@ -35,7 +35,7 @@
"id": "nested_m4blk_carbine_no_ammo",
"type": "item_group",
"subtype": "collection",
"items": [ { "item": "m16_auto_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
"items": [ { "item": "modular_m16_auto_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
},
{
"type": "item_group",
Expand Down

1 comment on commit e565014

@kevingranade
Copy link
Member

Choose a reason for hiding this comment

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

This commit has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/what-is-the-point-of-ammunition-changes-in-experimental/28824/4

Please sign in to comment.