From 6b110cd71b3cef9e2ee9cc04416103ea8f22e407 Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 6 May 2016 16:33:13 -0400 Subject: Added rope image --- content/materials/items/rope.png | Bin 0 -> 93628 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 content/materials/items/rope.png (limited to 'content/materials') diff --git a/content/materials/items/rope.png b/content/materials/items/rope.png new file mode 100644 index 0000000..76ed0e2 Binary files /dev/null and b/content/materials/items/rope.png differ -- cgit v1.2.3-70-g09d2 From 0af04c2949fec2aa0eff00b5e77b0fb251ec7180 Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 6 May 2016 16:56:34 -0400 Subject: Added concrete image --- content/materials/items/concrete.png | Bin 0 -> 5955 bytes gamemode/craftablesystem/playermade/concrete.lua | 1 + 2 files changed, 1 insertion(+) create mode 100644 content/materials/items/concrete.png (limited to 'content/materials') diff --git a/content/materials/items/concrete.png b/content/materials/items/concrete.png new file mode 100644 index 0000000..3824b12 Binary files /dev/null and b/content/materials/items/concrete.png differ 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 -- cgit v1.2.3-70-g09d2 From 0607b38bf0d04dda577bf310acaa6b5eb2af76bb Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 6 May 2016 17:45:13 -0400 Subject: Added dough image --- content/materials/items/dough.png | Bin 0 -> 2786482 bytes gamemode/craftablesystem/playermade/dough.lua | 4 ++++ gamemode/itemsystem/items/deaddroppable.lua | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 content/materials/items/dough.png (limited to 'content/materials') diff --git a/content/materials/items/dough.png b/content/materials/items/dough.png new file mode 100644 index 0000000..4ffb40f Binary files /dev/null and b/content/materials/items/dough.png 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"}, -- cgit v1.2.3-70-g09d2