3 files changed, 16 insertions, 28 deletions
diff --git a/entities/entities/art_droppeditem/init.lua b/entities/entities/art_droppeditem/init.lua
index 491d479..7d5ad2f 100644
--- a/entities/entities/art_droppeditem/init.lua
+++ b/entities/entities/art_droppeditem/init.lua
@@ -1,11 +1,11 @@
 --[[
-    This entity gives townies things to do
+    This entity is a item that was dropped, and can be picked up again.
 ]]
 AddCSLuaFile( "cl_init.lua" )
 AddCSLuaFile( "shared.lua" )
 
 include("shared.lua")
-
+local itm = nrequire("core/inventory/item.lua")
 util.AddNetworkString("art_requestmodel")
 util.AddNetworkString("art_informmodel")
 util.AddNetworkString("art_requestpickup")
@@ -26,6 +26,7 @@ function ENT:Initialize()
             end)
         end
     end
+	print("Dropped item spawned at", self:GetPos())
     self:DrawShadow(false)
     self:SetMoveType(MOVETYPE_NONE)
     self:SetSolid(SOLID_NONE)
@@ -56,13 +57,14 @@ net.Receive("art_requestpickup",function(len,pl)
     print("Got distance")
     if d < 30 then
         print("Inside if statement")
-        local i = ART.GetItemByName(e.ItemName):DeSerialize(e.ItemData)
+        local i = itm.GetItemFromData(e.ItemName, e.ItemData)
         print("Created item")
-        if pl:GiveItem(i) then
-            print("In if")
-            e:Remove()
-        end
-        print("Removed item")
+		xpcall(function()
+			pl:GiveItem(i)
+			e:Remove()
+		end,function() --We couldn't put the item in the player's inventory!
+			--Don't do anything I guess
+		end)
     else
         print("Player not close enough!")
     end
@@ -76,7 +78,7 @@ print("Remove the concommand in art_droppeditem/init.lua")
 concommand.Add("dropmellon",function(ply,cmd,args)
     local e = ents.Create("art_droppeditem")
     e.Model = "models/props_junk/Rock001a.mdl"
-    e.Item = ART.GetItemByName("Watermelon")
+    e.Item = itm.GetItemByName("Watermelon")
     local hitpos = ply:GetEyeTrace().HitPos + Vector(0,0,10)
     print("Traceresult was")
     PrintTable(ply:GetEyeTrace())
diff --git a/entities/entities/npc_huntable/init.lua b/entities/entities/npc_huntable/init.lua
index 6b4c000..a21e565 100644
--- a/entities/entities/npc_huntable/init.lua
+++ b/entities/entities/npc_huntable/init.lua
@@ -39,7 +39,7 @@ function ENT:Initialize()
 end
 
 function ENT:OnInjured(dmg)
-    print("Ent OnInjured fired!")
+    print("Ent OnInjured fired! dmg was", dmg)
     if self.OnDammage ~= nil then
         self:OnDammage(dmg)
     end
diff --git a/entities/entities/npc_shop/init.lua b/entities/entities/npc_shop/init.lua
index 796b389..022f80e 100644
--- a/entities/entities/npc_shop/init.lua
+++ b/entities/entities/npc_shop/init.lua
@@ -3,13 +3,7 @@ AddCSLuaFile( "shared.lua" )
 
 include("shared.lua")
 
-for k,v in pairs({
-	"art_openshop",
-	"art_buyitem",
-	"art_sellitem",
-}) do
-	util.AddNetworkString(v)
-end
+local shop = nrequire("core/npc/sv_shop.lua")
 
 function ENT:Initialize()
 
@@ -39,17 +33,9 @@ function ENT:Initialize()
 	self:SetUseType( SIMPLE_USE )
 end
 
-function OpenShop(tbl,ply)
-	print("Called openshop!")
-	print("tbl was")
-	PrintTable(tbl)
-	if CLIENT then return end
-	net.Start("art_openshop")
-	net.WriteTable(tbl)
-	net.Send(ply)
-end
-
 function ENT:Use(ply)
+	print("In shop npc, shop is", shop)
+	PrintTable(shop)
 	--TODO:Fix shop
-	OpenShop(self.shopitems,ply)
+	shop.OpenShop(self.shopitems,ply)
 end