Splits up round table initialize, start, end and shutdown

code/__DEFINES/subsystems.dm

@@ -1,7 +1,11 @@
 //Update this whenever the db schema changes
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 4
+<<<<<<< HEAD
 #define DB_MINOR_VERSION 1
+=======
+#define DB_MINOR_VERSION 4
+>>>>>>> 37854a5... Splits up round table initialize, start, end and shutdown (#37665)
 
 //Timing subsystem
 //Don't run if there is an identical unique timer active

code/__HELPERS/roundend.dm

@@ -220,7 +220,7 @@
 		log_game("[i]s[total_antagonists[i]].")
 
 	CHECK_TICK
-
+	SSdbcore.SetRoundEnd()
 	//Collects persistence features
 	if(mode.allow_persistence_save)
 		SSpersistence.CollectData()

code/controllers/subsystem/dbcore.dm

@@ -37,19 +37,18 @@ SUBSYSTEM_DEF(dbcore)
 			message_admins("Database schema ([db_major].[db_minor]) doesn't match the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
 		if(2)
 			message_admins("Could not get schema version from database")
-	
+
 	return ..()
 
-	
+
 /datum/controller/subsystem/dbcore/Recover()
 	_db_con = SSdbcore._db_con
 
 /datum/controller/subsystem/dbcore/Shutdown()
 	//This is as close as we can get to the true round end before Disconnect() without changing where it's called, defeating the reason this is a subsystem
 	if(SSdbcore.Connect())
-		var/sql_station_name = sanitizeSQL(station_name())
-		var/datum/DBQuery/query_round_end = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = '[sanitizeSQL(SSticker.mode_result)]', end_state = '[sanitizeSQL(SSticker.end_state)]', station_name = '[sql_station_name]' WHERE id = [GLOB.round_id]")
-		query_round_end.Execute()
+		var/datum/DBQuery/query_round_shutdown = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shutdown_datetime = Now(), end_state = '[sanitizeSQL(SSticker.end_state)]' WHERE id = [GLOB.round_id]")
+		query_round_shutdown.Execute()
 	if(IsConnected())
 		Disconnect()
 
@@ -107,13 +106,26 @@ SUBSYSTEM_DEF(dbcore)
 /datum/controller/subsystem/dbcore/proc/SetRoundID()
 	if(CONFIG_GET(flag/sql_enabled))
 		if(SSdbcore.Connect())
-			var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')")
-			query_round_start.Execute()
+			var/datum/DBQuery/query_round_initialize = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (initialize_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')")
+			query_round_initialize.Execute()
 			var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()")
 			query_round_last_id.Execute()
 			if(query_round_last_id.NextRow())
 				GLOB.round_id = query_round_last_id.item[1]
 
+/datum/controller/subsystem/dbcore/proc/SetRoundStart()
+	if(CONFIG_GET(flag/sql_enabled))
+		if(SSdbcore.Connect())
+			var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET start_datetime = Now() WHERE id = [GLOB.round_id]")
+			query_round_start.Execute()
+
+/datum/controller/subsystem/dbcore/proc/SetRoundEnd()
+	if(CONFIG_GET(flag/sql_enabled))
+		if(SSdbcore.Connect())
+			var/sql_station_name = sanitizeSQL(station_name())
+			var/datum/DBQuery/query_round_end = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = '[sanitizeSQL(SSticker.mode_result)]', station_name = '[sql_station_name]' WHERE id = [GLOB.round_id]")
+			query_round_end.Execute()
+
 /datum/controller/subsystem/dbcore/proc/Disconnect()
 	failed_connections = 0
 	return _dm_db_close(_db_con)

code/controllers/subsystem/ticker.dm

@@ -301,6 +301,7 @@ SUBSYSTEM_DEF(ticker)
 
 	log_world("Game start took [(world.timeofday - init_start)/10]s")
 	round_start_time = world.time
+	SSdbcore.SetRoundStart()
 
 	to_chat(world, "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>")
 	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))