Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt

code/controllers/ProcessScheduler/core/process.dm

@@ -340,7 +340,7 @@
 	var/averageRunTime = round(getAverageRunTime(), 0.1)/10
 	var/lastRunTime = round(getLastRunTime(), 0.1)/10
 	var/highestRunTime = round(getHighestRunTime(), 0.1)/10
-	stat("[name]", "T#[getTicks()]|AR [averageRunTime]|LR [lastRunTime]|HR [highestRunTime]|D [cpu_defer_count]")
+	stat("[name]", "T#[getTicks()] | AR [averageRunTime] | LR [lastRunTime] | HR [highestRunTime] | D [cpu_defer_count]")
 
 /datum/controller/process/proc/catchException(var/exception/e, var/thrower)
 	var/etext = "[e]"

code/controllers/ProcessScheduler/core/processScheduler.dm

@@ -98,7 +98,7 @@ var/global/datum/controller/processScheduler/processScheduler
 
 /datum/controller/processScheduler/proc/process()
 	updateCurrentTickData()
-	
+
 	for(var/i=world.tick_lag,i<world.tick_lag*50,i+=world.tick_lag)
 		spawn(i) updateCurrentTickData()
 	while(isRunning)
@@ -252,7 +252,7 @@ var/global/datum/controller/processScheduler/processScheduler
 		last_start[process] = time
 	else
 		last_queued[process] = (time == 0 ? 0 : world.time)
-		last_start[process] = time	
+		last_start[process] = time
 
 /datum/controller/processScheduler/proc/recordEnd(var/datum/controller/process/process, var/time = null)
 	if (isnull(time))
@@ -376,7 +376,7 @@ var/global/datum/controller/processScheduler/processScheduler
 	if(!isRunning)
 		stat("Processes", "Scheduler not running")
 		return
-	stat("Processes", "[processes.len] (R[running.len]/Q[queued.len]/I[idle.len])")
+	stat("Processes", "[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])")
 	stat(null, "[round(cpuAverage, 0.1)] CPU, [round(timeAllowance, 0.1)/10] TA")
 	for(var/datum/controller/process/p in processes)
 		p.statProcess()

code/controllers/Processes/air.dm

@@ -27,7 +27,7 @@ var/global/datum/controller/process/air_system/air_master
 	schedule_interval = 20 // every 2 seconds
 	start_delay = 4
 	air_master = src
-	
+
 	var/watch = start_watch()
 	log_startup_progress("Processing geometry...")
 	setup_allturfs() // Get all currently active tiles that need processing each atmos tick.
@@ -48,7 +48,7 @@ var/global/datum/controller/process/air_system/air_master
 /datum/controller/process/air_system/statProcess()
 	..()
 	stat(null, "[last_active] active")
-	stat(null, "[last_excited] EG|[last_hpd] HPD|[last_asc] ASC|[last_hotspots] Hot")
+	stat(null, "[last_excited] EG | [last_hpd] HPD | [last_asc] ASC | [last_hotspots] Hot")
 
 /datum/controller/process/air_system/proc/process_hotspots()
 	last_hotspots = hotspots.len

code/controllers/Processes/pipenet.dm

@@ -9,7 +9,7 @@
 
 /datum/controller/process/pipenet/doWork()
 	for(last_object in pipe_networks)
-		var/datum/pipe_network/pipeNetwork = last_object
+		var/datum/pipeline/pipeNetwork = last_object
 		if(istype(pipeNetwork) && isnull(pipeNetwork.gcDestroyed))
 			try
 				pipeNetwork.process()

code/controllers/configuration.dm

@@ -164,6 +164,11 @@
 	
 	var/autoconvert_notes = 0 //if all connecting player's notes should attempt to be converted to the database
 	
+	var/ooc_allowed = 1
+	var/looc_allowed = 1
+	var/dooc_allowed = 1
+	var/dsay_allowed = 1
+	
 	var/disable_lobby_music = 0 // Disables the lobby music
 
 /datum/configuration/New()

code/controllers/master_controller.dm

@@ -72,14 +72,6 @@ datum/controller/game_controller/proc/setup_objects()
 		count++
 	log_startup_progress("  Initialized [count] objects in [stop_watch(watch)]s.")
 
-	watch = start_watch()
-	count = 0
-	log_startup_progress("Initializing pipe networks...")
-	for(var/obj/machinery/atmospherics/machine in machines)
-		machine.build_network()
-		count++
-	log_startup_progress("  Initialized [count] pipe networks in [stop_watch(watch)]s.")
-
 	watch = start_watch()
 	count = 0
 	log_startup_progress("Initializing atmospherics machinery...")
@@ -92,8 +84,16 @@ datum/controller/game_controller/proc/setup_objects()
 			var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
 			T.broadcast_status()
 			count++
-
-	log_startup_progress("  Initialized [count] atmospherics devices in [stop_watch(watch)]s.")
+	log_startup_progress("  Initialized [count] atmospherics machines in [stop_watch(watch)]s.")	
+	
+	watch = start_watch()
+	count = 0
+	log_startup_progress("Initializing pipe networks...")
+	for(var/obj/machinery/atmospherics/machine in machines)
+		machine.build_network()
+		count++
+	log_startup_progress("  Initialized [count] pipe networks in [stop_watch(watch)]s.")
+	
 	log_startup_progress("Finished object initializations in [stop_watch(overwatch)]s.")
 
 datum/controller/game_controller/proc/setup_starlight()

code/controllers/voting.dm

@@ -59,9 +59,9 @@ datum/controller/vote
 		voting.Cut()
 		current_votes.Cut()
 
-		if(auto_muted && !ooc_allowed)
+		if(auto_muted && !config.ooc_allowed)
 			auto_muted = 0
-			ooc_allowed = !( ooc_allowed )
+			config.ooc_allowed = !( config.ooc_allowed )
 			world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
 			log_admin("OOC was toggled automatically due to vote end.")
 			message_admins("OOC has been toggled on automatically.")
@@ -239,21 +239,21 @@ datum/controller/vote
 			if(mode == "gamemode" && going)
 				going = 0
 				world << "<font color='red'><b>Round start has been delayed.</b></font>"
-			if(mode == "crew_transfer" && ooc_allowed)
+			if(mode == "crew_transfer" && config.ooc_allowed)
 				auto_muted = 1
-				ooc_allowed = !( ooc_allowed )
+				config.ooc_allowed = !( config.ooc_allowed )
 				world << "<b>The OOC channel has been automatically disabled due to a crew transfer vote.</b>"
 				log_admin("OOC was toggled automatically due to crew_transfer vote.")
 				message_admins("OOC has been toggled off automatically.")
-			if(mode == "gamemode" && ooc_allowed)
+			if(mode == "gamemode" && config.ooc_allowed)
 				auto_muted = 1
-				ooc_allowed = !( ooc_allowed )
+				config.ooc_allowed = !( config.ooc_allowed )
 				world << "<b>The OOC channel has been automatically disabled due to the gamemode vote.</b>"
 				log_admin("OOC was toggled automatically due to gamemode vote.")
 				message_admins("OOC has been toggled off automatically.")
-			if(mode == "custom" && ooc_allowed)
+			if(mode == "custom" && config.ooc_allowed)
 				auto_muted = 1
-				ooc_allowed = !( ooc_allowed )
+				config.ooc_allowed = !( config.ooc_allowed )
 				world << "<b>The OOC channel has been automatically disabled due to a custom vote.</b>"
 				log_admin("OOC was toggled automatically due to custom vote.")
 				message_admins("OOC has been toggled off automatically.")