Merge branch 'master' of git@gitorious.org:tmwdata/mainline

9 files changed, 74 insertions, 5 deletions

diff --git a/graphics/items/generic-bone.png b/graphics/items/generic-bone.png
new file mode 100644
index 00000000..e9fc883b
--- /dev/null
+++ b/graphics/items/generic-bone.png
diff --git a/graphics/items/generic-ear-zombie.png b/graphics/items/generic-ear-zombie.png
new file mode 100644
index 00000000..05a1625c
--- /dev/null
+++ b/graphics/items/generic-ear-zombie.png
diff --git a/graphics/items/generic-eyeball.png b/graphics/items/generic-eyeball.png
new file mode 100644
index 00000000..3b4f46f0
--- /dev/null
+++ b/graphics/items/generic-eyeball.png
diff --git a/graphics/items/generic-heart-diseased.png b/graphics/items/generic-heart-diseased.png
new file mode 100644
index 00000000..43d4d6ed
--- /dev/null
+++ b/graphics/items/generic-heart-diseased.png
diff --git a/graphics/items/generic-rags-rotten.png b/graphics/items/generic-rags-rotten.png
new file mode 100644
index 00000000..a91ad5c1
--- /dev/null
+++ b/graphics/items/generic-rags-rotten.png
diff --git a/graphics/items/generic-skull.png b/graphics/items/generic-skull.png
new file mode 100644
index 00000000..514f744a
--- /dev/null
+++ b/graphics/items/generic-skull.png
diff --git a/graphics/items/generic-spice.png b/graphics/items/generic-spice.png
new file mode 100644
index 00000000..28fccc65
--- /dev/null
+++ b/graphics/items/generic-spice.png
diff --git a/graphics/tiles/Woodland_ground.png b/graphics/tiles/Woodland_ground.png
index 49bf3937..e3febbed 100644
--- a/graphics/tiles/Woodland_ground.png
+++ b/graphics/tiles/Woodland_ground.png
diff --git a/items.xml b/items.xml
index cd33edc7..522a50bc 100644
--- a/items.xml
+++ b/items.xml
@@ -2583,10 +2583,79 @@
         <sprite gender="male">leg-miniskirt-male.xml|#a4b2b2,ffffff</sprite>
         <sprite gender="female">leg-miniskirt-female.xml|#a4b2b2,ffffff</sprite>
     </item>
-
-    <!-- PLACEHOLDER for Item 772: Silk Thread to be committed by Fate -->
-
-    <item id="773" 
+    <item id="772"
+        image="generic-spice.png|R:#FFFF00"
+        name="Wisp Powder"
+        description="Powder from a wisp."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="30"/>
+    <item id="773"
+        image="generic-spice.png|R:#FF00FF"
+        name="Spectre Powder"
+        description="Powder from a spectre."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="30"/>
+    <item id="774"
+        image="generic-spice.png|R:#00FFFF"
+        name="Poltergeist Powder"
+        description="Powder from a poltergeist."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="30"/>
+    <item id="775"
+        image="generic-bone.png"
+        name="Bone"
+        description="A bone."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="5"/>
+    <item id="776"
+        image="generic-skull.png"
+        name="Skull"
+        description="A skull."
+        effect=""
+        type="generic"
+        weight="20"
+        max-per-slot="2"/>
+    <item id="777"
+        image="generic-rags-rotten.png"
+        name="Rotten rags"
+        description="Rotten rags from an undead creature."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="40"/>
+    <item id="778"
+        image="generic-heart-diseased.png"
+        name="Diseased Heart"
+        description="A diseased heart. Likely from a zombie."
+        effect=""
+        type="generic"
+        weight="5"
+        max-per-slot="15"/>
+    <item id="779"
+        image="generic-ear-zombie.png"
+        name="Undead ear"
+        description="An ear from a zombie."
+        effect=""
+        type="generic"
+        weight="2"
+        max-per-slot="25"/>
+    <item id="780"
+        image="generic-eye.png"
+        name="Undead eye"
+        description="an eye from a zombie."
+        effect=""
+        type="generic"
+        weight="4"
+        max-per-slot="20"/>
+    <item id="781"
         image="equipment/head/witch-doctor-mask.png"
         name="Witch Doctor's Mask"
         description="A crazy mask from the Voodoo doctor."
@@ -2597,7 +2666,7 @@
         max-per-slot="1">
         <sprite>equipment/head/witch-doctor-mask.xml</sprite>
     </item>
-    <item id="774"
+    <item id="782"
         image="equipment/chest/forest-armor.png"
         name="Forest Armor"
         description="A clean and comfortable mantle with dags made for the finest stalkers."