diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
index bfd44570600cb..99d64db85b4fa 100644
--- a/data/json/itemgroups/Clothing_Gear/gear.json
+++ b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -10,7 +10,6 @@
       [ "ammo_satchel", 5 ],
       [ "bootstrap", 5 ],
       [ "chestpouch", 5 ],
-      [ "dragonskin", 5 ],
       [ "flashbang", 30 ],
       { "item": "goggles_ir", "prob": 10, "charges": [ 0, 100 ] },
       { "item": "goggles_nv", "prob": 10, "charges": [ 0, 100 ] },
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
index d3341482ef94a..0597c2bd227ac 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -596,6 +596,7 @@
       [ "motorbike_armor", 2 ],
       [ "motorbike_pants", 2 ],
       [ "motorbike_boots", 2 ],
+      [ "dragonskin", 2 ],
       [ "kittel", 1 ],
       [ "kippah", 3 ],
       [ "thawb", 2 ],
diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
index b63a372f3ad1a..f8854c5c2f8bb 100644
--- a/data/json/itemgroups/collections_domestic.json
+++ b/data/json/itemgroups/collections_domestic.json
@@ -1134,6 +1134,7 @@
       [ "petrified_eye", 5 ],
       [ "talking_doll", 40 ],
       [ "bondage_mask", 20 ],
+      [ "dragonskin", 2 ],
       [ "knife_hunting", 25 ],
       [ "throwing_knife", 25 ],
       [ "throwing_axe", 25 ],
diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json
index 0d8caf9a8ee19..1c9ccbc755ca8 100644
--- a/data/json/items/armor/ballistic_armor.json
+++ b/data/json/items/armor/ballistic_armor.json
@@ -927,43 +927,35 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "dragon skin vest" },
-    "description": "A state-of-the-art, lightweight, flexible, bullet resistant vest.  The ceramic disks used in its construction make it impossible to repair, only replace.",
-    "weight": "2860 g",
+    "//": "Based on a true story related to the real-world design",
+    "description": "This type of ballistic vest once promised to be the future of body armor, claiming to allow a greater range of movement than conventional ballistic vests as well as better protection.  Created by the now-defunct company Meridian Ballistics, it features a unique design consisting of overlapping ceramic disks, and was once famously demonstrated on TV absorbing high-energy rifle rounds at point blank.\n\nThe US Army quickly snapped up several hundred units of the armor, but testing soon revealed that they were extremely heavy, weighing almost fifty pounds, and that the design failed spectacularly in environmental tests.  After a series of investigations, claims of fraud, and court hearings, Meridian went bankrupt, and the Department of Justice subsequently dropped this design from its certifications.\n\nThere were no known users of these vests by the time that the world ended; this one was either an original production in the hands of a collector, or a similar design from a different company.  Whatever the case may be, you have one now, in all its unwieldy glory.",
+    "weight": "21545 g",
     "volume": "6 L",
-    "price": 190000,
-    "price_postapoc": 6000,
-    "to_hit": -3,
+    "price": "5000 USD",
+    "price_postapoc": "60 USD",
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "uneven" },
     "bashing": 6,
-    "material": [ "lightceramic", "kevlar_layered" ],
+    "material": [ "ceramic", "nylon" ],
     "symbol": "[",
     "looks_like": "kevlar",
-    "color": "light_red",
+    "color": "yellow",
     "warmth": 12,
-    "material_thickness": 3,
-    "//": "Ceramic disks inside block addition of steel plating modification",
     "flags": [ "STURDY", "OUTER", "NO_REPAIR" ],
-    "armor": [ { "encumbrance": 8, "coverage": 95, "covers": [ "torso" ] } ]
-  },
-  {
-    "id": "dragonskinempty",
-    "repairs_like": "survivor_suit",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "lamellar Kevlar vest" },
-    "description": "A lamellar Kevlar vest, there are intricately cut voids usually filled with stitched in ceramic disks, you could repair the stitching if needed",
-    "weight": "2060 g",
-    "volume": "4 L",
-    "price": 1900,
-    "price_postapoc": 2000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar_layered" ],
-    "symbol": "[",
-    "looks_like": "dragonskin",
-    "color": "light_red",
-    "warmth": 10,
-    "material_thickness": 2,
-    "flags": [ "STURDY", "OUTER" ],
-    "armor": [ { "encumbrance": 6, "coverage": 25, "covers": [ "torso" ] } ]
+    "use_action": [ { "type": "attach_molle", "size": 10 }, { "type": "detach_molle" } ],
+    "//2": "Ceramic disks in real-life dragon skin are 6.4mm thick; the actual fabric itself wasn't intended to provide high-grade protection, and so it's quite thin here.",
+    "//3": "The double instance of ceramic here represents possible hits on parts where the disks themselves are overlapping, providing enhanced protection.",
+    "armor": [
+      {
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "ceramic", "covered_by_mat": 90, "thickness": 6.4 },
+          { "type": "ceramic", "covered_by_mat": 30, "thickness": 6.4 }
+        ],
+        "encumbrance": 8,
+        "coverage": 100,
+        "cover_vitals": 90,
+        "covers": [ "torso" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index ce29d28bb3cd5..14f5d06e58dc0 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -326,22 +326,6 @@
     "volume": "250 ml",
     "to_hit": -4
   },
-  {
-    "type": "GENERIC",
-    "id": "ceramicdisks",
-    "category": "spare_parts",
-    "symbol": ",",
-    "color": "light_gray",
-    "name": { "str": "set of 100 ceramic disk", "str_pl": "ceramic disks" },
-    "description": "A set of small slightly elongated disks, made of high-grade ceramic.  They remind you of scales.",
-    "price": 0,
-    "price_postapoc": 25,
-    "material": [ "lightceramic" ],
-    "weight": "100 g",
-    "volume": "250 ml",
-    "bashing": 1,
-    "to_hit": -3
-  },
   {
     "type": "GENERIC",
     "id": "acidchitin_piece",
diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
index e9713353fc848..0d517ecceb584 100644
--- a/data/json/items/obsolete.json
+++ b/data/json/items/obsolete.json
@@ -1216,5 +1216,43 @@
     "material_thickness": 5,
     "environmental_protection": 1,
     "flags": [ "POCKETS", "STURDY", "OUTER" ]
+  },
+  {
+    "id": "dragonskinempty",
+    "repairs_like": "survivor_suit",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "lamellar Kevlar vest" },
+    "description": "A lamellar Kevlar vest, there are intricately cut voids usually filled with stitched in ceramic disks, you could repair the stitching if needed",
+    "weight": "2060 g",
+    "volume": "4 L",
+    "price": 1900,
+    "price_postapoc": 2000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar_layered" ],
+    "symbol": "[",
+    "looks_like": "dragonskin",
+    "color": "light_red",
+    "warmth": 10,
+    "material_thickness": 2,
+    "flags": [ "STURDY", "OUTER" ],
+    "armor": [ { "encumbrance": 6, "coverage": 25, "covers": [ "torso" ] } ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "ceramicdisks",
+    "category": "spare_parts",
+    "symbol": ",",
+    "color": "light_gray",
+    "name": { "str": "ceramic disk" },
+    "description": "A set of small slightly elongated disks, made of high-grade ceramic.  They remind you of scales.",
+    "price": 0,
+    "price_postapoc": 25,
+    "material": [ "ceramic" ],
+    "weight": "100 g",
+    "volume": "250 ml",
+    "bashing": 1,
+    "to_hit": -3
   }
 ]
diff --git a/data/json/materials.json b/data/json/materials.json
index 5b4de5595536e..25dacba30f35f 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -446,22 +446,6 @@
     "bash_dmg_verb": "cracked",
     "cut_dmg_verb": "cut"
   },
-  {
-    "type": "material",
-    "id": "lightceramic",
-    "name": "Dragon Scale",
-    "density": 4.5,
-    "bash_resist": 4,
-    "cut_resist": 8,
-    "bullet_resist": 6,
-    "acid_resist": 10,
-    "fire_resist": 10,
-    "elec_resist": 10,
-    "chip_resist": 20,
-    "dmg_adj": [ "chipped", "cracked", "split", "broken" ],
-    "bash_dmg_verb": "cracked",
-    "cut_dmg_verb": "cut"
-  },
   {
     "type": "material",
     "id": "chitin",
diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
index 5856168ba43f0..7169cf4d4432f 100644
--- a/data/json/recipes/armor/torso.json
+++ b/data/json/recipes/armor/torso.json
@@ -1012,20 +1012,6 @@
     "components": [ [ [ "ballistic_vest_esapi", 1 ] ], [ [ "iotv_groin_plate", 1 ] ] ],
     "flags": [ "BLIND_EASY" ]
   },
-  {
-    "result": "dragonskin",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 5,
-    "time": "8 h",
-    "reversible": true,
-    "decomp_learn": 4,
-    "autolearn": true,
-    "components": [ [ [ "dragonskinempty", 1 ] ], [ [ "ceramicdisks", 8 ] ] ]
-  },
   {
     "result": "peacoat",
     "type": "recipe",
diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
index 065c0e5925177..6e34a25c3a017 100644
--- a/data/json/recipes/recipe_obsolete.json
+++ b/data/json/recipes/recipe_obsolete.json
@@ -609,5 +609,10 @@
     "type": "recipe",
     "result": "armor_scavenger",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "dragonskin",
+    "obsolete": true
   }
 ]