Skip to content

Remove more guns #83780

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+286 −893
Open

Remove more guns #83780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c36769c
Remove guns
Holli-Git Nov 15, 2025
301e506
Update gunstore_guns.json
Holli-Git Nov 15, 2025
a9990b9
lint
Holli-Git Nov 15, 2025
8dfce74
Remember to hit ctrl s sometime
Holli-Git Nov 15, 2025
c0ffb4c
fix
Holli-Git Nov 15, 2025
26d5b0d
fix gg
Holli-Git Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,7 +1828,7 @@
{ "item": "mossberg_590", "prob": 23 },
{ "item": "mossberg_930", "prob": 8 },
{ "item": "m1014", "prob": 2 },
{ "item": "remington_870_breacher", "prob": 2 }
{ "item": "mossberg_590_shockwave", "prob": 2 }
]
},
{
Expand Down
12 changes: 0 additions & 12 deletions data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,18 +185,6 @@
"subtype": "collection",
"entries": [ { "item": "axmc", "contents-item": "retool_axmc_308win" } ]
},
{
"id": "cz600",
"type": "item_group",
"subtype": "collection",
"entries": [ { "item": "cz600", "contents-item": "retool_cz600_223rem" } ]
},
{
"id": "cz600_762",
"type": "item_group",
"subtype": "collection",
"entries": [ { "item": "cz600", "contents-item": "retool_cz600_762" } ]
},
{
"id": "modular_deagle_357",
"type": "item_group",
Expand Down
39 changes: 1 addition & 38 deletions data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,23 +232,6 @@
"on_overflow": "spill",
"entries": [ { "item": "retool_axmc_308win" }, { "item": "ai_308mag_10", "charges": 0 }, { "group": "nested_retool_extras" } ]
},
{
"type": "item_group",
"id": "boxed_223rem_cz600kit",
"//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.",
"subtype": "collection",
"container-item": "box_retool",
"on_overflow": "spill",
"entries": [ { "item": "retool_cz600_223rem" }, { "item": "stanag10", "charges": 0 }, { "group": "nested_retool_extras" } ]
},
{
"type": "item_group",
"id": "boxed_762_cz600kit",
"//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.",
"subtype": "collection",
"container-item": "box_retool",
"entries": [ { "item": "retool_cz600_762" }, { "item": "bren2_762mag10", "charges": 0 }, { "group": "nested_retool_extras" } ]
},
{
"type": "item_group",
"id": "boxed_50ae_deaglekit",
Expand Down Expand Up @@ -362,18 +345,6 @@
}
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "boxed_cz600kits",
"//": "An item group for a specific weapon platform's possible conversion kits .",
"entries": [
{
"distribution": [ { "group": "boxed_223rem_cz600kit", "prob": 30 }, { "group": "boxed_762_cz600kit", "prob": 25 } ],
"prob": 100
}
]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -411,13 +382,6 @@
"//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
"entries": [ { "group": "boxed_axmckits" }, { "group": "axmc" } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "nested_cz600_with_kits",
"//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
"entries": [ { "group": "boxed_cz600kits" }, { "group": "cz600" } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand All @@ -435,8 +399,7 @@
"distribution": [
{ "group": "boxed_ar15kits", "prob": 30 },
{ "group": "boxed_mdrxkits", "prob": 15 },
{ "group": "boxed_axmckits", "prob": 5 },
{ "group": "boxed_cz600kits", "prob": 15 }
{ "group": "boxed_axmckits", "prob": 5 }
],
"prob": 100
}
Expand Down
14 changes: 0 additions & 14 deletions data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,5 @@
"prob": 100
}
]
},
{
"id": "nested_converted_cz600",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"//2": "An item group for a random, personally-converted weapon to spawn.",
"subtype": "collection",
"ammo": 100,
"entries": [
{ "group": "cz600_762", "charges": [ 0, 10 ] },
{ "item": "bren2_762mag10" },
{ "item": "bren2_762mag10", "prob": 50 },
{ "group": "on_hand_308" }
]
}
]
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
"//2": "Making the assumption any loaded gun will have additional ammo and mags with it.",
"items": [
{ "group": "nested_remington_870_express", "prob": 50 },
{ "group": "nested_remington_870_breacher", "prob": 20 },
{ "group": "nested_mossberg_590_shockwave", "prob": 20 },
{ "group": "nested_mossberg_590", "prob": 50 },
{ "group": "nested_m1014", "prob": 100 }
]
Expand Down
25 changes: 4 additions & 21 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
{ "group": "nested_rough_rider_pistol", "prob": 61 },
{ "group": "nested_rough_rider_pistol_9", "prob": 14 },
{ "group": "nested_sig_mosquito", "prob": 65 },
{ "group": "nested_cp33", "prob": 16 },
{ "group": "nested_ruger_mk4", "prob": 113 },
{ "group": "nested_1911_22", "prob": 100 },
{ "group": "nested_sw617", "prob": 46 },
Expand Down Expand Up @@ -121,10 +120,8 @@
{ "group": "nested_p220_10", "prob": 35 },
{ "group": "nested_xd_10", "prob": 85 },
{ "group": "nested_witness_10", "prob": 10 },
{ "group": "nested_TDI_10", "prob": 183 },
{ "group": "nested_glock_20", "prob": 121 },
{ "group": "nested_glock_29", "prob": 62 },
{ "group": "nested_sw_610", "prob": 34 }
{ "group": "nested_glock_29", "prob": 62 }
]
},
{
Expand All @@ -140,11 +137,7 @@
{
"type": "item_group",
"id": "guns_pistol_common_57",
"items": [
{ "group": "nested_ruger_57", "prob": 100 },
{ "group": "nested_fn57", "prob": 13 },
{ "group": "nested_p50", "prob": 12 }
]
"items": [ { "group": "nested_ruger_57", "prob": 100 }, { "group": "nested_fn57", "prob": 13 } ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -224,7 +217,6 @@
{ "item": "ruger_lcr_22", "prob": 2, "charges": [ 0, -1 ] },
{ "item": "ruger_mk4", "prob": 16, "charges": [ 0, -1 ] },
{ "item": "1911_22", "prob": 20, "charges": [ 0, -1 ] },
{ "item": "cp33", "prob": 3, "charges": [ 0, -1 ] },
{ "item": "glock_44", "prob": 13, "charges": [ 0, -1 ] },
{ "item": "sw617", "prob": 8, "charges": [ 0, -1 ] }
]
Expand Down Expand Up @@ -296,8 +288,6 @@
"type": "item_group",
"id": "guns_pistol_common_everyday_carry_10mm",
"items": [
{ "item": "sw_610", "prob": 3, "charges": [ 0, -1 ] },
{ "item": "sw_610", "prob": 5, "charges": [ 0, -1 ] },
{ "item": "glock_40", "prob": 5, "charges": [ 0, -1 ] },
{ "item": "m1911_10", "prob": 3, "charges": [ 0, -1 ] },
{ "item": "p220_10", "prob": 4, "charges": [ 0, -1 ] },
Expand Down Expand Up @@ -370,7 +360,6 @@
{ "item": "rough_rider_pistol", "prob": 61 },
{ "item": "rough_rider_pistol_9", "prob": 14 },
{ "item": "sig_mosquito", "prob": 65 },
{ "item": "cp33", "prob": 16 },
{ "item": "ruger_mk4", "prob": 113 },
{ "item": "1911_22", "prob": 100 },
{ "item": "sw617", "prob": 46 },
Expand Down Expand Up @@ -462,16 +451,14 @@
{ "item": "p220_10", "prob": 35 },
{ "item": "xd_10", "prob": 85 },
{ "item": "witness_10", "prob": 10 },
{ "item": "TDI_10", "prob": 183 },
{ "item": "glock_20", "prob": 121 },
{ "item": "glock_29", "prob": 62 },
{ "item": "sw_610", "prob": 34 }
{ "item": "glock_29", "prob": 62 }
]
},
{
"type": "item_group",
"id": "guns_pistol_common_display_57",
"items": [ { "item": "ruger_57", "prob": 100 }, { "item": "fn57", "prob": 13 }, { "item": "p50", "prob": 12 } ]
"items": [ { "item": "ruger_57", "prob": 100 }, { "item": "fn57", "prob": 13 } ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -556,7 +543,6 @@
{ "group": "nested_bren2_556", "prob": 4 },
{ "group": "nested_rdb_223", "prob": 44 },
{ "group": "nested_mdrx_retool_223rem_civilian", "prob": 9 },
{ "group": "nested_cz600", "prob": 13 },
{ "group": "nested_sl8", "prob": 3 },
{ "group": "nested_sig_assault_rifle", "prob": 1 },
{ "group": "nested_scar_16s", "prob": 14 },
Expand Down Expand Up @@ -591,7 +577,6 @@
"items": [
{ "group": "nested_sks", "prob": 34 },
{ "group": "nested_aksemi", "prob": 100 },
{ "group": "nested_bren2_762", "prob": 1 },
{ "group": "nested_mk47", "prob": 26 },
{ "group": "nested_ar15_retool_762", "prob": 5 }
]
Expand Down Expand Up @@ -744,7 +729,6 @@
{ "item": "rdb_223", "prob": 44 },
{ "group": "mdrx_223", "prob": 4 },
{ "group": "mdrx", "prob": 5 },
{ "group": "cz600", "prob": 13 },
{ "item": "sl8", "prob": 3 },
{ "item": "sig_assault_rifle", "prob": 1 },
{ "item": "scar_16s", "prob": 14 },
Expand Down Expand Up @@ -780,7 +764,6 @@
{ "item": "sks", "prob": 34 },
{ "item": "aksemi", "prob": 100 },
{ "item": "mk47", "prob": 26 },
{ "item": "bren2_762", "prob": 1 },
{ "group": "ar15_762", "prob": 5 }
]
},
Expand Down
47 changes: 3 additions & 44 deletions data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@
{ "group": "boxed_ruger_lcr_22", "prob": 2 },
{ "group": "boxed_22_revolver", "prob": 75 },
{ "group": "boxed_sig_mosquito", "prob": 65 },
{ "group": "boxed_cp33", "prob": 16 },
{ "group": "boxed_ruger_mk4", "prob": 113 },
{ "group": "boxed_1911_22", "prob": 100 },
{ "group": "boxed_sw617", "prob": 46 },
Expand Down Expand Up @@ -325,13 +324,6 @@
"container-item": "box_pistol",
"items": [ { "item": "glock_44" }, { "group": "firearm_box_extras" }, { "item": "glock44_mag", "count": [ 1, 2 ] } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "boxed_cp33",
"container-item": "box_pistol",
"items": [ { "item": "cp33" }, { "group": "firearm_box_extras" }, { "item": "cp33_mag", "count": [ 1, 2 ] } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -656,8 +648,7 @@
{ "group": "boxed_m1911_10", "prob": 30 },
{ "group": "boxed_p220_10", "prob": 35 },
{ "group": "boxed_xd_10", "prob": 85 },
{ "group": "boxed_witness_10", "prob": 10 },
{ "group": "boxed_sw_610", "prob": 34 }
{ "group": "boxed_witness_10", "prob": 10 }
]
},
{
Expand All @@ -669,12 +660,7 @@
{ "item": "glock_20mag_10", "count": [ 1, 2 ] },
{ "group": "firearm_box_extras" },
{
"distribution": [
{ "item": "glock_40", "prob": 100 },
{ "item": "TDI_10", "prob": 183 },
{ "item": "glock_20", "prob": 121 },
{ "item": "glock_29", "prob": 62 }
]
"distribution": [ { "item": "glock_40", "prob": 100 }, { "item": "glock_20", "prob": 121 }, { "item": "glock_29", "prob": 62 } ]
}
]
},
Expand Down Expand Up @@ -706,13 +692,6 @@
"container-item": "box_pistol",
"items": [ { "item": "witness_10" }, { "group": "firearm_box_extras" }, { "item": "witness_mag_10", "count": [ 1, 2 ] } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "boxed_sw_610",
"container-item": "box_pistol",
"items": [ { "item": "sw_610" }, { "group": "firearm_box_extras" }, { "item": "40_speedloader6", "prob": 5 } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand All @@ -738,11 +717,7 @@
{
"type": "item_group",
"id": "guns_pistol_common_boxed_57",
"items": [
{ "group": "boxed_ruger_57", "prob": 100 },
{ "group": "boxed_fn57", "prob": 13 },
{ "group": "boxed_p50", "prob": 12 }
]
"items": [ { "group": "boxed_ruger_57", "prob": 100 }, { "group": "boxed_fn57", "prob": 13 } ]
},
{
"type": "item_group",
Expand All @@ -758,13 +733,6 @@
"container-item": "box_pistol",
"items": [ { "item": "fn57" }, { "group": "firearm_box_extras" }, { "item": "fn57mag_10rd", "count": [ 1, 2 ] } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "boxed_p50",
"container-item": "box_pistol",
"items": [ { "item": "p50" }, { "group": "firearm_box_extras" }, { "item": "fnp90mag_10rd" } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -972,7 +940,6 @@
{ "item": "rdb_223", "prob": 44 },
{ "group": "mdrx", "prob": 5 },
{ "group": "mdrx_223", "prob": 4 },
{ "group": "cz600", "prob": 4 },
{ "item": "sig_assault_rifle", "prob": 1 },
{ "item": "scar_16s", "prob": 14 },
{ "item": "iwi_tavor_x95_300blk", "prob": 27 },
Expand Down Expand Up @@ -1100,7 +1067,6 @@
"items": [
{ "group": "boxed_sks", "prob": 34 },
{ "group": "boxed_akmag", "prob": 126 },
{ "group": "boxed_bren2_762", "prob": 1 },
{ "group": "boxed_ar15_762", "prob": 5 }
]
},
Expand All @@ -1122,13 +1088,6 @@
{ "distribution": [ { "item": "aksemi", "prob": 100 }, { "item": "mk47", "prob": 26 } ] }
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "boxed_bren2_762",
"container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" },
"items": [ { "item": "bren2_762" }, { "group": "firearm_box_extras" }, { "item": "bren2_762mag10", "count": [ 1, 2 ] } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down
14 changes: 0 additions & 14 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,6 @@
{ "item": "ruger1022mag_110", "prob": 20 }
]
},
{
"type": "item_group",
"subtype": "distribution",
"id": "magazines_22_cp33",
"//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
"items": [ { "item": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ]
},
{
"type": "item_group",
"subtype": "distribution",
Expand Down Expand Up @@ -441,13 +434,6 @@
{ "item": "akdrum75", "prob": 50 }
]
},
{
"type": "item_group",
"subtype": "distribution",
"id": "magazines_bren2762",
"//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
"items": [ { "item": "bren2_762mag30", "prob": 500 }, { "item": "bren2_762mag10", "prob": 400 } ]
},
{
"type": "item_group",
"subtype": "distribution",
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
{ "item": "500_speedloader5", "prob": 4 },
{ "item": "38_speedloader6", "prob": 60 },
{ "item": "38_speedloader", "prob": 20 },
{ "item": "40_speedloader6", "prob": 5 },
{ "item": "44_speedloader6", "prob": 35 },
{ "item": "454_speedloader5", "prob": 5 }
]
Expand Down
Loading
Loading