summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott <scotth0828@gmail.com>2016-05-06 17:45:13 -0400
committerScott <scotth0828@gmail.com>2016-05-06 17:45:13 -0400
commit0607b38bf0d04dda577bf310acaa6b5eb2af76bb (patch)
tree6f5844bfbca552c9b1987578d06ea5bd3a3b328b
parentd701283a513e70b0c0a6fb79bb2774f99a79d3ac (diff)
downloadgmstranded-0607b38bf0d04dda577bf310acaa6b5eb2af76bb.tar.gz
gmstranded-0607b38bf0d04dda577bf310acaa6b5eb2af76bb.tar.bz2
gmstranded-0607b38bf0d04dda577bf310acaa6b5eb2af76bb.zip
Added dough image
-rw-r--r--content/materials/items/dough.pngbin0 -> 2786482 bytes
-rw-r--r--gamemode/craftablesystem/playermade/dough.lua4
-rw-r--r--gamemode/itemsystem/items/deaddroppable.lua2
3 files changed, 5 insertions, 1 deletions
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
Binary files differ
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/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua
index 0a9d8b5..12bec62 100644
--- a/gamemode/itemsystem/items/deaddroppable.lua
+++ b/gamemode/itemsystem/items/deaddroppable.lua
@@ -14,7 +14,7 @@ local tbl = {
{"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"},