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

Jump to bottom

only brass recipe ingame now uses proper protective equipment & the proper proficiency #64398

Merged
merged 4 commits into from
Mar 27, 2023
Merged

only brass recipe ingame now uses proper protective equipment & the proper proficiency #64398

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eaa025c
updated brass knuckles recipe
Daved27hundred Mar 19, 2023
5b21c70
ignore this
Daved27hundred Mar 25, 2023
0508f8d
i said ignore it
Daved27hundred Mar 25, 2023
28c0658
moved ppe to using
Daved27hundred Mar 25, 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
8 changes: 4 additions & 4 deletions data/json/recipes/weapon/bashing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,14 @@
"skills_required": [ "bashing", 1 ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_redsmithing" },
{ "proficiency": "prof_toolsmithing" }
],
"difficulty": 3,
"time": "1 h",
"autolearn": false,
"book_learn": [ [ "recipe_melee", 2 ] ],
"using": [ [ "blacksmithing_standard", 4 ] ],
"using": [ [ "blacksmithing_standard", 4 ], [ "ppe_gas", 1 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 100 ] ], [ [ "chem_zinc_powder", 500 ] ] ]
},
Expand All @@ -379,7 +379,7 @@
"type": "recipe",
"copy-from": "knuckle_brass",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"using": [ [ "blacksmithing_standard", 4 ], [ "ppe_gas", 1 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 150 ] ], [ [ "chem_zinc_powder", 600 ] ] ]
},
Expand All @@ -388,7 +388,7 @@
"type": "recipe",
"copy-from": "knuckle_brass",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"using": [ [ "blacksmithing_standard", 4 ], [ "ppe_gas", 1 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 80 ] ], [ [ "chem_zinc_powder", 400 ] ] ]
},
Expand Down