From 961a80d94ca9eb67a5ff2f4901a9482d540754d5 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 17 Jun 2023 10:36:44 -0400
Subject: [PATCH 01/25] Fix infinite loading screen

---
 .../mod/scripts/vscripts/ui/_menus.nut           | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index c83381fdb..b4c50029f 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -178,6 +178,20 @@ void function UICodeCallback_ToggleInGameMenu()
 	}
 }
 
+void function CancelLevelLoadingInfinite()
+{
+	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
+	print("CancelLevelLoadingInfinite has Initialized")
+	wait 30
+	if (uiGlobal.isLoading == true)
+	{
+		printt("CancelLevelLoadingInfinite disconnected because loading took too long")
+		UICodeCallback_LevelLoadingFinished( true )
+		Disconnect()
+	}
+	return
+}
+
 // Return true to show load screen, false to not show load screen.
 // levelname can be "" because the level to load isn't always known when the load screen starts
 bool function UICodeCallback_LevelLoadingStarted( string levelname )
@@ -204,7 +218,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
 	if ( !Console_IsSignedIn() )
 		return false
 #endif
-
+	thread CancelLevelLoadingInfinite()
 	return true
 }
 

From a91a22ce1e4e924f4d88840678906000f6023d2f Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 17 Jun 2023 11:20:56 -0400
Subject: [PATCH 02/25] Update
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index b4c50029f..dca212bab 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -189,7 +189,6 @@ void function CancelLevelLoadingInfinite()
 		UICodeCallback_LevelLoadingFinished( true )
 		Disconnect()
 	}
-	return
 }
 
 // Return true to show load screen, false to not show load screen.

From a94610d38b71b2fad666c518575006866aac72b9 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 17 Jun 2023 11:22:16 -0400
Subject: [PATCH 03/25] Update _menus.nut

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index dca212bab..7de2e13b1 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -178,14 +178,14 @@ void function UICodeCallback_ToggleInGameMenu()
 	}
 }
 
-void function CancelLevelLoadingInfinite()
+void function CancelLevelLoading()
 {
 	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
-	print("CancelLevelLoadingInfinite has Initialized")
+	print("CancelLevelLoading has Initialized")
 	wait 30
 	if (uiGlobal.isLoading == true)
 	{
-		printt("CancelLevelLoadingInfinite disconnected because loading took too long")
+		printt("CancelLevelLoading disconnected because loading took too long")
 		UICodeCallback_LevelLoadingFinished( true )
 		Disconnect()
 	}
@@ -217,7 +217,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
 	if ( !Console_IsSignedIn() )
 		return false
 #endif
-	thread CancelLevelLoadingInfinite()
+	thread CancelLevelLoading()
 	return true
 }
 

From da65be23024055e4aed7bde971c803a15960af91 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 17 Jun 2023 11:38:17 -0400
Subject: [PATCH 04/25] Update _menus.nut

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 7de2e13b1..1893a0b1d 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -188,6 +188,7 @@ void function CancelLevelLoading()
 		printt("CancelLevelLoading disconnected because loading took too long")
 		UICodeCallback_LevelLoadingFinished( true )
 		Disconnect()
+		OpenErrorDialog( "Loading timed out (Over 30 seconds)" )
 	}
 }
 

From 3246c7d213b358da30f269e3150ed4f211b7d806 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 17 Jun 2023 12:07:45 -0400
Subject: [PATCH 05/25] Update _menus.nut

---
 .../mod/scripts/vscripts/ui/_menus.nut        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 1893a0b1d..d908b098a 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -178,17 +178,26 @@ void function UICodeCallback_ToggleInGameMenu()
 	}
 }
 
-void function CancelLevelLoading()
+void function TimeoutHandler()
 {
 	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
-	print("CancelLevelLoading has Initialized")
-	wait 30
-	if (uiGlobal.isLoading == true)
+	printt( "TimeoutHandler has Initialized" )
+	const int timeoutThreshold = 30 // how long this function will wait before disconnecting
+	for ( int i = 0; i < timeoutThreshold; i++ ) //Ensure that they aren't disconnected if they leave and rejoin multiple servers
 	{
-		printt("CancelLevelLoading disconnected because loading took too long")
-		UICodeCallback_LevelLoadingFinished( true )
-		Disconnect()
-		OpenErrorDialog( "Loading timed out (Over 30 seconds)" )
+		wait 1
+		if ( uiGlobal.isLoading == false )
+		{
+			printt( "TimeoutHandler cancelled because it detected a successful load" )
+			return //Cancel function if the client is no longer loading (If there is a better way to stop a threaded function please let me know)
+		}
+	}
+	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
+	{
+		printt( "TimeoutHandler disconnected because loading took too long" )
+		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
+		Disconnect() // Loads menu
+		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", timeoutThreshold ) ) //Opens error dialog to notify user
 	}
 }
 
@@ -218,7 +227,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
 	if ( !Console_IsSignedIn() )
 		return false
 #endif
-	thread CancelLevelLoading()
+	thread TimeoutHandler()
 	return true
 }
 

From 9817a5505b940fa8cfa110138392222a9e8350fc Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 7 Jul 2023 18:17:03 -0400
Subject: [PATCH 06/25] Add files via upload

---
 Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut b/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
index 19c6b6df1..6ea252467 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
@@ -69,6 +69,7 @@ function CodeCallback_RegisterClass_CPlayer()
 
 		Assert( !this.GetParent(), this + " should not have a parent yet! - Parent: " + this.GetParent() )
 		Assert( this.s.respawnCount <= 1 || IsMultiplayer(), "Tried to respawn in single player, see callstack" )
+		Assert( this.IsEntAlive(), this + "Tried to respawn when it is already alive") // Crash failsafe when loading via dropship, North
 		this.Code_RespawnPlayer( ent )
 	}
 

From d766fc3a710ab443e0237b502e6a064ae7c3f72c Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:50:06 -0400
Subject: [PATCH 07/25] remove other pr stuffs

---
 Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut b/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
index 6ea252467..19c6b6df1 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/class/cplayer.nut
@@ -69,7 +69,6 @@ function CodeCallback_RegisterClass_CPlayer()
 
 		Assert( !this.GetParent(), this + " should not have a parent yet! - Parent: " + this.GetParent() )
 		Assert( this.s.respawnCount <= 1 || IsMultiplayer(), "Tried to respawn in single player, see callstack" )
-		Assert( this.IsEntAlive(), this + "Tried to respawn when it is already alive") // Crash failsafe when loading via dropship, North
 		this.Code_RespawnPlayer( ent )
 	}
 

From eb5fd2c7cedfa3f98999c8a18f9ff4ffccd16d5a Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:13:25 -0400
Subject: [PATCH 08/25] Update _menus.nut

---
 .../mod/scripts/vscripts/ui/_menus.nut        | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index d908b098a..c83381fdb 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -178,29 +178,6 @@ void function UICodeCallback_ToggleInGameMenu()
 	}
 }
 
-void function TimeoutHandler()
-{
-	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
-	printt( "TimeoutHandler has Initialized" )
-	const int timeoutThreshold = 30 // how long this function will wait before disconnecting
-	for ( int i = 0; i < timeoutThreshold; i++ ) //Ensure that they aren't disconnected if they leave and rejoin multiple servers
-	{
-		wait 1
-		if ( uiGlobal.isLoading == false )
-		{
-			printt( "TimeoutHandler cancelled because it detected a successful load" )
-			return //Cancel function if the client is no longer loading (If there is a better way to stop a threaded function please let me know)
-		}
-	}
-	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
-	{
-		printt( "TimeoutHandler disconnected because loading took too long" )
-		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
-		Disconnect() // Loads menu
-		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", timeoutThreshold ) ) //Opens error dialog to notify user
-	}
-}
-
 // Return true to show load screen, false to not show load screen.
 // levelname can be "" because the level to load isn't always known when the load screen starts
 bool function UICodeCallback_LevelLoadingStarted( string levelname )
@@ -227,7 +204,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
 	if ( !Console_IsSignedIn() )
 		return false
 #endif
-	thread TimeoutHandler()
+
 	return true
 }
 

From d4fa01cfdd3b135276718f6c4b7ecd8c5c470a9e Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:30:08 -0400
Subject: [PATCH 09/25] Re-add loading screen fix

---
 .../mod/scripts/vscripts/ui/_menus.nut        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index c83381fdb..241f7227f 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -178,6 +178,24 @@ void function UICodeCallback_ToggleInGameMenu()
 	}
 }
 
+
+void function TimeoutHandler()
+{
+	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
+	printt( "TimeoutHandler has Initialized" )
+	const int timeoutThreshold = 30 // how long this function will wait before disconnecting
+	EndSignal( uiGlobal.signalDummy, "LevelShutdown" ) // Cancels thread if map is unloaded
+
+	wait timeoutThreshold
+	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
+	{
+		printt( "TimeoutHandler disconnected because loading took too long" )
+		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
+		Disconnect() // Loads menu
+		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", timeoutThreshold ) ) //Opens error dialog to notify user
+	}
+}
+
 // Return true to show load screen, false to not show load screen.
 // levelname can be "" because the level to load isn't always known when the load screen starts
 bool function UICodeCallback_LevelLoadingStarted( string levelname )
@@ -204,7 +222,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname )
 	if ( !Console_IsSignedIn() )
 		return false
 #endif
-
+	thread TimeoutHandler()
 	return true
 }
 

From fd6345802f5887c88ba0490754137d4ee874c0d5 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:00:53 -0400
Subject: [PATCH 10/25] New localization

---
 .../northstar_client_localisation_english.txt | Bin 14296 -> 28720 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index 5dabd539875451ae0304903cdd0f2cd6238cd5b4..e937f056df3fd5b7912b09f7bc804a4d67d6b989 100644
GIT binary patch
literal 28720
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
F{{pc)Xzu_3

literal 14296
zcmc&*ZIj|glK$-Z73GfDus6cfep#<~W4~Mo5DjjSI7tlKcfM5!C_rwII7xK7eX;-j
zo+qm$Bw+0D?QYzBm`0_ntgNi8eAnGR$+maz{^#8%cN6?NC0l)`?sT@@r{(Srqf!2>
zvl71m^2wK9s%V#%YLo7@%CugWs>;<;E1j+KwO*^FRP$)~{_F45#C?YecT?A!#}jAn
z^+&Pi2hk{uoB%6Kl2f+YDK9UoU0Eds7O=q4IGVWe)E|TZo91h-{mEV6PJCxj4+nam
zCu`NbT{wX^_8u@{krY|V9br!24+K#>7>7;|NE<M9H%QB5xd)_L<%L!UtfN**rj~_H
zp4D4^D%5J9>a6-yP+1IEz)aM4vb(|9nfMQ}A$ja!Z<C2T=xj9FCD}7LmKQ3`u+zOP
z+U(n)cjnQ^^`dd#iN?McI}d^Df^!ilHw(Cbjj;9*NSc}C{A*r3f1%Rqd=|;6+JWkH
zl~h`tN^TGXtyzbptaPDDUA*Yx-W=y^y5Flp|Mw{cD@vWMIZb$w7wI<5uoQ%V3ldic
zgRCy|v%I1tloj~7R-p7$;xG4|WN#|R%t9Sc#W62+dH-%!=(1E#x>V_gOQ~dAXl<5A
zOH0>km!~Uj&INzK$t_Tl9+JT$JLn8kD_NpS5BgqCtLO9|<B#zae00uCO7l!PTpE}v
znf%Y57Y8n7p6B<3eHvcj>Ts`M0%X5ZQCcP02C|{P5sp>7WOn!Ddh(1bw%O=ag$+`)
ztz5Ke^&aA>6Gm<jy1@sRcdWfl%0b>eI>W0r3g0_Rp66SFcgYKRk7LUe&lqSrLiU<g
zt$Td0xJllmmsG#XLCMLIz4giQ+RDk<&4`XLcgWBl_X2-`pP(QVIaR$Pe}%}(0eN9;
zz$_H5n|Y?f@Nz5KymF^(eS5~-d-VK;2PNZT&OCe0^4E+Kg?kO|Uahcj#u4<((6`Lx
zN{b||cuy$dhRX8(-thEle&6>zx6ivhbjHvSnBLE`4ChJt+ayq@YoiGQcL;eI*&TA7
zKyM%>(8Z*z#VU(4o;hK-@Pigk$QX`fmXsy*gW-V8t7o(y&Xkx1X2JM_6G3e{5j6J9
zd2r)d;C=uYZtP2%pGqKxjUX{MU_GO#JpEH;;Toz9#?Xz(Nzv^|1q%@BiflAmUMTAV
z#^JojVNme9^6M7(H3cCMPu$tWd2)kz;(l-^cGBk|R@m#~K6%r{?`5N~WSb&UyA)!{
z6Fe5_3svSph@x8g0@`eqK#2)pp6%b%4(4q(i7_!=>vBbTen~PY&qRnZZ-^4>;u?Gg
zZCac%+9Orw`}|%#Qqk&6A5thjT%^}DyI1{uzlS8KKd5C=K{xZAsLiulFc$?hQ$!))
zhGoK9h%kgjm>R=;xDS5t6wk&Jp9*J|?sKEnDC*a6xO9#OIMF|HrnljO@o)&RAl+>2
zLES_rCkMDGnP}u`wTBp{tN3ulc;7sz=}guFZ(@A}iQ5yMj^LCjw|?Z_N}A?<dPvF7
zQ0(+Xp7^rh?fw{q`dnVWUna0YIB>wzI@Gu#{8ksJZoj{Q2$%7gyk^HDugv`=>1IsL
znn9f1!8!@tQWfuXvafdW;k2*PBRq=&(?&9;T4S;^gA5`Dd2Jyd$TK09d0tj!tTVVU
zdJT}C49Gq;9H981AxE)UIES5IL%PXgfrIL$2XG!I%ByKDqO2S#S=P>Oy%xpPnqSeF
zbvG*V_0joQKGEB>j8DgHk>F;5QilU-UJsDOG~1+ETIqP5=LfxxVLB^rYHY{V0OKl@
zQNkNK%3Z4W>$uQcodG!DUtJ`kx<h#fi6(df;f^=^94=3}PhJuL4|KA|wSN#{67Ftv
zQk~%6#Jq?x40gQ3#TG^bK7w2F00**Cz2pFH{k%7d@_H8bc|77RHd<B5>RG`I2$Sdp
zd}O5~)DLHH6`$@@nOb{wjUNu+Guap()79Gzd|0zepP`M2ulY?jT;Mt!u~~s$C3`s-
zjwqQUBiD0^eD$oWI4K~XKp)7Xa^&$Ey4>Z}_LP-znWabU2{W7m#|xKktp@b?z<r~1
z(jw2|;<Oh58RNmQOa(F|hqyY%iIBWXjy$ONm_r?(=^iD;+76MFRgN%6pAIp@iTu>L
zQ&7wDPEG8)yLSrzI1QG6eZU4+ID~i$HD*?jX9$2i*T7KPSsmouuTF4}4{D!-bqGMj
z`a{fr#IRcHRVt3Rb+U|aU*>R{McvcQ$9gbFFjw$bNC=Ekxy*m!L4#fV)f&a7mP;xS
z`wko7a~pzI3;_ES{^b@Tt(K>XK?UTj4VEmIR99io|Er8YI8)ac3XU`jSPx<nZ?_nH
zfI5Fjs00n6+igQo{i;h504zNZ8Xmo(cp6tmCvX%XB(=$Gp|sZaH_Wh`d3fk<1<w~W
zgC3Fq)$t0c!CSH3GhM9U%fbgzfqB9G0hV^Itj^GmJgbkw>!0-ML<u-gaqFR5vn(4c
z8bhN`qr}9ykb<genA^PTau*PmyDlt*GM7NT?ik6#k3k4lDAAbrYJjMu$lq`TGC;0x
zaUuc&KiT-WW>L%je<n(MK2g*?A3S&VZP|gK@URqP>SwYMhK7AR*oA30bPd^MmBm@}
zi{K%&)EA1sC<OOP<P8^<LGAJc|4o7$;SkaWN40!Y^iAmb89{ECRwK8Z`_~}1JnWC0
zX%Ar(`Ow_idQjb6^P#!HyL7!4dr4z6G7pxU=2gSYGeDP#7R<^Vmoo0Rg1$?$m$Xdb
zyD-kL@v9y6X2T~tzs08i(|pT`(ReU$y)Gl{m@%lWJ(}_O$)Cp#5=adgJbDGA)*{)2
zY!?1;JeeR^2|kQJAWW>)1!Ma1RJ^1w(5hy07JfJm!sv{h!3|ggiE1r?36|?6a&S<z
zV%NnqhE<-y5T0K*CvpYUJs4oBC40z}%Mj+op-j&a>da1i{NLNt3zKCUl_c>B{9H)7
zivZ?Li9_CA-?BRN!Y-dV@G;Uu=IDC96Aa>><2?rRSw!F-a%RQpSjlZOn*<ibbj|>w
zT@6XBCMtlRhKpFwGRJab0%J)`BC8h&<;-q+Z|ZmDH$pO}w2)upt6y3~kO;*7Lc#^U
zuLU1j{d&;GjJza!33C=u3J2sz+&z3*6A^xpS3FA2DDzFVq-!bGr=Awt(OWa}%?7!#
zb$5bq25-S5gn@(BK`#gYWpmoMW+8sk7kim<=oYM5;YewUmz1V>mFN34tVaxk*B&Po
zI1{Q>M8XEfoQyg54oA)rPs0w^20`^jL6iV=hzV?PW-kban+wvs>|P9lSalW3jYT>V
zw-Lhz)x9#qxX7Xh%nNv`ugJKHx1!gL`XVx`yZ$-I?ClzR!|v_kz~z21X0lC<5;G%`
zc!JP=hK$})gXppBt<F82r(NkX14uoAvpFP)!(iDOc9>nCryJGQTC=6xhG_w3w_f;i
z<^&ncMv2<1YPI47iR)%bbH&dq3c;6?Ezvl{1GWpd83)S99}aq{;O$=`sWtv3o?7u!
z8h()qqy1gfJG#5D5^&b$)n>!c$hc~vh3V9TyK=U4tpL!->or(ca0S>(u8U~@O-Vp1
zfdV&Q>ivr@zd(dx{W_c?lTdHQzdPGpK~%eR|1csevC(kobVXK1ZtvdS)*X!<OtLnn
zPV48IF}t#1OXq!;BY?8}AQ0~B4u8Ht;!HpDsRE1O)FPdLEIb(0+*-`D+yBk;YDeS3
z_<dw2@Bv)M8-%X=*xXS*NX{E_sNi`hN7*5Ar9Hz8#{)O)gHJ<lgBzq?!cWoDW?w&K
zlwBz~NYaX)KJQ|wS2?n0!qhh6`UY@}+4nOgX5^9(8LjCc%aAKYd~5k^*xJT#2oK}2
z*Y~HUU}uL^GjzGez(*bI!HwdfKlhmB9^}Z`G9Zxzzq!QiMF=Z5(9mq`{Ww%8u_=x#
zGk&>Fz4y-4ngPEu_rZtOipEp2%zB9>R1MM?pCT)jeP-xIHhH_VT8HO_!y>0*82cn!
z>A2F#fr5{^O>W2Nd*fWc42|T<fwiaNH#BifwT6iRre2mO+C$_XAl`835~#klhP=aC
zK?I7gkvo(MuLS%i%0rM#2Q*R0n4zGE$Q?;*m40?Gg*PI`IIBN4?t%Xa^hkES!j~%a
z2Du6BLKax-7gT7EEc%emP3*CG1(ic&ZYm@|;e(li4)onGylC!wdtUdtZ(i%`KCmi|
zs#;XsXSn+bN}W>l<n6F|+a{W=6$^0KD?D5nue+i8naK}F@?LaPie%L!HGc6`LwR>@
zm-gqPrkyb*y&>_m(`<!AB94wb+2gcO(aEJ!S_lw{IF}9xwAm+8<1-b-w1T?=gnUD!
zI3W0`Qgmd|q24uCw+iq7X?4r<M-!yB!hy#Cg;PWayz$~32C@Mm9Pd1L5eH6Rv{cKx
zkmO&(AR}IYuJ3kxR((;)p<kGW+KO4MCWc&1l!xMGi!7ssu+nhiJhau@kf(yf%n!Ig
zHSv8PZ32C0Gyr3Jbpgm+FI1h7-j;*o0zBxVLGOC*^eLvd!_CLODfEH?kaHe0p?Qm$
z+^<)|=7Xy#*!@|MetCu*3dkhGwkQCT-CT=)L-%&WLu23q*kS#X0KDJz^T%H`x22xj
zy(cw>`nDjic0gQ_RJ(gMVg?-+4Oy$bIwqMmcL;*6OqodRB4QF2ZfvRxx)!xQv?A13
zp;^FQh=1JzwVvt8(nFY}9{NU5Z1vm;YIw6~9*Cz-M%z3#^cJ^uj#STab2ER0t_KFs
zGsA$s$$+E&+c~6FwLvUq%5nIkq5M%BQvC>V1pt3TjWO_T{Tx-VrgVP0eu(B9ci_*P
zk|Z(==zxF=Ziq8!@i<9~I9aXq-c+uz6(@yP%n_;B<e4xm%WY)~*?VNskwFFII73bA
z{fwnHDX5xp?i>nViZv#7B!A3+TIl4MOKTIV9>-W8mPzs4Dym7Oa)k9op~1W?zig7W
z#&@c#n+2*tIZ)RH&On~IdY&)EIu|X(K9cOv<vpojqK0v>cU3A-(j>G^m$E15a{OeU
z6D$tV35ZFAA+EMOtm|`UrgGa->~4T!1Q;tl%J(#cz-@o2SHlDo!!kZcJyE!JYdY#-
z)y~f%+?{4Ec0_5Gujsv~hNfFM>X+OxNT^X*f8`d<j1`@9Z6}z}F-c*?h~d@}o7Rj_
z@0kkVpZB=?zdniOSevfLyz^?NbgLi=HuHaT=_Hj6LCw#Echj^ik%)#%1Y`r@ta8Tc
zfMM~d=tN)(xNt~~9MLy*+HANbXv^}*bO|fwpU=JF*c*o<ckp}F?qXoB<S2BU;TsKl
z1=v-k7JZ{hK`zV<H05?DW`|v4b+-f*(BYV*+sssAHt0^M1BceawaWa*F<IRhqC<ep
z2xoB=IN*RZ_eC((a>Zfo9?(EoA@43cXo1CjIPl@PUq>ZWgUDA%;GQ1xGQr%cuo;Xp
zMIBqpaMqRqQ9p3PQ8<oVu)i0*|I;^r`nF!9d3CwS_cTB}5qPx+t*cVmnP;@2yFhE!
z*F=gMvng)|sQcBp?fXm27AZZ~UWC93ngiMcUO1fXwf^~q4LQ>8GfjSE3IT&uSm$+n
zzCVr7>xB5kG@(ILnm#^f`BoY=hFy2TE~#)bg>DO7Y{i@+LO?|m#Vhs3+Ioq1`lln3
zWN`jrg-bLNG7_l$17IJ`duWoJqOoZ_q!DnXmrbm4pDi{u6FP8LMBt7TEC{P35^nI3
zGH4z6I_ngr7Wg|@9l=PK4>)Yxqyk})we?o0dai?RC{RL?>Y=`9Z3{UeuPztwo&)=I
z4oFXflW7LcdXRflG?}ptRI})KI+x>VA7nruXDyCI1Luj$7iqF*wFug#;R4^?ULSZ&
zGN=>>OyW9}he-!lf;%I1C}fx6hP|hxu%!qUJ^)xxLI9lt2^GtV@EbY}<b#ZwONYVR
z6v&xD61O?y#3K>QU)(S>ca|skurO^T2H4J07(PBNu&ED}e=apdqSqSW`s^E!%Z0HT
z#lJoQgtCoO1jap{mPlmw;0V~|pip~gkV12->B?K0)<M~=bVg!l{$xJo>D#_NA;I*G
zwO$%EZf?lbfnum<O%tPen*gzS!+Lk)3I*;1n|Yg;Xg#5?VhC}9{;21mP0i^^n_7ql
zn$_+v@|KGY#}l-2g2b!Enm3)rnA3=dbGVVsd!`Q55XDIZf^7CZr+Z>|I*XnzAYBMF
zsydgTvjDk`E>1X5Y<<FgYeSnJOi{bRc*b5wP>*<gRisCjx$VZ;n_9PV!>=(!^-<YD
z>?C`pG|IC~_}(9Tac>?)f{ssCa2I1XC_cFaM;o!hZU&`w)yvyMj>p^PWN3dN|LcBC
zu_}GriJ5Kd{!LgLbU4ITA~4a4!e7+izUw*P^}qe<EBNMuKl0J@-Rjn~906qi+wc0{
z^(`b8g<NvKun*ZuWMJekfEtzMS3@bDW5fZZ(<XvL4*A~XDRw<Jurn6+*@)N_J$PFi
zAlszgK-pGx<ItVKJRE4?{`-7vq6|Uk%Mn2pHAixWzl04;qj=qZZ?~2l&s!5=ocR4m
zp;+V)Eicb>Ee-TId%tCZ3B_<p5RK-87<K6=UW~@!3<83l)8Uw{CI4wh{!4h&z*%8C
zgP8$9k+q&5^8hUn`e|pr7s8(N<nz;h&4e7XD{Lx}G?&P{EYQO@1|OTs`vwcltAu%o
znV@D-$wnv78rVw45=Mp3JvLSQ!T3M$Ex;L@tlvfg+r?fVc2lEO;Ah+?Xww6Gy(O*2
zhI}Y=q3a6e-6!~mdT{XuvkV(&cLh5J7ntS<rck=b5l|t{fL4A*(L;=f=`+7ZJ6k|<
z1nmMDx-BBkRs(Su1y8KKwwc*x=P^Ok5Dm1@(_x2g$felX6s|1NoP?y|VII+&t1Pub
z+}QizOvd=;0|9c~)gDLwBkK6-69jyQ^Kg3Le876HZFjppA^BuM@O&Ra3(p+1ZpUsA
z_)w~{zFQQSOS+lb{E<;!hwQl*&Sx`xvVuc|&I(1Lk?FKwRHx8s%q55sHeXuEfug&M
zO>3z7ACGX8Ogv>T3H&~!kEGw3a*ANN?#T`1Krz$;5$c<dW>A^N4x0XHOh11L(o4Yn
z8na9jtugXZhw8RdV;Q4DMra|0A<ay77k;&EfR^4}I-2LM>@%*uWBo{j^%@zvFY!48
z&A;sd<}Rg`ypQaCG@v6oalMCV#JSxyArM)`5L69LY|ykOgCE$~etmcbV|*2Z+QF2?
zlRJE~ly6ntzTcPcb>Jr;u~Ww=REd*`zrYzr4jS<L&O|uPB)~3Rq5^-}%UFX!(jmBg
z`3#3=gU(UN=t{m5Y1$u!)vYxau0vHL@U0cvnT8hH*nnSQH{gOBT6jJgfEMJ0JP3b0
z@q4`|@-EQmZ$t-VZely-Y}nLmPS3U9JveAzVd@igNtdf&ngjQVLR+Fa^50~M1^ZTT
zt&!(s7OE{^@~xNsIEbMK-ZzqARLl}-epVdle?t2C)zLOD-tK?Me#m6D)p7WCKo=F;
zmEjYDjMk!dLE*yXf)pfX!K^rPowR}zj9Ny5Mrw55qo?9m7i(WLYpP{6W2=Rp4u~*A
zAObc@d;~yjwH$=7#+q!H9!#H4(8gjIjt^3xRzR%HGy(vN*|)sI_2y7|dBKMu<k6?7
zk0bR1&+WjX^?_~!^!eZZ_{Ts0c{u#)t8+tXg{CP+eEjI@KF$C371{gucYlBPzxAeA
AtpET3


From bfb7656750ddf658c0104054b740e74f63c66ef1 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:01:30 -0400
Subject: [PATCH 11/25] Use convar

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 241f7227f..72f083786 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -183,16 +183,15 @@ void function TimeoutHandler()
 {
 	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
 	printt( "TimeoutHandler has Initialized" )
-	const int timeoutThreshold = 30 // how long this function will wait before disconnecting
 	EndSignal( uiGlobal.signalDummy, "LevelShutdown" ) // Cancels thread if map is unloaded
 
-	wait timeoutThreshold
+	wait GetConVarFloat( "ns_max_load_time" )
 	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
 	{
 		printt( "TimeoutHandler disconnected because loading took too long" )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
 		Disconnect() // Loads menu
-		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", timeoutThreshold ) ) //Opens error dialog to notify user
+		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", GetConVarInt( "ns_max_load_time" ) ) ) //Opens error dialog to notify user
 	}
 }
 

From 8b7863bee31a31e64497bfcc108530c79a6c702d Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:02:00 -0400
Subject: [PATCH 12/25] New ConVar

---
 Northstar.Client/mod.json | 274 +++++++++++++++++++-------------------
 1 file changed, 140 insertions(+), 134 deletions(-)

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
index 8040c14c4..346d87e36 100644
--- a/Northstar.Client/mod.json
+++ b/Northstar.Client/mod.json
@@ -1,136 +1,142 @@
 {
-	"Name": "Northstar.Client",
-	"Description": "Various ui and client changes to fix bugs and add better support for mods",
-	"Version": "1.16.0",
-	"LoadPriority": 0,
-	"InitScript": "cl_northstar_client_init.nut",
-	"ConVars": [
-		{
-			"Name": "filter_hide_empty",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_hide_full",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_hide_protected",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_map",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_gamemode",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_mods",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "filter_map_hide_locked",
-			"DefaultValue": "0"
-		},
-		{
-			"Name": "modlist_show_convars",
-			"DefaultValue": "0",
-			"Flags": 16777216
-		},
-		{
-			"Name": "modlist_reverse",
-			"DefaultValue": "0",
-			"Flags": 16777216
-		}
-	],
-	"Scripts": [
-		{
-			"Path": "_custom_codecallbacks_client.gnut",
-			"RunOn": "CLIENT"
-		},
-		{
-			"Path": "client/cl_chat.gnut",
-			"RunOn": "CLIENT"
-		},
-		{
-			"Path": "ui/menu_ns_modmenu.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"Before": "AddNorthstarModMenu",
-				"After": "AddNorthstarModMenu_MainMenuFooter"
-			}
-		},
-		{
-			"Path": "ui/menu_ns_setversionlabel.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"After": "NS_SetVersionLabel"
-			}
-		},
-		{
-			"Path": "presence/ui_presence.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"After": "NSUpdateGameStateUIStart"
-			}
-		},
-		{
-			"Path": "presence/cl_presence.nut",
-			"RunOn": "CLIENT",
-			"ClientCallback": {
-				"After": "NSUpdateGameStateClientStart"
-			}
-		},
-		{
-			"Path": "ui/menu_ns_serverbrowser.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"Before": "AddNorthstarServerBrowserMenu"
-			}
-		},
-		{
-			"Path": "ui/menu_ns_connect_password.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"Before": "AddNorthstarConnectWithPasswordMenu"
-			}
-		},
-		{
-			"Path": "ui/menu_ns_custom_match_settings_categories.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
-			}
-		},
-		{
-			"Path": "ui/menu_ns_custom_match_settings.nut",
-			"RunOn": "UI",
-			"UICallback": {
-				"Before": "AddNorthstarCustomMatchSettingsMenu"
-			}
-		},
-		{
-			"Path": "ui/controller_prompts.nut",
-			"RunOn": "UI"
-		},
-		{
-			"Path": "ui/ns_slider.nut",
-			"RunOn": "UI"
-		},
-		{
-			"Path": "ui/menu_mod_settings.nut",
-			"RunOn": "UI",
-			"UICallback":{
-				"Before": "AddModSettingsMenu"
-      		}
-    	},
-    	{
-			"Path": "ui/ui_mouse_capture.nut",
-			"RunOn": "UI"
-		}
-	],
-	"Localisation": [
-		"resource/northstar_client_localisation_%language%.txt"
-	]
+  "Name": "Northstar.Client",
+  "Description": "Various ui and client changes to fix bugs and add better support for mods",
+  "Version": "1.18.1",
+  "LoadPriority": 0,
+  "InitScript": "cl_northstar_client_init.nut",
+  "ConVars": [
+    {
+      "Name": "ns_max_load_time",
+      "DefaultValue": "30",
+      "HelpString": "Amount of time (in seconds) until a loading screen returns to menu",
+      "Flags": "ARCHIVE_PLAYERPROFILE"
+    },
+    {
+      "Name": "filter_hide_empty",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_hide_full",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_hide_protected",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_map",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_gamemode",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_mods",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "filter_map_hide_locked",
+      "DefaultValue": "0"
+    },
+    {
+      "Name": "modlist_show_convars",
+      "DefaultValue": "0",
+      "Flags": 16777216
+    },
+    {
+      "Name": "modlist_reverse",
+      "DefaultValue": "0",
+      "Flags": 16777216
+    }
+  ],
+  "Scripts": [
+    {
+      "Path": "_custom_codecallbacks_client.gnut",
+      "RunOn": "CLIENT"
+    },
+    {
+      "Path": "client/cl_chat.gnut",
+      "RunOn": "CLIENT"
+    },
+    {
+      "Path": "ui/menu_ns_modmenu.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddNorthstarModMenu",
+        "After": "AddNorthstarModMenu_MainMenuFooter"
+      }
+    },
+    {
+      "Path": "ui/menu_ns_setversionlabel.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "After": "NS_SetVersionLabel"
+      }
+    },
+    {
+      "Path": "presence/ui_presence.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "After": "NSUpdateGameStateUIStart"
+      }
+    },
+    {
+      "Path": "presence/cl_presence.nut",
+      "RunOn": "CLIENT",
+      "ClientCallback": {
+        "After": "NSUpdateGameStateClientStart"
+      }
+    },
+    {
+      "Path": "ui/menu_ns_serverbrowser.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddNorthstarServerBrowserMenu"
+      }
+    },
+    {
+      "Path": "ui/menu_ns_connect_password.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddNorthstarConnectWithPasswordMenu"
+      }
+    },
+    {
+      "Path": "ui/menu_ns_custom_match_settings_categories.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
+      }
+    },
+    {
+      "Path": "ui/menu_ns_custom_match_settings.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddNorthstarCustomMatchSettingsMenu"
+      }
+    },
+    {
+      "Path": "ui/controller_prompts.nut",
+      "RunOn": "UI"
+    },
+    {
+      "Path": "ui/ns_slider.nut",
+      "RunOn": "UI"
+    },
+    {
+      "Path": "ui/menu_mod_settings.nut",
+      "RunOn": "UI",
+      "UICallback": {
+        "Before": "AddModSettingsMenu"
+      }
+    },
+    {
+      "Path": "ui/ui_mouse_capture.nut",
+      "RunOn": "UI"
+    }
+  ],
+  "Localisation": [
+    "resource/northstar_client_localisation_%language%.txt"
+  ]
 }

From 873d372d75a480d9434a07a5e13856264ca871c9 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Fri, 25 Aug 2023 18:02:42 -0400
Subject: [PATCH 13/25] Create Northstar.Client section

---
 .../mod/scripts/vscripts/ui/menu_mod_settings.nut            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
index a45082c71..ffd0cc573 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
@@ -82,6 +82,9 @@ struct {
 void function AddModSettingsMenu()
 {
 	AddMenu( "ModSettings", $"resource/ui/menus/mod_settings.menu", InitModMenu )
+	AddModTitle( "^656dce00Northstar.Client" )
+	AddModCategory( "#MISC" )
+	ModSettings_AddSetting( "ns_max_load_time", "#MAX_LOAD", "int" )
 }
 
 void function InitModMenu()
@@ -343,6 +346,7 @@ void function UpdateListSliderHeight()
 
 void function UpdateList()
 {
+
 	Hud_SetFocused( Hud_GetChild( file.menu, "BtnModsSearch" ) )
 	file.updatingList = true
 
@@ -949,6 +953,7 @@ void function SendTextPanelChanges( var textPanel )
 					ThrowInvalidValue( "This setting is an integer, and only accepts whole numbers." )
 					Hud_SetText( textPanel, GetConVarString( c.conVar ) )
 				}
+				break
 			case "bool":
 				if ( newSetting != "0" && newSetting != "1" )
 				{

From 75379a3d9973cc5b04ca58f65f03216961215199 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 12:44:07 -0400
Subject: [PATCH 14/25] Fix indent

---
 Northstar.Client/mod.json | 276 +++++++++++++++++++-------------------
 1 file changed, 138 insertions(+), 138 deletions(-)

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
index 346d87e36..165d0c0ef 100644
--- a/Northstar.Client/mod.json
+++ b/Northstar.Client/mod.json
@@ -1,142 +1,142 @@
 {
-  "Name": "Northstar.Client",
-  "Description": "Various ui and client changes to fix bugs and add better support for mods",
-  "Version": "1.18.1",
-  "LoadPriority": 0,
-  "InitScript": "cl_northstar_client_init.nut",
-  "ConVars": [
-    {
-      "Name": "ns_max_load_time",
-      "DefaultValue": "30",
-      "HelpString": "Amount of time (in seconds) until a loading screen returns to menu",
-      "Flags": "ARCHIVE_PLAYERPROFILE"
-    },
-    {
-      "Name": "filter_hide_empty",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_hide_full",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_hide_protected",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_map",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_gamemode",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_mods",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "filter_map_hide_locked",
-      "DefaultValue": "0"
-    },
-    {
-      "Name": "modlist_show_convars",
-      "DefaultValue": "0",
-      "Flags": 16777216
-    },
-    {
-      "Name": "modlist_reverse",
-      "DefaultValue": "0",
-      "Flags": 16777216
-    }
-  ],
-  "Scripts": [
-    {
-      "Path": "_custom_codecallbacks_client.gnut",
-      "RunOn": "CLIENT"
-    },
-    {
-      "Path": "client/cl_chat.gnut",
-      "RunOn": "CLIENT"
-    },
-    {
-      "Path": "ui/menu_ns_modmenu.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddNorthstarModMenu",
-        "After": "AddNorthstarModMenu_MainMenuFooter"
+    "Name": "Northstar.Client",
+    "Description": "Various ui and client changes to fix bugs and add better support for mods",
+    "Version": "1.18.1",
+    "LoadPriority": 0,
+    "InitScript": "cl_northstar_client_init.nut",
+    "ConVars": [
+      {
+        "Name": "ns_max_load_time",
+        "DefaultValue": "30",
+        "HelpString": "Amount of time (in seconds) until a loading screen returns to menu",
+        "Flags": "ARCHIVE_PLAYERPROFILE"
+      },
+      {
+        "Name": "filter_hide_empty",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_hide_full",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_hide_protected",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_map",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_gamemode",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_mods",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "filter_map_hide_locked",
+        "DefaultValue": "0"
+      },
+      {
+        "Name": "modlist_show_convars",
+        "DefaultValue": "0",
+        "Flags": 16777216
+      },
+      {
+        "Name": "modlist_reverse",
+        "DefaultValue": "0",
+        "Flags": 16777216
       }
-    },
-    {
-      "Path": "ui/menu_ns_setversionlabel.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "After": "NS_SetVersionLabel"
+    ],
+    "Scripts": [
+      {
+        "Path": "_custom_codecallbacks_client.gnut",
+        "RunOn": "CLIENT"
+      },
+      {
+        "Path": "client/cl_chat.gnut",
+        "RunOn": "CLIENT"
+      },
+      {
+        "Path": "ui/menu_ns_modmenu.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddNorthstarModMenu",
+          "After": "AddNorthstarModMenu_MainMenuFooter"
+        }
+      },
+      {
+        "Path": "ui/menu_ns_setversionlabel.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "After": "NS_SetVersionLabel"
+        }
+      },
+      {
+        "Path": "presence/ui_presence.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "After": "NSUpdateGameStateUIStart"
+        }
+      },
+      {
+        "Path": "presence/cl_presence.nut",
+        "RunOn": "CLIENT",
+        "ClientCallback": {
+          "After": "NSUpdateGameStateClientStart"
+        }
+      },
+      {
+        "Path": "ui/menu_ns_serverbrowser.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddNorthstarServerBrowserMenu"
+        }
+      },
+      {
+        "Path": "ui/menu_ns_connect_password.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddNorthstarConnectWithPasswordMenu"
+        }
+      },
+      {
+        "Path": "ui/menu_ns_custom_match_settings_categories.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
+        }
+      },
+      {
+        "Path": "ui/menu_ns_custom_match_settings.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddNorthstarCustomMatchSettingsMenu"
+        }
+      },
+      {
+        "Path": "ui/controller_prompts.nut",
+        "RunOn": "UI"
+      },
+      {
+        "Path": "ui/ns_slider.nut",
+        "RunOn": "UI"
+      },
+      {
+        "Path": "ui/menu_mod_settings.nut",
+        "RunOn": "UI",
+        "UICallback": {
+          "Before": "AddModSettingsMenu"
+        }
+      },
+      {
+        "Path": "ui/ui_mouse_capture.nut",
+        "RunOn": "UI"
       }
-    },
-    {
-      "Path": "presence/ui_presence.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "After": "NSUpdateGameStateUIStart"
-      }
-    },
-    {
-      "Path": "presence/cl_presence.nut",
-      "RunOn": "CLIENT",
-      "ClientCallback": {
-        "After": "NSUpdateGameStateClientStart"
-      }
-    },
-    {
-      "Path": "ui/menu_ns_serverbrowser.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddNorthstarServerBrowserMenu"
-      }
-    },
-    {
-      "Path": "ui/menu_ns_connect_password.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddNorthstarConnectWithPasswordMenu"
-      }
-    },
-    {
-      "Path": "ui/menu_ns_custom_match_settings_categories.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
-      }
-    },
-    {
-      "Path": "ui/menu_ns_custom_match_settings.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddNorthstarCustomMatchSettingsMenu"
-      }
-    },
-    {
-      "Path": "ui/controller_prompts.nut",
-      "RunOn": "UI"
-    },
-    {
-      "Path": "ui/ns_slider.nut",
-      "RunOn": "UI"
-    },
-    {
-      "Path": "ui/menu_mod_settings.nut",
-      "RunOn": "UI",
-      "UICallback": {
-        "Before": "AddModSettingsMenu"
-      }
-    },
-    {
-      "Path": "ui/ui_mouse_capture.nut",
-      "RunOn": "UI"
-    }
-  ],
-  "Localisation": [
-    "resource/northstar_client_localisation_%language%.txt"
-  ]
+    ],
+    "Localisation": [
+      "resource/northstar_client_localisation_%language%.txt"
+    ]
 }

From 299685ee51599cc93f8c47d79b8c9244f712b66f Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 12:49:56 -0400
Subject: [PATCH 15/25] Fix indent (again)

---
 Northstar.Client/mod.json | 280 +++++++++++++++++++-------------------
 1 file changed, 140 insertions(+), 140 deletions(-)

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
index 165d0c0ef..48981c40f 100644
--- a/Northstar.Client/mod.json
+++ b/Northstar.Client/mod.json
@@ -1,142 +1,142 @@
 {
-    "Name": "Northstar.Client",
-    "Description": "Various ui and client changes to fix bugs and add better support for mods",
-    "Version": "1.18.1",
-    "LoadPriority": 0,
-    "InitScript": "cl_northstar_client_init.nut",
-    "ConVars": [
-      {
-        "Name": "ns_max_load_time",
-        "DefaultValue": "30",
-        "HelpString": "Amount of time (in seconds) until a loading screen returns to menu",
-        "Flags": "ARCHIVE_PLAYERPROFILE"
-      },
-      {
-        "Name": "filter_hide_empty",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_hide_full",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_hide_protected",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_map",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_gamemode",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_mods",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "filter_map_hide_locked",
-        "DefaultValue": "0"
-      },
-      {
-        "Name": "modlist_show_convars",
-        "DefaultValue": "0",
-        "Flags": 16777216
-      },
-      {
-        "Name": "modlist_reverse",
-        "DefaultValue": "0",
-        "Flags": 16777216
-      }
-    ],
-    "Scripts": [
-      {
-        "Path": "_custom_codecallbacks_client.gnut",
-        "RunOn": "CLIENT"
-      },
-      {
-        "Path": "client/cl_chat.gnut",
-        "RunOn": "CLIENT"
-      },
-      {
-        "Path": "ui/menu_ns_modmenu.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddNorthstarModMenu",
-          "After": "AddNorthstarModMenu_MainMenuFooter"
-        }
-      },
-      {
-        "Path": "ui/menu_ns_setversionlabel.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "After": "NS_SetVersionLabel"
-        }
-      },
-      {
-        "Path": "presence/ui_presence.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "After": "NSUpdateGameStateUIStart"
-        }
-      },
-      {
-        "Path": "presence/cl_presence.nut",
-        "RunOn": "CLIENT",
-        "ClientCallback": {
-          "After": "NSUpdateGameStateClientStart"
-        }
-      },
-      {
-        "Path": "ui/menu_ns_serverbrowser.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddNorthstarServerBrowserMenu"
-        }
-      },
-      {
-        "Path": "ui/menu_ns_connect_password.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddNorthstarConnectWithPasswordMenu"
-        }
-      },
-      {
-        "Path": "ui/menu_ns_custom_match_settings_categories.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
-        }
-      },
-      {
-        "Path": "ui/menu_ns_custom_match_settings.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddNorthstarCustomMatchSettingsMenu"
-        }
-      },
-      {
-        "Path": "ui/controller_prompts.nut",
-        "RunOn": "UI"
-      },
-      {
-        "Path": "ui/ns_slider.nut",
-        "RunOn": "UI"
-      },
-      {
-        "Path": "ui/menu_mod_settings.nut",
-        "RunOn": "UI",
-        "UICallback": {
-          "Before": "AddModSettingsMenu"
-        }
-      },
-      {
-        "Path": "ui/ui_mouse_capture.nut",
-        "RunOn": "UI"
-      }
-    ],
-    "Localisation": [
-      "resource/northstar_client_localisation_%language%.txt"
-    ]
+	"Name": "Northstar.Client",
+	"Description": "Various ui and client changes to fix bugs and add better support for mods",
+	"Version": "1.18.1",
+	"LoadPriority": 0,
+	"InitScript": "cl_northstar_client_init.nut",
+	"ConVars": [
+		{
+			"Name": "ns_max_load_time",
+			"DefaultValue": "30",
+			"HelpString": "Amount of time (in seconds) until a loading screen returns to menu",
+			"Flags": "ARCHIVE_PLAYERPROFILE"
+		},
+		{
+			"Name": "filter_hide_empty",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_hide_full",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_hide_protected",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_map",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_gamemode",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_mods",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "filter_map_hide_locked",
+			"DefaultValue": "0"
+		},
+		{
+			"Name": "modlist_show_convars",
+			"DefaultValue": "0",
+			"Flags": 16777216
+		},
+		{
+			"Name": "modlist_reverse",
+			"DefaultValue": "0",
+			"Flags": 16777216
+		}
+	],
+	"Scripts": [
+		{
+			"Path": "_custom_codecallbacks_client.gnut",
+			"RunOn": "CLIENT"
+		},
+		{
+			"Path": "client/cl_chat.gnut",
+			"RunOn": "CLIENT"
+		},
+		{
+			"Path": "ui/menu_ns_modmenu.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"Before": "AddNorthstarModMenu",
+				"After": "AddNorthstarModMenu_MainMenuFooter"
+			}
+		},
+		{
+			"Path": "ui/menu_ns_setversionlabel.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"After": "NS_SetVersionLabel"
+			}
+		},
+		{
+			"Path": "presence/ui_presence.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"After": "NSUpdateGameStateUIStart"
+			}
+		},
+		{
+			"Path": "presence/cl_presence.nut",
+			"RunOn": "CLIENT",
+			"ClientCallback": {
+				"After": "NSUpdateGameStateClientStart"
+			}
+		},
+		{
+			"Path": "ui/menu_ns_serverbrowser.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"Before": "AddNorthstarServerBrowserMenu"
+			}
+		},
+		{
+			"Path": "ui/menu_ns_connect_password.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"Before": "AddNorthstarConnectWithPasswordMenu"
+			}
+		},
+		{
+			"Path": "ui/menu_ns_custom_match_settings_categories.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"Before": "AddNorthstarCustomMatchSettingsCategoryMenu"
+			}
+		},
+		{
+			"Path": "ui/menu_ns_custom_match_settings.nut",
+			"RunOn": "UI",
+			"UICallback": {
+				"Before": "AddNorthstarCustomMatchSettingsMenu"
+			}
+		},
+		{
+			"Path": "ui/controller_prompts.nut",
+			"RunOn": "UI"
+		},
+		{
+			"Path": "ui/ns_slider.nut",
+			"RunOn": "UI"
+		},
+		{
+			"Path": "ui/menu_mod_settings.nut",
+			"RunOn": "UI",
+			"UICallback":{
+				"Before": "AddModSettingsMenu"
+      		}
+    	},
+    	{
+			"Path": "ui/ui_mouse_capture.nut",
+			"RunOn": "UI"
+		}
+	],
+	"Localisation": [
+		"resource/northstar_client_localisation_%language%.txt"
+	]
 }

From 58024fe06c4fac75882aab58a61197cdfbcbb9f6 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 13:00:36 -0400
Subject: [PATCH 16/25] localized and changed to float from int

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut       | 8 ++++----
 .../mod/scripts/vscripts/ui/menu_mod_settings.nut         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 72f083786..e8dbdf562 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -182,16 +182,16 @@ void function UICodeCallback_ToggleInGameMenu()
 void function TimeoutHandler()
 {
 	//Singleplayer "Continue" counts as finished loading and shouldn't be affected
-	printt( "TimeoutHandler has Initialized" )
 	EndSignal( uiGlobal.signalDummy, "LevelShutdown" ) // Cancels thread if map is unloaded
 
-	wait GetConVarFloat( "ns_max_load_time" )
+	float maxLoadTime = GetConVarFloat( "ns_max_load_time" )
+	wait maxLoadTime
 	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
 	{
-		printt( "TimeoutHandler disconnected because loading took too long" )
+		printt( format( "TimeoutHandler disconnected because loading took too long (%i seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
 		Disconnect() // Loads menu
-		OpenErrorDialog( format( "Loading timed out (Over %i seconds)", GetConVarInt( "ns_max_load_time" ) ) ) //Opens error dialog to notify user
+		OpenErrorDialog( format( Localize("#MAX_LOAD_ERROR"), maxLoadTime ) ) //Opens error dialog to notify user
 	}
 }
 
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
index ffd0cc573..96b05cdfd 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
@@ -83,8 +83,8 @@ void function AddModSettingsMenu()
 {
 	AddMenu( "ModSettings", $"resource/ui/menus/mod_settings.menu", InitModMenu )
 	AddModTitle( "^656dce00Northstar.Client" )
-	AddModCategory( "#MISC" )
-	ModSettings_AddSetting( "ns_max_load_time", "#MAX_LOAD", "int" )
+	AddModCategory( "#STATS_MISC" )
+	ModSettings_AddSetting( "ns_max_load_time", "#MAX_LOAD", "float" )
 }
 
 void function InitModMenu()
@@ -449,7 +449,7 @@ void function UpdateList()
 	}
 	file.updatingList = false
 
-	if ( file.conVarList.len() <= 0 )
+	if ( file.conVarList.len() <= 6 )
 	{
 		Hud_SetVisible( Hud_GetChild( file.menu, "NoResultLabel" ), true )
 		Hud_SetText( Hud_GetChild( file.menu, "NoResultLabel" ), "#NO_MODS" )

From bbc9992dedefeee1291da914b669271fc5c581bc Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 13:01:10 -0400
Subject: [PATCH 17/25] update localization

---
 .../northstar_client_localisation_english.txt | Bin 28720 -> 28982 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index e937f056df3fd5b7912b09f7bc804a4d67d6b989..788e127b32ac0c5935bf3a3ac9176e1eaaf3178a 100644
GIT binary patch
delta 263
zcmXX>F$%&!5S(<zPEb&*GawkS@Dmn7K(H1hBrygw3m0Q2KH|W4r1B|N7UD1LoIAs@
zce^t?vwO|kdwjg6Bfj8_12Sk69|vYEck`0SJf(lzVTldTni0TnPk;!57%2*r$f2k&
zaH2!XTu`%Cm{E1HuFR+86)IK<`I3DVLTs6>uqR{Z7sQn7*X*&XV&Nd|WHlk(4xE!r
lD2d(ptTo_kz7qDVtzGPIYtczQ8Y;J7$>joc`H?Gc8$VUFHDdq(

delta 62
zcmdn?h;hRM#tj_#lST4Z$a^vbGdMFSF>s<lB?e!HOon2H<jIT$(vwf++i}z~a4~=|
E0OukNTmS$7


From 5db9983a7363a229ad797da461e94792d562ada1 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 13:02:42 -0400
Subject: [PATCH 18/25] fix whitespace change

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
index 96b05cdfd..dd8085b25 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
@@ -346,7 +346,6 @@ void function UpdateListSliderHeight()
 
 void function UpdateList()
 {
-
 	Hud_SetFocused( Hud_GetChild( file.menu, "BtnModsSearch" ) )
 	file.updatingList = true
 

From e082165deb71dc401c845badc1c8783271ebf6b2 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 13:03:23 -0400
Subject: [PATCH 19/25] Add whitespace between required stuff and northstar
 section

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
index dd8085b25..a97d728a2 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mod_settings.nut
@@ -82,6 +82,7 @@ struct {
 void function AddModSettingsMenu()
 {
 	AddMenu( "ModSettings", $"resource/ui/menus/mod_settings.menu", InitModMenu )
+
 	AddModTitle( "^656dce00Northstar.Client" )
 	AddModCategory( "#STATS_MISC" )
 	ModSettings_AddSetting( "ns_max_load_time", "#MAX_LOAD", "float" )

From 9cdda7b0eadf3fb373dc88620838cca594457981 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:52:43 -0400
Subject: [PATCH 20/25] Update
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index e8dbdf562..c73858bff 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -191,7 +191,7 @@ void function TimeoutHandler()
 		printt( format( "TimeoutHandler disconnected because loading took too long (%i seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
 		Disconnect() // Loads menu
-		OpenErrorDialog( format( Localize("#MAX_LOAD_ERROR"), maxLoadTime ) ) //Opens error dialog to notify user
+		OpenErrorDialog( format( Localize( "#MAX_LOAD_ERROR" ), maxLoadTime ) ) //Opens error dialog to notify user
 	}
 }
 

From 4a7dd0e581ed5d28a4023616da713d4b9d1e8857 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:53:11 -0400
Subject: [PATCH 21/25] reformatting or something because nerd

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
index 48981c40f..a2a1fa146 100644
--- a/Northstar.Client/mod.json
+++ b/Northstar.Client/mod.json
@@ -1,7 +1,7 @@
 {
 	"Name": "Northstar.Client",
 	"Description": "Various ui and client changes to fix bugs and add better support for mods",
-	"Version": "1.18.1",
+	"Version": "1.16.0",
 	"LoadPriority": 0,
 	"InitScript": "cl_northstar_client_init.nut",
 	"ConVars": [

From 33a278182a8a49e687cc0e16dad4dfee3d05f21d Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:53:40 -0400
Subject: [PATCH 22/25] Update
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index c73858bff..59723bbb2 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -188,7 +188,7 @@ void function TimeoutHandler()
 	wait maxLoadTime
 	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
 	{
-		printt( format( "TimeoutHandler disconnected because loading took too long (%i seconds)", maxLoadTime ) )
+		printt( format( "TimeoutHandler disconnected because loading took too long (%f seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen
 		Disconnect() // Loads menu
 		OpenErrorDialog( format( Localize( "#MAX_LOAD_ERROR" ), maxLoadTime ) ) //Opens error dialog to notify user

From 6618aac010a4aeb30cbc6e91fe2634c6056dd87e Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:55:34 -0400
Subject: [PATCH 23/25] optimization

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 59723bbb2..7950546b7 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -186,7 +186,7 @@ void function TimeoutHandler()
 
 	float maxLoadTime = GetConVarFloat( "ns_max_load_time" )
 	wait maxLoadTime
-	if ( uiGlobal.isLoading == true ) //Disconnects client after 30 seconds of loading
+	if ( uiGlobal.isLoading ) //Disconnects client after 30 seconds of loading
 	{
 		printt( format( "TimeoutHandler disconnected because loading took too long (%f seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen

From 29365dfcb3afdfcbd9b307dce724340e3407b686 Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:57:39 -0400
Subject: [PATCH 24/25] Update _menus.nut text

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 7950546b7..5cbbe708c 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -186,7 +186,7 @@ void function TimeoutHandler()
 
 	float maxLoadTime = GetConVarFloat( "ns_max_load_time" )
 	wait maxLoadTime
-	if ( uiGlobal.isLoading ) //Disconnects client after 30 seconds of loading
+	if ( uiGlobal.isLoading ) //Disconnects client specified amount of time ( Default 30 seconds )
 	{
 		printt( format( "TimeoutHandler disconnected because loading took too long (%f seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen

From e3985158a396d9649cd4a7f38fb4716bc243774d Mon Sep 17 00:00:00 2001
From: EnderBoy9217 <122132914+EnderBoy9217@users.noreply.github.com>
Date: Sun, 27 Aug 2023 12:18:11 -0400
Subject: [PATCH 25/25] Fix not connected error

---
 Northstar.Client/mod/scripts/vscripts/ui/_menus.nut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
index 5cbbe708c..dfe0ce4ea 100644
--- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
+++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut
@@ -186,7 +186,7 @@ void function TimeoutHandler()
 
 	float maxLoadTime = GetConVarFloat( "ns_max_load_time" )
 	wait maxLoadTime
-	if ( uiGlobal.isLoading ) //Disconnects client specified amount of time ( Default 30 seconds )
+	if ( uiGlobal.isLoading && IsConnected() ) //Disconnects client specified amount of time ( Default 30 seconds )
 	{
 		printt( format( "TimeoutHandler disconnected because loading took too long (%f seconds)", maxLoadTime ) )
 		UICodeCallback_LevelLoadingFinished( true ) //Removes loading screen