Skip to content

Commit 9888942

Browse files
authored
Merge pull request #82005 from sparr/standard_drilling_alternative_no_steel
2 parents a293772 + e0439aa commit 9888942

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

data/json/requirements/toolsets.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,23 @@
287287
{
288288
"id": "drilling_standard",
289289
"type": "requirement",
290-
"//": "Drilling holes in various materials, including metal",
290+
"//": "Drilling holes in various materials, including steel",
291291
"tools": [ [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ], [ "drill_press_tool", 1 ], [ "hand_drill", -1 ] ] ]
292292
},
293+
{
294+
"id": "drilling_light",
295+
"type": "requirement",
296+
"//": "Drilling holes in various materials other than steel",
297+
"tools": [
298+
[
299+
[ "cordless_drill", 1 ],
300+
[ "corded_powerdrill", 1 ],
301+
[ "drill_press_tool", 1 ],
302+
[ "hand_drill", -1 ],
303+
[ "makeshift_hand_drill", -2 ]
304+
]
305+
]
306+
},
293307
{
294308
"id": "anesthetic",
295309
"type": "requirement",

data/json/vehicleparts/vehicle_parts.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@
10601060
"item": "plastic_boat_hull",
10611061
"location": "under",
10621062
"requirements": {
1063-
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "40 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 40 ] ] },
1063+
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "40 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_light", 40 ] ] },
10641064
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
10651065
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "soldering_standard", 15 ] ] }
10661066
},
@@ -1113,7 +1113,7 @@
11131113
"item": "carbonfiber_boat_hull",
11141114
"location": "under",
11151115
"requirements": {
1116-
"install": { "skills": [ [ "mechanics", 6 ] ], "time": "40 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 40 ] ] },
1116+
"install": { "skills": [ [ "mechanics", 6 ] ], "time": "40 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_light", 40 ] ] },
11171117
"removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
11181118
"repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "adhesive", 3 ] ] }
11191119
},
@@ -1138,7 +1138,7 @@
11381138
"unfolding_tools": [ "hand_pump" ],
11391139
"unfolding_time": "150 seconds",
11401140
"requirements": {
1141-
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 10 ] ] },
1141+
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_light", 10 ] ] },
11421142
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
11431143
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "adhesive", 2 ] ] }
11441144
},
@@ -1162,7 +1162,7 @@
11621162
"unfolding_tools": [ "hand_pump" ],
11631163
"unfolding_time": "150 seconds",
11641164
"requirements": {
1165-
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_standard", 10 ] ] },
1165+
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ], [ "drilling_light", 10 ] ] },
11661166
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
11671167
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "adhesive_rubber", 2 ], [ "tire_rubber", 2 ] ] }
11681168
},

0 commit comments

Comments
 (0)