4 files changed, 43 insertions, 4 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index 076dd2a..598ca97 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -396,6 +396,7 @@ function PANEL:Init()
 
 		local slot = vgui.Create("DButton", dpnl)
 		slot:SetSize(dPanelWidth/5, 100)
+		slot:SetText("")
 		slot:SetTooltip(createTooltipTextFor(v.Req))
 		slot.DoClick = function()
 		  --print("I want to combine a " .. v.Name)
@@ -418,14 +419,14 @@ function PANEL:Init()
 
 			surface.SetFont( "ButtonText" )
 			surface.SetTextColor( 255,255,255 )
-			surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )/2) )
+			surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )-5) )
 			surface.DrawText( v.Name )
 		end
 
 		local img = vgui.Create("DImage", slot)
-		img:SetPos(0, 0)
-		img:SetSize(slot:GetWide(), slot:GetTall()-20)
-		img:SetImage("gms_icons/gms_weapon.png")
+		img:SetPos(20, 10)
+		img:SetSize(slot:GetWide()-40, slot:GetTall()-40)
+		if (v.Icon != nil) then img:SetImage(v.Icon) else img:SetImage("vgui/avatar_default") end
 
 
 		i=i+1
diff --git a/gamemode/craftablesystem/playermade/medicine.lua b/gamemode/craftablesystem/playermade/medicine.lua
index 223cc1c..998c1a2 100644
--- a/gamemode/craftablesystem/playermade/medicine.lua
+++ b/gamemode/craftablesystem/playermade/medicine.lua
@@ -2,6 +2,7 @@ local COMBI = {}
 
 COMBI.Name = "Medicine"
 COMBI.Description = "To restore your health."
+COMBI.Icon = "items/medicine.png"
 
 COMBI.Req = {}
 COMBI.Req["Herbs"] = 7
diff --git a/gamemode/craftablesystem/playermade/urine.lua b/gamemode/craftablesystem/playermade/urine.lua
index aed7d35..ae05626 100644
--- a/gamemode/craftablesystem/playermade/urine.lua
+++ b/gamemode/craftablesystem/playermade/urine.lua
@@ -3,6 +3,7 @@ local COMBI = {}
 
 COMBI.Name = "Urine"
 COMBI.Description = "Drink some water and wait, used in gunpowder production."
+COMBI.Icon = "items/bottle_urine.png"
 
 COMBI.Req = {}
 COMBI.Req["Water Bottles"] = 2
@@ -17,6 +18,7 @@ local COMBI = {}
 
 COMBI.Name = "Urine 10x"
 COMBI.Description = "Drink loads of water and wait, messy, but used in gunpowder production."
+COMBI.Icon = "items/bottle_urine.png"
 
 COMBI.Req = {}
 COMBI.Req["Water Bottles"] = 20
@@ -25,3 +27,19 @@ COMBI.Results = {}
 COMBI.Results["Urine Bottles"] = 10
 
 GMS.RegisterCombi( COMBI, "Combinations" )
+
+/* Urine 50x */
+local COMBI = {}
+
+COMBI.Name = "Urine 50x"
+COMBI.Description = "Drink loads of water and wait, messy, but used in gunpowder production."
+COMBI.Icon = "items/bottle_urine.png"
+
+COMBI.Req = {}
+COMBI.Req["Water Bottles"] = 100
+
+COMBI.Results = {}
+COMBI.Results["Urine Bottles"] = 50
+
+GMS.RegisterCombi( COMBI, "Combinations" )
+
diff --git a/gamemode/itemsystem/items/medicine.lua b/gamemode/itemsystem/items/medicine.lua
new file mode 100644
index 0000000..7b178f8
--- /dev/null
+++ b/gamemode/itemsystem/items/medicine.lua
@@ -0,0 +1,19 @@
+
+ITEM = {}
+
+ITEM.Name = "Medicine"
+ITEM.Description = "Heals you!"
+ITEM.Icon = "items/medicine.png"
+ITEM.UniqueData = false
+
+local use_medicine = function(ln, player)
+
+	LocalPlayer():ConCommand( "gms_takemedicine" )
+
+end
+
+ITEM.Actions = {}
+genericMakeDroppable(ITEM)
+ITEM.Actions["Use"] = use_medicine
+
+GMS.RegisterResource(ITEM)
+\ No newline at end of file