Merge branch 'virgoMaster' into virgoPull

code/controllers/Processes/scheduler.dm

@@ -58,6 +58,9 @@
 /proc/schedule_task_in(var/in_time, var/procedure, var/list/arguments = list())
 	return schedule_task(world.time + in_time, procedure, arguments)
 
+/proc/schedule_callback_in(var/in_time, var/datum/callback)
+	return schedule_callback(world.time + in_time, callback)
+
 /proc/schedule_task_with_source_in(var/in_time, var/source, var/procedure, var/list/arguments = list())
 	return schedule_task_with_source(world.time + in_time, source, procedure, arguments)
 
@@ -66,6 +69,11 @@
 	scheduler.schedule(st)
 	return st
 
+/proc/schedule_callback(var/trigger_time, var/datum/callback)
+	var/datum/scheduled_task/callback/st = new/datum/scheduled_task/callback(trigger_time, callback, /proc/destroy_scheduled_task, list())
+	scheduler.schedule(st)
+	return st
+
 /proc/schedule_task_with_source(var/trigger_time, var/source, var/procedure, var/list/arguments)
 	var/datum/scheduled_task/st = new/datum/scheduled_task/source(trigger_time, source, procedure, arguments, /proc/destroy_scheduled_task, list())
 	scheduler.schedule(st)
@@ -125,6 +133,15 @@
 /datum/scheduled_task/proc/trigger_task_in(var/trigger_in)
 	src.trigger_time = world.time + trigger_in
 
+/datum/scheduled_task/callback
+	var/datum/callback/callback
+
+/datum/scheduled_task/callback/New(var/trigger_time, var/datum/callback, var/proc/task_after_process, var/list/task_after_process_args)
+	..(trigger_time = trigger_time, task_after_process = task_after_process, task_after_process_args = task_after_process_args)
+
+/datum/scheduled_task/callback/process()
+	callback.Invoke()
+
 /datum/scheduled_task/source
 	var/datum/source
 

code/controllers/subsystems/transcore_vr.dm

@@ -139,10 +139,12 @@ SUBSYSTEM_DEF(transcore)
 					var/datum/nifsoft/nifsoft = N
 					nifsofts += nifsoft.type
 			MR.nif_software = nifsofts
+			MR.nif_savedata = nif.save_data.Copy()
 		else if(isnull(nif)) //Didn't pass anything, so no NIF
 			MR.nif_path = null
 			MR.nif_durability = null
 			MR.nif_software = null
+			MR.nif_savedata = null
 
 	else
 		MR = new(mind, mind.current, add_to_db = TRUE, one_time = one_time)