Merge branch 'core'

This commit is contained in:
Unknown
2018-03-30 20:30:18 +01:00
3 changed files with 7 additions and 13 deletions

View File

@@ -7,13 +7,6 @@ Any changes that you may make to the code are yours but that does not make the s
Discord: https://discord.gg/r6dC2uK Discord: https://discord.gg/r6dC2uK
]] ]]
--Please Only Edit Below This Line----------------------------------------------------------- --Please Only Edit Below This Line-----------------------------------------------------------
local return_err = true
local _require = require
local function require(path)
local success, err = pcall(_require,path)
if not success and return_err then error(err) end
end
-- this file will just contain all the diffrent requires -- this file will just contain all the diffrent requires
-- admin dir -- admin dir

View File

@@ -7,12 +7,6 @@ Any changes that you may make to the code are yours but that does not make the s
Discord: https://discord.gg/r6dC2uK Discord: https://discord.gg/r6dC2uK
]] ]]
--Please Only Edit Below This Line----------------------------------------------------------- --Please Only Edit Below This Line-----------------------------------------------------------
local return_err = true
local _require = require
local function require(path)
local success, err = pcall(_require,path)
if not success and return_err then error(err) end
end
-- this file will just contain all the diffrent requires -- this file will just contain all the diffrent requires
require('colours') require('colours')
require('health') require('health')

View File

@@ -22,6 +22,13 @@ error = function(err)
_error(err) _error(err)
end end
end end
-- replaces the base require function
require_return_err = false
_require = require
local function require(path)
local success, err = pcall(_require,path)
if not success and require_return_err then error(err) end
end
require("mod-gui") require("mod-gui")
-- loads the stdlib and allows Core Game and Event -- loads the stdlib and allows Core Game and Event