Merge branch 'jimathy:main' into main

shared/helpers.lua

@@ -638,6 +638,8 @@ function lookEnt(entity)
                 debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..formatCoord(entity).."^7'")
                 Wait(1500)
             end
+            -- Make players head face the coord for 5 seconds
+            TaskLookAtCoord(ped, entity.x, entity.y, entity.z, 5000, 1, 1)
         else
             if DoesEntityExist(entity) then
                 local entCoords = GetEntityCoords(entity)
@@ -646,6 +648,9 @@ function lookEnt(entity)
                     debugPrint("^6Bridge^7: ^2Turning Player to^7: '^6"..entity.."^7' - '"..formatCoord(entCoords).."^7'")
                     Wait(1500)
                 end
+
+                -- Make players head face the coord for 5 seconds
+                TaskLookAtEntity(ped, entity, 5000, 1, 1)
             end
         end
     end

shared/societybank.lua

@@ -263,4 +263,14 @@ function fundSociety(society, amount)
     end
 
     print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
+end
+
+if isServer() then
+    createCallback(getScript()..":server:getAccount", function(source, society)
+        if society then
+            local getMoney = getSocietyAccount(society)
+            return getMoney
+        end
+        return 0
+    end)
 end

starter.lua

@@ -77,6 +77,7 @@ end
 -- [[ Server.Cfg Convar Check ]]--
 -- Check server convars for hard set defaults, otherwise it uses per script configurations
 if Config and Config.System then
+    debugMode = Config.System.Debug
     if Config.System.Debug then
         if GetConvar("jim_DisableDebug", "false") == "true" then
             debugMode = false
@@ -84,10 +85,7 @@ if Config and Config.System then
         if GetConvar("jim_DisableEventDebug", "false") == "true" then
             Config.System.EventDebug = false
         end
-    else
-        debugMode = Config.System.Debug
     end
-
     Config.System.Menu = GetConvar("jim_menuScript", Config.System.Menu)
     Config.System.Notify = GetConvar("jim_notifyScript", Config.System.Notify or "gta")
     Config.System.ProgressBar = GetConvar("jim_progressBarScript", Config.System.ProgressBar or "gta")