Moved makeshift Kevlar vest from makeshift items mod to base game.

CleverRaven · Jan 23, 2020 · f95abdf · f95abdf
1 parent 1fb22bc
commit f95abdf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -4524,6 +4524,15 @@
     "material_thickness": 4,
     "flags": [ "STURDY", "SKINTIGHT" ]
   },
+  {
+    "id": "makeshift_kevlar",
+    "copy-from": "kevlar",
+    "type": "ARMOR",
+    "name": "makeshift Kevlar vest",
+    "description": "A vest sewn together from Kevlar plates, less durable and protective than a proper Kevlar vest.  Suitable for wearing under clothing.",
+    "relative": { "material_thickness": -1 },
+    "delete": { "flags": [ "STURDY" ] }
+  },
   {
     "id": "kilt",
     "type": "ARMOR",

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -1194,6 +1194,20 @@
     "using": [ [ "sewing_standard", 15 ] ],
     "components": [ [ [ "lycra_patch", 10 ] ] ]
   },
+  {
+    "result": "makeshift_kevlar",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "difficulty": 4,
+    "time": "30 m",
+    "reversible": true,
+    "decomp_learn": 4,
+    "autolearn": true,
+    "using": [ [ "sewing_standard", 30 ] ],
+    "components": [ [ [ "kevlar_plate", 24 ] ] ]
+  },
   {
     "result": "xlkevlar",
     "type": "recipe",

diff --git a/data/mods/makeshift/item.json b/data/mods/makeshift/item.json
@@ -1,13 +1,4 @@
 [
-  {
-    "id": "makeshift_kevlar",
-    "copy-from": "kevlar",
-    "type": "ARMOR",
-    "name": "makeshift kevlar vest",
-    "description": "A vest sewn together from Kevlar plates, less durable and protective than a proper Kevlar vest.  Suitable for wearing under clothing.",
-    "relative": { "material_thickness": -1 },
-    "delete": { "flags": [ "STURDY" ] }
-  },
   {
     "id": "makeshift_pistol_bayonet",
     "copy-from": "pistol_bayonet",

diff --git a/data/mods/makeshift/recipe.json b/data/mods/makeshift/recipe.json
@@ -1,18 +1,4 @@
 [
-  {
-    "result": "makeshift_kevlar",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 4,
-    "time": 30000,
-    "reversible": true,
-    "decomp_learn": 4,
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 30 ] ],
-    "components": [ [ [ "kevlar_plate", 24 ] ] ]
-  },
   {
     "result": "makeshift_pistol_bayonet",
     "type": "recipe",