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.

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

M249/M240 semi triggers give select fire #65883

Merged
merged 5 commits into from
Jun 7, 2023
Merged

M249/M240 semi triggers give select fire #65883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8e7c58
M249/M240 semi triggers give select fire
anoobindisguise May 27, 2023
1d6f58f
add gunsmith prof req to triggers
anoobindisguise May 27, 2023
8acf3a1
change names
anoobindisguise May 31, 2023
49015c8
Merge branch 'CleverRaven:master' into patch-20
anoobindisguise May 31, 2023
47009e5
fix a whoops
anoobindisguise Jun 2, 2023
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
12 changes: 6 additions & 6 deletions data/json/items/gunmod/mechanism.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
{
"id": "m249semi",
"type": "GUNMOD",
"name": { "str": "M249 semi-auto trigger" },
"description": "A trigger modification that allows the M249 to fire in semi-automatic mode.",
"name": { "str": "M249 select fire trigger" },
"description": "A trigger modification that allows the M249 to switch between semi and full automatic modes.",
"weight": "60 g",
"volume": "250 ml",
"integral_volume": "0 ml",
Expand All @@ -200,15 +200,15 @@
"consume_chance": 50,
"consume_divisor": 110,
"//durability_modifier": -3,
"mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ],
"mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "burst", 4 ] ],
"min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ],
"flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ]
},
{
"id": "m240semi",
"type": "GUNMOD",
"name": { "str": "M240 semi-auto trigger" },
"description": "A trigger modification that allows the M240 to fire in semi-automatic mode.",
"name": { "str": "M240 select fire trigger" },
"description": "A trigger modification that allows the M240 to switch between semi and full automatic modes.",
"weight": "60 g",
"volume": "250 ml",
"integral_volume": "0 ml",
Expand All @@ -224,7 +224,7 @@
"consume_chance": 50,
"consume_divisor": 110,
"//durability_modifier": -3,
"mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ],
"mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "burst", 4 ] ],
"min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ],
"flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ]
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/weapon/mods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@
"subcategory": "CSC_WEAPON_MODS",
"skill_used": "mechanics",
"skills_required": [ [ "rifle", 4 ] ],
"proficiencies": [ { "proficiency": "prof_welding_basic" } ],
"proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_gunsmithing_basic" } ],
"difficulty": 4,
"time": "5 h",
"book_learn": [ [ "manual_rifle", 6 ] ],
Expand All @@ -1248,7 +1248,7 @@
"subcategory": "CSC_WEAPON_MODS",
"skill_used": "mechanics",
"skills_required": [ [ "rifle", 4 ] ],
"proficiencies": [ { "proficiency": "prof_welding_basic" } ],
"proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_gunsmithing_basic" } ],
"difficulty": 4,
"time": "5 h",
"book_learn": [ [ "manual_rifle", 6 ] ],
Expand Down