Merge branch 'main' into main

4 files changed, 18 insertions, 32 deletions

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
index 4842755b..fbaf1203 100644
--- a/Northstar.Client/mod.json
+++ b/Northstar.Client/mod.json
@@ -25,14 +25,13 @@
 			"DefaultValue": "0"
 		}
 	],
-	// ui inits need to happen before so our init callbacks get called
 	"Scripts": [
 		{
 			"Path": "ui/menu_ns_modmenu.nut",
 			"RunOn": "UI",
 			"UICallback": {
 				"Before": "AddNorthstarModMenu", 
-				"After": "AddNorthstarModMenu_MainMenuFooter" // need to do this after, so we add footer after mainmenu init
+				"After": "AddNorthstarModMenu_MainMenuFooter"
 			}
 		},
 		
@@ -72,4 +71,4 @@
 	"Localisation": [
 		"resource/northstar_client_localisation_%language%.txt"
 	]
-}
\ No newline at end of file
+}
diff --git a/Northstar.Coop/mod.json b/Northstar.Coop/mod.json
index b4dfaeb2..f4fafbf9 100644
--- a/Northstar.Coop/mod.json
+++ b/Northstar.Coop/mod.json
@@ -20,6 +20,6 @@
 			"ServerCallback": {
 				"After": "SingleplayerCoopLobby_Init"
 			}
-		},
-	],
-}
\ No newline at end of file
+		}
+	]
+}
diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
index 4805e346..797016db 100644
--- a/Northstar.Custom/mod.json
+++ b/Northstar.Custom/mod.json
@@ -38,10 +38,9 @@
 		
 		{
 			"Path": "weapons/mp_weapon_peacekraber.nut",
-			"RunOn": "( CLIENT || SERVER ) && MP",
+			"RunOn": "( CLIENT || SERVER ) && MP"
 		},
 		
-		// one in the chamber
 		{
 			"Path": "gamemodes/sh_gamemode_chamber.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -57,12 +56,11 @@
 			"Path": "gamemodes/_gamemode_chamber.nut",
 			"RunOn": "SERVER && MP"
 		},
-        	{
+    {
 			"Path": "gamemodes/cl_gamemode_chamber.nut",
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// Hidden
 		{
 			"Path": "gamemodes/sh_gamemode_hidden.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -78,12 +76,11 @@
 			"Path": "gamemodes/_gamemode_hidden.nut",
 			"RunOn": "SERVER && MP"
 		},
-        	{
+    {
 			"Path": "gamemodes/cl_gamemode_hidden.nut",
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// fortwar
 		{
 			"Path": "gamemodes/sh_gamemode_fw_custom.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -104,7 +101,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// gungame
 		{
 			"Path": "gamemodes/sh_gamemode_gg.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -125,7 +121,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// titan tag
 		{
 			"Path": "gamemodes/sh_gamemode_tt.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -146,12 +141,11 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// infection
 		{
 			"Path": "gamemodes/sh_gamemode_inf.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
-				"Before": "Sh_GamemodeInfection_Init",
+				"Before": "Sh_GamemodeInfection_Init"
 			},
 			
 			"ServerCallback": {
@@ -167,7 +161,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// arena
 		{
 			"Path": "_droppod_spawn.gnut",
 			"RunOn": "SERVER && MP",
@@ -211,7 +204,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// amped killrace
 		{
 			"Path": "gamemodes/sh_gamemode_kr.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -232,7 +224,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// fastball
 		{
 			"Path": "gamemodes/sh_gamemode_fastball.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -257,7 +248,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// hide and seek
 		{
 			"Path": "gamemodes/sh_gamemode_hs.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -278,7 +268,6 @@
 			"RunOn": "CLIENT && MP"
 		},
 		
-		// ctf comp
 		{
 			"Path": "gamemodes/sh_gamemode_ctf_comp.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -305,7 +294,6 @@
 			}
 		},
 		
-		// riffs, playlist vars etc
 		{
 			"Path": "gamemodes/sh_riff_instagib.gnut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
@@ -401,7 +389,6 @@
 		}
 	],
 	
-	// todo this bit of the format
 	"Maps": [
 		{
 			"Name": "mp_skyway_v1",
diff --git a/Northstar.CustomServers/mod.json b/Northstar.CustomServers/mod.json
index 40e64cf6..28a08868 100644
--- a/Northstar.CustomServers/mod.json
+++ b/Northstar.CustomServers/mod.json
@@ -13,7 +13,7 @@
 		{
 			"Name": "ns_is_modded_server",
 			"DefaultValue": "1",
-			"Flags": 8192 // FCVAR_REPLICATED
+			"Flags": 8192
 		},
 		
 		{
@@ -60,20 +60,20 @@
 	"Scripts": [
 		{
 			"Path": "_misc_stubs.gnut",
-			"RunOn": "SERVER && MP",
+			"RunOn": "SERVER && MP"
 		},
 		{
 			"Path": "_store.gnut",
-			"RunOn": "SERVER && MP",
+			"RunOn": "SERVER && MP"
 		},
 		{
 			"Path": "_script_movers.gnut",
-			"RunOn": "SERVER && MP",
+			"RunOn": "SERVER && MP"
 		},
 		
 		{
 			"Path": "sh_northstar_utils.gnut",
-			"RunOn": "CLIENT || SERVER || UI",
+			"RunOn": "CLIENT || SERVER || UI"
 		},
 		
 		{
@@ -99,7 +99,7 @@
 		
 		{
 			"Path": "mp/_classic_mp_dropship_intro.gnut",
-			"RunOn": "SERVER && MP",
+			"RunOn": "SERVER && MP"
 		},
 		{
 			"Path": "mp/_classic_mp_no_intro.gnut",
@@ -116,7 +116,7 @@
 		
 		{
 			"Path": "lobby/sh_private_lobby_modes_init.gnut",
-			"RunOn": "( SERVER || CLIENT ) && MP",
-		},
+			"RunOn": "( SERVER || CLIENT ) && MP"
+		}
 	]
-}
\ No newline at end of file
+}