aboutsummaryrefslogtreecommitdiff
path: root/entities
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-06-19 00:07:01 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-06-19 00:07:01 -0400
commit461a29d8fdb2fd6c86a77912e9c2232e1f101ca8 (patch)
treeed76c1a1abf64369ee36b88533e78a8a94566631 /entities
parent0ae33ad32868af226fba6d887320aa87aa19d3a4 (diff)
downloadartery-461a29d8fdb2fd6c86a77912e9c2232e1f101ca8.tar.gz
artery-461a29d8fdb2fd6c86a77912e9c2232e1f101ca8.tar.bz2
artery-461a29d8fdb2fd6c86a77912e9c2232e1f101ca8.zip
Massive updates
Lots of stuff was updated, mostly to support addons. Inventory tracking is also updated a little and a bug fixed in inventory. Nrequire now probably won't crash the client, no matter how many times it's used.
Diffstat (limited to 'entities')
-rw-r--r--entities/entities/art_chest/cl_init.lua9
-rw-r--r--entities/entities/art_chest/init.lua2
2 files changed, 1 insertions, 10 deletions
diff --git a/entities/entities/art_chest/cl_init.lua b/entities/entities/art_chest/cl_init.lua
index 89745c0..232010c 100644
--- a/entities/entities/art_chest/cl_init.lua
+++ b/entities/entities/art_chest/cl_init.lua
@@ -21,15 +21,6 @@ end
local oldpanel = nil
local namecache = {}
-net.Receive("informchestname",function()
- local e = net.ReadEntity()
- local s = net.ReadString()
- namecache[e] = s
- if oldpanel ~= nil then
- oldpanel:SetTitle(s)
- end
-end)
-
net.Receive("openchestinv",function(len,ply)
if oldpanel ~= nil then oldpanel:Remove() end
print("Opening chest inventory")
diff --git a/entities/entities/art_chest/init.lua b/entities/entities/art_chest/init.lua
index f33b57a..e2d70e1 100644
--- a/entities/entities/art_chest/init.lua
+++ b/entities/entities/art_chest/init.lua
@@ -21,7 +21,7 @@ function ENT:Initialize()
inventories = {}
}
- local myinv = inv.CreateInventory("Shaped Inventory")
+ local myinv = inv.CreateInventory(self.InvType or "Shaped Inventory")
myinv.Owner = self
timer.Simple(0, function()