Massive updates

updates to nrequire, only re-includes things out of date
changes to cl_inventory, and config

2 files changed, 26 insertions, 0 deletions

diff --git a/gamemode/core/config/sv_config.lua b/gamemode/core/config/sv_config.lua
new file mode 100644
index 0000000..6eb5394
--- /dev/null
+++ b/gamemode/core/config/sv_config.lua
@@ -0,0 +1,25 @@
+--[[
+	Allows addons to add config settings for easy manipulation
+]]
+
+local config = {}
+
+--Master list of addons, and the config for each
+local addons = {}
+
+local function config_number(panel)
+	
+end
+local config_types = {
+	["number"] = config_number,
+	"text",
+	"textbox"
+}
+function config.RegisterConfig(name,t,func)
+	assert(config_types[t],string.format("Attempted to register unknown config type %q, allowed types are %s"),t,table.concat(table.GetKeys(config_types)))
+	local tb = debug.getinfo(-1,"flnSu")
+	print("Debug info was:")
+	PrintTable(tb)
+end
+
+return config
diff --git a/gamemode/core/inventory/inventory.lua b/gamemode/core/inventory/inventory.lua
index 1fb3dba..d97f5be 100644
--- a/gamemode/core/inventory/inventory.lua
+++ b/gamemode/core/inventory/inventory.lua
@@ -184,6 +184,7 @@ end)
 
 ---To Be Depriciated.
 function inv.DeriveInventory(name)
+	error("inv.DeriveInventory called")
 	while inventories[name] == nil do
 		coroutine.yield()
 	end