Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix

Fix harddel issues with 515 upgrade PR

code/datums/callback.dm

@@ -34,7 +34,7 @@
  * ### global proc
  * GLOBAL_PROC_REF(procname)
  *
- * `CALLBACK(src, GLOBAL_PROC_REF(some_proc_here))`
+ * `CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(some_proc_here))`
  *
  *
  * ### proc defined on some type

code/datums/components/storage/storage.dm

@@ -436,7 +436,7 @@
 	if(over_object == M)
 		user_show_to_mob(M, trigger_on_found = TRUE)
 	if(isrevenant(M))
-		INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(RevenantThrow), over_object, M, source)
+		INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(RevenantThrow), over_object, M, source)
 		return
 	if(check_locked(null, M) || !M.CanReach(A))
 		return

code/datums/elements/weather_listener.dm

@@ -37,7 +37,7 @@
 	if(!(new_z in fitting_z_levels))
 		return
 	var/datum/component/our_comp = source.AddComponent(/datum/component/area_sound_manager, playlist, list(), COMSIG_MOB_CLIENT_LOGOUT, fitting_z_levels)
-	our_comp.RegisterSignal(SSdcs, sound_change_signals, /datum/component/area_sound_manager/proc/handle_change)
+	our_comp.RegisterSignal(SSdcs, sound_change_signals, TYPE_PROC_REF(/datum/component/area_sound_manager, handle_change))
 
 /datum/element/weather_listener/proc/handle_logout(datum/source, client/this_is_a_null_ref)
 	SIGNAL_HANDLER

code/datums/mind.dm

@@ -176,7 +176,7 @@
 	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
 	SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)
 //splurt change
-	INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(_paci_check), new_character, old_character)
+	INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(_paci_check), new_character, old_character)
 //end change
 
 /datum/mind/proc/store_memory(new_text)