From 859ca4d379c1a0805177e2916d35f0a4edd00f7f Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 6 May 2016 18:25:01 -0400 Subject: Flour and spices images added --- content/materials/items/flour.png | Bin 0 -> 6668 bytes content/materials/items/spices.png | Bin 0 -> 4621 bytes gamemode/craftablesystem/playermade/flour.lua | 1 + gamemode/craftablesystem/playermade/spice.lua | 1 + gamemode/itemsystem/items/deaddroppable.lua | 3 ++- 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 content/materials/items/flour.png create mode 100644 content/materials/items/spices.png diff --git a/content/materials/items/flour.png b/content/materials/items/flour.png new file mode 100644 index 0000000..cbcffd5 Binary files /dev/null and b/content/materials/items/flour.png differ diff --git a/content/materials/items/spices.png b/content/materials/items/spices.png new file mode 100644 index 0000000..2a0b24d Binary files /dev/null and b/content/materials/items/spices.png differ diff --git a/gamemode/craftablesystem/playermade/flour.lua b/gamemode/craftablesystem/playermade/flour.lua index 4ebd77d..3a9891e 100644 --- a/gamemode/craftablesystem/playermade/flour.lua +++ b/gamemode/craftablesystem/playermade/flour.lua @@ -2,6 +2,7 @@ local COMBI = {} COMBI.Name = "Flour" COMBI.Description = "Flour can be used for making dough." +COMBI.Icon = "items/flour.png" COMBI.Req = {} COMBI.Req["Stone"] = 1 diff --git a/gamemode/craftablesystem/playermade/spice.lua b/gamemode/craftablesystem/playermade/spice.lua index 3172ed5..f6f39e2 100644 --- a/gamemode/craftablesystem/playermade/spice.lua +++ b/gamemode/craftablesystem/playermade/spice.lua @@ -3,6 +3,7 @@ local COMBI = {} COMBI.Name = "Spices" COMBI.Description = "Spice can be used for various meals." +COMBI.Icon = "items/spices.png" COMBI.Req = {} COMBI.Req["Stone"] = 1 diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua index 12bec62..0ea26e6 100644 --- a/gamemode/itemsystem/items/deaddroppable.lua +++ b/gamemode/itemsystem/items/deaddroppable.lua @@ -20,6 +20,7 @@ local tbl = { {"Elm","You can identify that this is wood.","items/wood_elm.png"}, {"Fire Rune","A slightly warm stone.","test.png"}, {"Flashlight","Lights up the dark!","test.png"}, + {"Flour","An item to craft with!","items/flour.png"}, {"Glass","Useful in construction!","test.png"}, {"Gold","You're Rich!","items/ingot_gold.png"}, {"Gold Ore","Something you can craft with!","items/ore_gold.png"}, @@ -45,7 +46,7 @@ local tbl = { {"Shark","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"}, + {"Spices","Freshen up that stinking mutton!","items/spices.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"}, -- cgit v1.2.3-70-g09d2