Merge branch 'dev' into feature/admin-markers

config/_file_loader.lua

@@ -30,6 +30,7 @@ return {
     'modules.commands.home',
     'modules.commands.connect',
     'modules.commands.last-location',
+    'modules.commands.search',
 
     --- Addons
     'modules.addons.chat-popups',
@@ -44,6 +45,8 @@ return {
     'modules.addons.discord-alerts',
     'modules.addons.chat-reply',
     'modules.addons.tree-decon',
+    'modules.addons.afk-kick',
+    'modules.addons.report-jail',
 
     --- Data
     'modules.data.statistics',

config/afk_kick.lua

@@ -0,0 +1,9 @@
+return {
+    admin_as_active = true, --- @setting admin_as_active When true admins will be treated as active regardless of afk time
+    trust_as_active = true, --- @setting trust_as_active When true trusted players (by playtime) will be treated as active regardless of afk time
+    active_role = 'Veteran', --- @setting active_role When not nil a player with this role will be treated as active regardless of afk time
+    afk_time = 3600*10, --- @setting afk_time The time in ticks that must pass for a player to be considered afk
+    kick_time = 3600*30, --- @setting kick_time The time in ticks that must pass without any active players for all players to be kicked
+    trust_time = 3600*60*10, --- @setting trust_time The time in ticks that a player must be online for to count as trusted
+    update_time = 3600*30, --- @setting update_time How often in ticks the script checks for active players
+}

config/expcore/roles.lua

@@ -103,6 +103,10 @@ Roles.new_role('Trainee','TrMod')
     'command/unjail',
     'command/kick',
     'command/ban',
+    'command/search',
+    'command/search-amount',
+    'command/search-recent',
+    'command/search-online',
 }
 
 --- Trusted Roles

config/gui/player_list_actions.lua

@@ -173,6 +173,7 @@ return {
         },
         ['command/report'] = {
             auth=function(player,selected_player)
+                if player == selected_player then return false end
                 if not Roles.player_allowed(player,'command/give-warning') then
                     return not Roles.player_has_flag(selected_player,'report-immune')
                 end