More 515 Compatibility

code/controllers/master.dm

@@ -68,7 +68,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			qdel(Master)
 		else
 			var/list/subsytem_types = subtypesof(/datum/controller/subsystem)
-			sortTim(subsytem_types, /proc/cmp_subsystem_init)
+			sortTim(subsytem_types, GLOBAL_PROC_REF(cmp_subsystem_init))
 			for(var/I in subsytem_types)
 				_subsystems += new I
 		Master = src
@@ -83,7 +83,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 
 /datum/controller/master/Shutdown()
 	processing = FALSE
-	sortTim(subsystems, /proc/cmp_subsystem_init)
+	sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init))
 	reverseRange(subsystems)
 	for(var/datum/controller/subsystem/ss in subsystems)
 		log_world("Shutting down [ss.name] subsystem...")
@@ -173,7 +173,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	to_chat(world, "<span class='boldannounce'>MC: Initializing subsystems...</span>")
 
 	// Sort subsystems by init_order, so they initialize in the correct order.
-	sortTim(subsystems, /proc/cmp_subsystem_init)
+	sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init))
 
 	var/start_timeofday = REALTIMEOFDAY
 	// Initialize subsystems.
@@ -199,7 +199,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	GLOB.revdata = new // It can load revdata now, from tgs or .git or whatever
 
 	// Sort subsystems by display setting for easy access.
-	sortTim(subsystems, /proc/cmp_subsystem_display)
+	sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display))
 	// Set world options.
 	#ifdef UNIT_TEST
 	world.sleep_offline = 0
@@ -279,9 +279,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	queue_tail = null
 	//these sort by lower priorities first to reduce the number of loops needed to add subsequent SS's to the queue
 	//(higher subsystems will be sooner in the queue, adding them later in the loop means we don't have to loop thru them next queue add)
-	sortTim(tickersubsystems, /proc/cmp_subsystem_priority)
+	sortTim(tickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
 	for(var/I in runlevel_sorted_subsystems)
-		sortTim(runlevel_sorted_subsystems, /proc/cmp_subsystem_priority)
+		sortTim(runlevel_sorted_subsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
 		I += tickersubsystems
 
 	var/cached_runlevel = current_runlevel

code/controllers/subsystems/assets.dm

@@ -14,5 +14,5 @@ SUBSYSTEM_DEF(assets)
 	preload = cache.Copy() //don't preload assets generated during the round
 
 	for(var/client/C in GLOB.clients)
-		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
-	return ..()
+		addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(getFilesSlow), C, preload, FALSE), 10)
+	return ..()

code/controllers/subsystems/job.dm

@@ -37,11 +37,11 @@ SUBSYSTEM_DEF(job)
 		if(LAZYLEN(job.departments))
 			add_to_departments(job)
 
-	sortTim(occupations, /proc/cmp_job_datums)
+	sortTim(occupations, GLOBAL_PROC_REF(cmp_job_datums))
 	for(var/D in department_datums)
 		var/datum/department/dept = department_datums[D]
-		sortTim(dept.jobs, /proc/cmp_job_datums, TRUE)
-		sortTim(dept.primary_jobs, /proc/cmp_job_datums, TRUE)
+		sortTim(dept.jobs, GLOBAL_PROC_REF(cmp_job_datums), TRUE)
+		sortTim(dept.primary_jobs, GLOBAL_PROC_REF(cmp_job_datums), TRUE)
 
 	return TRUE
 
@@ -69,7 +69,7 @@ SUBSYSTEM_DEF(job)
 		var/datum/department/D = new t()
 		department_datums[D.name] = D
 
-	sortTim(department_datums, /proc/cmp_department_datums, TRUE)
+	sortTim(department_datums, GLOBAL_PROC_REF(cmp_department_datums), TRUE)
 
 /datum/controller/subsystem/job/proc/get_all_department_datums()
 	var/list/dept_datums = list()
@@ -140,4 +140,4 @@ SUBSYSTEM_DEF(job)
 
 /datum/controller/subsystem/job/proc/job_debug_message(message)
 	if(debug_messages)
-		log_debug("JOB DEBUG: [message]")
+		log_debug("JOB DEBUG: [message]")

code/controllers/subsystems/media_tracks.dm

@@ -56,14 +56,18 @@ SUBSYSTEM_DEF(media_tracks)
 			T.secret = entry["secret"] ? 1 : 0
 			T.lobby = entry["lobby"] ? 1 : 0
 
+<<<<<<< HEAD
 			/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
 			T.casino = entry["casino"] ? 1 : 0
 			/// CHOMPstation edit end
 
+=======
+>>>>>>> b6b3a1357c... Merge pull request #14976 from ItsSelis/selis-515compat
 			all_tracks += T
 
 /datum/controller/subsystem/media_tracks/proc/sort_tracks()
 	report_progress("Sorting media tracks...")
+<<<<<<< HEAD
 	sortTim(all_tracks, /proc/cmp_media_track_asc)
 
 	jukebox_tracks.Cut()
@@ -71,6 +75,12 @@ SUBSYSTEM_DEF(media_tracks)
 	/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
 	casino_tracks.Cut()
 	/// CHOMPstation edit end
+=======
+	sortTim(all_tracks, GLOBAL_PROC_REF(cmp_media_track_asc))
+
+	jukebox_tracks.Cut()
+	lobby_tracks.Cut()
+>>>>>>> b6b3a1357c... Merge pull request #14976 from ItsSelis/selis-515compat
 
 	for(var/datum/track/T in all_tracks)
 		/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
@@ -120,17 +130,21 @@ SUBSYSTEM_DEF(media_tracks)
 			if(!songdata["url"] || !songdata["title"] || !songdata["duration"])
 				to_chat(C, "<span class='warning'>URL, Title, or Duration was missing from a song. Skipping.</span>")
 				continue
+<<<<<<< HEAD
 			var/datum/track/T = new(songdata["url"], songdata["title"], songdata["duration"], songdata["artist"], songdata["genre"], songdata["secret"], songdata["lobby"], songdata["casino"])
+=======
+			var/datum/track/T = new(songdata["url"], songdata["title"], songdata["duration"], songdata["artist"], songdata["genre"], songdata["secret"], songdata["lobby"])
+>>>>>>> b6b3a1357c... Merge pull request #14976 from ItsSelis/selis-515compat
 			all_tracks += T
 
 			report_progress("New media track added by [C]: [T.title]")
 		sort_tracks()
 		return
-	
+
 	var/title = tgui_input_text(C, "REQUIRED: Provide title for track", "Track Title")
 	if(!title)
 		return
-	
+
 	var/duration = tgui_input_number(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration")
 	if(!duration)
 		return
@@ -139,7 +153,7 @@ SUBSYSTEM_DEF(media_tracks)
 	var/artist = tgui_input_text(C, "Optional: Provide artist for track", "Track Artist")
 	if(isnull(artist)) // Cancel rather than empty string
 		return
-	
+
 	var/genre = tgui_input_text(C, "Optional: Provide genre for track (try to match an existing one)", "Track Genre")
 	if(isnull(genre)) // Cancel rather than empty string
 		return
@@ -174,9 +188,12 @@ SUBSYSTEM_DEF(media_tracks)
 
 	T.secret = secret
 	T.lobby = lobby
+<<<<<<< HEAD
 	/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
 	T.casino = casino
 	/// CHOMPstation edit end
+=======
+>>>>>>> b6b3a1357c... Merge pull request #14976 from ItsSelis/selis-515compat
 
 	all_tracks += T
 

code/controllers/subsystems/ticker.dm

@@ -220,7 +220,7 @@ var/global/datum/controller/subsystem/ticker/ticker
 		end_game_state = END_GAME_READY_TO_END
 		current_state = GAME_STATE_FINISHED
 		Master.SetRunLevel(RUNLEVEL_POSTGAME)
-		INVOKE_ASYNC(src, .proc/declare_completion)
+		INVOKE_ASYNC(src, PROC_REF(declare_completion))
 	else if (mode_finished && (end_game_state < END_GAME_MODE_FINISHED))
 		end_game_state = END_GAME_MODE_FINISHED // Only do this cleanup once!
 		mode.cleanup()

code/controllers/subsystems/timer.dm

@@ -256,7 +256,7 @@ SUBSYSTEM_DEF(timer)
 	if (!length(alltimers))
 		return
 
-	sortTim(alltimers, /proc/cmp_timer)
+	sortTim(alltimers, GLOBAL_PROC_REF(cmp_timer))
 
 	var/datum/timedevent/head = alltimers[1]
 
@@ -516,4 +516,4 @@ SUBSYSTEM_DEF(timer)
 #undef BUCKET_LEN
 #undef BUCKET_POS
 #undef TIMER_MAX
-#undef TIMER_ID_MAX
+#undef TIMER_ID_MAX