Merge pull request #42816 from Fris0uman/toolbox

Disassemble legacy toolboxes
CleverRaven · Aug 9, 2020 · 40e4a09 · 40e4a09
2 parents 42816da + eac997e
commit 40e4a09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
@@ -67,7 +67,7 @@
       [ "SCREW_FINE", 1 ],
       [ "BUTCHER", 11 ]
     ],
-    "use_action": [ "HAMMER", "CROWBAR" ]
+    "use_action": [ "HAMMER", "CROWBAR", "DISASSEMBLE" ]
   },
   {
     "id": "combination_gun_shotgun_pipe",

diff --git a/data/json/recipes/recipe_deconstruction_package.json b/data/json/recipes/recipe_deconstruction_package.json
@@ -427,5 +427,21 @@
       [ [ "bag_plastic", 1 ] ]
     ],
     "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "//": "Until 0.F, allow disassembling legacy toolboxes",
+    "result": "toolbox",
+    "type": "uncraft",
+    "time": "30 s",
+    "components": [
+      [ [ "toolbox_empty", 1 ] ],
+      [ [ "pockknife", 1 ] ],
+      [ [ "screwdriver_set", 1 ] ],
+      [ [ "hacksaw", 1 ] ],
+      [ [ "wrench", 1 ] ],
+      [ [ "saw", 1 ] ],
+      [ [ "hammer", 1 ] ]
+    ],
+    "flags": [ "BLIND_EASY" ]
   }
 ]