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

7 files changed, 9 insertions, 1 deletions

diff --git a/content/materials/items/concrete.png b/content/materials/items/concrete.png
new file mode 100644
index 0000000..3824b12
--- /dev/null
+++ b/content/materials/items/concrete.png
diff --git a/content/materials/items/dough.png b/content/materials/items/dough.png
new file mode 100644
index 0000000..4ffb40f
--- /dev/null
+++ b/content/materials/items/dough.png
diff --git a/content/materials/items/rope.png b/content/materials/items/rope.png
new file mode 100644
index 0000000..76ed0e2
--- /dev/null
+++ b/content/materials/items/rope.png
diff --git a/gamemode/craftablesystem/playermade/concrete.lua b/gamemode/craftablesystem/playermade/concrete.lua
index a173ee3..55c0165 100644
--- a/gamemode/craftablesystem/playermade/concrete.lua
+++ b/gamemode/craftablesystem/playermade/concrete.lua
@@ -3,6 +3,7 @@ local COMBI = {}
 
 COMBI.Name = "Concrete"
 COMBI.Description = "Concrete can be used for spawning concrete props."
+COMBI.Icon = "items/concrete.png"
 
 COMBI.Req = {}
 COMBI.Req["Sand"] = 5
diff --git a/gamemode/craftablesystem/playermade/dough.lua b/gamemode/craftablesystem/playermade/dough.lua
index 846a322..e839de1 100644
--- a/gamemode/craftablesystem/playermade/dough.lua
+++ b/gamemode/craftablesystem/playermade/dough.lua
@@ -1,8 +1,11 @@
+img = "items/dough.png"
+
 /* Dough */
 local COMBI = {}
 
 COMBI.Name = "Dough"
 COMBI.Description = "Dough is used for baking."
+COMBI.Icon = img
 
 COMBI.Req = {}
 COMBI.Req["Water Bottles"] = 1
@@ -18,6 +21,7 @@ local COMBI = {}
 
 COMBI.Name = "Dough 10x"
 COMBI.Description = "Dough is used for baking."
+COMBI.Icon = img
 
 COMBI.Req = {}
 COMBI.Req["Water Bottles"] = 7
diff --git a/gamemode/craftablesystem/playermade/rope.lua b/gamemode/craftablesystem/playermade/rope.lua
index 4e6e15e..e2f50e5 100644
--- a/gamemode/craftablesystem/playermade/rope.lua
+++ b/gamemode/craftablesystem/playermade/rope.lua
@@ -3,6 +3,7 @@ local COMBI = {}
 
 COMBI.Name = "Rope"
 COMBI.Description = "Allows you to use Rope tool ( Using Rope Tool will consume the Rope ) and used in fishing rod crafting."
+COMBI.Icon = "items/rope.png"
 
 COMBI.Req = {}
 COMBI.Req["Herbs"] = 5
diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua
index 9da0359..12bec62 100644
--- a/gamemode/itemsystem/items/deaddroppable.lua
+++ b/gamemode/itemsystem/items/deaddroppable.lua
@@ -11,9 +11,10 @@ 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"},
+  {"Concrete","Block of concrete.","items/concrete.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"},
+  {"Dough","Something you can craft with!","items/dough.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"},
   {"Elm","You can identify that this is wood.","items/wood_elm.png"},
@@ -38,6 +39,7 @@ local tbl = {
   {"Platinum Ore","Something you can craft with!","items/ore_platinum.png"},
   {"Pure Mithril","Something you can craft with!","items/ingot_puremithril.png"},
   {"Resin","Something you can craft with!","test.png"},
+  {"Rope","Something you can craft with!","items/rope.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"},