17 files changed, 15 insertions, 14 deletions

diff --git a/content/materials/items/urine.png b/content/materials/items/bottle_urine.png
index a7b9b19..a7b9b19 100644
--- a/content/materials/items/urine.png
+++ b/content/materials/items/bottle_urine.png
diff --git a/content/materials/items/water_bottle.png b/content/materials/items/bottle_water.png
index 627a183..627a183 100644
--- a/content/materials/items/water_bottle.png
+++ b/content/materials/items/bottle_water.png
diff --git a/content/materials/items/adamantine_ore.png b/content/materials/items/ore_adamantine.png
index 1f80cba..1f80cba 100644
--- a/content/materials/items/adamantine_ore.png
+++ b/content/materials/items/ore_adamantine.png
diff --git a/content/materials/items/Copper_Ore.png b/content/materials/items/ore_copper.png
index ecad12d..ecad12d 100644
--- a/content/materials/items/Copper_Ore.png
+++ b/content/materials/items/ore_copper.png
diff --git a/content/materials/items/gold_ore.png b/content/materials/items/ore_gold.png
index d4a5472..d4a5472 100644
--- a/content/materials/items/gold_ore.png
+++ b/content/materials/items/ore_gold.png
diff --git a/content/materials/items/iron_ore.png b/content/materials/items/ore_iron.png
index 6317143..6317143 100644
--- a/content/materials/items/iron_ore.png
+++ b/content/materials/items/ore_iron.png
diff --git a/content/materials/items/mithril_ore.png b/content/materials/items/ore_mithril.png
index b76929c..b76929c 100644
--- a/content/materials/items/mithril_ore.png
+++ b/content/materials/items/ore_mithril.png
diff --git a/content/materials/items/platinum_ore.png b/content/materials/items/ore_platinum.png
index 78acf96..78acf96 100644
--- a/content/materials/items/platinum_ore.png
+++ b/content/materials/items/ore_platinum.png
diff --git a/content/materials/items/silver_ore.png b/content/materials/items/ore_silver.png
index 0967c91..0967c91 100644
--- a/content/materials/items/silver_ore.png
+++ b/content/materials/items/ore_silver.png
diff --git a/content/materials/items/steel_ore.png b/content/materials/items/ore_steel.png
index 6fa25c8..6fa25c8 100644
--- a/content/materials/items/steel_ore.png
+++ b/content/materials/items/ore_steel.png
diff --git a/content/materials/items/tech_ore.png b/content/materials/items/ore_tech.png
index 19d2763..19d2763 100644
--- a/content/materials/items/tech_ore.png
+++ b/content/materials/items/ore_tech.png
diff --git a/content/materials/items/stone.png b/content/materials/items/stone.png
new file mode 100644
index 0000000..afda50e
--- /dev/null
+++ b/content/materials/items/stone.png
diff --git a/content/materials/items/wood.png b/content/materials/items/wood.png
new file mode 100644
index 0000000..6913312
--- /dev/null
+++ b/content/materials/items/wood.png
diff --git a/content/materials/items/wood_oak.png b/content/materials/items/wood_oak.png
new file mode 100644
index 0000000..55dead5
--- /dev/null
+++ b/content/materials/items/wood_oak.png
diff --git a/content/materials/items/wook_teak.png b/content/materials/items/wook_teak.png
new file mode 100644
index 0000000..9273638
--- /dev/null
+++ b/content/materials/items/wook_teak.png
diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua
index 75c127f..81af605 100644
--- a/gamemode/itemsystem/items/deaddroppable.lua
+++ b/gamemode/itemsystem/items/deaddroppable.lua
@@ -2,7 +2,7 @@
 
 --Try to keep this table in alphabetical order so if something needs changeing, you can find it
 local tbl = {
-  {"Adamantine Ore","Something you can craft with!","items/adamantine_ore.png"},
+  {"Adamantine Ore","Something you can craft with!","items/ore_adamantine.png"},
   {"Air Rune","This stone seems like it should be heavier.","test.png"},
   {"Baits","Something you can use to fish with! (Consumed automatically)","test.png"},
   {"Basic Rune","Something you can craft with!","test.png"},
@@ -10,7 +10,7 @@ local tbl = {
   {"Batteries","It holds a charge!","test.png"},
   {"Cedar","You can identify that this is wood.","test.png"},
   {"Charcoal","Bits of burnt wood.","test.png"},
-  {"Copper Ore","Something you can craft with!","items/copper_ore.png"},
+  {"Copper Ore","Something you can craft with!","items/ore_copper.png"},
   {"Dough","Something you can craft with!","test.png"},
   {"Dust","Ever wondered what would happen if sand got smaller?","test.png"},
   {"Earth Rune","A stone that's heavier than it looks.","test.png"},
@@ -19,40 +19,41 @@ local tbl = {
   {"Flashlight","Lights up the dark!","test.png"},
   {"Glass","Useful in construction!","test.png"},
   {"Gold","You're Rich!","test.png"},
-  {"Gold Ore","Something you can craft with!","items/gold_ore.png"},
+  {"Gold Ore","Something you can craft with!","items/ore_gold.png"},
   {"Gunpowder","Something you can craft with!","test.png"},
   {"Herbs","Blech, vegtables...","test.png"},
   {"Iron","Something you can craft with!","test.png"},
-  {"Iron Ore","Something you can craft with!","items/iron_ore.png"},
+  {"Iron Ore","Something you can craft with!","items/ore_iron.png"},
   {"Mahogany","A rich dark color.","test.png"},
   {"Maple","It's some nice wood, Eh?","test.png"},
   {"Meat","Something you can craft with!","test.png"},
-  {"Mithril Ore","Something you can craft with!","items/mithril_ore.png"},
+  {"Mithril Ore","Something you can craft with!","items/ore_mithril.png"},
+  {"Oak","You've got wood.","items/wood_oak.png"},
   {"Pickaxe Handle","Something you can craft with!","test.png"},
   {"Pickaxe Head","Something you can craft with!","test.png"},
   {"Plastic","Some solidified resin!","test.png"},
   {"Platinum","Something you can craft with!","test.png"},
-  {"Platinum Ore","Something you can craft with!","items/platinum_ore.png"},
+  {"Platinum Ore","Something you can craft with!","items/ore_platinum.png"},
   {"Pure Mithril","Something you can craft with!","test.png"},
   {"Resin","Something you can craft with!","test.png"},
   {"Salmon","Something you can craft with!","test.png"},
   {"Sand","How in the world are you holding this stuff?","test.png"},
   {"Shark","Something you can craft with!","test.png"},
   {"Silver","Something you can craft with!","test.png"},
-  {"Silver Ore","Something you can craft with!","items/silver_ore.png"},
+  {"Silver Ore","Something you can craft with!","items/ore_silver.png"},
   {"Spices","Freshen up that stinking mutton!","test.png"},
   {"Steel","Something you can craft with!","test.png"},
-  {"Steel Ore","Something you can craft with!","items/steel_ore.png"},
-  {"Stone","Something you can craft with!","test.png"},
+  {"Steel Ore","Something you can craft with!","items/ore_steel.png"},
+  {"Stone","Something you can craft with!","stone.png"},
   {"Strange Stone","Something you can craft with!","test.png"},
   {"Sulpher","Watch out, it's explosive!","test.png"},
-  {"Teak","You've got wood.","test.png"},
+  {"Teak","You've got wood.","wood_teak.png"},
   {"Tech","You're blinded by SCIENCE!","test.png"},
-  {"Tech Ore","Something you can craft with!","items/tech_ore.png"},
+  {"Tech Ore","Something you can craft with!","items/ore_tech.png"},
   {"Trout","A flippy floppy fish!","test.png"},
-  {"Urine Bottles","Something you can craft with!","items/urine.png"},
+  {"Urine Bottles","Something you can craft with!","items/bottle_urine.png"},
   {"Water Rune","Whenever you touch it, your hand feels slightly damp.","test.png"},
-  {"Wood","Something you can craft with!","test.png"},
+  {"Wood","Something you can craft with!","items/wood.png"},
   {"Wrist Watch","See the time wherever you go!","test.png"},
 }
 
diff --git a/gamemode/itemsystem/items/waterbottle.lua b/gamemode/itemsystem/items/waterbottle.lua
index 8f0fca0..8176556 100644
--- a/gamemode/itemsystem/items/waterbottle.lua
+++ b/gamemode/itemsystem/items/waterbottle.lua
@@ -3,7 +3,7 @@ ITEM = {}
 
 ITEM.Name = "Water Bottles"
 ITEM.Description = "Something you can drink!"
-ITEM.Icon = "items/water_bottle.png"
+ITEM.Icon = "items/bottle_water.png"
 ITEM.UniqueData = false
 
 if(SERVER) then