Minor update

7 files changed, 6 insertions, 38 deletions

diff --git a/AUTHORS b/AUTHORS
index ec79be5..4627e00 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ Built using work from:
 		JetBoom - AnimBoneLib (Lua Animation API)
 		CapsAdmin - Pac3
 		bobbleheadbob - Zones
+		Valkyrie_ - Legs
 
 	Art & graphics:
 		opengameart.org user "Emerald"
diff --git a/README.md b/README.md
index ecc1e48..bdbf3b5 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,5 @@ Oh boy! A readme file!
 As of now, artery depends on the following addons:
 
 * bobbleheadbob's zone tool
+* CapsAdmin's PAC3
 * artery_editor
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index df0f453..2135fc4 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -42,27 +42,18 @@ local clt = nrequire("cl_invtracker.lua")
 
 local player_data --The data the player needs to show the q panel
 net.Receive("art_load_player_data",function()
-	--print("Got player data")
 	player_data = net.ReadTable()
-	--print("It was")
-	--PrintTable(player_data)
 	credits = player_data.credits
 	if creditslabel then creditslabel:SetText(credits or 0) end
-	--print("Credits was", credits)
 end)
 
 local function CreateSheetTree(tabs,dpropertysheet)
-	print("Createing sheet tree!")
-	PrintTable(tabs)
-	local observers = {}
 	for k,v in pairs(tabs) do
 		if type(k) == "string" then
-			print("Makeing inventory ", k)
 			local tsheet = vgui.Create( "DPropertySheet", dpropertysheet )
 			dpropertysheet:AddSheet(k,tsheet,"icon16/user.png")
 			CreateSheetTree(v,tsheet)
 		elseif type(k) == "number" then
-			print("Makeing inventory number ", k)
 			local tsheet = vgui.Create("DPanel")
 			dpropertysheet:AddSheet(v.Name,tsheet,"icon16/user.png")
 			local prox = v:DrawOnDPanel(tsheet)
@@ -71,18 +62,9 @@ local function CreateSheetTree(tabs,dpropertysheet)
 			error("k was not a number or string, it was a " .. type(k))
 		end
 	end
-	--local invsheet = qinv.CreateInventorySheet(inv.tabsheet)
-	--qpray.CreatePrayerSheet(tabsheet)
-	--invsheet.id = #qtabs + 1
-	--qtabs[#qtabs + 1] = invsheet
-	--prasheet.id = #qtabs + 1
-	--qtabs[#qtabs + 1] = prasheet
-	--inv.tabsheet:AddSheet("Inventory",invsheet,"icon16/user.png")
-	--tabsheet:AddSheet("Prayers",prasheet,"icon16/user.png")
 end
 
 local function BuildInventory()
-	--print("Building inventory")
 	if qframe and IsValid(qframe) then return end
 	if not player_data then print("no player data!") player_data = {credits = 0} end
 	qframe = vgui.Create("DFrame")
@@ -116,8 +98,6 @@ local function BuildInventory()
 	initalsheet:Dock(FILL)
 
 	CreateSheetTree(clt.known_inventories,initalsheet)
-	print("After createing sheet tree, known inventories was")
-	PrintTable(clt.known_inventories)
 end
 
 function inv.ShowInventory()
@@ -132,13 +112,9 @@ function inv.ShowInventory()
 	droppanel:SetAlpha(10)
 	droppanel:Receiver("item",function(self,panels,dropped,_,_,_)
 		if not dropped then return end
-		--print("Dropedpanel had something dropped on it!")
-		--Drop the item
-		--print("Pnl:",pnl)
 		local froment = panels[1].info.owner
 		local fromid = panels[1].info.id
 		local frompos = panels[1].info.pos
-		--local frominv = panels[1].info.inv
 		itm.DropItem(froment,fromid,frompos)
 	end,{})
 end
@@ -151,7 +127,6 @@ function inv.HideInventory()
 	lastpanel = sheet:GetActiveTab():GetPanel().sheetnum
 	for k,v in pairs(LocalPlayer().invdisplays) do
 		if not v.panel:IsValid() then continue end
-		--PrintTable(v)
 		v.panel:Close()
 		LocalPlayer().invdisplays[k] = nil
 	end
@@ -173,7 +148,6 @@ hook.Add("CalcView","ArteryInventoryView",function(ply,pos,ang,fov,nearz,farz)
 		bone = LocalPlayer():LookupBone("ValveBiped.Bip01_Head1")
 	end
 	local view = {}
-	--view.origin = LocalPlayer():GetBonePosition(bone) + LocalPlayer():GetUp() * 2
 	local tr = util.TraceLine({
 		start = pos,
 	endpos =  (ang:Forward() * -100) + pos,
diff --git a/gamemode/client/cl_legs.lua b/gamemode/client/cl_legs.lua
index 506a0a9..53f8cf4 100644
--- a/gamemode/client/cl_legs.lua
+++ b/gamemode/client/cl_legs.lua
@@ -1,14 +1,9 @@
-do return end
 --[[
-
-	The purpose of this file is to render the client's legs
-	for realism purposes, this file wasn't coded by any of the
-	NightZ team it was however coded by Valkyrie:
+	Made by Valkyrie
 
 	http://facepunch.com/showthread.php?t=1227980&p=38680440&viewfull=1#post38680440
 
 --]]
-if SERVER then error("What happened?") end
 
 local Legs = {}
 Legs.LegEnt = nil
diff --git a/gamemode/core/inventory/cl_invtracker.lua b/gamemode/core/inventory/cl_invtracker.lua
index 1e75ef2..14cbfbe 100644
--- a/gamemode/core/inventory/cl_invtracker.lua
+++ b/gamemode/core/inventory/cl_invtracker.lua
@@ -105,9 +105,6 @@ net.Receive("art_UpdateInventory",function()
 		--PrintTable(known_inventories[id])
 	else
 		known_inventories[id]:Remove(position)
-		for k,v in pairs(known_inventories[id].observers) do
-			v:Remove(position)
-		end
 	end
 end)
 
diff --git a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
index 69e18ca..1b53d43 100644
--- a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
+++ b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
@@ -11,7 +11,7 @@ if CLIENT then inv = nrequire("cl_shaped.lua") end
 inv.Name = "Shaped Inventory"
 inv.tracker = {}
 inv.width = 5
-inv.height = 10
+inv.height = 5
 
 local function calcposition(width,height,row,col)
 	return ((row-1) * width) + col
diff --git a/gamemode/inventorysystem/skills/cl_skills.lua b/gamemode/inventorysystem/skills/cl_skills.lua
index d4dbf65..fed0f46 100644
--- a/gamemode/inventorysystem/skills/cl_skills.lua
+++ b/gamemode/inventorysystem/skills/cl_skills.lua
@@ -62,12 +62,12 @@ inv.DrawOnDPanel = function(self,panel)
 		print("Calling inventory's put")
 		print("At time of call, skill was")
 		PrintTable(self)
-		set_xp_of(position[1],self.skills[position[1]])
+		set_xp_of(position[1],self.skills[position[1]] or item.ammt)--Observer might be called before our put()
 	end
 
 	prox.Remove = function(s,position)
 		print("Calling inventory's remove")
-		set_xp_of(position[1],self.skills[position[1]])
+		set_xp_of(position[1],self.skills[position[1]] or itm.ammt)
 	end
 
 	return prox