Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded

1 files changed, 9 insertions, 7 deletions

diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua
index a22bfb7..9da0359 100644
--- a/gamemode/itemsystem/items/deaddroppable.lua
+++ b/gamemode/itemsystem/items/deaddroppable.lua
@@ -2,6 +2,7 @@
 
 --Try to keep this table in alphabetical order so if something needs changeing, you can find it
 local tbl = {
+  {"Adamantine","Something you can craft with!","items/ingot_adamantine.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"},
@@ -10,6 +11,7 @@ local tbl = {
   {"Batteries","It holds a charge!","test.png"},
   {"Cedar","You can identify that this is wood.","items/wood_cedar.png"},
   {"Charcoal","Bits of burnt wood.","test.png"},
+  {"Copper","Lowest tier ingot","items/ingot_copper.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"},
@@ -18,11 +20,11 @@ local tbl = {
   {"Fire Rune","A slightly warm stone.","test.png"},
   {"Flashlight","Lights up the dark!","test.png"},
   {"Glass","Useful in construction!","test.png"},
-  {"Gold","You're Rich!","test.png"},
+  {"Gold","You're Rich!","items/ingot_gold.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","Something you can craft with!","items/ingot_iron.png"},
   {"Iron Ore","Something you can craft with!","items/ore_iron.png"},
   {"Mahogany","A rich dark color.","items/wood_mahogany.png"},
   {"Maple","It's some nice wood, Eh?","items/wood_maple.png"},
@@ -32,23 +34,23 @@ local tbl = {
   {"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","Something you can craft with!","items/ingot_platinum.png"},
   {"Platinum Ore","Something you can craft with!","items/ore_platinum.png"},
-  {"Pure Mithril","Something you can craft with!","test.png"},
+  {"Pure Mithril","Something you can craft with!","items/ingot_puremithril.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","Something you can craft with!","items/ingot_silver.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","Something you can craft with!","items/ingot_steel.png"},
   {"Steel Ore","Something you can craft with!","items/ore_steel.png"},
   {"Stone","Something you can craft with!","items/stone.png"},
   {"Strange Stone","Something you can craft with!","test.png"},
   {"Sulpher","Watch out, it's explosive!","test.png"},
   {"Teak","You've got wood.","items/wood_teak.png"},
-  {"Tech","You're blinded by SCIENCE!","test.png"},
+  {"Tech","You're blinded by SCIENCE!","items/ingot_tech.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/bottle_urine.png"},