Merge pull request #57562 from lbnesquik/master

Make it so you can craft, and hopefully disassemble bathroom scales.
CleverRaven · May 12, 2022 · 7a89bbe · 7a89bbe
2 parents f7f9c53 + 5a0296e
commit 7a89bbe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/data/json/items/tool/toiletries.json b/data/json/items/tool/toiletries.json
@@ -13,7 +13,7 @@
     "price_postapoc": 50,
     "to_hit": -2,
     "bashing": 6,
-    "material": [ "steel" ],
+    "material": [ "steel", "aluminum" ],
     "use_action": { "type": "weigh_self", "max_weight": "150 kg" },
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },

diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json
@@ -1319,5 +1319,18 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_pottery" } ],
     "components": [ [ [ "pot_canning_clay", 1 ] ], [ [ "clay_pot", 1 ] ], [ [ "fire_brick", 2 ] ], [ [ "clay_lump", 3 ] ] ]
+  },
+  {
+    "result": "bathroom_scale",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "30 m",
+    "reversible": true,
+    "autolearn": true,
+    "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 10 ] ], [ [ "clockworks", 2 ] ] ]
   }
 ]