Fix all linter warnings

8 files changed, 458 insertions, 458 deletions

diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index c5725dc..92eae94 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -71,15 +71,15 @@ local function BuildInventory()
 		droppanel:Hide()
 		return
 	end
-	
+
 	creditslabel = vgui.Create("DLabel",qframe)
 	creditslabel:SetText(credits)
 	creditslabel:SetPos(150,5)
-	
+
 	local creditstext = vgui.Create("DLabel",qframe)
 	creditstext:SetText("Credits:")
 	creditstext:SetPos(100,5)
-	
+
 	inv.tabsheet = vgui.Create("DPropertySheet",qframe)
 	inv.tabsheet:Dock(FILL)
 
@@ -112,7 +112,7 @@ function inv.ShowInventory()
 		local froment = panels[1].info.owner
 		local fromid = panels[1].info.id
 		local frompos = panels[1].info.pos
-		local frominv = panels[1].info.inv
+		--local frominv = panels[1].info.inv
 		itm.DropItem(froment,fromid,frompos)
 	end,{})
 end
diff --git a/gamemode/client/cl_weaponswitch.lua b/gamemode/client/cl_weaponswitch.lua
index 085a0b3..2f681c9 100644
--- a/gamemode/client/cl_weaponswitch.lua
+++ b/gamemode/client/cl_weaponswitch.lua
@@ -5,5 +5,5 @@ function gm:PlayerSwitchWeapon( ply, oldWeapon, newWeapon )
 end
 
 hook.Add( "HUDShouldDraw", "HideWeaponSelHUD", function( name )
-	if name == "CHudWeaponSelection" then return false end
+    if name == "CHudWeaponSelection" then return false end
 end )
diff --git a/gamemode/client/hud/cl_svgtest.lua b/gamemode/client/hud/cl_svgtest.lua
index baeb698..9a55c8c 100644
--- a/gamemode/client/hud/cl_svgtest.lua
+++ b/gamemode/client/hud/cl_svgtest.lua
@@ -1,46 +1,46 @@
-do return end
-local svg = nrequire("cl_svg.lua")
-local mats = {}
-local matstrs = {}
-for i = 2,10 do
-	for _,t in pairs({"clubs","diamonds","hearts","spades"}) do
-		matstrs[#matstrs + 1] = string.format( "materials/svg/aussiesim/cards/svg/000000/transparent/card-%d-%s.svg",i,t)
-	end
-end
-
-for k,v in pairs(matstrs) do
-	mats[k] = file.Read(v,"GAME")
-end
-local truemats = {}
-for k,v in pairs(matstrs) do
-	truemats[k] = svg.MaterialFromSVG(v)
-end
---local parsed = xmlparser:parse(matstr)
-local htmls = {}
-local nx = ScrW()/64
-local ny = ScrH()/64
-for x = 1,nx do
-	for y = 1,ny do
-		local thtml = vgui.Create("DSprite") --svg.SvgOnDpanel("materials/svg/aussiesim/cards/svg/000000/transparent/card-2-clubs.svg")
-		thtml:SetSize(64,64)
-		thtml:SetPos(x * 64,y * 64)
-		htmls[y * nx + x] = thtml
-	end
-end
-
-hook.Add("HUDPaint","paint_svg",function()
-	--local randommat = table.Random(matstrs)
-	--html:RunJavascript( string.format("document.body.innerHTML = 'HTML changed from Lua using JavaScript!';"" )
-	--[[
-	for k,v in pairs(htmls) do
-		v:UpdateImage(randommat)
-	end
-	]]
-
-	for k,v in pairs(htmls) do
-		local randommat = table.Random(truemats)
-		if randommat.material then
-			v:SetMaterial(randommat.material)
-		end
-	end
-end)
+-- do return end
+-- local svg = nrequire("cl_svg.lua")
+-- local mats = {}
+-- local matstrs = {}
+-- for i = 2,10 do
+-- 	for _,t in pairs({"clubs","diamonds","hearts","spades"}) do
+-- 		matstrs[#matstrs + 1] = string.format( "materials/svg/aussiesim/cards/svg/000000/transparent/card-%d-%s.svg",i,t)
+-- 	end
+-- end
+-- 
+-- for k,v in pairs(matstrs) do
+-- 	mats[k] = file.Read(v,"GAME")
+-- end
+-- local truemats = {}
+-- for k,v in pairs(matstrs) do
+-- 	truemats[k] = svg.MaterialFromSVG(v)
+-- end
+-- --local parsed = xmlparser:parse(matstr)
+-- local htmls = {}
+-- local nx = ScrW()/64
+-- local ny = ScrH()/64
+-- for x = 1,nx do
+-- 	for y = 1,ny do
+-- 		local thtml = vgui.Create("DSprite") --svg.SvgOnDpanel("materials/svg/aussiesim/cards/svg/000000/transparent/card-2-clubs.svg")
+-- 		thtml:SetSize(64,64)
+-- 		thtml:SetPos(x * 64,y * 64)
+-- 		htmls[y * nx + x] = thtml
+-- 	end
+-- end
+-- 
+-- hook.Add("HUDPaint","paint_svg",function()
+-- 	--local randommat = table.Random(matstrs)
+-- 	--html:RunJavascript( string.format("document.body.innerHTML = 'HTML changed from Lua using JavaScript!';"" )
+-- 	--[[
+-- 	for k,v in pairs(htmls) do
+-- 		v:UpdateImage(randommat)
+-- 	end
+-- 	]]
+-- 
+-- 	for k,v in pairs(htmls) do
+-- 		local randommat = table.Random(truemats)
+-- 		if randommat.material then
+-- 			v:SetMaterial(randommat.material)
+-- 		end
+-- 	end
+-- end)
diff --git a/gamemode/client/qpanels/inventory.lua b/gamemode/client/qpanels/inventory.lua
index b93fd7f..4dc5075 100644
--- a/gamemode/client/qpanels/inventory.lua
+++ b/gamemode/client/qpanels/inventory.lua
@@ -1,194 +1,194 @@
-do return end
-local invfuncs
-invfuncs = ART.invfuncs
---invfuncs = include("../gamemodes/artery/gamemode/shared/inventory_common.lua")
---invfuncs = include("../shared/inventory_common.lua")
-assert(invfuncs ~= nil, "Dependency failed")
-
-local function createMenuFor(menu, tbl)
-  for k,v in pairs(tbl) do
-    if isfunction(v) then --This is a dead-end, add the menu
-      local thisoption = menu:AddOption(k,v)
-    else --Otherwise it should be a table, recursively call to create
-      local submenu = menu:AddSubMenu(k)
-      createMenuFor(submenu,v)
-    end
-  end
-end
-
-local function DrawBackpackOnDPanel(dp, backpack, backpacknum, tent)
-    local width = ScrW()
-    local height = ScrH()
-    local slotsize = math.Round(width / 32)
-    local backgrid = vgui.Create( "DGrid", dp )
-    backgrid:SetPos( 10, 30 )
-    backgrid:SetCols( backpack[2][1] )
-    backgrid:SetColWide( backpack[2][2] )
-    backgrid:Dock(FILL)
-    for i = 1,#(backpack[1]) do
-        for j = 1,#(backpack[1][i]) do
-            local item = backpack[1][j][i]
-            if type(backpack[1][j][i]) == "table" then
-                local itemwidth = 0
-                for _,l in pairs(item.Shape) do
-                    itemwidth = math.Max(itemwidth,#l)
-                end
-                local itemheight = #item.Shape
-                local invicon = vgui.Create( "DImageButton", dp )
-                invicon:SetSize(slotsize * itemwidth, slotsize * itemheight)
-                invicon:SetPos(slotsize * (i - 1), slotsize * (j - 1))
-                invicon:SetText(item.Name)
-                if item.Tooltip then
-                    invicon:SetTooltip(item.Tooltip)
-                end
-                if item.Paint then
-                    invicon.Paint = item.Paint
-                end
-                if item.DoOnPanel then
-                    item.DoOnPanel(invicon)
-                end
-                --invicon.Paint = function(self, w, h) draw.RoundedBox(4, 0,0,w,h,Color(0,100,0)) end
-                invicon.DoClick = function()
-                    if not item.GetOptions then return end
-                    local menu = vgui.Create("DMenu")
-        			createMenuFor(menu,item:GetOptions())
-        			menu:Open()
-                end
-                invicon.Item = item
-                invicon.invpos = {j,i}
-                invicon.ent = tent
-                invicon.backpacknum = backpacknum
-                invicon:Droppable("Inventory")
-            elseif not backpack[1][j][i] then
-                local emptyslot = vgui.Create("DPanel", dp)
-                emptyslot:SetSize(slotsize,slotsize)
-                emptyslot:SetPos(slotsize * (i - 1), slotsize * (j - 1))
-                --emptyslot.Paint = function(self, w, h) draw.RoundedBox(4, 0,0,w,h,Color(0,0,100)) end
-                emptyslot:Receiver( "Inventory", function( receiver, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
-                    if not isDropped then return end
-                    local icon = tableOfDroppedPanels[1]
-                    local item = icon.Item
-                    local curpos = icon.invpos
-                    --Set the shape it was at to false
-                    if not icon.wasequiped and icon.ent == tent then
-                        assert(curpos ~= nil, "print curpos was nil when not equiped")
-                        for k = 1,#item.Shape do
-                            for l = 1,#(item.Shape[k]) do
-                                if k == 1 and l == 1 then continue end
-                                backpack[1][curpos[1] + k - 1][curpos[2] + l - 1] = false
-                            end
-                        end
-                        backpack[1][curpos[1]][curpos[2]] = false
-                    end
-                    if invfuncs.CanFitInBackpack(backpack,j,i,item) then
-                        local fromtbl = icon.invpos
-                        local wasequiped = icon.wasequiped
-                        local ondropped = icon.ondropped
-                        if ondropped then
-                            ondropped(backpacknum,j,i,item)
-                        elseif wasequiped then
-                            net.Start("unequipitem")
-                            net.WriteString(wasequiped)
-                            net.WriteUInt(backpacknum,16)
-                            net.WriteUInt(i,16)
-                            net.WriteUInt(j,16)
-                            net.SendToServer()
-                        else
-                            net.Start("moveitem")
-                            net.WriteEntity(icon.ent) -- from ent
-                            net.WriteEntity(tent) -- to ent
-                            net.WriteUInt(icon.backpacknum,16) -- from backpack number
-                            net.WriteUInt(backpacknum,16) -- to backpack number
-                            net.WriteUInt(fromtbl[1],16) -- From position
-                            net.WriteUInt(fromtbl[2],16)
-                            net.WriteUInt(j,16) -- To position
-                            net.WriteUInt(i,16)
-                            net.SendToServer()
-                            if item.onEquip ~= nil then
-                                item:onEquip(LocalPlayer())
-                            end
-                        end
-                    end
-                end, {} )
-            end
-        end
-    end
-end
-
-local invsheetfunc = function()
-    local width = ScrW()
-    local height = ScrH()
-
-
-    local invsheet = vgui.Create( "DPanel" )
-
-    invsheet.Paint = function( self, w, h ) end
-
-    --Display gear
-    local slotsize = math.Round(width / 32)
-    local displaypos = {
-        ["Head"] = {(width / 8) - slotsize, 25},
-        ["Body"] = {(width / 8) - slotsize, slotsize + 26},
-        ["Legs"] = {(width / 8) - slotsize, (slotsize * 2) + 27},
-        ["Boots"] = {(width / 8) - slotsize, (slotsize * 3) + 28},
-        ["Gloves"] = {(width / 8) + (slotsize), (slotsize * 2) + 27},
-        ["Left"] = {(width / 8) - (1.5 * slotsize), (slotsize * 4) + 29},
-        ["Right"] = {(width / 8) - (0.5 * slotsize), (slotsize * 4) + 29}
-    }
-    for k,v in pairs (LocalPlayer().Inventory.Equiped) do
-        if v == false then
-            local eqslot = vgui.Create( "DPanel", invsheet )
-            eqslot:SetSize( slotsize, slotsize )
-            eqslot:SetPos(displaypos[k][1],displaypos[k][2])
-            eqslot:Receiver( "Inventory", function( receiver, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
-                if not isDropped then return end
-                print("Attempting to equip")
-                local icon = tableOfDroppedPanels[1]
-                local item = icon.Item
-                if item.Equipable == k then
-                    net.Start("equipitem")
-                    net.WriteUInt(icon.backpacknum,16) -- Backpack number
-                    local fromtbl = icon.invpos
-                    net.WriteUInt(fromtbl[1],16) -- From position
-                    net.WriteUInt(fromtbl[2],16)
-                    net.WriteString(k)
-                    net.SendToServer()
-                end
-            end, {} )
-        else
-            local eqslot = vgui.Create("DImageButton",invsheet)
-            eqslot:SetSize(slotsize,slotsize)
-            eqslot:SetPos(displaypos[k][1],displaypos[k][2])
-            if v.PaintEquiped then
-                eqslot.Paint = v.PaintEquiped
-            end
-            if v.DoOnEquipPanel then
-                v.DoOnEquipPanel(eqslot)
-            end
-            eqslot:Droppable("Inventory")
-            eqslot.Item = v
-            eqslot.wasequiped = k
-        end
-    end
-    local moneylabel = vgui.Create("DLabel",invsheet)
-    moneylabel:SetPos(0,0)
-    moneylabel:SetSize(width/5,18)
-    moneylabel:SetText(string.format("Credits:%7d", ART.Credits or 0))
-    print("Displaying credits:" .. string.format("Credits:%7d", ART.Credits or 0))
-
-    local backpacksheet = vgui.Create( "DPropertySheet", invsheet )
-    backpacksheet:SetPos(0,slotsize * 6)
-    backpacksheet:SetSize((width / 4) - 26, height - (slotsize * 6) - 70)
-    for k,v in pairs(LocalPlayer().Inventory.Backpacks) do
-        local tbacksheet = vgui.Create( "DPanel", backpacksheet )
-        tbacksheet.Paint = function( self, w, h ) draw.RoundedBox( 4, 0, 0, w, h, Color( 157, 160, 167 ) ) end
-        backpacksheet:AddSheet( v[3], tbacksheet, "icon16/cross.png" )
-
-        DrawBackpackOnDPanel(tbacksheet,v,k,LocalPlayer())
-    end
-
-    return "Inventory", invsheet, "icon16/cross.png"
-end
-
-
-ART.RegisterInventorySheet(invsheetfunc)
+-- do return end
+-- local invfuncs
+-- invfuncs = ART.invfuncs
+-- --invfuncs = include("../gamemodes/artery/gamemode/shared/inventory_common.lua")
+-- --invfuncs = include("../shared/inventory_common.lua")
+-- assert(invfuncs ~= nil, "Dependency failed")
+-- 
+-- local function createMenuFor(menu, tbl)
+--   for k,v in pairs(tbl) do
+--     if isfunction(v) then --This is a dead-end, add the menu
+--       local thisoption = menu:AddOption(k,v)
+--     else --Otherwise it should be a table, recursively call to create
+--       local submenu = menu:AddSubMenu(k)
+--       createMenuFor(submenu,v)
+--     end
+--   end
+-- end
+-- 
+-- local function DrawBackpackOnDPanel(dp, backpack, backpacknum, tent)
+--     local width = ScrW()
+--     local height = ScrH()
+--     local slotsize = math.Round(width / 32)
+--     local backgrid = vgui.Create( "DGrid", dp )
+--     backgrid:SetPos( 10, 30 )
+--     backgrid:SetCols( backpack[2][1] )
+--     backgrid:SetColWide( backpack[2][2] )
+--     backgrid:Dock(FILL)
+--     for i = 1,#(backpack[1]) do
+--         for j = 1,#(backpack[1][i]) do
+--             local item = backpack[1][j][i]
+--             if type(backpack[1][j][i]) == "table" then
+--                 local itemwidth = 0
+--                 for _,l in pairs(item.Shape) do
+--                     itemwidth = math.Max(itemwidth,#l)
+--                 end
+--                 local itemheight = #item.Shape
+--                 local invicon = vgui.Create( "DImageButton", dp )
+--                 invicon:SetSize(slotsize * itemwidth, slotsize * itemheight)
+--                 invicon:SetPos(slotsize * (i - 1), slotsize * (j - 1))
+--                 invicon:SetText(item.Name)
+--                 if item.Tooltip then
+--                     invicon:SetTooltip(item.Tooltip)
+--                 end
+--                 if item.Paint then
+--                     invicon.Paint = item.Paint
+--                 end
+--                 if item.DoOnPanel then
+--                     item.DoOnPanel(invicon)
+--                 end
+--                 --invicon.Paint = function(self, w, h) draw.RoundedBox(4, 0,0,w,h,Color(0,100,0)) end
+--                 invicon.DoClick = function()
+--                     if not item.GetOptions then return end
+--                     local menu = vgui.Create("DMenu")
+--         			createMenuFor(menu,item:GetOptions())
+--         			menu:Open()
+--                 end
+--                 invicon.Item = item
+--                 invicon.invpos = {j,i}
+--                 invicon.ent = tent
+--                 invicon.backpacknum = backpacknum
+--                 invicon:Droppable("Inventory")
+--             elseif not backpack[1][j][i] then
+--                 local emptyslot = vgui.Create("DPanel", dp)
+--                 emptyslot:SetSize(slotsize,slotsize)
+--                 emptyslot:SetPos(slotsize * (i - 1), slotsize * (j - 1))
+--                 --emptyslot.Paint = function(self, w, h) draw.RoundedBox(4, 0,0,w,h,Color(0,0,100)) end
+--                 emptyslot:Receiver( "Inventory", function( receiver, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
+--                     if not isDropped then return end
+--                     local icon = tableOfDroppedPanels[1]
+--                     local item = icon.Item
+--                     local curpos = icon.invpos
+--                     --Set the shape it was at to false
+--                     if not icon.wasequiped and icon.ent == tent then
+--                         assert(curpos ~= nil, "print curpos was nil when not equiped")
+--                         for k = 1,#item.Shape do
+--                             for l = 1,#(item.Shape[k]) do
+--                                 if k == 1 and l == 1 then continue end
+--                                 backpack[1][curpos[1] + k - 1][curpos[2] + l - 1] = false
+--                             end
+--                         end
+--                         backpack[1][curpos[1]][curpos[2]] = false
+--                     end
+--                     if invfuncs.CanFitInBackpack(backpack,j,i,item) then
+--                         local fromtbl = icon.invpos
+--                         local wasequiped = icon.wasequiped
+--                         local ondropped = icon.ondropped
+--                         if ondropped then
+--                             ondropped(backpacknum,j,i,item)
+--                         elseif wasequiped then
+--                             net.Start("unequipitem")
+--                             net.WriteString(wasequiped)
+--                             net.WriteUInt(backpacknum,16)
+--                             net.WriteUInt(i,16)
+--                             net.WriteUInt(j,16)
+--                             net.SendToServer()
+--                         else
+--                             net.Start("moveitem")
+--                             net.WriteEntity(icon.ent) -- from ent
+--                             net.WriteEntity(tent) -- to ent
+--                             net.WriteUInt(icon.backpacknum,16) -- from backpack number
+--                             net.WriteUInt(backpacknum,16) -- to backpack number
+--                             net.WriteUInt(fromtbl[1],16) -- From position
+--                             net.WriteUInt(fromtbl[2],16)
+--                             net.WriteUInt(j,16) -- To position
+--                             net.WriteUInt(i,16)
+--                             net.SendToServer()
+--                             if item.onEquip ~= nil then
+--                                 item:onEquip(LocalPlayer())
+--                             end
+--                         end
+--                     end
+--                 end, {} )
+--             end
+--         end
+--     end
+-- end
+-- 
+-- local invsheetfunc = function()
+--     local width = ScrW()
+--     local height = ScrH()
+-- 
+-- 
+--     local invsheet = vgui.Create( "DPanel" )
+-- 
+--     invsheet.Paint = function( self, w, h ) end
+-- 
+--     --Display gear
+--     local slotsize = math.Round(width / 32)
+--     local displaypos = {
+--         ["Head"] = {(width / 8) - slotsize, 25},
+--         ["Body"] = {(width / 8) - slotsize, slotsize + 26},
+--         ["Legs"] = {(width / 8) - slotsize, (slotsize * 2) + 27},
+--         ["Boots"] = {(width / 8) - slotsize, (slotsize * 3) + 28},
+--         ["Gloves"] = {(width / 8) + (slotsize), (slotsize * 2) + 27},
+--         ["Left"] = {(width / 8) - (1.5 * slotsize), (slotsize * 4) + 29},
+--         ["Right"] = {(width / 8) - (0.5 * slotsize), (slotsize * 4) + 29}
+--     }
+--     for k,v in pairs (LocalPlayer().Inventory.Equiped) do
+--         if v == false then
+--             local eqslot = vgui.Create( "DPanel", invsheet )
+--             eqslot:SetSize( slotsize, slotsize )
+--             eqslot:SetPos(displaypos[k][1],displaypos[k][2])
+--             eqslot:Receiver( "Inventory", function( receiver, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
+--                 if not isDropped then return end
+--                 print("Attempting to equip")
+--                 local icon = tableOfDroppedPanels[1]
+--                 local item = icon.Item
+--                 if item.Equipable == k then
+--                     net.Start("equipitem")
+--                     net.WriteUInt(icon.backpacknum,16) -- Backpack number
+--                     local fromtbl = icon.invpos
+--                     net.WriteUInt(fromtbl[1],16) -- From position
+--                     net.WriteUInt(fromtbl[2],16)
+--                     net.WriteString(k)
+--                     net.SendToServer()
+--                 end
+--             end, {} )
+--         else
+--             local eqslot = vgui.Create("DImageButton",invsheet)
+--             eqslot:SetSize(slotsize,slotsize)
+--             eqslot:SetPos(displaypos[k][1],displaypos[k][2])
+--             if v.PaintEquiped then
+--                 eqslot.Paint = v.PaintEquiped
+--             end
+--             if v.DoOnEquipPanel then
+--                 v.DoOnEquipPanel(eqslot)
+--             end
+--             eqslot:Droppable("Inventory")
+--             eqslot.Item = v
+--             eqslot.wasequiped = k
+--         end
+--     end
+--     local moneylabel = vgui.Create("DLabel",invsheet)
+--     moneylabel:SetPos(0,0)
+--     moneylabel:SetSize(width/5,18)
+--     moneylabel:SetText(string.format("Credits:%7d", ART.Credits or 0))
+--     print("Displaying credits:" .. string.format("Credits:%7d", ART.Credits or 0))
+-- 
+--     local backpacksheet = vgui.Create( "DPropertySheet", invsheet )
+--     backpacksheet:SetPos(0,slotsize * 6)
+--     backpacksheet:SetSize((width / 4) - 26, height - (slotsize * 6) - 70)
+--     for k,v in pairs(LocalPlayer().Inventory.Backpacks) do
+--         local tbacksheet = vgui.Create( "DPanel", backpacksheet )
+--         tbacksheet.Paint = function( self, w, h ) draw.RoundedBox( 4, 0, 0, w, h, Color( 157, 160, 167 ) ) end
+--         backpacksheet:AddSheet( v[3], tbacksheet, "icon16/cross.png" )
+-- 
+--         DrawBackpackOnDPanel(tbacksheet,v,k,LocalPlayer())
+--     end
+-- 
+--     return "Inventory", invsheet, "icon16/cross.png"
+-- end
+-- 
+-- 
+-- ART.RegisterInventorySheet(invsheetfunc)
diff --git a/gamemode/client/qpanels/prayers.lua b/gamemode/client/qpanels/prayers.lua
index cdcb742..674d5d8 100644
--- a/gamemode/client/qpanels/prayers.lua
+++ b/gamemode/client/qpanels/prayers.lua
@@ -1,170 +1,170 @@
-do return end
-local refreshboundprayers
-local infopart
-local prayersheet
-
-local function displaydefaulthelp(panel)
-    local ll = vgui.Create("DLabel",panel)
-    ll:Dock(FILL)
-    ll:SetWrap(true)
-    ll:SetDark(true)
-    ll:SetText("Oh no! It looks like this dosen't have any help text yet!")
-end
-
-local function createprayericon(parrent,prayer,equiped,place)
-
-    local width = ScrW()
-    local height = ScrH()
-
-    local ret = vgui.Create("DButton",parrent)
-    ret:SetText(prayer)
-    ret:SetWrap(true)
-    ret:SetSize(64,64)
-    local prayertbl = ART.GetPrayerByName(prayer)
-    assert(prayertbl ~= nil, "Could not find an appropriate prayer!")
-    if prayertbl.Paint then
-        ret.Paint = prayertbl.Paint
-    end
-    if prayertbl.DoOnPanel then
-        prayertbl.DoOnPanel(ret)
-    end
-    if equiped then
-        ret.DoClick = function(self)
-            self:Remove()
-            ART.PrayerEquiped[place] = false
-            refreshboundprayers()
-            infopart:Remove()
-            infopart = vgui.Create("DPanel")
-            infopart:SetSize( (width / 4) - 10, height / 3)
-            infopart:SetPos(0, height * 2 / 3)
-            prayersheet:Add(infopart)
-        end
-    else
-        ret:Droppable("PrayerBind")
-        ret.PrayerName = prayer
-        ret:SetSize(64,64)
-        ret.DoClick = function(self)
-            infopart:Remove()
-            infopart = vgui.Create("DPanel")
-            infopart:SetSize( (width / 4) - 10, height / 3)
-            prayersheet:Add(infopart)
-            local rettbl = ART.GetPrayerByName(prayer)
-            if rettbl.DisplayHelp ~= nil then
-                rettbl.DisplayHelp(infopart)
-            else
-                displaydefaulthelp(infopart)
-            end
-        end
-    end
-    return ret
-end
-
-local function createreceiver(parrent,num)
-    local prayerbut = vgui.Create( "DPanel", parrent )
-    local prayerlabel = vgui.Create("DLabel",prayerbut)
-    prayerlabel:SetText( "F" .. num )
-    prayerlabel.Paint = function( self, w, h ) end
-    prayerlabel:SetWrap(true)
-    prayerlabel:SetDark(true)
-    prayerlabel:Dock(FILL)
-    prayerbut:Dock(FILL)
-    prayerbut:Receiver( "PrayerBind", function( self, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
-        if not isDropped then return end
-        local pname = tableOfDroppedPanels[1].PrayerName
-        print("Prayer name:")
-        print(pname)
-        ART.PrayerEquiped[num] = pname
-        print("Prayer bound to " .. num)
-        prayerbut:Remove()
-        createprayericon(parrent,pname,true,num)
-    end)
-end
-
-local function displayboundprayers(panel)
-
-    local width = ScrW()
-    local height = ScrH()
-
-    local prayerbindgrid = nil
-
-    refreshboundprayers = function()
-
-        if prayerbindgrid ~= nil then prayerbindgrid:Remove() end
-
-        prayerbindgrid = vgui.Create("DGrid")
-        prayerbindgrid:SetPos(height * (2 / 3),5)
-        prayerbindgrid:SetSize((width / 4) - 20, height / 3)
-        prayerbindgrid:SetColWide(64)
-        prayerbindgrid:SetRowHeight(64)
-        function prayerbindgrid:Paint(w,h)
-            draw.RoundedBox( 8, 0, 0, w, h, Color( 0, 255, 0 ) )
-        end
-
-        for k,v in pairs(ART.PrayerEquiped) do
-            local but = vgui.Create( "DPanel", prayerbindgrid )
-            but:SetSize(64, 64)
-            if v ~= false then
-                createprayericon(but,v,true,k)
-            else
-                createreceiver(but,k)
-            end
-            prayerbindgrid:AddItem(but)
-        end
-        panel:Add(prayerbindgrid)
-    end
-    refreshboundprayers()
-end
-
-ART.RegisterInventorySheet(function()
-
-    local width = ScrW()
-    local height = ScrH()
-
-    prayersheet = vgui.Create( "DListLayout")
-
-    local prayergridscroll = vgui.Create("DScrollPanel")
-    prayergridscroll:SetSize( (width / 4) - 20, height / 3 )
-    prayergridscroll:SetPos( 5, 5 )
-    prayersheet:Add(prayergridscroll)
-    local prayergrid = vgui.Create( "DGrid", prayergridscroll )
-    prayergrid:SetPos( 5 , 5 )
-    prayergrid:Dock(FILL)
-
-    prayergrid:SetCols( (width / 4) / 64 )
-    prayergrid:SetColWide( 64 )
-    prayergrid:SetRowHeight(64)
-    prayergridscroll:AddItem(prayergrid)
-
-    for k,v in pairs(ART.MyPrayer) do
-        print("Displaying prayer:" .. k)
-        print("Type:" .. type(k))
-        if k == "" then
-            ART.MyPrayer[k] = nil
-        end
-        local but = createprayericon(prayergrid,k,false,nil)
-        prayergrid:AddItem(but)
-    end
-
-    displayboundprayers(prayersheet)
-
-    infopart = vgui.Create("DPanel")
-    infopart:SetSize( (width / 4) - 10, height / 3)
-    infopart:SetPos(0, height * 2 / 3)
-    prayersheet:Add(infopart)
-
-    return "Prayers", prayersheet, "icon16/tick.png"
-end)
-
-hook.Add("Think","art_prayer_keybinds",function()
-    local mapping = {
-        KEY_F1,
-        KEY_F2,
-        KEY_F3,
-        KEY_F4,
-    }
-    for k,v in pairs(mapping) do
-        if input.IsKeyDown(v) and ART.PrayerEquiped[k] then
-            ART.GetPrayerByName(ART.PrayerEquiped[k]).Pray()
-        end
-    end
-end)
+-- do return end
+-- local refreshboundprayers
+-- local infopart
+-- local prayersheet
+-- 
+-- local function displaydefaulthelp(panel)
+--     local ll = vgui.Create("DLabel",panel)
+--     ll:Dock(FILL)
+--     ll:SetWrap(true)
+--     ll:SetDark(true)
+--     ll:SetText("Oh no! It looks like this dosen't have any help text yet!")
+-- end
+-- 
+-- local function createprayericon(parrent,prayer,equiped,place)
+-- 
+--     local width = ScrW()
+--     local height = ScrH()
+-- 
+--     local ret = vgui.Create("DButton",parrent)
+--     ret:SetText(prayer)
+--     ret:SetWrap(true)
+--     ret:SetSize(64,64)
+--     local prayertbl = ART.GetPrayerByName(prayer)
+--     assert(prayertbl ~= nil, "Could not find an appropriate prayer!")
+--     if prayertbl.Paint then
+--         ret.Paint = prayertbl.Paint
+--     end
+--     if prayertbl.DoOnPanel then
+--         prayertbl.DoOnPanel(ret)
+--     end
+--     if equiped then
+--         ret.DoClick = function(self)
+--             self:Remove()
+--             ART.PrayerEquiped[place] = false
+--             refreshboundprayers()
+--             infopart:Remove()
+--             infopart = vgui.Create("DPanel")
+--             infopart:SetSize( (width / 4) - 10, height / 3)
+--             infopart:SetPos(0, height * 2 / 3)
+--             prayersheet:Add(infopart)
+--         end
+--     else
+--         ret:Droppable("PrayerBind")
+--         ret.PrayerName = prayer
+--         ret:SetSize(64,64)
+--         ret.DoClick = function(self)
+--             infopart:Remove()
+--             infopart = vgui.Create("DPanel")
+--             infopart:SetSize( (width / 4) - 10, height / 3)
+--             prayersheet:Add(infopart)
+--             local rettbl = ART.GetPrayerByName(prayer)
+--             if rettbl.DisplayHelp ~= nil then
+--                 rettbl.DisplayHelp(infopart)
+--             else
+--                 displaydefaulthelp(infopart)
+--             end
+--         end
+--     end
+--     return ret
+-- end
+-- 
+-- local function createreceiver(parrent,num)
+--     local prayerbut = vgui.Create( "DPanel", parrent )
+--     local prayerlabel = vgui.Create("DLabel",prayerbut)
+--     prayerlabel:SetText( "F" .. num )
+--     prayerlabel.Paint = function( self, w, h ) end
+--     prayerlabel:SetWrap(true)
+--     prayerlabel:SetDark(true)
+--     prayerlabel:Dock(FILL)
+--     prayerbut:Dock(FILL)
+--     prayerbut:Receiver( "PrayerBind", function( self, tableOfDroppedPanels, isDropped, menuIndex, mouseX, mouseY )
+--         if not isDropped then return end
+--         local pname = tableOfDroppedPanels[1].PrayerName
+--         print("Prayer name:")
+--         print(pname)
+--         ART.PrayerEquiped[num] = pname
+--         print("Prayer bound to " .. num)
+--         prayerbut:Remove()
+--         createprayericon(parrent,pname,true,num)
+--     end)
+-- end
+-- 
+-- local function displayboundprayers(panel)
+-- 
+--     local width = ScrW()
+--     local height = ScrH()
+-- 
+--     local prayerbindgrid = nil
+-- 
+--     refreshboundprayers = function()
+-- 
+--         if prayerbindgrid ~= nil then prayerbindgrid:Remove() end
+-- 
+--         prayerbindgrid = vgui.Create("DGrid")
+--         prayerbindgrid:SetPos(height * (2 / 3),5)
+--         prayerbindgrid:SetSize((width / 4) - 20, height / 3)
+--         prayerbindgrid:SetColWide(64)
+--         prayerbindgrid:SetRowHeight(64)
+--         function prayerbindgrid:Paint(w,h)
+--             draw.RoundedBox( 8, 0, 0, w, h, Color( 0, 255, 0 ) )
+--         end
+-- 
+--         for k,v in pairs(ART.PrayerEquiped) do
+--             local but = vgui.Create( "DPanel", prayerbindgrid )
+--             but:SetSize(64, 64)
+--             if v ~= false then
+--                 createprayericon(but,v,true,k)
+--             else
+--                 createreceiver(but,k)
+--             end
+--             prayerbindgrid:AddItem(but)
+--         end
+--         panel:Add(prayerbindgrid)
+--     end
+--     refreshboundprayers()
+-- end
+-- 
+-- ART.RegisterInventorySheet(function()
+-- 
+--     local width = ScrW()
+--     local height = ScrH()
+-- 
+--     prayersheet = vgui.Create( "DListLayout")
+-- 
+--     local prayergridscroll = vgui.Create("DScrollPanel")
+--     prayergridscroll:SetSize( (width / 4) - 20, height / 3 )
+--     prayergridscroll:SetPos( 5, 5 )
+--     prayersheet:Add(prayergridscroll)
+--     local prayergrid = vgui.Create( "DGrid", prayergridscroll )
+--     prayergrid:SetPos( 5 , 5 )
+--     prayergrid:Dock(FILL)
+-- 
+--     prayergrid:SetCols( (width / 4) / 64 )
+--     prayergrid:SetColWide( 64 )
+--     prayergrid:SetRowHeight(64)
+--     prayergridscroll:AddItem(prayergrid)
+-- 
+--     for k,v in pairs(ART.MyPrayer) do
+--         print("Displaying prayer:" .. k)
+--         print("Type:" .. type(k))
+--         if k == "" then
+--             ART.MyPrayer[k] = nil
+--         end
+--         local but = createprayericon(prayergrid,k,false,nil)
+--         prayergrid:AddItem(but)
+--     end
+-- 
+--     displayboundprayers(prayersheet)
+-- 
+--     infopart = vgui.Create("DPanel")
+--     infopart:SetSize( (width / 4) - 10, height / 3)
+--     infopart:SetPos(0, height * 2 / 3)
+--     prayersheet:Add(infopart)
+-- 
+--     return "Prayers", prayersheet, "icon16/tick.png"
+-- end)
+-- 
+-- hook.Add("Think","art_prayer_keybinds",function()
+--     local mapping = {
+--         KEY_F1,
+--         KEY_F2,
+--         KEY_F3,
+--         KEY_F4,
+--     }
+--     for k,v in pairs(mapping) do
+--         if input.IsKeyDown(v) and ART.PrayerEquiped[k] then
+--             ART.GetPrayerByName(ART.PrayerEquiped[k]).Pray()
+--         end
+--     end
+-- end)
diff --git a/gamemode/client/qpanels/quests.lua b/gamemode/client/qpanels/quests.lua
index 015fc97..eda9e31 100644
--- a/gamemode/client/qpanels/quests.lua
+++ b/gamemode/client/qpanels/quests.lua
@@ -1,31 +1,31 @@
-do return end
-
-ART.RegisterInventorySheet(function()
-
-    local width = ScrW()
-    local height = ScrH()
-
-    local questsheet = vgui.Create( "DPanel")
-    questsheet.Paint = function(self,w,h) end
-
-    --Display quests
-    local questselector = vgui.Create( "DScrollPanel", questsheet )
-    questselector:SetSize((width / 4) - 20, (height / 2) - 40)
-    questselector:SetPos(0,0)
-    local questinfo = vgui.Create("DScrollPanel", questsheet)
-    questinfo:SetSize(width / 4, height / 2)
-    questinfo:SetPos(0,height / 2)
-    for k,v in pairs(LocalPlayer().Quests or {}) do
-        print("Displaying quest:" .. k)
-        local questbutton = vgui.Create( "DButton" , questselector )
-        questbutton:Dock(TOP)
-        questbutton:SetText(k)
-        questbutton.DoClick = function()
-            print("At point of clicking, art is:")
-            PrintTable(ART)
-            ART.GetQuest(k).DrawQuestInfo(questinfo,v)
-        end
-    end
-
-    return "Quests", questsheet, "icon16/house.png"
-end)
+-- do return end
+-- 
+-- ART.RegisterInventorySheet(function()
+-- 
+--     local width = ScrW()
+--     local height = ScrH()
+-- 
+--     local questsheet = vgui.Create( "DPanel")
+--     questsheet.Paint = function(self,w,h) end
+-- 
+--     --Display quests
+--     local questselector = vgui.Create( "DScrollPanel", questsheet )
+--     questselector:SetSize((width / 4) - 20, (height / 2) - 40)
+--     questselector:SetPos(0,0)
+--     local questinfo = vgui.Create("DScrollPanel", questsheet)
+--     questinfo:SetSize(width / 4, height / 2)
+--     questinfo:SetPos(0,height / 2)
+--     for k,v in pairs(LocalPlayer().Quests or {}) do
+--         print("Displaying quest:" .. k)
+--         local questbutton = vgui.Create( "DButton" , questselector )
+--         questbutton:Dock(TOP)
+--         questbutton:SetText(k)
+--         questbutton.DoClick = function()
+--             print("At point of clicking, art is:")
+--             PrintTable(ART)
+--             ART.GetQuest(k).DrawQuestInfo(questinfo,v)
+--         end
+--     end
+-- 
+--     return "Quests", questsheet, "icon16/house.png"
+-- end)
diff --git a/gamemode/client/qpanels/skills.lua b/gamemode/client/qpanels/skills.lua
index 6d71442..1904445 100644
--- a/gamemode/client/qpanels/skills.lua
+++ b/gamemode/client/qpanels/skills.lua
@@ -1,10 +1,10 @@
-do return end
-
-
-ART.RegisterInventorySheet(function()
-
-    local skillsheet = vgui.Create( "DPanel" )
-    skillsheet.Paint = function( self, w, h ) end
-
-    return "Skills", skillsheet, "icon16/tick.png"
-end)
+-- do return end
+-- 
+-- 
+-- ART.RegisterInventorySheet(function()
+-- 
+--     local skillsheet = vgui.Create( "DPanel" )
+--     skillsheet.Paint = function( self, w, h ) end
+-- 
+--     return "Skills", skillsheet, "icon16/tick.png"
+-- end)
diff --git a/gamemode/client/qtabs/cl_qinventory.lua b/gamemode/client/qtabs/cl_qinventory.lua
index 2ae70a2..9f2eebe 100644
--- a/gamemode/client/qtabs/cl_qinventory.lua
+++ b/gamemode/client/qtabs/cl_qinventory.lua
@@ -15,8 +15,8 @@ q.known_inventories = known_inventories
 local drawfloatinginventory = function(id, inventory)
 	--print("Drawing a floating inventory!")
 	local frame = vgui.Create("DFrame")
-	frame:SetPos( ScrW() - (ScrW()/4), 0 )
-	frame:SetSize( ScrW()/4, ScrH()/4 )
+	frame:SetPos( ScrW() - (ScrW() / 4), 0 )
+	frame:SetSize( ScrW() / 4, ScrH() / 4 )
 	frame:SetTitle( inventory.Name )
 	frame:SetDraggable( true )
 	local panel = vgui.Create("DPanel",frame)