diff --git a/data/stockpiles/adamantineweapons.dfstock b/data/stockpiles/adamantineweapons.dfstock
new file mode 100644
index 000000000..6236196f0
Binary files /dev/null and b/data/stockpiles/adamantineweapons.dfstock differ
diff --git a/data/stockpiles/artifactweapons.dfstock b/data/stockpiles/artifactweapons.dfstock
index ba91931e0..0299f41d2 100644
Binary files a/data/stockpiles/artifactweapons.dfstock and b/data/stockpiles/artifactweapons.dfstock differ
diff --git a/data/stockpiles/bronzeweapons.dfstock b/data/stockpiles/bronzeweapons.dfstock
index 1295304e8..54cd87d11 100644
Binary files a/data/stockpiles/bronzeweapons.dfstock and b/data/stockpiles/bronzeweapons.dfstock differ
diff --git a/data/stockpiles/copperweapons.dfstock b/data/stockpiles/copperweapons.dfstock
index d3a2aac2f..a30c53107 100644
Binary files a/data/stockpiles/copperweapons.dfstock and b/data/stockpiles/copperweapons.dfstock differ
diff --git a/data/stockpiles/ironweapons.dfstock b/data/stockpiles/ironweapons.dfstock
index 2128596fe..8c0afecd1 100644
Binary files a/data/stockpiles/ironweapons.dfstock and b/data/stockpiles/ironweapons.dfstock differ
diff --git a/data/stockpiles/masterworkweapons.dfstock b/data/stockpiles/masterworkweapons.dfstock
index 29d2ec1b8..61bbfd17b 100644
Binary files a/data/stockpiles/masterworkweapons.dfstock and b/data/stockpiles/masterworkweapons.dfstock differ
diff --git a/data/stockpiles/metalweapons.dfstock b/data/stockpiles/metalweapons.dfstock
index d89f668e1..b9cd66511 100644
Binary files a/data/stockpiles/metalweapons.dfstock and b/data/stockpiles/metalweapons.dfstock differ
diff --git a/data/stockpiles/platinumweapons.dfstock b/data/stockpiles/platinumweapons.dfstock
new file mode 100644
index 000000000..162865512
Binary files /dev/null and b/data/stockpiles/platinumweapons.dfstock differ
diff --git a/data/stockpiles/silverweapons.dfstock b/data/stockpiles/silverweapons.dfstock
new file mode 100644
index 000000000..de517d0ab
Binary files /dev/null and b/data/stockpiles/silverweapons.dfstock differ
diff --git a/data/stockpiles/steelweapons.dfstock b/data/stockpiles/steelweapons.dfstock
index 4b742ca4b..fc5233925 100644
Binary files a/data/stockpiles/steelweapons.dfstock and b/data/stockpiles/steelweapons.dfstock differ
diff --git a/data/stockpiles/stoneweapons.dfstock b/data/stockpiles/stoneweapons.dfstock
index 8a6ee77aa..acba2374c 100644
Binary files a/data/stockpiles/stoneweapons.dfstock and b/data/stockpiles/stoneweapons.dfstock differ
diff --git a/data/stockpiles/trapcomponents.dfstock b/data/stockpiles/trapcomponents.dfstock
index 9f7c4194b..475b530d4 100644
Binary files a/data/stockpiles/trapcomponents.dfstock and b/data/stockpiles/trapcomponents.dfstock differ
diff --git a/data/stockpiles/unusableweapons.dfstock b/data/stockpiles/unusableweapons.dfstock
new file mode 100644
index 000000000..6af8d1b5a
Binary files /dev/null and b/data/stockpiles/unusableweapons.dfstock differ
diff --git a/data/stockpiles/usableweapons.dfstock b/data/stockpiles/usableweapons.dfstock
new file mode 100644
index 000000000..248610ae9
Binary files /dev/null and b/data/stockpiles/usableweapons.dfstock differ
diff --git a/data/stockpiles/woodentools.dfstock b/data/stockpiles/woodentools.dfstock
deleted file mode 100644
index de3acb794..000000000
Binary files a/data/stockpiles/woodentools.dfstock and /dev/null differ