untool the wool

CleverRaven · Aug 15, 2024 · 84f52b4 · 84f52b4
1 parent f77e07e
commit 84f52b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
@@ -160,6 +160,21 @@
     "symbol": "=",
     "color": "dark_gray"
   },
+  {
+    "id": "wool_staple",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "wool staple" },
+    "description": "A natural cluster of wool fibers.  Could be processed into felt patches or yarn.",
+    "weight": "200 g",
+    "volume": "500 ml",
+    "price": "0 cent",
+    "price_postapoc": "10 cent",
+    "material": [ "wool" ],
+    "symbol": ",",
+    "color": "white",
+    "flags": [ "NO_SALVAGE" ]
+  },
   {
     "type": "GENERIC",
     "id": "fur",

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -1514,21 +1514,6 @@
     "qualities": [ [ "SMOOTH", 1 ] ],
     "melee_damage": { "bash": 12 }
   },
-  {
-    "id": "wool_staple",
-    "type": "TOOL",
-    "category": "spare_parts",
-    "name": { "str": "wool staple" },
-    "description": "A natural cluster of wool fibers.  Could be processed into felt patches or yarn.",
-    "weight": "200 g",
-    "volume": "500 ml",
-    "price": "0 cent",
-    "price_postapoc": "10 cent",
-    "material": [ "wool" ],
-    "symbol": ",",
-    "color": "white",
-    "flags": [ "NO_SALVAGE" ]
-  },
   {
     "id": "xacto",
     "type": "TOOL",