Merge branch 'patch/5.5.1' into dev

config/preset_player_colours.lua

@@ -6,7 +6,6 @@ return {
 		mark9064={r=99,g=0,b=255},
 		eissturm={r=25,g=25,b=112},
 		Sakama={r=20,g=213,b=80},
-		Sakama={r=20,g=213,b=80},
 		freek18={r=50,g=0,b=255},
 		aldldl={r=0,g=131,b=255},
 		NAD4X4={r=135,g=206,b=250},
@@ -33,4 +32,4 @@ return {
 		fail = {r = 255, g = 0, b = 0},
 		info = {r = 255, g = 255, b = 255}
 	}
-}
+}

expcore/gui/progress-bar.lua

@@ -63,11 +63,11 @@ local ProgressBar = {
     }
 }
 Global.register({
-    ProgressBar.unregistered,
-    ProgressBar.independent
+    unregistered = ProgressBar.unregistered,
+    independent = ProgressBar.independent
 },function(tbl)
-    ProgressBar.unregistered = tbl[1]
-    ProgressBar.independent = tbl[2]
+    ProgressBar.unregistered = tbl.unregistered
+    ProgressBar.independent = tbl.independent
 end)
 
 --- Gets the define data, cant use Gui.get_define as it would error

modules/addons/compilatron.lua

@@ -13,11 +13,11 @@ local Public = {
 }
 
 Global.register({
-    Public.compilatrons,
-    Public.current_messages
+    compilatrons = Public.compilatrons,
+    current_messages = Public.current_messages
 },function(tbl)
-    Public.compilatrons=tbl[1]
-    Public.current_messages=tbl[2]
+    Public.compilatrons = tbl.compilatrons
+    Public.current_messages = tbl.current_messages
 end)
 
 --- This will re-create the speech bubble after it de-spawns called with set_timeout

modules/addons/jail-control.lua

@@ -13,11 +13,11 @@ local Public = {
 }
 
 Global.register({
-    Public.old_roles,
-    Public.temp_bans
+    old_roles = Public.old_roles,
+    temp_bans = Public.temp_bans
 },function(tbl)
-    Public.old_roles=tbl[1]
-    Public.temp_bans=tbl[2]
+    Public.old_roles = tbl.old_roles
+    Public.temp_bans = tbl.temp_bans
 end)
 
 local function event_emit(event,player,by_player_name,reason)

modules/addons/warnings-control.lua

@@ -15,11 +15,11 @@ local Public = {
 }
 
 Global.register({
-    Public.user_warnings,
-    Public.user_temp_warnings
+    user_warnings = Public.user_warnings,
+    user_temp_warnings = Public.user_temp_warnings
 },function(tbl)
-    Public.user_warnings = tbl[1]
-    Public.user_temp_warnings = tbl[2]
+    Public.user_warnings = tbl.user_warnings
+    Public.user_temp_warnings = tbl.user_temp_warnings
 end)
 
 local function event_emit(event,player,by_player_name)

modules/commands/interface.lua

@@ -23,9 +23,12 @@ end
 
 local interface_env = {} -- used as a persistent sandbox for interface commands
 local interface_callbacks = {} -- saves callbacks which can load new values per use
-Global.register({interface_env,interface_callbacks},function(tbl)
-    interface_env = tbl[1]
-    interface_callbacks = tbl[2]
+Global.register({
+    interface_env = interface_env,
+    interface_callbacks = interface_callbacks
+},function(tbl)
+    interface_env = tbl.interface_env
+    interface_callbacks = tbl.interface_callbacks
 end)
 
 --- Adds a callback function when the interface command is used