Merge branch 'master' into upstream-merge-27721

code/world.dm

@@ -56,6 +56,7 @@
 /world/proc/SetRoundID()
 	if(config.sql_enabled)
 		if(SSdbcore.Connect())
+
 			log_world("Database connection established.")
 			var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')")
 			query_feedback_create_round.Execute()
@@ -225,7 +226,7 @@
 	else
 		to_chat(world, "<span class='boldannounce'>Rebooting world...</span>")
 		Master.Shutdown()	//run SS shutdowns
-	log_world("World rebooted at [time_stamp()]");
+	log_world("World rebooted at [time_stamp()]")
 	..()
 
 /world/proc/load_motd()