diff --git a/code/__DEFINES/_cooldowns.dm b/code/__DEFINES/_cooldowns.dm
index cc4120cbd05..2648f642305 100644
--- a/code/__DEFINES/_cooldowns.dm
+++ b/code/__DEFINES/_cooldowns.dm
@@ -25,7 +25,7 @@
#define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"
#define COMSIG_CD_RESET(cd_index) "cd_reset_[cd_index]"
-#define TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time))
+#define TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_cooldown), cd_source, cd_index), cd_time))
#define TIMER_COOLDOWN_CHECK(cd_source, cd_index) LAZYACCESS(cd_source.cooldowns, cd_index)
@@ -38,7 +38,7 @@
* A bit more expensive than the regular timers, but can be reset before they end and the time left can be checked.
*/
-#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time, TIMER_STOPPABLE))
+#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_cooldown), cd_source, cd_index), cd_time, TIMER_STOPPABLE))
#define S_TIMER_COOLDOWN_RESET(cd_source, cd_index) reset_cooldown(cd_source, cd_index)
diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm
index e72612537d5..33eda1bac26 100644
--- a/code/__DEFINES/callbacks.dm
+++ b/code/__DEFINES/callbacks.dm
@@ -15,14 +15,15 @@
} \
else { \
ASYNC { \
- call(proc_owner, proc_path)(##proc_arguments); \
+ /* Written with `0 ||` to avoid the compiler seeing call("string"), and thinking it's a deprecated DLL */ \
+ call(0 || proc_owner, proc_path)(##proc_arguments); \
}; \
}
/// Varset callback for a list
-#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##target, ##var_name, ##var_value)
+#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value)
/// Varset callback for a datum
-#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##datum, NAMEOF(##datum, ##var), ##var_value)
+#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value)
/// Create a varset timer
#define VARSET_IN(datum, var, var_value, time) addtimer(VARSET_CALLBACK(datum, var, var_value), time)
@@ -37,9 +38,9 @@
datum.vars[var_name] = var_value
/// flick() callback
-#define FLICK_CALLBACK(state, target) CALLBACK(GLOBAL_PROC, /proc/___callbackflick, target, state)
+#define FLICK_CALLBACK(state, target) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackflick), target, state)
/// flick() using timer
-#define FLICK_IN(state, target, time) addtimer(CALLBACK(GLOBAL_PROC, /proc/___callbackflick, target, state), time)
+#define FLICK_IN(state, target, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackflick), target, state), time)
/proc/___callbackflick(target, state)
flick(target, state)
diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm
index 9c8d625f7d7..d36121bd886 100644
--- a/code/__DEFINES/qdel.dm
+++ b/code/__DEFINES/qdel.dm
@@ -35,13 +35,13 @@
#define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
//Qdel helper macros.
-#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE)
-#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE)
+#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
#define QDEL_NULL(item) qdel(item); item = null
#define QDEL_NULL_LIST QDEL_LIST_NULL
#define QDEL_LIST_NULL(x) if(x) { for(var/y in x) { qdel(y) } ; x = null }
#define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); }
-#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/______qdel_list_wrapper, L), time, TIMER_STOPPABLE)
+#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE)
#define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); }
#define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); }
diff --git a/code/__DEFINES/rendering/zmimic.dm b/code/__DEFINES/rendering/zmimic.dm
index e290281103b..e2b44def296 100644
--- a/code/__DEFINES/rendering/zmimic.dm
+++ b/code/__DEFINES/rendering/zmimic.dm
@@ -1,5 +1,5 @@
#define TURF_IS_MIMICKING(T) (isturf(T) && (T:mz_flags & MZ_MIMIC_BELOW))
-#define CHECK_OO_EXISTENCE(OO) if (OO && !MOVABLE_IS_ON_ZTURF(OO) && !OO.destruction_timer) { OO.destruction_timer = addtimer(CALLBACK(OO, /datum/.proc/qdel_self), 10 SECONDS, TIMER_STOPPABLE); }
+#define CHECK_OO_EXISTENCE(OO) if (OO && !MOVABLE_IS_ON_ZTURF(OO) && !OO.destruction_timer) { OO.destruction_timer = addtimer(CALLBACK(OO, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE); }
#define UPDATE_OO_IF_PRESENT CHECK_OO_EXISTENCE(bound_overlay); if (bound_overlay) { update_above(); }
// I do not apologize.
diff --git a/code/__HELPERS/_lists_tg.dm b/code/__HELPERS/_lists_tg.dm
index ec36cbc16ce..6d04dfad755 100644
--- a/code/__HELPERS/_lists_tg.dm
+++ b/code/__HELPERS/_lists_tg.dm
@@ -70,7 +70,7 @@ This actually tests if they have the same entries and values.
return tim_sort(L, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc)
//any value in a list
-/proc/sortList(list/L, cmp=/proc/cmp_text_asc)
+/proc/sortList(list/L, cmp= GLOBAL_PROC_REF(cmp_text_asc))
return tim_sort(L.Copy(), cmp)
//uses sortList() but uses the var's name specifically. This should probably be using mergeAtom() instead
diff --git a/code/__HELPERS/animations.dm b/code/__HELPERS/animations.dm
index 7715feef9e3..7ad18d3ed7a 100644
--- a/code/__HELPERS/animations.dm
+++ b/code/__HELPERS/animations.dm
@@ -1,7 +1,7 @@
/proc/fade_out(image/I, list/show_to)
animate(I, alpha = 0, time = 0.5 SECONDS, easing = EASE_IN)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_clients, I, show_to), 0.5 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_image_from_clients), I, show_to), 0.5 SECONDS)
/proc/animate_speech_bubble(image/I, list/show_to, duration)
var/matrix/M = matrix()
@@ -11,7 +11,7 @@
for(var/client/C in show_to)
C.images += I
animate(I, transform = 0, alpha = 255, time = 0.2 SECONDS, easing = EASE_IN)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/fade_out, I, show_to), (duration - 0.5 SECONDS))
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(fade_out), I, show_to), (duration - 0.5 SECONDS))
/proc/animate_receive_damage(atom/A)
var/pixel_x_diff = rand(-2,2)
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index 25a4aab35d0..0c49f66add9 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -5,12 +5,12 @@
for(var/area/A in world)
GLOB.sortedAreas.Add(A)
- tim_sort(GLOB.sortedAreas, /proc/cmp_name_asc)
+ tim_sort(GLOB.sortedAreas, GLOBAL_PROC_REF(cmp_name_asc))
setupTeleportLocs() // shitcode patch to make vorecode work until we get rid of this shit meme or refactor it entirely
/area/proc/addSorted()
GLOB.sortedAreas.Add(src)
- tim_sort(GLOB.sortedAreas, /proc/cmp_name_asc)
+ tim_sort(GLOB.sortedAreas, GLOBAL_PROC_REF(cmp_name_asc))
//Takes: Area type as a text string from a variable.
//Returns: Instance for the area in the world.
diff --git a/code/__HELPERS/files/client_io.dm b/code/__HELPERS/files/client_io.dm
index a4ba49e4efc..70cde253dd9 100644
--- a/code/__HELPERS/files/client_io.dm
+++ b/code/__HELPERS/files/client_io.dm
@@ -19,7 +19,7 @@ GLOBAL_VAR_INIT(fileaccess_timer, 0)
var/list/choices = flist(path)
if(path != root)
choices.Insert(1,"/")
- tim_sort(choices, /proc/cmp_text_asc)
+ tim_sort(choices, GLOBAL_PROC_REF(cmp_text_asc))
var/choice = input(src,"Choose a file to access:","Download",null) as null|anything in choices
switch(choice)
diff --git a/code/__HELPERS/lists/asset_sorted.dm b/code/__HELPERS/lists/asset_sorted.dm
index 2c0e6b499c1..9abbe51736e 100644
--- a/code/__HELPERS/lists/asset_sorted.dm
+++ b/code/__HELPERS/lists/asset_sorted.dm
@@ -1,5 +1,5 @@
/// Runtimes if the passed in list is not sorted.
-/proc/assert_sorted(list/list, name, cmp = /proc/cmp_numeric_asc)
+/proc/assert_sorted(list/list, name, cmp = GLOBAL_PROC_REF(cmp_numeric_asc))
var/last_value = list[1]
for (var/index in 2 to list.len)
diff --git a/code/__HELPERS/misc/sonar.dm b/code/__HELPERS/misc/sonar.dm
index f8cedac34e2..0bce293f0e8 100644
--- a/code/__HELPERS/misc/sonar.dm
+++ b/code/__HELPERS/misc/sonar.dm
@@ -46,12 +46,12 @@
C.images += images
for(var/image/I as anything in images)
animate(I, alpha = 255, time = fadein, easing = SINE_EASING)
- addtimer(CALLBACK(src, .proc/remove_sonar_images, images, clients, fadeout), sustain, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(remove_sonar_images), images, clients, fadeout), sustain, TIMER_CLIENT_TIME)
/datum/controller/subsystem/sonar/proc/remove_sonar_images(list/image/images, list/client/clients, time)
for(var/image/I as anything in images)
animate(I, alpha = 0, time = time, easing = SINE_EASING)
- addtimer(CALLBACK(src, .proc/dispose_sonar_images, images, clients), time, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(dispose_sonar_images), images, clients), time, TIMER_CLIENT_TIME)
/datum/controller/subsystem/sonar/proc/dispose_sonar_images(list/image/images, list/client/clients)
for(var/client/C in clients)
diff --git a/code/__HELPERS/path.dm b/code/__HELPERS/path.dm
index 14c6d6f1aac..df2a8b4d36e 100644
--- a/code/__HELPERS/path.dm
+++ b/code/__HELPERS/path.dm
@@ -126,7 +126,7 @@
/datum/pathfind/New(atom/movable/caller, atom/goal, id, max_distance, mintargetdist, simulated_only, avoid)
src.caller = caller
end = get_turf(goal)
- open = new /datum/heap(/proc/HeapPathWeightCompare)
+ open = new /datum/heap(GLOBAL_PROC_REF(HeapPathWeightCompare))
sources = new()
src.id = id
src.max_distance = max_distance
diff --git a/code/__HELPERS/piping_colors_lists.dm b/code/__HELPERS/piping_colors_lists.dm
index f359632ee12..4089e6fec44 100644
--- a/code/__HELPERS/piping_colors_lists.dm
+++ b/code/__HELPERS/piping_colors_lists.dm
@@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(pipe_colors_ordered, tim_sort(list(
PIPE_COLOR_PURPLE = 2,
PIPE_COLOR_RED = 3,
PIPE_COLOR_YELLOW = 4
-), /proc/cmp_text_asc))
+), GLOBAL_PROC_REF(cmp_text_asc)))
///Names shown in the examine for every colored atmos component
GLOBAL_LIST_INIT(pipe_color_name, tim_sort(list(
@@ -51,4 +51,4 @@ GLOBAL_LIST_INIT(pipe_color_name, tim_sort(list(
PIPE_COLOR_YELLOW = "yellow",
PIPE_COLOR_BROWN = "brown",
PIPE_COLOR_PURPLE = "purple"
-), /proc/cmp_text_asc))
+), GLOBAL_PROC_REF(cmp_text_asc)))
diff --git a/code/__HELPERS/sorts/InsertSort.dm b/code/__HELPERS/sorts/InsertSort.dm
index ad824d6df2f..eaeccca0e32 100644
--- a/code/__HELPERS/sorts/InsertSort.dm
+++ b/code/__HELPERS/sorts/InsertSort.dm
@@ -2,7 +2,7 @@
* InsertionSort
* - Generally faster than merge for runs of 7 or smaller.
*/
-/proc/insertion_sort(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex=0)
+/proc/insertion_sort(list/L, cmp= GLOBAL_PROC_REF(cmp_numeric_asc), associative, fromIndex=1, toIndex=0)
if(L && L.len >= 2)
fromIndex = fromIndex % L.len
toIndex = toIndex % (L.len+1)
diff --git a/code/__HELPERS/sorts/MergeSort.dm b/code/__HELPERS/sorts/MergeSort.dm
index 2d17bb35b31..7f34d263743 100644
--- a/code/__HELPERS/sorts/MergeSort.dm
+++ b/code/__HELPERS/sorts/MergeSort.dm
@@ -2,7 +2,7 @@
* MergeSort
* - Gernerally faster than insert sort, for runs of 7 or larger.
*/
-/proc/merge_sort(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex)
+/proc/merge_sort(list/L, cmp= GLOBAL_PROC_REF(cmp_numeric_asc), associative, fromIndex=1, toIndex)
if(L && L.len >= 2)
fromIndex = fromIndex % L.len
toIndex = toIndex % (L.len+1)
diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm
index 86bde54f080..d16a9832a8a 100644
--- a/code/__HELPERS/sorts/TimSort.dm
+++ b/code/__HELPERS/sorts/TimSort.dm
@@ -1,7 +1,7 @@
/**
* TimSort
*/
-/proc/tim_sort(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex=0)
+/proc/tim_sort(list/L, cmp= GLOBAL_PROC_REF(cmp_numeric_asc), associative, fromIndex=1, toIndex=0)
if(L && L.len >= 2)
fromIndex = fromIndex % L.len
toIndex = toIndex % (L.len+1)
diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm
index a9b44a7d372..8a4f9066135 100644
--- a/code/__HELPERS/sorts/__main.dm
+++ b/code/__HELPERS/sorts/__main.dm
@@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(sort_instance, /datum/sort_instance, new())
var/list/L
/// The comparator proc-reference.
- var/cmp = /proc/cmp_numeric_asc
+ var/cmp = GLOBAL_PROC_REF(cmp_numeric_asc)
/// Whether we are sorting list keys (0: L[i]) or associated values (1: L[L[i]])
var/associative = 0
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index daa2da4e0e9..4d121bd82ed 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -456,7 +456,7 @@
/// Orders mobs by type then by name.
/proc/sortmobs()
var/list/moblist = list()
- var/list/sortmob = sortList(GLOB.mob_list, cmp=/proc/cmp_name_asc)
+ var/list/sortmob = sortList(GLOB.mob_list, cmp= GLOBAL_PROC_REF(cmp_name_asc))
for(var/mob/observer/eye/M in sortmob)
moblist.Add(M)
for(var/mob/observer/blob/M in sortmob)
diff --git a/code/_globals/lists/mobs.dm b/code/_globals/lists/mobs.dm
index ef29122e9ed..487fd5c1d14 100644
--- a/code/_globals/lists/mobs.dm
+++ b/code/_globals/lists/mobs.dm
@@ -54,9 +54,9 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_name[S.name] = S
- tim_sort(by_name, /proc/cmp_text_asc, associative = FALSE)
+ tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE)
GLOB.legacy_hair_lookup = by_name
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
/proc/all_ear_styles()
. = list()
@@ -74,9 +74,9 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_type[S.type] = S
- tim_sort(by_type, /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
GLOB.legacy_ears_lookup = by_type
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
/proc/all_wing_styles()
. = list()
@@ -94,9 +94,9 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_type[S.type] = S
- tim_sort(by_type, /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
GLOB.legacy_wing_lookup = by_type
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
/proc/all_tail_styles()
. = list()
@@ -114,9 +114,9 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_type[S.type] = S
- tim_sort(by_type, /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
GLOB.legacy_tail_lookup = by_type
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
/proc/all_facial_hair_styles()
. = list()
@@ -137,9 +137,9 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_name[S.name] = S
- tim_sort(by_name, /proc/cmp_text_asc, associative = FALSE)
+ tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE)
GLOB.legacy_facial_hair_lookup = by_name
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
/proc/all_marking_styles()
. = list()
@@ -160,6 +160,6 @@ GLOBAL_LIST(legacy_marking_lookup)
continue
.[S.id] = S
by_name[S.name] = S
- tim_sort(by_name, /proc/cmp_text_asc, associative = FALSE)
+ tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE)
GLOB.legacy_marking_lookup = by_name
- tim_sort(., /proc/cmp_name_asc, associative = TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE)
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index ddd9a30c745..b933dea3bd4 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -175,7 +175,7 @@
var/good_update = istext(new_value)
log_config("LINE [linenumber]: Entry [entry] is deprecated and will be removed soon. Migrate to [new_ver.name]![good_update ? " Suggested new value is: [new_value]" : ""]")
if(!warned_deprecated_configs)
- addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, "This server is using deprecated configuration settings. Please check the logs and update accordingly."), 0)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), "This server is using deprecated configuration settings. Please check the logs and update accordingly."), 0)
warned_deprecated_configs = TRUE
if(good_update)
value = new_value
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 130402a2174..ec69547019d 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -107,7 +107,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
qdel(Master)
else
var/list/subsytem_types = subtypesof(/datum/controller/subsystem)
- tim_sort(subsytem_types, /proc/cmp_subsystem_init)
+ tim_sort(subsytem_types, GLOBAL_PROC_REF(cmp_subsystem_init))
for(var/I in subsytem_types)
var/datum/controller/subsystem/S = new I
_subsystems += S
@@ -142,7 +142,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
/datum/controller/master/Shutdown()
processing = FALSE
- tim_sort(subsystems, /proc/cmp_subsystem_init)
+ tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init))
reverseRange(subsystems)
for(var/datum/controller/subsystem/ss in subsystems)
log_world("Shutting down [ss.name] subsystem...")
@@ -245,7 +245,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
to_chat(world, SPAN_BOLDANNOUNCE("Initializing subsystems..."))
// Sort subsystems by init_order, so they initialize in the correct order.
- tim_sort(subsystems, /proc/cmp_subsystem_init)
+ tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init))
var/start_timeofday = REALTIMEOFDAY
// Initialize subsystems.
@@ -268,7 +268,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
SetRunLevel(RUNLEVEL_LOBBY)
// Sort subsystems by display setting for easy access.
- tim_sort(subsystems, /proc/cmp_subsystem_display)
+ tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display))
if(world.system_type == MS_WINDOWS && CONFIG_GET(flag/toast_notification_on_init) && !length(GLOB.clients))
world.shelleo("start /min powershell -ExecutionPolicy Bypass -File tools/initToast/initToast.ps1 -name \"[world.name]\" -icon %CD%\\icons\\CS13_16.png -port [world.port]")
@@ -378,9 +378,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
* 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)
*/
- tim_sort(SStickersubsystems, /proc/cmp_subsystem_priority)
+ tim_sort(SStickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
for(var/I in runlevel_sorted_subsystems)
- tim_sort(I, /proc/cmp_subsystem_priority)
+ tim_sort(I, GLOBAL_PROC_REF(cmp_subsystem_priority))
I += SStickersubsystems
var/cached_runlevel = current_runlevel
diff --git a/code/controllers/subsystem/characters/backgrounds.dm b/code/controllers/subsystem/characters/backgrounds.dm
index 6db143f97aa..84aa3dcf6b5 100644
--- a/code/controllers/subsystem/characters/backgrounds.dm
+++ b/code/controllers/subsystem/characters/backgrounds.dm
@@ -48,11 +48,11 @@
character_cultures[L.id] = L
- tim_sort(character_origins, /proc/cmp_auto_compare, TRUE)
- tim_sort(character_citizenships, /proc/cmp_auto_compare, TRUE)
- tim_sort(character_religions, /proc/cmp_auto_compare, TRUE)
- tim_sort(character_factions, /proc/cmp_auto_compare, TRUE)
- tim_sort(character_cultures, /proc/cmp_auto_compare, TRUE)
+ tim_sort(character_origins, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(character_citizenships, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(character_religions, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(character_factions, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(character_cultures, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
/datum/controller/subsystem/characters/proc/available_citizenships(species_id, category)
. = list()
diff --git a/code/controllers/subsystem/characters/character_species.dm b/code/controllers/subsystem/characters/character_species.dm
index 1b983b117c4..6c48ac3e7b5 100644
--- a/code/controllers/subsystem/characters/character_species.dm
+++ b/code/controllers/subsystem/characters/character_species.dm
@@ -49,7 +49,7 @@
stack_trace("ignoring custom character species path [path] - collides on uid [S.uid]")
continue
character_species_lookup[S.uid] = S
- tim_sort(character_species_lookup, /proc/cmp_auto_compare, TRUE)
+ tim_sort(character_species_lookup, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
rebuild_character_species_ui_cache()
/datum/controller/subsystem/characters/proc/rebuild_character_species_ui_cache()
diff --git a/code/controllers/subsystem/characters/languages.dm b/code/controllers/subsystem/characters/languages.dm
index 7921019e36d..0f175c82e69 100644
--- a/code/controllers/subsystem/characters/languages.dm
+++ b/code/controllers/subsystem/characters/languages.dm
@@ -26,9 +26,9 @@
if(!(L.language_flags & LANGUAGE_NONGLOBAL) && L.key)
language_keys[L.key] = L
- tim_sort(language_names, /proc/cmp_auto_compare, TRUE)
- tim_sort(language_keys, /proc/cmp_auto_compare)
- tim_sort(language_paths, /proc/cmp_auto_compare, TRUE)
+ tim_sort(language_names, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(language_keys, GLOBAL_PROC_REF(cmp_auto_compare))
+ tim_sort(language_paths, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
/datum/controller/subsystem/characters/proc/resolve_language(id_path_name)
if(ispath(id_path_name))
diff --git a/code/controllers/subsystem/characters/species.dm b/code/controllers/subsystem/characters/species.dm
index d9fcb3b90b1..b347a5deaa5 100644
--- a/code/controllers/subsystem/characters/species.dm
+++ b/code/controllers/subsystem/characters/species.dm
@@ -46,11 +46,11 @@
if((!(S.species_spawn_flags & (SPECIES_SPAWN_WHITELISTED | SPECIES_SPAWN_SPECIAL)) && !(S.get_species_id() in blacklisted_icon_ids)) || (S.get_species_id() in whitelisted_icon_ids))
custom_species_bases += S.name
- tim_sort(species_lookup, /proc/cmp_auto_compare, TRUE)
- tim_sort(species_names, /proc/cmp_auto_compare, TRUE)
- tim_sort(species_paths, /proc/cmp_auto_compare, TRUE)
- tim_sort(playable_species, /proc/cmp_auto_compare)
- tim_sort(custom_species_bases, /proc/cmp_auto_compare)
+ tim_sort(species_lookup, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(species_names, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(species_paths, GLOBAL_PROC_REF(cmp_auto_compare), TRUE)
+ tim_sort(playable_species, GLOBAL_PROC_REF(cmp_auto_compare))
+ tim_sort(custom_species_bases, GLOBAL_PROC_REF(cmp_auto_compare))
/datum/controller/subsystem/characters/proc/resolve_species(id_path_name)
RETURN_TYPE(/datum/species)
diff --git a/code/controllers/subsystem/dbcore/_dbcore.dm b/code/controllers/subsystem/dbcore/_dbcore.dm
index bdfeccca66e..4b9662bddb3 100644
--- a/code/controllers/subsystem/dbcore/_dbcore.dm
+++ b/code/controllers/subsystem/dbcore/_dbcore.dm
@@ -231,9 +231,9 @@ SUBSYSTEM_DEF(dbcore)
for (var/thing in querys)
var/datum/db_query/query = thing
if (warn)
- INVOKE_ASYNC(query, /datum/db_query.proc/warn_execute)
+ INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/db_query, warn_execute))
else
- INVOKE_ASYNC(query, /datum/db_query.proc/Execute)
+ INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/db_query, Execute))
for (var/thing in querys)
var/datum/db_query/query = thing
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index f0e44eddf49..a598989f32e 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(events)
return ..()
/datum/controller/subsystem/events/Initialize()
- SSticker.OnRoundstart(CALLBACK(src, .proc/HolidayRoundstart))
+ SSticker.OnRoundstart(CALLBACK(src, PROC_REF(HolidayRoundstart)))
allEvents = typesof(/datum/event) - /datum/event
event_containers = list(
EVENT_LEVEL_MUNDANE = new/datum/event_container/mundane,
@@ -146,7 +146,7 @@ SUBSYSTEM_DEF(events)
else
qdel(holiday)
- tim_sort(holidays, /proc/cmp_holiday_priority)
+ tim_sort(holidays, GLOBAL_PROC_REF(cmp_holiday_priority))
// // regenerate station name because holiday prefixes.
// set_station_name(new_station_name())
// world.update_status()
diff --git a/code/controllers/subsystem/game_master.dm b/code/controllers/subsystem/game_master.dm
index 49f9cfd756d..b6ec462c586 100644
--- a/code/controllers/subsystem/game_master.dm
+++ b/code/controllers/subsystem/game_master.dm
@@ -87,7 +87,7 @@ SUBSYSTEM_DEF(gamemaster)
var/datum/gm_action/choice = pickweight(weighted_actions)
if(choice)
log_debug(SPAN_DEBUG("[choice.name] was chosen by the Game Master, and is now being ran."))
- INVOKE_ASYNC(src, .proc/run_action, choice)
+ INVOKE_ASYNC(src, PROC_REF(run_action), choice)
/datum/controller/subsystem/gamemaster/proc/run_action(var/datum/gm_action/action)
action.set_up()
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 52278895285..83c28482c13 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -64,7 +64,7 @@ SUBSYSTEM_DEF(garbage)
var/list/dellog = list()
//sort by how long it's wasted hard deleting
- tim_sort(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE)
+ tim_sort(items, cmp= GLOBAL_PROC_REF(cmp_qdel_item_time), associative = TRUE)
for(var/path in items)
var/datum/qdel_item/I = items[path]
dellog += "Path: [path]"
@@ -338,7 +338,7 @@ SUBSYSTEM_DEF(garbage)
++c
var/list/built = list("counted [c] datums in [round((world.timeofday - start) * 0.1, 0.01)] seconds")
start = world.timeofday
- tim_sort(L, /proc/cmp_numeric_dsc, associative = TRUE)
+ tim_sort(L, GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE)
built += "sorted [c] datums in [round((world.timeofday - start) * 0.1, 0.01)] seconds"
for(var/i in L)
built += "[i] - [L[i]]"
@@ -424,7 +424,7 @@ SUBSYSTEM_DEF(garbage)
var/list/built = list("counted [c] datums in [round((world.timeofday - start) * 0.1, 0.01)] seconds")
start = world.timeofday
built += "sorted [c] datums in [round((world.timeofday - start) * 0.1, 0.01)] seconds"
- tim_sort(L, /proc/cmp_numeric_dsc, associative = TRUE)
+ tim_sort(L, GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE)
for(var/i in L)
built += "[i] - [L[i]]"
var/datum/browser/B = new(usr, "datum_outgoing_ref_count", "datum outgoing ref count")
diff --git a/code/controllers/subsystem/job/_job.dm b/code/controllers/subsystem/job/_job.dm
index a8766281b88..8d3e88e0349 100644
--- a/code/controllers/subsystem/job/_job.dm
+++ b/code/controllers/subsystem/job/_job.dm
@@ -98,11 +98,11 @@ SUBSYSTEM_DEF(job)
if(LAZYLEN(job.departments))
add_to_departments(job)
- tim_sort(occupations, /proc/cmp_job_datums)
+ tim_sort(occupations, GLOBAL_PROC_REF(cmp_job_datums))
for(var/D in department_datums)
var/datum/department/dept = department_datums[D]
- tim_sort(dept.jobs, /proc/cmp_job_datums, TRUE)
- tim_sort(dept.primary_jobs, /proc/cmp_job_datums, TRUE)
+ tim_sort(dept.jobs, GLOBAL_PROC_REF(cmp_job_datums), TRUE)
+ tim_sort(dept.primary_jobs, GLOBAL_PROC_REF(cmp_job_datums), TRUE)
return TRUE
@@ -130,7 +130,7 @@ SUBSYSTEM_DEF(job)
var/datum/department/D = new t()
department_datums[D.name] = D
- tim_sort(department_datums, /proc/cmp_department_datums, TRUE)
+ tim_sort(department_datums, GLOBAL_PROC_REF(cmp_department_datums), TRUE)
/datum/controller/subsystem/job/proc/get_all_department_datums()
var/list/dept_datums = list()
diff --git a/code/controllers/subsystem/job/_legacy_job_stuff.dm b/code/controllers/subsystem/job/_legacy_job_stuff.dm
index 875433e085a..6ede34f33e4 100644
--- a/code/controllers/subsystem/job/_legacy_job_stuff.dm
+++ b/code/controllers/subsystem/job/_legacy_job_stuff.dm
@@ -235,7 +235,7 @@
for(var/mob/new_player/player in divide_unassigned)
if(divide_overflows[player] == JOB_ALTERNATIVE_RETURN_LOBBY)
player.ready = 0
- INVOKE_ASYNC(player, /mob/new_player/proc/new_player_panel_proc)
+ INVOKE_ASYNC(player, TYPE_PROC_REF(/mob/new_player, new_player_panel_proc))
to_chat(player, SPAN_WARNING("You have been returned to the lobby, as you do not qualify for any selected role(s)."))
divide_unassigned -= player
dispose_unassigned()
diff --git a/code/controllers/subsystem/job/access.dm b/code/controllers/subsystem/job/access.dm
index d7356eee1a8..41e532683ce 100644
--- a/code/controllers/subsystem/job/access.dm
+++ b/code/controllers/subsystem/job/access.dm
@@ -39,7 +39,7 @@
if(A.is_edit_relevant())
cached_access_edit_relevant += A.access_value
- tim_sort(access_datums, /proc/cmp_auto_compare)
+ tim_sort(access_datums, GLOBAL_PROC_REF(cmp_auto_compare))
// todo: register access; maybe mandate custom access to start at -1? databaes query? haha?
@@ -122,7 +122,7 @@
for(var/datum/access/A as anything in access_datums)
if(A.access_type & access_type)
. += A
- tim_sort(generating, /proc/cmp_auto_compare)
+ tim_sort(generating, GLOBAL_PROC_REF(cmp_auto_compare))
/datum/controller/subsystem/job/proc/access_region_list(access_region)
PRIVATE_PROC(TRUE)
@@ -135,7 +135,7 @@
for(var/datum/access/A as anything in access_datums)
if(A.access_region & access_region)
. += A
- tim_sort(generating, /proc/cmp_auto_compare)
+ tim_sort(generating, GLOBAL_PROC_REF(cmp_auto_compare))
/datum/controller/subsystem/job/proc/access_category_list(access_category)
PRIVATE_PROC(TRUE)
@@ -148,7 +148,7 @@
for(var/datum/access/A as anything in access_datums)
if(A.access_category == access_category)
. += A
- tim_sort(generating, /proc/cmp_auto_compare)
+ tim_sort(generating, GLOBAL_PROC_REF(cmp_auto_compare))
/**
* looks up an access datum by id or typepath
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index eb00ed21efc..63ef976132b 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -16,4 +16,4 @@ SUBSYSTEM_DEF(overmaps)
/datum/controller/subsystem/overmaps/proc/queue_helm_computer_rebuild()
if(!initialized)
return
- addtimer(CALLBACK(src, .proc/rebuild_helm_computers), 0, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(rebuild_helm_computers)), 0, TIMER_UNIQUE)
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index 9da0b93d995..fdf46539637 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -139,4 +139,4 @@ SUBSYSTEM_DEF(parallax)
* z
*/
/datum/controller/subsystem/parallax/proc/queue_z_vis_update(z)
- addtimer(CALLBACK(src, .proc/update_z_vis_contents, z), flags = TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(update_z_vis_contents), z), flags = TIMER_UNIQUE)
diff --git a/code/controllers/subsystem/processing/chemistry.dm b/code/controllers/subsystem/processing/chemistry.dm
index 60b0d6725df..bb93af7da31 100644
--- a/code/controllers/subsystem/processing/chemistry.dm
+++ b/code/controllers/subsystem/processing/chemistry.dm
@@ -37,7 +37,7 @@ PROCESSING_SUBSYSTEM_DEF(chemistry)
for(var/path in paths)
var/datum/chemical_reaction/D = new path
chemical_reactions += D
- tim_sort(chemical_reactions, /proc/cmp_chemical_reaction_priority)
+ tim_sort(chemical_reactions, GLOBAL_PROC_REF(cmp_chemical_reaction_priority))
for(var/datum/chemical_reaction/D as anything in chemical_reactions)
if(!length(D.required_reagents))
continue
diff --git a/code/controllers/subsystem/processing/pathfinder.dm b/code/controllers/subsystem/processing/pathfinder.dm
index ed9ef0b3b78..9e6ac945f5b 100644
--- a/code/controllers/subsystem/processing/pathfinder.dm
+++ b/code/controllers/subsystem/processing/pathfinder.dm
@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(pathfinder)
while(flow[free])
CHECK_TICK
free = (free % lcount) + 1
- var/t = addtimer(CALLBACK(src, /datum/flowcache.proc/toolong, free), 150, TIMER_STOPPABLE)
+ var/t = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/flowcache, toolong), free), 150, TIMER_STOPPABLE)
flow[free] = t
flow[t] = M
return free
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index a5e2821e684..33eb999ab1b 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -365,8 +365,8 @@ SUBSYSTEM_DEF(throwing)
thrownthing.throwing = null
if(!QDELETED(thrownthing))
// move
- addtimer(CALLBACK(thrownthing, /atom/movable/proc/newtonian_move, init_dir), 1)
- addtimer(CALLBACK(thrownthing, /atom/movable/proc/fall), 1)
+ addtimer(CALLBACK(thrownthing, TYPE_PROC_REF(/atom/movable, newtonian_move), init_dir), 1)
+ addtimer(CALLBACK(thrownthing, TYPE_PROC_REF(/atom/movable, fall)), 1)
if(in_qdel)
return
qdel(src)
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 54a840094ec..88f1fc7fbdd 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -280,7 +280,7 @@ SUBSYSTEM_DEF(timer)
return
// Sort all timers by time to run
- tim_sort(alltimers, .proc/cmp_timer)
+ tim_sort(alltimers, GLOBAL_PROC_REF(cmp_timer))
// Get the earliest timer, and if the TTR is earlier than the current world.time,
// then set the head offset appropriately to be the earliest time tracked by the
diff --git a/code/controllers/subsystem/transcore_vr.dm b/code/controllers/subsystem/transcore_vr.dm
index c06a6112f32..70b1e3fa8fe 100644
--- a/code/controllers/subsystem/transcore_vr.dm
+++ b/code/controllers/subsystem/transcore_vr.dm
@@ -168,7 +168,7 @@ SUBSYSTEM_DEF(transcore)
/datum/controller/subsystem/transcore/proc/add_backup(datum/transhuman/mind_record/MR)
ASSERT(MR)
backed_up[MR.mindname] = MR
- backed_up = tim_sort(backed_up, /proc/cmp_text_asc, TRUE)
+ backed_up = tim_sort(backed_up, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
subsystem_log("Added [MR.mindname] to transcore DB.")
// Remove a mind_record from the backup-checking list. Keeps track of it in has_left // Why do we do that? ~Leshana
@@ -183,7 +183,7 @@ SUBSYSTEM_DEF(transcore)
/datum/controller/subsystem/transcore/proc/add_body(datum/transhuman/body_record/BR)
ASSERT(BR)
body_scans[BR.mydna.name] = BR
- body_scans = tim_sort(body_scans, /proc/cmp_text_asc, TRUE)
+ body_scans = tim_sort(body_scans, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
subsystem_log("Added [BR.mydna.name] to transcore body DB.")
// Remove a body record from the database (Usually done when someone cryos) // Why? ~Leshana
diff --git a/code/controllers/subsystem/zmimic.dm b/code/controllers/subsystem/zmimic.dm
index a9b19d671ef..f325c0e48ec 100644
--- a/code/controllers/subsystem/zmimic.dm
+++ b/code/controllers/subsystem/zmimic.dm
@@ -714,7 +714,7 @@ var/list/zmimic_fixed_planes = list(
found_oo += D
temp_objects += D
- tim_sort(found_oo, /proc/cmp_planelayer)
+ tim_sort(found_oo, GLOBAL_PROC_REF(cmp_planelayer))
var/list/atoms_list_list = list()
for (var/thing in found_oo)
diff --git a/code/datums/announce/announcement.dm b/code/datums/announce/announcement.dm
index 6c411affabf..28b05639d00 100644
--- a/code/datums/announce/announcement.dm
+++ b/code/datums/announce/announcement.dm
@@ -23,4 +23,4 @@
. = SSsounds.reserve_sound_channel_datumless()
if(!.)
CRASH("Failed to reserve channel.")
- addtimer(CALLBACK(SSsounds, /datum/controller/subsystem/sounds/proc/free_sound_channel, .), time)
+ addtimer(CALLBACK(SSsounds, TYPE_PROC_REF(/datum/controller/subsystem/sounds, free_sound_channel), .), time)
diff --git a/code/datums/announce/announcement/simple.dm b/code/datums/announce/announcement/simple.dm
index a26e7b8c538..ae482b0fc6a 100644
--- a/code/datums/announce/announcement/simple.dm
+++ b/code/datums/announce/announcement/simple.dm
@@ -62,5 +62,5 @@
if(sound_preamble)
announcer.SendSound(sound_preamble, channel, affected, sound_volume, sound_allow_environment)
if(sound_main)
- addtimer(CALLBACK(announcer, /datum/announcer/proc/SendSound, sound_main, channel, affected, sound_volume, sound_allow_environment), delay)
- addtimer(CALLBACK(announcer, /datum/announcer/proc/SendText, source, name, message, affected), delay)
+ addtimer(CALLBACK(announcer, TYPE_PROC_REF(/datum/announcer, SendSound), sound_main, channel, affected, sound_volume, sound_allow_environment), delay)
+ addtimer(CALLBACK(announcer, TYPE_PROC_REF(/datum/announcer, SendText), source, name, message, affected), delay)
diff --git a/code/datums/browser/_modal.dm b/code/datums/browser/_modal.dm
index 8ea22ab8286..b6d83f5ad3f 100644
--- a/code/datums/browser/_modal.dm
+++ b/code/datums/browser/_modal.dm
@@ -35,7 +35,7 @@
winset(user, "mapwindow", "focus=true")
break
if (timeout)
- addtimer(CALLBACK(src, .proc/close), timeout)
+ addtimer(CALLBACK(src, PROC_REF(close)), timeout)
/datum/browser/modal/proc/wait()
while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index bd17eabf630..721d050b5c3 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -27,26 +27,20 @@
* (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...)
*
* ### global proc while in another global proc:
- * .procname
+ * GLOBAL_PROC_REF(some_proc_here)
*
- * `CALLBACK(GLOBAL_PROC, .some_proc_here)`
+ * `CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(some_proc_here))`
*
* ### proc defined on current(src) object (when in a /proc/ and not an override) OR overridden at src or any of it's parents:
- * .procname
- *
- * `CALLBACK(src, .some_proc_here)`
- *
- * ### when the above doesn't apply:
- *.proc/procname
- *
- * `CALLBACK(src, .proc/some_proc_here)`
+ * PROC_REF(some_proc_here)
*
+ * `CALLBACK(src, PROC_REF(some_proc_here))`
*
* proc defined on a parent of a some type
*
- * `/some/type/.proc/some_proc_here`
+ * `TYPE_PROC_REF(/some/type, some_proc_here)`
*
- * Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname)
+ * Otherwise you must always provide the full typepath of the proc via TYPE_PROC_REF(/type/of/thing, procname)
*/
/datum/callback
diff --git a/code/datums/category.dm b/code/datums/category.dm
index 83d899b5eb9..9564287725e 100644
--- a/code/datums/category.dm
+++ b/code/datums/category.dm
@@ -16,7 +16,7 @@
category = new category(src)
categories += category
categories_by_name[category.name] = category
- categories = tim_sort(categories, /proc/cmp_auto_compare)
+ categories = tim_sort(categories, GLOBAL_PROC_REF(cmp_auto_compare))
/datum/category_collection/Destroy()
for(var/category in categories)
@@ -49,7 +49,7 @@
// For whatever reason dd_insertObjectList(items, item) doesn't insert in the correct order
// If you change this, confirm that character setup doesn't become completely unordered.
- tim_sort(items, /proc/cmp_auto_compare)
+ tim_sort(items, GLOBAL_PROC_REF(cmp_auto_compare))
/datum/category_group/Destroy()
for(var/item in items)
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index ed5c8fd25b2..be17b51b834 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -10,10 +10,10 @@
/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE, _psychic = FALSE, _allowed_slots, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire)
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
else if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect)
+ RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect))
else
return COMPONENT_INCOMPATIBLE
@@ -32,7 +32,7 @@
if (allowed_slots) //Check that the slot is valid for antimagic
UnregisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC)
return
- RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect, TRUE)
+ RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect), TRUE)
/datum/component/anti_magic/proc/on_drop(datum/source, mob/user)
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
diff --git a/code/datums/components/atoms/latently_radioactive.dm b/code/datums/components/atoms/latently_radioactive.dm
index b0ba46ad8b5..6648bf3468b 100644
--- a/code/datums/components/atoms/latently_radioactive.dm
+++ b/code/datums/components/atoms/latently_radioactive.dm
@@ -24,7 +24,7 @@
/datum/component/latently_radioactive/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_ATOM_RAD_ACT, .proc/on_radiated)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_ACT, PROC_REF(on_radiated))
/datum/component/latently_radioactive/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/atoms/radioactive.dm b/code/datums/components/atoms/radioactive.dm
index 0840f6db994..3d4238269f1 100644
--- a/code/datums/components/atoms/radioactive.dm
+++ b/code/datums/components/atoms/radioactive.dm
@@ -21,10 +21,10 @@
src.falloff = falloff
if(istype(parent, /atom))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/rad_examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(rad_examine))
// if(istype(parent, /obj/item))
- // RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/rad_attack)
- // RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack)
+ // RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(rad_attack))
+ // RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(rad_attack))
else
. = COMPONENT_INCOMPATIBLE
CRASH("Something that wasn't an atom was given /datum/component/radioactive")
@@ -36,7 +36,7 @@
//This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS
var/atom/movable/master = parent
master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#14fff714", "size" = 2))
- addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven
+ addtimer(CALLBACK(src, PROC_REF(glow_loop), master), rand(1,19))//Things should look uneven
SSradiation.sources += src
/datum/component/radioactive/Destroy()
@@ -56,7 +56,7 @@
radiation_pulse(parent, (strength - becoming) * RAD_CONTAMINATION_CHEAT_FACTOR, falloff, FALSE, can_contaminate)
strength = becoming
if(strength <= RAD_BACKGROUND_RADIATION)
- addtimer(CALLBACK(src, .proc/check_dissipate), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(check_dissipate)), 5 SECONDS)
SSradiation.sources -= src
/datum/component/radioactive/proc/check_dissipate()
diff --git a/code/datums/components/connect_loc_behalf.dm b/code/datums/components/connect_loc_behalf.dm
index b758b6ad5f3..297227e2aed 100644
--- a/code/datums/components/connect_loc_behalf.dm
+++ b/code/datums/components/connect_loc_behalf.dm
@@ -20,8 +20,8 @@
src.tracked = tracked
/datum/component/connect_loc_behalf/RegisterWithParent()
- RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel)
+ RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
update_signals()
/datum/component/connect_loc_behalf/UnregisterFromParent()
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index c5c4c47c545..72830cb2b2e 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -1,6 +1,6 @@
/datum/component/personal_crafting/Initialize()
if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button)
+ RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(create_mob_button))
/datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL)
// SIGNAL_HANDLER
@@ -12,7 +12,7 @@
C.alpha = H.ui_alpha
LAZYADD(H.other_important, C)
CL.screen += C
- RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact)
+ RegisterSignal(C, COMSIG_CLICK, PROC_REF(component_ui_interact))
/datum/component/personal_crafting
var/busy
@@ -324,7 +324,7 @@
// SIGNAL_HANDLER
if(user == parent)
- INVOKE_ASYNC(src, .proc/ui_interact, user)
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
/datum/component/personal_crafting/ui_state(mob/user, datum/tgui_module/module)
return GLOB.not_incapacitated_turf_state
diff --git a/code/datums/components/gps_signal.dm b/code/datums/components/gps_signal.dm
index 7d134f3b1cf..fae6bf02af2 100644
--- a/code/datums/components/gps_signal.dm
+++ b/code/datums/components/gps_signal.dm
@@ -49,7 +49,7 @@ GLOBAL_LIST_EMPTY(gps_transmitters)
/datum/component/gps_signal/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/on_z_transit)
+ RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_transit))
register_transmitter()
/datum/component/gps_signal/UnregisterFromParent()
diff --git a/code/datums/components/items/wielding.dm b/code/datums/components/items/wielding.dm
index 991b1c2c35f..3da34c621d0 100644
--- a/code/datums/components/items/wielding.dm
+++ b/code/datums/components/items/wielding.dm
@@ -22,8 +22,8 @@
/datum/component/wielding/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/signal_examine)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/signal_dropped)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(signal_examine))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(signal_dropped))
/datum/component/wielding/UnregisterFromParent()
unwield()
diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm
index 76d87594b0e..f7893f5be41 100644
--- a/code/datums/components/jousting.dm
+++ b/code/datums/components/jousting.dm
@@ -18,12 +18,12 @@
/datum/component/jousting/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack))
/datum/component/jousting/proc/on_equip(datum/source, mob/user, slot)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(mob_move), TRUE)
current_holder = user
/datum/component/jousting/proc/on_drop(datum/source, mob/user)
@@ -69,7 +69,7 @@
current_tile_charge++
if(current_timerid)
deltimer(current_timerid)
- current_timerid = addtimer(CALLBACK(src, .proc/reset_charge), movement_reset_tolerance, TIMER_STOPPABLE)
+ current_timerid = addtimer(CALLBACK(src, PROC_REF(reset_charge)), movement_reset_tolerance, TIMER_STOPPABLE)
/datum/component/jousting/proc/reset_charge()
current_tile_charge = 0
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index c34d56982a5..3726f071906 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -23,7 +23,7 @@
. = ..()
var/atom/target = parent
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
target = target.loc
/datum/component/orbiter/UnregisterFromParent()
@@ -62,7 +62,7 @@
orbiter.orbiting.end_orbit(orbiter)
orbiters[orbiter] = TRUE
orbiter.orbiting = src
- RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react)
+ RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
var/matrix/initial_transform = matrix(orbiter.transform)
orbiters[orbiter] = initial_transform
@@ -121,7 +121,7 @@
if(orbited?.loc && orbited.loc != newturf) // We want to know when anything holding us moves too
var/atom/target = orbited.loc
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react), TRUE)
target = target.loc
var/atom/curloc = master.loc
diff --git a/code/datums/components/riding/riding_filter.dm b/code/datums/components/riding/riding_filter.dm
index ff1af33ee6c..0ccee758731 100644
--- a/code/datums/components/riding/riding_filter.dm
+++ b/code/datums/components/riding/riding_filter.dm
@@ -61,12 +61,12 @@
/datum/component/riding_filter/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_MOVABLE_PRE_BUCKLE_MOB, .proc/signal_hook_pre_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_MOB_BUCKLED, .proc/signal_hook_post_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_USER_BUCKLE_MOB, .proc/signal_hook_user_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_MOB_UNBUCKLED, .proc/signal_hook_mob_unbuckle)
+ RegisterSignal(parent, COMSIG_MOVABLE_PRE_BUCKLE_MOB, PROC_REF(signal_hook_pre_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOB_BUCKLED, PROC_REF(signal_hook_post_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_USER_BUCKLE_MOB, PROC_REF(signal_hook_user_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOB_UNBUCKLED, PROC_REF(signal_hook_mob_unbuckle))
if(implements_can_buckle_hints)
- RegisterSignal(parent, COMSIG_MOVABLE_CAN_BUCKLE_MOB, .proc/signal_hook_can_buckle)
+ RegisterSignal(parent, COMSIG_MOVABLE_CAN_BUCKLE_MOB, PROC_REF(signal_hook_can_buckle))
/datum/component/riding_filter/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/riding/riding_handler.dm b/code/datums/components/riding/riding_handler.dm
index 3da80e24aff..d72d1a4a050 100644
--- a/code/datums/components/riding/riding_handler.dm
+++ b/code/datums/components/riding/riding_handler.dm
@@ -85,13 +85,13 @@
/datum/component/riding_handler/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_MOVABLE_MOB_BUCKLED, .proc/signal_hook_mob_buckled)
- RegisterSignal(parent, COMSIG_MOVABLE_MOB_UNBUCKLED, .proc/signal_hook_mob_unbuckled)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/signal_hook_handle_move)
- RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/signal_hook_handle_turn)
- RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE_FROM_BUCKLED, .proc/signal_hook_handle_relaymove)
- RegisterSignal(parent, COMSIG_MOVABLE_PRE_BUCKLE_MOB, .proc/signal_hook_pre_buckle_mob)
- RegisterSignal(parent, COMSIG_MOVABLE_PIXEL_OFFSET_CHANGED, .proc/signal_hook_pixel_offset_changed)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOB_BUCKLED, PROC_REF(signal_hook_mob_buckled))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOB_UNBUCKLED, PROC_REF(signal_hook_mob_unbuckled))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(signal_hook_handle_move))
+ RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(signal_hook_handle_turn))
+ RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE_FROM_BUCKLED, PROC_REF(signal_hook_handle_relaymove))
+ RegisterSignal(parent, COMSIG_MOVABLE_PRE_BUCKLE_MOB, PROC_REF(signal_hook_pre_buckle_mob))
+ RegisterSignal(parent, COMSIG_MOVABLE_PIXEL_OFFSET_CHANGED, PROC_REF(signal_hook_pixel_offset_changed))
/datum/component/riding_handler/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/simple_access.dm b/code/datums/components/simple_access.dm
index fd82d723327..7a5209a1d60 100644
--- a/code/datums/components/simple_access.dm
+++ b/code/datums/components/simple_access.dm
@@ -9,14 +9,14 @@
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
access = new_access
- RegisterSignal(parent, COMSIG_MOB_TRIED_ACCESS, .proc/on_tried_access)
+ RegisterSignal(parent, COMSIG_MOB_TRIED_ACCESS, PROC_REF(on_tried_access))
if(!donor_atom)
return
if(istype(donor_atom, /obj/item/organ))
- RegisterSignal(donor_atom, COMSIG_ORGAN_REMOVED, .proc/on_donor_removed)
+ RegisterSignal(donor_atom, COMSIG_ORGAN_REMOVED, PROC_REF(on_donor_removed))
else if(istype(donor_atom, /obj/item/implant))
- RegisterSignal(donor_atom, COMSIG_IMPLANT_REMOVED, .proc/on_donor_removed)
- RegisterSignal(donor_atom, COMSIG_PARENT_QDELETING, .proc/on_donor_removed)
+ RegisterSignal(donor_atom, COMSIG_IMPLANT_REMOVED, PROC_REF(on_donor_removed))
+ RegisterSignal(donor_atom, COMSIG_PARENT_QDELETING, PROC_REF(on_donor_removed))
/datum/component/simple_access/proc/on_tried_access(datum/source, atom/locked_thing)
SIGNAL_HANDLER
diff --git a/code/datums/components/slaved_atom_to_loc.dm b/code/datums/components/slaved_atom_to_loc.dm
index 48def4e26f9..5579677419d 100644
--- a/code/datums/components/slaved_atom_to_loc.dm
+++ b/code/datums/components/slaved_atom_to_loc.dm
@@ -30,8 +30,8 @@
/datum/component/slaved_atom_to_loc/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_move)
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_move))
/datum/component/slaved_atom_to_loc/UnregisterFromParent()
. = ..()
@@ -44,7 +44,7 @@
if(slaved)
return
slaved = new path
- RegisterSignal(slaved, COMSIG_PARENT_QDELETING, .proc/on_created_qdel)
+ RegisterSignal(slaved, COMSIG_PARENT_QDELETING, PROC_REF(on_created_qdel))
/datum/component/slaved_atom_to_loc/proc/Delete()
if(!slaved)
diff --git a/code/datums/design/design.dm b/code/datums/design/design.dm
index bf49e747e31..b60809bcbf3 100644
--- a/code/datums/design/design.dm
+++ b/code/datums/design/design.dm
@@ -74,7 +74,7 @@
// lathe designs shouldn't be qdeleting, but incase someone puts in a random..
if(QDELETED(instance))
return
- // todo: maybe /obj/proc/detect_materials, /obj/proc/detect_material_parts ? this works fine for now tho.
+ // todo: maybe /obj/proc/detect_materials, TYPE_PROC_REF(/obj, detect_material_parts) ? this works fine for now tho.
if(isnull(materials))
if(!isnull(instance.materials))
materials = instance.materials.Copy()
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index f74dcd0b6e1..81430e2ecf2 100644
--- a/code/datums/elements/_element.dm
+++ b/code/datums/elements/_element.dm
@@ -20,7 +20,7 @@
if(type == /datum/element)
return ELEMENT_INCOMPATIBLE
if(element_flags & ELEMENT_DETACH)
- RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(Detach), override = TRUE)
/// Deactivates the functionality defines by the element on the given datum
/datum/element/proc/Detach(datum/source, force)
diff --git a/code/datums/elements/atoms/z_radiation_listener.dm b/code/datums/elements/atoms/z_radiation_listener.dm
index 894b4c29723..3ff47dde097 100644
--- a/code/datums/elements/atoms/z_radiation_listener.dm
+++ b/code/datums/elements/atoms/z_radiation_listener.dm
@@ -12,7 +12,7 @@
// gotta deal with nullspace :/
SSradiation.z_listeners[T.z] += target
A.rad_flags |= RAD_Z_LISTENING
- RegisterSignal(A, COMSIG_MOVABLE_Z_CHANGED, .proc/z_change)
+ RegisterSignal(A, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(z_change))
/datum/element/z_radiation_listener/Detach(datum/source, force)
. = ..()
diff --git a/code/datums/elements/conflict_checking.dm b/code/datums/elements/conflict_checking.dm
index 59c52aa02b6..f298d184f01 100644
--- a/code/datums/elements/conflict_checking.dm
+++ b/code/datums/elements/conflict_checking.dm
@@ -18,7 +18,7 @@
CRASH("Invalid ID in conflict checking element.")
if(isnull(src.id))
src.id = id
- RegisterSignal(target, COMSIG_CONFLICT_ELEMENT_CHECK, .proc/check)
+ RegisterSignal(target, COMSIG_CONFLICT_ELEMENT_CHECK, PROC_REF(check))
/datum/element/conflict_checking/proc/check(datum/source, id_to_check)
if(id == id_to_check)
diff --git a/code/datums/elements/connect_loc.dm b/code/datums/elements/connect_loc.dm
index fee9072f751..12fa35ea3fa 100644
--- a/code/datums/elements/connect_loc.dm
+++ b/code/datums/elements/connect_loc.dm
@@ -14,7 +14,7 @@
src.connections = connections
- RegisterSignal(listener, COMSIG_MOVABLE_MOVED, .proc/on_moved, override = TRUE)
+ RegisterSignal(listener, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE)
update_signals(listener)
/datum/element/connect_loc/Detach(atom/movable/listener)
diff --git a/code/datums/elements/icon_scaling.dm b/code/datums/elements/icon_scaling.dm
index 4c9fc21e32e..b2130f384c0 100644
--- a/code/datums/elements/icon_scaling.dm
+++ b/code/datums/elements/icon_scaling.dm
@@ -39,9 +39,9 @@
src.storage_scaling = storage_scaling
// Object scaled when dropped/thrown OR when exiting a storage component.
- RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), .proc/scale_overworld)
+ RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), PROC_REF(scale_overworld))
// Object scaled when placed in an inventory slot OR when entering a storage component.
- RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED), .proc/scale_storage)
+ RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED), PROC_REF(scale_storage))
/**
* Detach proc for the item_scaling element.
diff --git a/code/datums/elements/items/darksight_granter.dm b/code/datums/elements/items/darksight_granter.dm
index 85a00945109..2b9da2d02c7 100644
--- a/code/datums/elements/items/darksight_granter.dm
+++ b/code/datums/elements/items/darksight_granter.dm
@@ -15,8 +15,8 @@
return ELEMENT_INCOMPATIBLE
src.modifier = modifier
src.slots = islist(slots)? slots : list(slots)
- RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(target, COMSIG_ITEM_UNEQUIPPED, .proc/on_unequip)
+ RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(target, COMSIG_ITEM_UNEQUIPPED, PROC_REF(on_unequip))
/datum/element/vision_granter/Detach(datum/source)
. = ..()
diff --git a/code/datums/elements/items/hud_granter.dm b/code/datums/elements/items/hud_granter.dm
index 0907e23fcac..3782bc75860 100644
--- a/code/datums/elements/items/hud_granter.dm
+++ b/code/datums/elements/items/hud_granter.dm
@@ -14,8 +14,8 @@
return ELEMENT_INCOMPATIBLE
src.huds = huds
src.slots = islist(slots)? slots : list(slots)
- RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(target, COMSIG_ITEM_UNEQUIPPED, .proc/on_unequip)
+ RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(target, COMSIG_ITEM_UNEQUIPPED, PROC_REF(on_unequip))
/datum/element/hud_granter/Detach(datum/source)
. = ..()
diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm
index 24c73b15b50..95a4a40442c 100644
--- a/code/datums/helper_datums/global_iterator.dm
+++ b/code/datums/helper_datums/global_iterator.dm
@@ -69,7 +69,7 @@
tag = "\ref[src]"
set_process_args(arguments)
if(autostart)
- INVOKE_ASYNC(src, .proc/start)
+ INVOKE_ASYNC(src, PROC_REF(start))
return
/datum/global_iterator/proc/main()
diff --git a/code/datums/holograms/hologram.dm b/code/datums/holograms/hologram.dm
index 7bf8dcf4031..eeeef5374ad 100644
--- a/code/datums/holograms/hologram.dm
+++ b/code/datums/holograms/hologram.dm
@@ -14,7 +14,7 @@ GLOBAL_LIST_INIT(holograms, __init_holograms())
stack_trace("collision on [H.type] vs [.[H.name]:type].")
continue
.[H.name] = H
- tim_sort(., /proc/cmp_name_asc, TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), TRUE)
/**
* fetches a hologram datum
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index 4d1ea74696d..66bb5e0a742 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -78,7 +78,7 @@
if(!chance || prob(chance))
play(get_sound(starttime))
if(!timerid)
- timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_STOPPABLE | TIMER_LOOP)
+ timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_STOPPABLE | TIMER_LOOP)
/datum/looping_sound/proc/play(soundfile)
var/list/atoms_cache = output_atoms
@@ -110,7 +110,7 @@
if(start_sound)
play(start_sound)
start_wait = start_length
- addtimer(CALLBACK(src, .proc/sound_loop), start_wait)
+ addtimer(CALLBACK(src, PROC_REF(sound_loop)), start_wait)
/datum/looping_sound/proc/on_stop()
if(end_sound)
diff --git a/code/datums/looping_sounds/sequence.dm b/code/datums/looping_sounds/sequence.dm
index 0b47ab6a343..2a4397dd033 100644
--- a/code/datums/looping_sounds/sequence.dm
+++ b/code/datums/looping_sounds/sequence.dm
@@ -54,7 +54,7 @@
/datum/looping_sound/sequence/sound_loop(starttime)
iterate_on_sequence()
- timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), next_iteration_delay, TIMER_STOPPABLE)
+ timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), next_iteration_delay, TIMER_STOPPABLE)
/// Yes this is an asterisk but its easier to see on a computer compared to a period.
#define MORSE_DOT "*"
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index b54437b0693..616f8af012c 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -5,7 +5,7 @@
if(initial(O.abstract_type) == path)
continue
. += new path
- tim_sort(., /proc/cmp_name_asc)
+ tim_sort(., GLOBAL_PROC_REF(cmp_name_asc))
/datum/outfit
/// Abstract type - set to self type for abstract outfits.
@@ -171,7 +171,7 @@
pda.name = "PDA-[H.real_name] ([assignment])"
if(H.client.prefs.ringtone) // if null we use the job default
pda.ringtone = H.client.prefs.ringtone
- tim_sort(GLOB.PDAs, /proc/cmp_name_asc)
+ tim_sort(GLOB.PDAs, GLOBAL_PROC_REF(cmp_name_asc))
if(H.equip_to_slot_if_possible(pda, pda_slot))
return pda
if(H.force_equip_to_slot(pda, /datum/inventory_slot_meta/abstract/put_in_backpack))
diff --git a/code/datums/profile.dm b/code/datums/profile.dm
index 3a03038476f..ddc3964dedb 100644
--- a/code/datums/profile.dm
+++ b/code/datums/profile.dm
@@ -5,7 +5,7 @@ GLOBAL_REAL_VAR(PROFILE_FILE)
GLOBAL_REAL_VAR(PROFILE_SLEEPCHECK)
GLOBAL_REAL_VAR(PROFILE_TIME)
-/proc/profile_show(user, sort = /proc/cmp_profile_avg_time_dsc)
+/proc/profile_show(user, sort = GLOBAL_PROC_REF(cmp_profile_avg_time_dsc))
tim_sort(PROFILE_STORE, sort, TRUE)
var/list/lines = list()
diff --git a/code/datums/proxfield/_proxfield.dm b/code/datums/proxfield/_proxfield.dm
index 40ebae3baf3..7d8a200ac28 100644
--- a/code/datums/proxfield/_proxfield.dm
+++ b/code/datums/proxfield/_proxfield.dm
@@ -18,7 +18,7 @@
/datum/proxfield/New(datum/parent, ...)
ASSERT(parent)
src.parent = parent
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel)
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel))
Init(arglist(args.Copy(2)))
/datum/proxfield/Destroy()
@@ -51,9 +51,9 @@
else
attached = A
if(attached != parent)
- RegisterSignal(attached, COMSIG_PARENT_QDELETING, .proc/on_attached_qdel)
- RegisterSignal(attached, COMSIG_MOVABLE_MOVED, .proc/on_move)
- RegisterSignal(attached, COMSIG_MOVABLE_Z_CHANGED, .proc/on_z_transit)
+ RegisterSignal(attached, COMSIG_PARENT_QDELETING, PROC_REF(on_attached_qdel))
+ RegisterSignal(attached, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ RegisterSignal(attached, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_transit))
/datum/proxfield/proc/on_move(datum/source, atom/movable/oldLoc, dir, forced)
SIGNAL_HANDLER
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index fcd2972c3c5..d81c783638f 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -310,5 +310,5 @@
else if (possible_recipes.len == 1)
return possible_recipes[1]
else //okay, let's select the most complicated recipe
- tim_sort(possible_recipes, /proc/cmp_recipe_complexity_dsc)
+ tim_sort(possible_recipes, GLOBAL_PROC_REF(cmp_recipe_complexity_dsc))
return possible_recipes[1]
diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm
index 731be641839..61f984b8867 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -23,7 +23,7 @@
to_chat(world, "Server updated, changes will be applied on the next round...")
if(TGS_EVENT_WATCHDOG_DETACH)
message_admins("TGS restarting...")
- reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES)
+ reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES)
if(TGS_EVENT_WATCHDOG_REATTACH)
var/datum/tgs_version/old_version = world.TgsVersion()
var/datum/tgs_version/new_version = args[2]
diff --git a/code/game/AStar.dm b/code/game/AStar.dm
index e26ba7fd1ee..242d22a4feb 100644
--- a/code/game/AStar.dm
+++ b/code/game/AStar.dm
@@ -14,7 +14,7 @@
*
* So an example use might be:
*
- * src.path_list = AStar(src.loc, target.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance)
+ * src.path_list = AStar(src.loc, target.loc, TYPE_PROC_REF(/turf, AdjacentTurfs), TYPE_PROC_REF(/turf, Distance))
*
* Note: The path is returned starting at the END node, so i wrote reverselist to reverse it for ease of use.
*
diff --git a/code/game/area/area.dm b/code/game/area/area.dm
index ccf6f48f958..17cfdbec1ca 100644
--- a/code/game/area/area.dm
+++ b/code/game/area/area.dm
@@ -206,7 +206,7 @@
A.power_light = FALSE
A.power_equip = FALSE
A.power_environ = FALSE
- INVOKE_ASYNC(A, .proc/power_change)
+ INVOKE_ASYNC(A, PROC_REF(power_change))
*/
STOP_PROCESSING(SSobj, src)
return ..()
@@ -652,7 +652,7 @@ var/list/teleportlocs = list()
if(station)
teleportlocs[AR.name] = AR
- teleportlocs = tim_sort(teleportlocs, /proc/cmp_text_asc, TRUE)
+ teleportlocs = tim_sort(teleportlocs, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
return 1
@@ -669,6 +669,6 @@ var/list/ghostteleportlocs = list()
ghostteleportlocs += AR.name
ghostteleportlocs[AR.name] = AR
- ghostteleportlocs = tim_sort(ghostteleportlocs, /proc/cmp_text_asc, TRUE)
+ ghostteleportlocs = tim_sort(ghostteleportlocs, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
return 1
diff --git a/code/game/area/areas_movement.dm b/code/game/area/areas_movement.dm
index e65587337d1..0def91f110b 100644
--- a/code/game/area/areas_movement.dm
+++ b/code/game/area/areas_movement.dm
@@ -42,7 +42,7 @@
if(!L.client.played)
SEND_SOUND(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE))
L.client.played = TRUE
- addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600)
+ addtimer(CALLBACK(L.client, TYPE_PROC_REF(/client, ResetAmbiencePlayed)), 600)
*/
/**
diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm
index b0667f9caad..3acc49052b3 100644
--- a/code/game/atoms/atom.dm
+++ b/code/game/atoms/atom.dm
@@ -799,7 +799,7 @@
M.show_message(msg, 2, deaf_message, 1)
heard_to_floating_message += M
if(!no_runechat)
- INVOKE_ASYNC(src, /atom/movable/proc/animate_chat, (message ? message : deaf_message), null, FALSE, heard_to_floating_message, 30)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), (message ? message : deaf_message), null, FALSE, heard_to_floating_message, 30)
/atom/movable/proc/dropInto(var/atom/destination)
while(istype(destination))
@@ -950,7 +950,7 @@
/atom/proc/update_filters()
filters = null
- filter_data = tim_sort(filter_data, /proc/cmp_filter_data_priority, TRUE)
+ filter_data = tim_sort(filter_data, GLOBAL_PROC_REF(cmp_filter_data_priority), TRUE)
for(var/f in filter_data)
var/list/data = filter_data[f]
var/list/arguments = data.Copy()
diff --git a/code/game/atoms/say.dm b/code/game/atoms/say.dm
index 9fa8dd8175e..e28b825808e 100644
--- a/code/game/atoms/say.dm
+++ b/code/game/atoms/say.dm
@@ -32,7 +32,7 @@
if(M.client)
speech_bubble_hearers += M.client
if(length(speech_bubble_hearers))
- INVOKE_ASYNC(src, /atom/movable/proc/animate_chat, message, speaking, italics, speech_bubble_hearers, 30)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), message, speaking, italics, speech_bubble_hearers, 30)
/proc/generate_speech_bubble(var/bubble_loc, var/speech_state, var/set_layer = FLOAT_LAYER)
var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 2727789cdf6..8fb8a5159b0 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -289,7 +289,7 @@
/obj/machinery/computer/scan_consolenew/LateInitialize()
. = ..()
scan_for_scanner()
- addtimer(CALLBACK(src, .proc/recharge_injector), 25 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(recharge_injector)), 25 SECONDS)
/obj/machinery/computer/scan_consolenew/proc/recharge_injector()
injector_ready = TRUE
diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index 5c9f058cd2a..3ba6b65417e 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -217,7 +217,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
to_chat(src, SPAN_WARNING("We cannot reach \the [M] with a sting!"))
return 0 //One is inside, the other is outside something.
// Maximum queued turfs set to 25; I don't *think* anything raises sting_range above 2, but if it does the 25 may need raising
- if(!AStar(src.loc, M.loc, /turf/proc/AdjacentTurfsRangedSting, /turf/proc/Distance, max_nodes=25, max_node_depth=sting_range)) //If we can't find a path, fail
+ if(!AStar(src.loc, M.loc, TYPE_PROC_REF(/turf, AdjacentTurfsRangedSting), TYPE_PROC_REF(/turf, Distance), max_nodes=25, max_node_depth=sting_range)) //If we can't find a path, fail
to_chat(src, SPAN_WARNING("We cannot find a path to sting \the [M] by!"))
return 0
return 1
diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm
index 1bfdf343efd..f0bad31e613 100644
--- a/code/game/gamemodes/changeling/modularchangling.dm
+++ b/code/game/gamemodes/changeling/modularchangling.dm
@@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(changeling_powers, init_changeling_powers())
if(!istype(M))
return
purchasePower(M, href_list["P"])
- call(/datum/changeling/proc/EvolutionMenu)()
+ call(TYPE_PROC_REF(/datum/changeling, EvolutionMenu))()
diff --git a/code/game/gamemodes/changeling/powers/blind_sting.dm b/code/game/gamemodes/changeling/powers/blind_sting.dm
index eb1f52814bc..83404b91084 100644
--- a/code/game/gamemodes/changeling/powers/blind_sting.dm
+++ b/code/game/gamemodes/changeling/powers/blind_sting.dm
@@ -12,7 +12,7 @@
set name = "Blind sting (20)"
set desc="Sting target"
- var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_blind_sting)
+ var/mob/living/carbon/T = changeling_sting(20, TYPE_PROC_REF(/mob, changeling_blind_sting))
if(!T)
return 0
add_attack_logs(src,T,"Blind sting (changeling)")
diff --git a/code/game/gamemodes/changeling/powers/cryo_sting.dm b/code/game/gamemodes/changeling/powers/cryo_sting.dm
index 1b6afec48f5..90ea24c1ce1 100644
--- a/code/game/gamemodes/changeling/powers/cryo_sting.dm
+++ b/code/game/gamemodes/changeling/powers/cryo_sting.dm
@@ -13,7 +13,7 @@
set name = "Cryogenic Sting (20)"
set desc = "Chills and freezes a biological creature."
- var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_cryo_sting)
+ var/mob/living/carbon/T = changeling_sting(20, TYPE_PROC_REF(/mob, changeling_cryo_sting))
if(!T)
return 0
add_attack_logs(src,T,"Cryo sting (changeling)")
diff --git a/code/game/gamemodes/changeling/powers/deaf_sting.dm b/code/game/gamemodes/changeling/powers/deaf_sting.dm
index 33a0d1aa02a..623db4ed243 100644
--- a/code/game/gamemodes/changeling/powers/deaf_sting.dm
+++ b/code/game/gamemodes/changeling/powers/deaf_sting.dm
@@ -13,7 +13,7 @@
set name = "Deaf sting (5)"
set desc="Sting target:"
- var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_deaf_sting)
+ var/mob/living/carbon/T = changeling_sting(5, TYPE_PROC_REF(/mob, changeling_deaf_sting))
if(!T) return 0
add_attack_logs(src,T,"Deaf sting (changeling)")
var/duration = 300
diff --git a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm
index 56be26db2f2..ed68258f79c 100644
--- a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm
+++ b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm
@@ -25,7 +25,7 @@
set name = "Delayed Toxic Sting (20)"
set desc = "Injects the target with a toxin that will take effect after a few minutes."
- var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_delayed_toxic_sting)
+ var/mob/living/carbon/T = changeling_sting(20, TYPE_PROC_REF(/mob, changeling_delayed_toxic_sting))
if(!T)
return 0
add_attack_logs(src,T,"Delayed toxic sting (chagneling)")
diff --git a/code/game/gamemodes/changeling/powers/enfeebling_string.dm b/code/game/gamemodes/changeling/powers/enfeebling_string.dm
index 7516f669930..b33e485c524 100644
--- a/code/game/gamemodes/changeling/powers/enfeebling_string.dm
+++ b/code/game/gamemodes/changeling/powers/enfeebling_string.dm
@@ -29,7 +29,7 @@
set name = "Enfeebling Sting (30)"
set desc = "Reduces the maximum health of a victim for a few minutes.."
- var/mob/living/carbon/T = changeling_sting(30,/mob/proc/changeling_enfeebling_string)
+ var/mob/living/carbon/T = changeling_sting(30, TYPE_PROC_REF(/mob, changeling_enfeebling_string))
if(!T)
return 0
if(ishuman(T))
diff --git a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
index 5687689b7cd..dea0a738ed9 100644
--- a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
+++ b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
@@ -18,7 +18,7 @@
if(!changeling)
return 0
- var/mob/living/carbon/human/T = changeling_sting(40, /mob/proc/changeling_extract_dna_sting)
+ var/mob/living/carbon/human/T = changeling_sting(40, TYPE_PROC_REF(/mob, changeling_extract_dna_sting))
if(!T)
return
diff --git a/code/game/gamemodes/changeling/powers/lsd_sting.dm b/code/game/gamemodes/changeling/powers/lsd_sting.dm
index 9529b13280f..9213a63a150 100644
--- a/code/game/gamemodes/changeling/powers/lsd_sting.dm
+++ b/code/game/gamemodes/changeling/powers/lsd_sting.dm
@@ -11,7 +11,7 @@
set name = "Hallucination Sting (15)"
set desc = "Causes terror in the target."
- var/mob/living/carbon/T = changeling_sting(15,/mob/proc/changeling_lsdsting)
+ var/mob/living/carbon/T = changeling_sting(15, TYPE_PROC_REF(/mob, changeling_lsdsting))
if(!T) return 0
add_attack_logs(src,T,"Hallucination sting (changeling)")
spawn(rand(300,600))
diff --git a/code/game/gamemodes/changeling/powers/para_sting.dm b/code/game/gamemodes/changeling/powers/para_sting.dm
index 957c95d2430..f13893cc8b9 100644
--- a/code/game/gamemodes/changeling/powers/para_sting.dm
+++ b/code/game/gamemodes/changeling/powers/para_sting.dm
@@ -9,7 +9,7 @@
set name = "Paralysis sting (30)"
set desc="Sting target"
- var/mob/living/carbon/T = changeling_sting(30,/mob/proc/changeling_paralysis_sting)
+ var/mob/living/carbon/T = changeling_sting(30, TYPE_PROC_REF(/mob, changeling_paralysis_sting))
if(!T)
return 0
add_attack_logs(src,T,"Paralysis sting (changeling)")
diff --git a/code/game/gamemodes/changeling/powers/silence_sting.dm b/code/game/gamemodes/changeling/powers/silence_sting.dm
index d8e24a2e566..e0657108759 100644
--- a/code/game/gamemodes/changeling/powers/silence_sting.dm
+++ b/code/game/gamemodes/changeling/powers/silence_sting.dm
@@ -13,7 +13,7 @@
set name = "Silence sting (10)"
set desc="Sting target"
- var/mob/living/carbon/T = changeling_sting(10,/mob/proc/changeling_silence_sting)
+ var/mob/living/carbon/T = changeling_sting(10, TYPE_PROC_REF(/mob, changeling_silence_sting))
if(!T) return 0
add_attack_logs(src,T,"Silence sting (changeling)")
var/duration = 30
diff --git a/code/game/gamemodes/changeling/powers/transform_sting.dm b/code/game/gamemodes/changeling/powers/transform_sting.dm
index d6ff529f3a2..b6f3de816eb 100644
--- a/code/game/gamemodes/changeling/powers/transform_sting.dm
+++ b/code/game/gamemodes/changeling/powers/transform_sting.dm
@@ -30,7 +30,7 @@
if(!chosen_dna)
return
- var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_transformation_sting)
+ var/mob/living/carbon/T = changeling_sting(40, TYPE_PROC_REF(/mob, changeling_transformation_sting))
if(!T)
return 0
if((MUTATION_HUSK in T.mutations) || (!ishuman(T) && !issmall(T)))
diff --git a/code/game/gamemodes/changeling/powers/unfat_sting.dm b/code/game/gamemodes/changeling/powers/unfat_sting.dm
index 627fc0ffdac..e8ea9c99f2a 100644
--- a/code/game/gamemodes/changeling/powers/unfat_sting.dm
+++ b/code/game/gamemodes/changeling/powers/unfat_sting.dm
@@ -9,7 +9,7 @@
set name = "Unfat sting (5)"
set desc = "Sting target"
- var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_unfat_sting)
+ var/mob/living/carbon/T = changeling_sting(5, TYPE_PROC_REF(/mob, changeling_unfat_sting))
if(!T) return 0
add_attack_logs(src,T,"Unfat sting (changeling)")
to_chat(T, "you feel a small prick as stomach churns violently and you become to feel skinnier.")
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index dfb37a7cb90..3b81bae9faf 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -155,7 +155,7 @@
/obj/effect/gateway/active/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/spawn_things), rand(30, 60) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(spawn_things)), rand(30, 60) SECONDS)
/obj/effect/gateway/active/proc/spawn_things()
var/t = pick(spawnable)
diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm
index be7ee616b79..904b870d0f8 100644
--- a/code/game/gamemodes/cult/narsie.dm
+++ b/code/game/gamemodes/cult/narsie.dm
@@ -46,7 +46,7 @@ var/global/list/narsie_list = list()
to_chat(world, "[uppertext(name)] HAS RISEN")
SEND_SOUND(world, sound('sound/effects/weather/wind/wind_5_1.ogg'))
- INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
+ INVOKE_ASYNC(src, PROC_REF(narsie_spawn_animation))
if(!narsie_cometh)//so we don't initiate Hell more than one time.
if(cause_hell)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 78b6b0fc747..329e56ee303 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -45,7 +45,7 @@ var/list/sacrificed = list()
if(istype(src,/obj/effect/rune))
return fizzle() //Use friggin manuals, Dorf, your list was of zero length.
else
- call(/obj/effect/rune/proc/fizzle)()
+ call(TYPE_PROC_REF(/obj/effect/rune, fizzle))()
return
@@ -415,7 +415,7 @@ var/list/sacrificed = list()
if(istype(src,/obj/effect/rune))
return fizzle()
else
- call(/obj/effect/rune/proc/fizzle)()
+ call(TYPE_PROC_REF(/obj/effect/rune, fizzle))()
return
//! TENTH RUNE
@@ -786,7 +786,7 @@ var/list/sacrificed = list()
if(istype(W,/obj/effect/rune))
return fizzle()
if(istype(W,/obj/item/paper/talisman))
- call(/obj/effect/rune/proc/fizzle)()
+ call(TYPE_PROC_REF(/obj/effect/rune, fizzle))()
return
//! SEVENTEENTH RUNE
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index eb148366e60..253a9206c16 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -14,24 +14,24 @@
// who the hell thought this was a good idea :(
switch(imbue)
if("newtome")
- call(/obj/effect/rune/proc/tomesummon)()
+ call(TYPE_PROC_REF(/obj/effect/rune, tomesummon))()
if("armor")
- call(/obj/effect/rune/proc/armor)()
+ call(TYPE_PROC_REF(/obj/effect/rune, armor))()
if("emp")
- call(/obj/effect/rune/proc/emp)(usr.loc,3)
+ call(TYPE_PROC_REF(/obj/effect/rune, emp))(usr.loc,3)
if("conceal")
- call(/obj/effect/rune/proc/obscure)(2)
+ call(TYPE_PROC_REF(/obj/effect/rune, obscure))(2)
if("revealrunes")
- call(/obj/effect/rune/proc/revealrunes)(src)
+ call(TYPE_PROC_REF(/obj/effect/rune, revealrunes))(src)
if("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
- call(/obj/effect/rune/proc/teleport)(imbue)
+ call(TYPE_PROC_REF(/obj/effect/rune, teleport))(imbue)
if("communicate")
//If the user cancels the talisman this var will be set to 0
- delete = call(/obj/effect/rune/proc/communicate)()
+ delete = call(TYPE_PROC_REF(/obj/effect/rune, communicate))()
if("deafen")
- call(/obj/effect/rune/proc/deafen)()
+ call(TYPE_PROC_REF(/obj/effect/rune, deafen))()
if("blind")
- call(/obj/effect/rune/proc/blind)()
+ call(TYPE_PROC_REF(/obj/effect/rune, blind))()
if("runestun")
to_chat(user, "To use this talisman, attack your target directly.")
return
@@ -51,7 +51,7 @@
var/mob/living/L = user
if(imbue == "runestun")
L.take_organ_damage(5, 0)
- call(/obj/effect/rune/proc/runestun)(target)
+ call(TYPE_PROC_REF(/obj/effect/rune, runestun))(target)
qdel(src)
return CLICKCHAIN_DO_NOT_PROPAGATE
return ..()
diff --git a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm
index 574b13506ec..49b81981636 100644
--- a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm
+++ b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm
@@ -37,7 +37,7 @@
/obj/effect/temporary_effect/destablize/Initialize(mapload)
. = ..()
- INVOKE_ASYNC(src, .proc/radiate_loop)
+ INVOKE_ASYNC(src, PROC_REF(radiate_loop))
/obj/effect/temporary_effect/destablize/proc/radiate_loop()
while(pulses_remaining)
diff --git a/code/game/machinery/_machinery_power.dm b/code/game/machinery/_machinery_power.dm
index 99d5ba78e83..c3d0c8b4809 100644
--- a/code/game/machinery/_machinery_power.dm
+++ b/code/game/machinery/_machinery_power.dm
@@ -93,7 +93,7 @@
. = ..()
update_power_on_move(src, old_loc, loc)
if(ismovable(loc)) // Register for recursive movement (if the thing we're inside moves)
- RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/update_power_on_move)
+ RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(update_power_on_move))
if(ismovable(old_loc)) // Unregister recursive movement.
UnregisterSignal(old_loc, COMSIG_MOVABLE_MOVED)
diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm
index a143483bd49..ab76632a49e 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -66,10 +66,10 @@
S.update_icon()
. = TRUE
if("allon")
- INVOKE_ASYNC(src, .proc/toggle_all, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(toggle_all), TRUE)
. = TRUE
if("alloff")
- INVOKE_ASYNC(src, .proc/toggle_all, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(toggle_all), FALSE)
. = TRUE
if("scan")
scanscrubbers()
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index 8d31732f188..0905e6c6682 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -192,7 +192,7 @@
switch(action)
if("activate")
- INVOKE_ASYNC(src, .proc/activate)
+ INVOKE_ASYNC(src, PROC_REF(activate))
return TRUE
if("detach")
eject_beaker(usr)
diff --git a/code/game/machinery/computer/arcade/battler.dm b/code/game/machinery/computer/arcade/battler.dm
index 5653a8c756b..898b7404cb4 100644
--- a/code/game/machinery/computer/arcade/battler.dm
+++ b/code/game/machinery/computer/arcade/battler.dm
@@ -214,7 +214,7 @@
else
playsound(src, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3)
- timer_id = addtimer(CALLBACK(src, .proc/enemy_action,player_stance,user),1 SECONDS,TIMER_STOPPABLE)
+ timer_id = addtimer(CALLBACK(src, PROC_REF(enemy_action),player_stance,user),1 SECONDS,TIMER_STOPPABLE)
gameover_check(user)
diff --git a/code/game/machinery/computer/arcade/orion_event.dm b/code/game/machinery/computer/arcade/orion_event.dm
index c2e076b7e49..2c1d541f987 100644
--- a/code/game/machinery/computer/arcade/orion_event.dm
+++ b/code/game/machinery/computer/arcade/orion_event.dm
@@ -120,7 +120,7 @@
game.food = rand(10,80) / rand(1,2)
game.fuel = rand(10,60) / rand(1,2)
if(game.electronics)
- addtimer(CALLBACK(game, .proc/revert_random, game, oldfood, oldfuel), 1 SECONDS)
+ addtimer(CALLBACK(game, PROC_REF(revert_random), game, oldfood, oldfuel), 1 SECONDS)
/datum/orion_event/electronic_part/proc/revert_random(obj/machinery/computer/arcade/orion_trail/game, oldfood, oldfuel)
if(oldfuel > game.fuel && oldfood > game.food)
@@ -166,7 +166,7 @@
smashed.ScrapeAway()
game.say("Something slams into the floor around [src], exposing it to space!")
if(game.hull)
- addtimer(CALLBACK(game, .proc/fix_floor, game), 1 SECONDS)
+ addtimer(CALLBACK(game, PROC_REF(fix_floor), game), 1 SECONDS)
/datum/orion_event/hull_part/proc/fix_floor(obj/machinery/computer/arcade/orion_trail/game)
game.say("A new floor suddenly appears around [src]. What the hell?")
@@ -440,7 +440,7 @@
game.say("A miniature black hole suddenly appears in front of [game], devouring [gamer] alive!")
gamer.afflict_stun(20 * 200, ignore_canstun = TRUE) //you can't run :^)
var/black_hole = new /obj/singularity/academy(gamer.loc)
- addtimer(CALLBACK(game, /atom/movable/proc/say, "[black_hole] winks out, just as suddenly as it appeared."), 50)
+ addtimer(CALLBACK(game, TYPE_PROC_REF(/atom/movable, say), "[black_hole] winks out, just as suddenly as it appeared."), 50)
QDEL_IN(black_hole, 5 SECONDS)
*/
#define BUTTON_DOCK "Dock"
diff --git a/code/game/machinery/computer/command/card.dm b/code/game/machinery/computer/command/card.dm
index 0915303c073..916d9cdf711 100644
--- a/code/game/machinery/computer/command/card.dm
+++ b/code/game/machinery/computer/command/card.dm
@@ -189,14 +189,14 @@
usr.action_feedback(SPAN_WARNING("[src] is still printing something!"), src)
return
TIMER_COOLDOWN_START(src, CD_INDEX_IDCONSOLE_PRINT, 5 SECONDS)
- addtimer(CALLBACK(src, /obj/machinery/computer/card/proc/print_manifest), 5 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/computer/card, print_manifest)), 5 SECONDS)
return TRUE
if("print_card_report")
if(TIMER_COOLDOWN_CHECK(src, CD_INDEX_IDCONSOLE_PRINT))
usr.action_feedback(SPAN_WARNING("[src] is still printing something!"), src)
return
TIMER_COOLDOWN_START(src, CD_INDEX_IDCONSOLE_PRINT, 5 SECONDS)
- addtimer(CALLBACK(src, /obj/machinery/computer/card/proc/print_card_report), 5 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/computer/card, print_card_report)), 5 SECONDS)
return TRUE
/obj/machinery/computer/card/proc/print_manifest()
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 66badb710a0..53e2f846377 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -351,7 +351,7 @@
printing = TRUE
// playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, TRUE)
SStgui.update_uis(src)
- addtimer(CALLBACK(src, .proc/print_finish), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(print_finish)), 5 SECONDS)
else
return FALSE
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 3374bf17690..10cdd39ca8a 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -334,7 +334,7 @@
printing = TRUE
// playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, TRUE)
SStgui.update_uis(src)
- addtimer(CALLBACK(src, .proc/print_finish), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(print_finish)), 5 SECONDS)
if("photo_front")
var/icon/photo = get_photo(usr)
if(photo && active1)
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index ba55c1287be..88b58a19ec9 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -242,7 +242,7 @@
printing = TRUE
// playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, TRUE)
SStgui.update_uis(src)
- addtimer(CALLBACK(src, .proc/print_finish), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(print_finish)), 5 SECONDS)
else
return FALSE
diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm
index b8a2d8edb4b..7eeded132ca 100644
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -21,7 +21,7 @@
. = ..()
radio_controller.remove_object(src, air_frequency)
air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM)
- INVOKE_ASYNC(src, /obj/machinery/door/proc/open)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/door, open))
/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
..()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 7852955f99d..cf0ee676204 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -92,7 +92,7 @@
continue
if(door.density)
continue
- INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/close)
+ INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, close))
for(var/datum/weakref/closet_ref as anything in closets)
var/obj/structure/closet/secure_closet/brig/closet = closet_ref.resolve()
@@ -127,7 +127,7 @@
continue
if(!door.density)
continue
- INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/open)
+ INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, open))
for(var/datum/weakref/closet_ref as anything in closets)
var/obj/structure/closet/secure_closet/brig/closet = closet_ref.resolve()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index b36fa04e035..51bd08969db 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -66,13 +66,13 @@
if(istype(bot))
if(density && src.check_access(bot.botcard))
open()
- addtimer(CALLBACK(src, .proc/close), 50)
+ addtimer(CALLBACK(src, PROC_REF(close)), 50)
else if(istype(AM, /obj/mecha))
var/obj/mecha/mecha = AM
if(density)
if(mecha.occupant && src.allowed(mecha.occupant))
open()
- addtimer(CALLBACK(src, .proc/close), 50)
+ addtimer(CALLBACK(src, PROC_REF(close)), 50)
return
if (!( SSticker ))
return
@@ -80,7 +80,7 @@
return
if (density && allowed(AM))
open()
- addtimer(CALLBACK(src, .proc/close), check_access(null)? 50 : 20)
+ addtimer(CALLBACK(src, PROC_REF(close)), check_access(null)? 50 : 20)
/obj/machinery/door/window/CanAllowThrough(atom/movable/mover, turf/target)
if(!(get_dir(mover, loc) & turn(dir, 180)))
diff --git a/code/game/machinery/fossilrevive.dm b/code/game/machinery/fossilrevive.dm
index c8d50d4b7b2..6f63a58a493 100644
--- a/code/game/machinery/fossilrevive.dm
+++ b/code/game/machinery/fossilrevive.dm
@@ -22,7 +22,7 @@
return ..()
var/obj/item/fossil/mosquito = I
if(mosquito.processable == "seed")
- addtimer(CALLBACK(src, .proc/findsaway, "seed"), 100)
+ addtimer(CALLBACK(src, PROC_REF(findsaway), "seed"), 100)
reviving = TRUE
mosquito.processable = FALSE
else
diff --git a/code/game/machinery/holopad.dm b/code/game/machinery/holopad.dm
index c24122084d7..2c33429ea9f 100644
--- a/code/game/machinery/holopad.dm
+++ b/code/game/machinery/holopad.dm
@@ -960,8 +960,8 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE)
user.action_feedback(SPAN_WARNING("You're already focusing somewhere else!"), source)
return FALSE
remoting = user
- RegisterSignal(remoting, COMSIG_MOB_RESET_PERSPECTIVE, .proc/cleanup_remote_presence)
- RegisterSignal(remoting, COMSIG_MOB_ITEM_EQUIPPED, .proc/on_item_equipped)
+ RegisterSignal(remoting, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(cleanup_remote_presence))
+ RegisterSignal(remoting, COMSIG_MOB_ITEM_EQUIPPED, PROC_REF(on_item_equipped))
action_hang_up.grant(remoting)
action_swap_view.grant(remoting)
if(isAI(user))
diff --git a/code/game/machinery/holoposter.dm b/code/game/machinery/holoposter.dm
index 424dbb2db3f..18b9881985d 100644
--- a/code/game/machinery/holoposter.dm
+++ b/code/game/machinery/holoposter.dm
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(holoposters)
. = ..()
set_rand_sprite()
GLOB.holoposters += src
- mytimer = addtimer(CALLBACK(src, .proc/set_rand_sprite), 30 MINUTES + rand(0, 5 MINUTES), TIMER_STOPPABLE | TIMER_LOOP)
+ mytimer = addtimer(CALLBACK(src, PROC_REF(set_rand_sprite)), 30 MINUTES + rand(0, 5 MINUTES), TIMER_STOPPABLE | TIMER_LOOP)
/obj/machinery/holoposter/Destroy()
GLOB.holoposters -= src
@@ -91,7 +91,7 @@ GLOBAL_LIST_EMPTY(holoposters)
machine_stat &= ~BROKEN
icon_forced = FALSE
if(!mytimer)
- mytimer = addtimer(CALLBACK(src, .proc/set_rand_sprite), 30 MINUTES + rand(0, 5 MINUTES), TIMER_STOPPABLE | TIMER_LOOP)
+ mytimer = addtimer(CALLBACK(src, PROC_REF(set_rand_sprite)), 30 MINUTES + rand(0, 5 MINUTES), TIMER_STOPPABLE | TIMER_LOOP)
set_rand_sprite()
return
icon_forced = TRUE
diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm
index 7762137b5c0..2c4c8a0b3c1 100644
--- a/code/game/machinery/pointdefense.dm
+++ b/code/game/machinery/pointdefense.dm
@@ -242,7 +242,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense)
var/Angle = round(get_visual_angle(src,M))
var/matrix/rot_matrix = matrix()
rot_matrix.Turn(Angle)
- addtimer(CALLBACK(src, .proc/finish_shot, target), rotation_speed)
+ addtimer(CALLBACK(src, PROC_REF(finish_shot), target), rotation_speed)
animate(src, transform = rot_matrix, rotation_speed, easing = SINE_EASING)
setDir(arctan(transform.b, transform.a) > 0 ? NORTH : SOUTH)
diff --git a/code/game/mecha/equipment/tools/passenger.dm b/code/game/mecha/equipment/tools/passenger.dm
index 6f44e5a0cce..96cb65e645a 100644
--- a/code/game/mecha/equipment/tools/passenger.dm
+++ b/code/game/mecha/equipment/tools/passenger.dm
@@ -75,7 +75,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/passenger/attach()
..()
if (chassis)
- add_obj_verb(chassis, /obj/mecha/proc/move_inside_passenger)
+ add_obj_verb(chassis, TYPE_PROC_REF(/obj/mecha, move_inside_passenger))
/obj/item/mecha_parts/mecha_equipment/tool/passenger/detach()
if(occupant)
diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm
index 78be59dc299..923f79cd7ac 100644
--- a/code/game/mecha/equipment/tools/shield_omni.dm
+++ b/code/game/mecha/equipment/tools/shield_omni.dm
@@ -77,7 +77,7 @@
/obj/item/shield_projector/rectangle/mecha/Initialize(mapload)
. = ..()
my_mech = loc
- RegisterSignal(my_mech, COMSIG_MOVABLE_MOVED, /obj/item/shield_projector/proc/update_shield_positions)
+ RegisterSignal(my_mech, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/obj/item/shield_projector, update_shield_positions))
update_shift(my_mech)
/obj/item/shield_projector/rectangle/mecha/proc/update_shift(atom/movable/mech)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 22463275fa3..90f9ff9c4d6 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -245,7 +245,7 @@
/obj/mecha/Initialize(mapload)
. = ..()
- INVOKE_ASYNC(src, .proc/create_components)
+ INVOKE_ASYNC(src, PROC_REF(create_components))
update_transform()
//! shitcode
@@ -288,7 +288,7 @@
add_cell()
// TODO: BURN ITERATORS WITH FUCKING FIRE
- INVOKE_ASYNC(src, /obj/mecha/proc/add_iterators)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/mecha, add_iterators))
removeVerb(/obj/mecha/verb/disconnect_from_port)
log_message("[src.name] created.")
loc.Entered(src)
@@ -512,7 +512,7 @@
"View Stats" = radial_image_statpanel
)
- var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_occupant_radial, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_occupant_radial), user), require_near = TRUE, tooltips = TRUE)
if(!check_occupant_radial(user))
return
if(!choice)
diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm
index 113ae4f0837..8edcf4b8303 100644
--- a/code/game/objects/effects/chem/foam.dm
+++ b/code/game/objects/effects/chem/foam.dm
@@ -23,9 +23,9 @@
metal = ismetal
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
if(dries)
- addtimer(CALLBACK(src, .proc/post_spread), 3 + metal * 3)
- addtimer(CALLBACK(src, .proc/pre_harden), 12 SECONDS)
- addtimer(CALLBACK(src, .proc/harden), 15 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(post_spread)), 3 + metal * 3)
+ addtimer(CALLBACK(src, PROC_REF(pre_harden)), 12 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(harden)), 15 SECONDS)
/obj/effect/foam/proc/post_spread()
process()
diff --git a/code/game/objects/effects/debris/cleanable/humans.dm b/code/game/objects/effects/debris/cleanable/humans.dm
index 9e1ecff3a1a..252bc18e3fa 100644
--- a/code/game/objects/effects/debris/cleanable/humans.dm
+++ b/code/game/objects/effects/debris/cleanable/humans.dm
@@ -54,7 +54,7 @@ var/global/list/image/splatter_cache=list()
if (B.blood_DNA)
blood_DNA |= B.blood_DNA.Copy()
qdel(B)
- addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount + 1))
+ addtimer(CALLBACK(src, PROC_REF(dry)), DRYING_TIME * (amount + 1))
/obj/effect/debris/cleanable/blood/update_icon()
if(basecolor == "rainbow")
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 63f4f1de58f..ee7731d2d0d 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -242,7 +242,7 @@ steam.start() -- spawns the effect
if(!(B in projectiles))
B.damage = (B.damage/2)
projectiles += B
- destroyed_event.register(B, src, /obj/effect/particle_effect/smoke/bad/proc/on_projectile_delete)
+ destroyed_event.register(B, src, TYPE_PROC_REF(/obj/effect/particle_effect/smoke/bad, on_projectile_delete))
to_chat(world, "Damage is: [B.damage]")
return 1
diff --git a/code/game/objects/effects/particle_holder.dm b/code/game/objects/effects/particle_holder.dm
index c9eb9de8e04..3ad3ee2a014 100644
--- a/code/game/objects/effects/particle_holder.dm
+++ b/code/game/objects/effects/particle_holder.dm
@@ -20,8 +20,8 @@
stack_trace("particle holder was created with no loc!")
return INITIALIZE_HINT_QDEL
if(ismovable(loc))
- RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/on_move)
- RegisterSignal(loc, COMSIG_PARENT_QDELETING, .proc/on_qdel)
+ RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ RegisterSignal(loc, COMSIG_PARENT_QDELETING, PROC_REF(on_qdel))
weak_attached = WEAKREF(loc)
particles = new particle_path
update_visual_contents(loc)
diff --git a/code/game/objects/effects/zone_divider.dm b/code/game/objects/effects/zone_divider.dm
index 7158b466be2..a179ef2c265 100644
--- a/code/game/objects/effects/zone_divider.dm
+++ b/code/game/objects/effects/zone_divider.dm
@@ -15,6 +15,6 @@
if(air_master.current_cycle == 0)
if(!isturf(loc))
return
- SSticker.OnRoundstart(CALLBACK(loc, /turf/proc/queue_zone_update))
+ SSticker.OnRoundstart(CALLBACK(loc, TYPE_PROC_REF(/turf, queue_zone_update)))
return ATMOS_PASS_AIR_BLOCKED
return ATMOS_PASS_ZONE_BLOCKED
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 33e7a17e9f0..84ca8a55673 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -64,7 +64,7 @@
SEND_SOUND(M, sound('sound/soundbytes/effects/explosion/explosionfar.ogg'))
if(creaking_explosion)
- addtimer(CALLBACK(M, /mob/proc/playsound_local, epicenter, null, rand(25, 40), 1, frequency, null, null, FALSE, 'sound/effects/creak1.ogg', null, null, null, null, 0), 5 SECONDS)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, playsound_local), epicenter, null, rand(25, 40), 1, frequency, null, null, FALSE, 'sound/effects/creak1.ogg', null, null, null, null, 0), 5 SECONDS)
if(adminlog)
message_admins("Explosion with [shaped ? "shaped" : "non-shaped"] size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)")
log_game("Explosion with [shaped ? "shaped" : "non-shaped"] size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ")
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 6f0cfe4cc24..c73f5e2ea55 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -273,7 +273,7 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(usr, "You can't send PDA messages because you are dead!")
return
var/list/plist = available_pdas()
- tim_sort(plist, cmp = /proc/cmp_text_asc)
+ tim_sort(plist, cmp = GLOBAL_PROC_REF(cmp_text_asc))
if (plist)
var/c = input(usr, "Please select a PDA") as null|anything in plist
if (!c) // if the user hasn't selected a PDA file we can't send a message
@@ -436,7 +436,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda/Initialize(mapload)
. = ..()
GLOB.PDAs += src
- tim_sort(GLOB.PDAs, cmp = /proc/cmp_name_asc)
+ tim_sort(GLOB.PDAs, cmp = GLOBAL_PROC_REF(cmp_name_asc))
if(default_cartridge)
cartridge = new default_cartridge(src)
new /obj/item/pen(src)
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index e82c7391e25..f1a4ea328e8 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -82,7 +82,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
/obj/item/communicator/Initialize(mapload)
. = ..()
all_communicators += src
- tim_sort(all_communicators, /proc/cmp_name_asc)
+ tim_sort(all_communicators, GLOBAL_PROC_REF(cmp_name_asc))
node = get_exonet_node(src)
START_PROCESSING(SSobj, src)
camera = new(src)
@@ -92,7 +92,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
setup_tgui_camera()
//This is a pretty terrible way of doing this.
- addtimer(CALLBACK(src, .proc/register_to_holder), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(register_to_holder)), 5 SECONDS)
// Proc: register_to_holder()
// Parameters: None
diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm
index c134667ba3a..53799e116cc 100644
--- a/code/game/objects/items/devices/communicator/phone.dm
+++ b/code/game/objects/items/devices/communicator/phone.dm
@@ -350,7 +350,7 @@
video_source = comm.camera
comm.visible_message("[icon2html(src, world)] New video connection from [comm].")
update_active_camera_screen()
- RegisterSignal(video_source, COMSIG_MOVABLE_MOVED, .proc/update_active_camera_screen)
+ RegisterSignal(video_source, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen))
update_icon()
// Proc: end_video()
diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm
index f6029a911f9..fe9dc7dba75 100644
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -148,7 +148,7 @@
if(user.a_intent == INTENT_HELP)
if(!(obj_flags & EMAGGED))
user.visible_message(SPAN_NOTICE("[user] scans [target] with [src]."), SPAN_NOTICE("You scan [target]'s radiation levels with [src]..."))
- addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
+ addtimer(CALLBACK(src, PROC_REF(scan), target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
else
user.visible_message(SPAN_NOTICE("[user] scans [target] with [src]."), SPAN_DANGER("You project [src]'s stored radiation into [target]!"))
target.rad_act(radiation_count / get_dist(user, target)) // yeah let's NOT have infinite range killbeams
@@ -230,7 +230,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
- RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act)
+ RegisterSignal(user, COMSIG_ATOM_RAD_ACT, PROC_REF(redirect_rad_act))
listeningTo = user
/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index d276e9d47e8..c4d0b7f1177 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -151,7 +151,7 @@
deltimer(emp_timerid)
else
visible_message(SPAN_WARNING("[src] overloads!"), range = MESSAGE_RANGE_COMBAT_SILENCED)
- emp_timerid = addtimer(CALLBACK(src, /obj/item/gps/proc/reset_emped), 5 MINUTES / severity, TIMER_STOPPABLE)
+ emp_timerid = addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/gps, reset_emped)), 5 MINUTES / severity, TIMER_STOPPABLE)
/obj/item/gps/proc/reset_emped()
if(!emped)
@@ -205,7 +205,7 @@
if(tracking)
stop_tracking()
tracking = target
- RegisterSignal(tracking, COMSIG_PARENT_QDELETING, /obj/item/gps/proc/stop_tracking)
+ RegisterSignal(tracking, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/obj/item/gps, stop_tracking))
if(!hud_arrow)
hud_arrow = new /atom/movable/screen/waypoint_tracker/gps
hud_bound?.add_screen(hud_arrow)
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index d2dee7532af..fdcff5492e6 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -68,7 +68,7 @@
return 0
known_targets.Insert(1, target) // Insert the newly hacked target first,
- target.register(OBSERVER_EVENT_DESTROY, src, /obj/item/multitool/hacktool/proc/on_target_destroy)
+ target.register(OBSERVER_EVENT_DESTROY, src, TYPE_PROC_REF(/obj/item/multitool/hacktool, on_target_destroy))
return 1
/obj/item/multitool/hacktool/proc/sanity_check()
diff --git a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm
index 06a2eb35e52..caf04995d63 100644
--- a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm
+++ b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm
@@ -141,11 +141,11 @@
if(obj_flags & EMAGGED)
tape.ruin()
audible_message("Tape Recorder: This tape recorder will self-destruct in... Five.")
- addtimer(CALLBACK(src, /atom/proc/audible_message, "Tape Recorder: Four."), 1 SECONDS)
- addtimer(CALLBACK(src, /atom/proc/audible_message, "Tape Recorder: Three."), 2 SECONDS)
- addtimer(CALLBACK(src, /atom/proc/audible_message, "Tape Recorder: Two."), 3 SECONDS)
- addtimer(CALLBACK(src, /atom/proc/audible_message, "Tape Recorder: One."), 4 SECONDS)
- addtimer(CALLBACK(src, /obj/item/tape_recorder/proc/explode), 5 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, audible_message), "Tape Recorder: Four."), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, audible_message), "Tape Recorder: Three."), 2 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, audible_message), "Tape Recorder: Two."), 3 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, audible_message), "Tape Recorder: One."), 4 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/tape_recorder, explode)), 5 SECONDS)
/obj/item/tape_recorder/proc/start_playing(mob/user, silent)
if(!tape)
@@ -198,7 +198,7 @@
if(delay > play_skip_threshold)
audible_message("[SPAN_BOLD("[src]")]: Skipping [round(delay * 0.1)] seconds of silence.")
delay = 3 SECONDS
- play_timerid = addtimer(CALLBACK(src, .proc/_play_next), delay, TIMER_STOPPABLE)
+ play_timerid = addtimer(CALLBACK(src, PROC_REF(_play_next)), delay, TIMER_STOPPABLE)
/obj/item/tape_recorder/verb/playback_memory()
set name = "Playback Tape"
diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm
index 7bd4ed16d29..5a2c051acb0 100644
--- a/code/game/objects/items/devices/translator.dm
+++ b/code/game/objects/items/devices/translator.dm
@@ -38,7 +38,7 @@
context = context_or_path
if(istype(context, /datum/translation_context/variable/learning))
var/datum/translation_context/variable/learning/CTX = context
- CTX.on_train = CALLBACK(src, .proc/on_learn)
+ CTX.on_train = CALLBACK(src, PROC_REF(on_learn))
/obj/item/universal_translator/proc/on_learn(datum/translation_context/context, datum/language/L, old_efficiency)
if(old_efficiency)
diff --git a/code/game/objects/items/falling_object.dm b/code/game/objects/items/falling_object.dm
index 08cb356c1e9..506bbc33d1d 100644
--- a/code/game/objects/items/falling_object.dm
+++ b/code/game/objects/items/falling_object.dm
@@ -21,7 +21,7 @@
dropped.density = FALSE
dropped.opacity = FALSE
animate(dropped, pixel_y = initial_y, pixel_x = initial_x , time = 7)
- addtimer(CALLBACK(dropped, /atom/movable.proc/end_fall), 7)
+ addtimer(CALLBACK(dropped, TYPE_PROC_REF(/atom/movable, end_fall)), 7)
return INITIALIZE_HINT_QDEL
/atom/movable/proc/end_fall(var/crushing = FALSE)
diff --git a/code/game/objects/items/godfigures.dm b/code/game/objects/items/godfigures.dm
index a459057dd7d..386105ac0f9 100644
--- a/code/game/objects/items/godfigures.dm
+++ b/code/game/objects/items/godfigures.dm
@@ -29,7 +29,7 @@
holy_icons = sortList(holy_icons)
- var/choice = show_radial_menu(L, src , holy_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
+ var/choice = show_radial_menu(L, src , holy_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), L), radius = 42, require_near = TRUE)
if(!choice || !check_menu(L))
return
diff --git a/code/game/objects/items/id_cards/syndicate_ids.dm b/code/game/objects/items/id_cards/syndicate_ids.dm
index 4b7829c017f..87ce989d2a9 100644
--- a/code/game/objects/items/id_cards/syndicate_ids.dm
+++ b/code/game/objects/items/id_cards/syndicate_ids.dm
@@ -73,7 +73,7 @@
unset_registered_user()
registered_user = user
user.set_id_info(src)
- user.register(OBSERVER_EVENT_DESTROY, src, /obj/item/card/id/syndicate/proc/unset_registered_user)
+ user.register(OBSERVER_EVENT_DESTROY, src, TYPE_PROC_REF(/obj/item/card/id/syndicate, unset_registered_user))
return TRUE
/obj/item/card/id/syndicate/proc/unset_registered_user(var/mob/user)
diff --git a/code/game/objects/items/robot/gripper.dm b/code/game/objects/items/robot/gripper.dm
index 184af1b4e6c..e3a3e6c5e39 100644
--- a/code/game/objects/items/robot/gripper.dm
+++ b/code/game/objects/items/robot/gripper.dm
@@ -45,7 +45,7 @@
remove_item(drop_location())
wrapped = I
I.forceMove(src)
- RegisterSignal(I, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), .proc/unwrap_hook)
+ RegisterSignal(I, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(unwrap_hook))
/**
* newloc false to not move
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index f89027ea40a..c02b7e65346 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -154,7 +154,7 @@
/obj/item/storage/bag/ore/equipped(mob/user, slot, flags)
. = ..()
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/autoload, override = TRUE)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(autoload), override = TRUE)
/obj/item/storage/bag/ore/dropped(mob/user, flags, atom/newLoc)
. = ..()
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
index 7eeef6c7dca..2512eb99043 100644
--- a/code/game/objects/items/storage/misc.dm
+++ b/code/game/objects/items/storage/misc.dm
@@ -119,7 +119,7 @@
/obj/item/storage/box/papersack/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/pen))
- var/choice = show_radial_menu(user, src , papersack_designs, custom_check = CALLBACK(src, .proc/check_menu, user, W), radius = 36, require_near = TRUE)
+ var/choice = show_radial_menu(user, src , papersack_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, W), radius = 36, require_near = TRUE)
if(!choice)
return FALSE
if(icon_state == "paperbag_[choice]")
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index f12d4fac395..0ad3a0d6926 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -134,7 +134,7 @@
"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
)
*/
- var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(choice)
@@ -466,7 +466,7 @@
status = rcd_status
delay = rcd_delay
if (status == RCD_DECONSTRUCT)
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 11)
delay -= 11
icon_state = "rcd_end_reverse"
else
@@ -488,7 +488,7 @@
qdel(src)
else
icon_state = "rcd_end"
- addtimer(CALLBACK(src, .proc/end), 15)
+ addtimer(CALLBACK(src, PROC_REF(end)), 15)
/obj/effect/constructing_effect/proc/end()
qdel(src)
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index fcaf1ab2cf4..0aa4275b216 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -94,7 +94,7 @@
/obj/item/pipe_dispenser/equipped(mob/user, slot, flags)
. = ..()
if(slot == SLOT_ID_HANDS)
- RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, .proc/mouse_wheeled)
+ RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, PROC_REF(mouse_wheeled))
else
UnregisterSignal(user, COMSIG_MOUSE_SCROLL_ON)
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index ece1f92a4d3..04e078271fa 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -351,7 +351,7 @@
/obj/item/melee/energy/sword/dualsaber/pre_attack(atom/target, mob/user, clickchain_flags, list/params)
if(prob(50))
- INVOKE_ASYNC(src, .proc/jedi_spin, user)
+ INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
return ..()
/obj/item/melee/energy/sword/dualsaber/proc/jedi_spin(mob/living/user)
@@ -469,7 +469,7 @@
/obj/item/melee/energy/sword/charge/dualsaber/pre_attack(atom/target, mob/user, clickchain_flags, list/params)
if(prob(50))
- INVOKE_ASYNC(src, .proc/jedi_spin, user)
+ INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
return ..()
/obj/item/melee/energy/sword/charge/dualsaber/proc/jedi_spin(mob/living/user)
@@ -666,7 +666,7 @@
to_chat(user, " [src] starts vibrating.")
playsound(user, 'sound/weapons/hf_machete/hfmachete1.ogg', 40, 0)
w_class = WEIGHT_CLASS_BULKY
- // user.lazy_register_event(/lazy_event/on_moved, src, .proc/mob_moved)
+ // user.lazy_register_event(/lazy_event/on_moved, src, PROC_REF(mob_moved))
else
damage_force = initial(damage_force)
throw_force = initial(throw_force)
@@ -677,7 +677,7 @@
to_chat(user, " [src] stops vibrating.")
playsound(user, 'sound/weapons/hf_machete/hfmachete0.ogg', 40, 0)
w_class = WEIGHT_CLASS_NORMAL
- // user.lazy_unregister_event(/lazy_event/on_moved, src, .proc/mob_moved)
+ // user.lazy_unregister_event(/lazy_event/on_moved, src, PROC_REF(mob_moved))
update_icon()
/obj/item/melee/energy/hfmachete/afterattack(atom/target, mob/user, clickchain_flags, list/params)
@@ -691,7 +691,7 @@
/*
/obj/item/melee/energy/hfmachete/dropped(mob/user, atom_flags, atom/newLoc)
- user.lazy_unregister_event(/lazy_event/on_moved, src, .proc/mob_moved)
+ user.lazy_unregister_event(/lazy_event/on_moved, src, PROC_REF(mob_moved))
/obj/item/melee/energy/hfmachete/throw_at_old(atom/target, range, speed, thrower) // todo: get silicons to interpret this because >sleeps
if(!usr)
diff --git a/code/game/objects/items/weapons/nullrod.dm b/code/game/objects/items/weapons/nullrod.dm
index e9a3926575a..fdaf09c32e8 100644
--- a/code/game/objects/items/weapons/nullrod.dm
+++ b/code/game/objects/items/weapons/nullrod.dm
@@ -34,7 +34,7 @@
return
if (istype(target, /turf/simulated/floor))
to_chat(user, "You hit the floor with the [src].")
- call(/obj/effect/rune/proc/revealrunes)(src)
+ call(TYPE_PROC_REF(/obj/effect/rune, revealrunes))(src)
if (isliving(target))
var/mob/living/tm = target // targeted mob
if(SA_vulnerability & tm.mob_class)
@@ -68,7 +68,7 @@
nullrod_icons = sortList(nullrod_icons)
- var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
+ var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), L), radius = 42, require_near = TRUE)
if(!choice || !check_menu(L))
return
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 13ca9fae3b6..3262bc35c41 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -229,7 +229,7 @@
/obj/item/shield/riot/implant/Moved()
. = ..()
if(istype(loc, /obj/item/organ/cyberimp/arm/shield))
- recharge_timerid = addtimer(CALLBACK(src, .proc/recharge), recharge_delay, flags = TIMER_STOPPABLE)
+ recharge_timerid = addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_delay, flags = TIMER_STOPPABLE)
else //extending
if(recharge_timerid)
deltimer(recharge_timerid)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 20b117bb1ac..3ca43f4c30d 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -336,7 +336,7 @@
"[pick(fluffmessages)]")
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
if(prob(25))
- INVOKE_ASYNC(src, .proc/jedi_spin, user)
+ INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
//Kanabo
/obj/item/melee/kanabo // parrying stick
diff --git a/code/game/objects/structures/crates_lockers/__closet.dm b/code/game/objects/structures/crates_lockers/__closet.dm
index b341a300b97..a6e49f6fcad 100644
--- a/code/game/objects/structures/crates_lockers/__closet.dm
+++ b/code/game/objects/structures/crates_lockers/__closet.dm
@@ -46,7 +46,7 @@
/obj/structure/closet/Initialize(mapload)
. = ..()
if(mapload && !opened)
- addtimer(CALLBACK(src, .proc/take_contents), 0)
+ addtimer(CALLBACK(src, PROC_REF(take_contents)), 0)
PopulateContents()
/*
if(secure)
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 8ecd1ddcd2d..437f974429e 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -13,7 +13,7 @@
/obj/structure/largecrate/Initialize(mapload) //Shamelessly copied from closets.dm since the old Initializer didnt seem to function properly - Bloop
. = ..()
if(mapload)
- addtimer(CALLBACK(src, .proc/take_contents), 0)
+ addtimer(CALLBACK(src, PROC_REF(take_contents)), 0)
PopulateContents()
// Closets need to come later because of spawners potentially creating objects during init.
return INITIALIZE_HINT_LATELOAD
diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm
index a680c37459a..36253a9b3fd 100644
--- a/code/game/objects/structures/femur_breaker.dm
+++ b/code/game/objects/structures/femur_breaker.dm
@@ -45,7 +45,7 @@
if (BREAKER_SLAT_DROPPED)
slat_status = BREAKER_SLAT_MOVING
icon_state = "breaker_raise"
- addtimer(CALLBACK(src, .proc/raise_slat), BREAKER_ANIMATION_LENGTH)
+ addtimer(CALLBACK(src, PROC_REF(raise_slat)), BREAKER_ANIMATION_LENGTH)
return
if (BREAKER_SLAT_RAISED)
if (LAZYLEN(buckled_mobs))
@@ -95,7 +95,7 @@
playsound(src, 'sound/effects/femur_breaker.ogg', 100, FALSE)
H.afflict_stun(20 * BREAKER_ANIMATION_LENGTH)
- addtimer(CALLBACK(src, .proc/damage_leg, H), BREAKER_ANIMATION_LENGTH, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(damage_leg), H), BREAKER_ANIMATION_LENGTH, TIMER_UNIQUE)
log_combat(user, H, "femur broke", src)
slat_status = BREAKER_SLAT_DROPPED
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 725171922a7..308a2c1b7f5 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -70,7 +70,7 @@
if (GUILLOTINE_BLADE_DROPPED)
blade_status = GUILLOTINE_BLADE_MOVING
icon_state = "guillotine_raise"
- addtimer(CALLBACK(src, .proc/raise_blade), GUILLOTINE_ANIMATION_LENGTH)
+ addtimer(CALLBACK(src, PROC_REF(raise_blade)), GUILLOTINE_ANIMATION_LENGTH)
return
if (GUILLOTINE_BLADE_RAISED)
if (LAZYLEN(buckled_mobs))
@@ -83,7 +83,7 @@
current_action = 0
blade_status = GUILLOTINE_BLADE_MOVING
icon_state = "guillotine_drop"
- addtimer(CALLBACK(src, .proc/drop_blade, user), GUILLOTINE_ANIMATION_LENGTH - 2) // Minus two so we play the sound and decap faster
+ addtimer(CALLBACK(src, PROC_REF(drop_blade), user), GUILLOTINE_ANIMATION_LENGTH - 2) // Minus two so we play the sound and decap faster
else
current_action = 0
else
@@ -96,7 +96,7 @@
else
blade_status = GUILLOTINE_BLADE_MOVING
icon_state = "guillotine_drop"
- addtimer(CALLBACK(src, .proc/drop_blade), GUILLOTINE_ANIMATION_LENGTH)
+ addtimer(CALLBACK(src, PROC_REF(drop_blade)), GUILLOTINE_ANIMATION_LENGTH)
/obj/structure/guillotine/proc/raise_blade()
blade_status = GUILLOTINE_BLADE_RAISED
@@ -139,7 +139,7 @@
for(var/mob/M in fov_viewers(world.view, src))
var/mob/living/carbon/human/C = M
if (ishuman(M))
- addtimer(CALLBACK(C, /mob/.proc/emote, "clap"), delay_offset * 0.3)
+ addtimer(CALLBACK(C, TYPE_PROC_REF(/mob, emote), "clap"), delay_offset * 0.3)
delay_offset++
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
diff --git a/code/game/rendering/atom_huds/atom_hud.dm b/code/game/rendering/atom_huds/atom_hud.dm
index f77b39d4cd5..2a99d4da779 100644
--- a/code/game/rendering/atom_huds/atom_hud.dm
+++ b/code/game/rendering/atom_huds/atom_hud.dm
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(huds, list(
hudusers[M] = 1
if(next_time_allowed[M] > world.time)
if(!queued_to_see[M])
- addtimer(CALLBACK(src, .proc/show_hud_images_after_cooldown, M), next_time_allowed[M] - world.time)
+ addtimer(CALLBACK(src, PROC_REF(show_hud_images_after_cooldown), M), next_time_allowed[M] - world.time)
queued_to_see[M] = TRUE
else
next_time_allowed[M] = world.time + ADD_HUD_TO_COOLDOWN
diff --git a/code/game/rendering/fullscreen/fullscreen.dm b/code/game/rendering/fullscreen/fullscreen.dm
index 0ab052fe24f..a4a080a0a76 100644
--- a/code/game/rendering/fullscreen/fullscreen.dm
+++ b/code/game/rendering/fullscreen/fullscreen.dm
@@ -35,7 +35,7 @@
return
if(animated > 0)
animate(screen, alpha = 0, time = animated)
- addtimer(CALLBACK(src, .proc/_remove_fullscreen_direct, screen), animated, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(_remove_fullscreen_direct), screen), animated, TIMER_CLIENT_TIME)
else
if(client)
client.screen -= screen
diff --git a/code/game/rendering/legacy/alert.dm b/code/game/rendering/legacy/alert.dm
index f3741247069..70753c7d629 100644
--- a/code/game/rendering/legacy/alert.dm
+++ b/code/game/rendering/legacy/alert.dm
@@ -54,7 +54,7 @@
animate(alert, transform = matrix(), time = 2.5, easing = CUBIC_EASING)
if(alert.timeout)
- addtimer(CALLBACK(src, .proc/alert_timeout, alert, category), alert.timeout)
+ addtimer(CALLBACK(src, PROC_REF(alert_timeout), alert, category), alert.timeout)
alert.timeout = world.time + alert.timeout - world.tick_lag
return alert
diff --git a/code/game/rendering/mob.dm b/code/game/rendering/mob.dm
index 7a82238544b..0be56c97185 100644
--- a/code/game/rendering/mob.dm
+++ b/code/game/rendering/mob.dm
@@ -21,7 +21,7 @@
client.global_planes.apply(client)
client.update_clickcatcher()
client.using_perspective?.reload(client, TRUE)
- INVOKE_ASYNC(client, /client/proc/init_viewport_blocking)
+ INVOKE_ASYNC(client, TYPE_PROC_REF(/client, init_viewport_blocking))
reload_fullscreen()
/**
diff --git a/code/game/rendering/parallax/parallax_object.dm b/code/game/rendering/parallax/parallax_object.dm
index 813d7d12124..ac298821a08 100644
--- a/code/game/rendering/parallax/parallax_object.dm
+++ b/code/game/rendering/parallax/parallax_object.dm
@@ -126,7 +126,7 @@
/atom/movable/screen/parallax_layer/proc/QueueLoop(delay, speed, matrix/translate_matrix, matrix/target_matrix)
if(queued_animation)
CancelAnimation()
- queued_animation = addtimer(CALLBACK(src, .proc/_loop, speed, translate_matrix, target_matrix), delay, TIMER_STOPPABLE)
+ queued_animation = addtimer(CALLBACK(src, PROC_REF(_loop), speed, translate_matrix, target_matrix), delay, TIMER_STOPPABLE)
/atom/movable/screen/parallax_layer/proc/_loop(speed, matrix/translate_matrix = matrix(1, 0, 0, 0, 1, 480), matrix/target_matrix = matrix())
transform = translate_matrix
diff --git a/code/game/turfs/simulated/wall_icon.dm b/code/game/turfs/simulated/wall_icon.dm
index 4ba18509cce..7a4138a04cb 100644
--- a/code/game/turfs/simulated/wall_icon.dm
+++ b/code/game/turfs/simulated/wall_icon.dm
@@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache)
/turf/simulated/wall/update_overlays()
if (material == initial(material))
- addtimer(CALLBACK(src, /turf/simulated/wall/proc/update_overlays_delayed), 1 SECOND) //our material datum has not been instanced, so we'll runtime about 2 lines down.
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/turf/simulated/wall, update_overlays_delayed)), 1 SECOND) //our material datum has not been instanced, so we'll runtime about 2 lines down.
return
icon = material.icon_base
if(reinf_material)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 0d9e8880406..70f4b7e1426 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -156,7 +156,7 @@
. = ..()
if(edge)
- addtimer(CALLBACK(src, .proc/on_atom_edge_touch, A), 0)
+ addtimer(CALLBACK(src, PROC_REF(on_atom_edge_touch), A), 0)
/turf/space/proc/on_atom_edge_touch(atom/movable/AM)
if(!QDELETED(AM) && (AM.loc == src))
diff --git a/code/game/world.dm b/code/game/world.dm
index 7b265dd9677..b0c6b53221f 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -131,7 +131,7 @@ GLOBAL_LIST(topic_status_cache)
#endif
if(config_legacy.ToRban)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/ToRban_autoupdate), 5 MINUTES)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ToRban_autoupdate)), 5 MINUTES)
/world/proc/InitTgs()
TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED)
diff --git a/code/modules/admin/ckey_vr.dm b/code/modules/admin/ckey_vr.dm
index 1cf569d55b2..d2353ec6a37 100644
--- a/code/modules/admin/ckey_vr.dm
+++ b/code/modules/admin/ckey_vr.dm
@@ -10,7 +10,7 @@
var/list/keys = list()
for(var/client/C as anything in GLOB.clients)
keys += C
- var/client/selection = input("Please, select a player!", "Set ckey", null, null) as null|anything in tim_sort(keys, /proc/cmp_ckey_asc)
+ var/client/selection = input("Please, select a player!", "Set ckey", null, null) as null|anything in tim_sort(keys, GLOBAL_PROC_REF(cmp_ckey_asc))
if(!selection || !istype(selection))
return
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 142160aebaf..b8c9b9ee87a 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -467,7 +467,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
options |= SDQL2_OPTION_DO_NOT_AUTOGC
/datum/SDQL2_query/proc/ARun()
- INVOKE_ASYNC(src, .proc/Run)
+ INVOKE_ASYNC(src, PROC_REF(Run))
/datum/SDQL2_query/proc/Run()
if(SDQL2_IS_RUNNING)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 1cd80f32901..5efad661ec6 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -507,7 +507,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ahelp)
//remove out adminhelp verb temporarily to prevent spamming of admins.
remove_verb(src, /client/verb/adminhelp)
- adminhelptimerid = addtimer(CALLBACK(src, .proc/giveadminhelpverb), 2 MINUTES, flags = TIMER_STOPPABLE)
+ adminhelptimerid = addtimer(CALLBACK(src, PROC_REF(giveadminhelpverb)), 2 MINUTES, flags = TIMER_STOPPABLE)
if(persistent.ligma)
to_chat(usr, "PM to-Admins: [msg]")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 89c95473310..3e8227a231f 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -235,7 +235,7 @@
if(!check_rights(R_DEBUG)) return
var/list/dellog = list("List of things that have gone through qdel this round
")
- tim_sort(SSgarbage.items, cmp=/proc/cmp_qdel_item_time, associative = TRUE)
+ tim_sort(SSgarbage.items, cmp=GLOBAL_PROC_REF(cmp_qdel_item_time), associative = TRUE)
for(var/path in SSgarbage.items)
var/datum/qdel_item/I = SSgarbage.items[path]
dellog += "- [path]
"
@@ -281,7 +281,7 @@
render_stats(SSoverlays.stats, src)
// Render stats list for round-end statistics.
-/proc/render_stats(list/stats, user, sort = /proc/cmp_generic_stat_item_time)
+/proc/render_stats(list/stats, user, sort = GLOBAL_PROC_REF(cmp_generic_stat_item_time))
tim_sort(stats, sort, TRUE)
var/list/lines = list()
diff --git a/code/modules/admin/verbs/debug/profiling.dm b/code/modules/admin/verbs/debug/profiling.dm
index aa48a89cbc4..b530bfcd0db 100644
--- a/code/modules/admin/verbs/debug/profiling.dm
+++ b/code/modules/admin/verbs/debug/profiling.dm
@@ -26,9 +26,9 @@
set desc = "Shows tracked profiling info from code lines that support it"
var/sortlist = list(
- "Avg time" = /proc/cmp_profile_avg_time_dsc,
- "Total Time" = /proc/cmp_profile_time_dsc,
- "Call Count" = /proc/cmp_profile_count_dsc
+ "Avg time" = GLOBAL_PROC_REF(cmp_profile_avg_time_dsc),
+ "Total Time" = GLOBAL_PROC_REF(cmp_profile_time_dsc),
+ "Call Count" = GLOBAL_PROC_REF(cmp_profile_count_dsc)
)
var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist
if (!sort)
diff --git a/code/modules/ai/ai_holder_movement.dm b/code/modules/ai/ai_holder_movement.dm
index e675c974aa8..2ec8c353fc8 100644
--- a/code/modules/ai/ai_holder_movement.dm
+++ b/code/modules/ai/ai_holder_movement.dm
@@ -90,7 +90,7 @@
// step_to(holder, A)
if(holder.IMove(get_step_to(holder, A)) == MOVEMENT_FAILED)
ai_log("walk_path() : Failed to move, attempting breakthrough.", AI_LOG_INFO)
- INVOKE_ASYNC(src, .proc/breakthrough, A)
+ INVOKE_ASYNC(src, PROC_REF(breakthrough), A)
return
if(move_once() == FALSE) // Start walking the path.
diff --git a/code/modules/ai/ai_holder_pathfinding.dm b/code/modules/ai/ai_holder_pathfinding.dm
index e9dd528af82..8acd45e6746 100644
--- a/code/modules/ai/ai_holder_pathfinding.dm
+++ b/code/modules/ai/ai_holder_pathfinding.dm
@@ -42,7 +42,7 @@
/datum/ai_holder/proc/get_path(var/turf/target,var/get_to = 1, var/max_distance = world.view*6)
ai_log("get_path() : Entering.",AI_LOG_DEBUG)
forget_path()
- var/list/new_path = AStar(get_turf(holder.loc), target, astar_adjacent_proc, /turf/proc/Distance, min_target_dist = get_to, max_node_depth = max_distance, id = holder.IGetID(), exclude = obstacles)
+ var/list/new_path = AStar(get_turf(holder.loc), target, astar_adjacent_proc, TYPE_PROC_REF(/turf, Distance), min_target_dist = get_to, max_node_depth = max_distance, id = holder.IGetID(), exclude = obstacles)
if(new_path && new_path.len)
path = new_path
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 298ef7316ad..a9fd7c19213 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -96,7 +96,7 @@
if(listening)
UnregisterSignal(listening, COMSIG_MOVABLE_MOVED)
listening = loc
- RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/Queue)
+ RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(Queue))
if(!isturf(loc) && !isturf(loc.loc)) // only allow nesting 1 deep
return
// spread
@@ -145,7 +145,7 @@
if(listening)
UnregisterSignal(listening, COMSIG_MOVABLE_MOVED)
if(on && ismovable(loc))
- RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/Queue)
+ RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(Queue))
listening = loc
/obj/item/assembly/infra/proc/trigger_beam()
@@ -157,7 +157,7 @@
for(var/mob/hearing_mob in get_hearers_in_view(hearing_range, src))
hearing_mob.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
cooldown = 2
- addtimer(CALLBACK(src, /obj/item/assembly/proc/process_cooldown), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/assembly, process_cooldown)), 10)
/obj/item/assembly/infra/ui_interact(mob/user, datum/tgui/ui)
if(!secured)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 9f04c9ae2ba..4a689be35cc 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -74,7 +74,7 @@
/obj/item/assembly/prox_sensor/dropped(mob/user, flags, atom/newLoc)
. = ..()
- INVOKE_ASYNC(src, .proc/sense)
+ INVOKE_ASYNC(src, PROC_REF(sense))
/obj/item/assembly/prox_sensor/proc/toggle_scan()
if(!secured)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 0015f9fd9c7..3cce9fd2ded 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -56,7 +56,7 @@
switch(action)
if("signal")
- INVOKE_ASYNC(src, .proc/signal)
+ INVOKE_ASYNC(src, PROC_REF(signal))
. = TRUE
if("freq")
frequency = unformat_frequency(params["freq"])
diff --git a/code/modules/asset_cache/assets/uplink.dm b/code/modules/asset_cache/assets/uplink.dm
index d220ee22297..24f6e2f49b5 100644
--- a/code/modules/asset_cache/assets/uplink.dm
+++ b/code/modules/asset_cache/assets/uplink.dm
@@ -8,7 +8,7 @@
var/list/items = list()
for(var/datum/uplink_category/category as anything in subtypesof(/datum/uplink_category))
categories += category
- categories = tim_sort(categories, .proc/cmp_uplink_category_desc)
+ categories = tim_sort(categories, GLOBAL_PROC_REF(uplink_category_desc))
var/list/new_categories = list()
for(var/datum/uplink_category/category as anything in categories)
diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm
index 5f0f8e3d536..82375ce1a6f 100644
--- a/code/modules/asset_cache/transports/asset_transport.dm
+++ b/code/modules/asset_cache/transports/asset_transport.dm
@@ -14,7 +14,7 @@
/datum/asset_transport/proc/Load()
if (CONFIG_GET(flag/asset_simple_preload))
for(var/client/C in GLOB.clients)
- addtimer(CALLBACK(src, .proc/send_assets_slow, C, preload), 1 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS)
/// Initialize - Called when SSassets initializes.
/datum/asset_transport/proc/Initialize(list/assets)
@@ -22,7 +22,7 @@
if (!CONFIG_GET(flag/asset_simple_preload))
return
for(var/client/C in GLOB.clients)
- addtimer(CALLBACK(src, .proc/send_assets_slow, C, preload), 1 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS)
/// Register a browser asset with the asset cache system
@@ -131,7 +131,7 @@
client.sent_assets[new_asset_name] = ACI.hash
- addtimer(CALLBACK(client, /client/proc/asset_cache_update_json), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(client, TYPE_PROC_REF(/client, asset_cache_update_json)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
return TRUE
return FALSE
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index e88d1e4b0eb..00419533122 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -76,7 +76,7 @@
W.assignment = corpseidjob
M.set_id_info(W)
M.equip_to_slot_or_del(W, SLOT_ID_WORN_ID)
- INVOKE_ASYNC(M, /mob/proc/death)
+ INVOKE_ASYNC(M, TYPE_PROC_REF(/mob, death))
/obj/spawner/corpse/syndicatesoldier
name = "Mercenary"
diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm
index 812d00c5249..197b5e26fe7 100644
--- a/code/modules/blob2/blobs/core.dm
+++ b/code/modules/blob2/blobs/core.dm
@@ -87,7 +87,7 @@ var/list/blob_cores = list()
START_PROCESSING(SSobj, src)
update_icon() //so it atleast appears
if(!placed && !overmind)
- INVOKE_ASYNC(src, .proc/create_overmind, new_overmind)
+ INVOKE_ASYNC(src, PROC_REF(create_overmind), new_overmind)
if(overmind)
update_icon()
point_rate = new_rate
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index b1ec9e1d256..376641d2b80 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -527,7 +527,7 @@ GLOBAL_VAR_INIT(log_clicks, FALSE)
//Precache the client with all other assets slowly, so as to not block other browse() calls
if (CONFIG_GET(flag/asset_simple_preload))
- addtimer(CALLBACK(SSassets.transport, /datum/asset_transport.proc/send_assets_slow, src, SSassets.transport.preload), 5 SECONDS)
+ addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS)
/* // We don't have vox_sounds atm
#if (PRELOAD_RSC == 0)
for (var/name in GLOB.vox_sounds)
diff --git a/code/modules/client/player_data.dm b/code/modules/client/player_data.dm
index e88b833efed..fb97ae15807 100644
--- a/code/modules/client/player_data.dm
+++ b/code/modules/client/player_data.dm
@@ -42,7 +42,7 @@
if(isnull(available))
available = FALSE
return FALSE
- INVOKE_ASYNC(src, .proc/load_blocking)
+ INVOKE_ASYNC(src, PROC_REF(load_blocking))
return TRUE
/datum/player_data/proc/load_blocking()
diff --git a/code/modules/client/statpanel.dm b/code/modules/client/statpanel.dm
index f26ce397ebf..ff39ae01c0d 100644
--- a/code/modules/client/statpanel.dm
+++ b/code/modules/client/statpanel.dm
@@ -37,7 +37,7 @@
// if it is there and we can't tell because byond is byond, send it a signal to reload
src << output(null, "statbrowser:byond_reconnect")
// check for it incase it breaks
- addtimer(CALLBACK(src, /client/proc/statpanel_check), 30 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/client, statpanel_check)), 30 SECONDS)
/**
* cleans up statpanel stuff during disconnect
@@ -179,7 +179,7 @@
if(HAS_TRAIT(src, "VERB_UPDATE_QUEUED"))
return
ADD_TRAIT(src, "VERB_UPDATE_QUEUED", "FUCK")
- addtimer(CALLBACK(src, .proc/legacy_verb_update), 1 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(legacy_verb_update)), 1 SECONDS)
/// -_-
/client/proc/legacy_verb_update()
diff --git a/code/modules/client/viewport.dm b/code/modules/client/viewport.dm
index 45c66610b00..dad6f2b9bed 100644
--- a/code/modules/client/viewport.dm
+++ b/code/modules/client/viewport.dm
@@ -311,7 +311,7 @@ GLOBAL_VAR(lock_client_view_y)
_request_viewport_update()
if(!viewport_queued)
viewport_queued = TRUE
- addtimer(CALLBACK(src, .proc/_request_viewport_update), 0)
+ addtimer(CALLBACK(src, PROC_REF(_request_viewport_update)), 0)
/**
* call this when things change to queue an update
@@ -326,7 +326,7 @@ GLOBAL_VAR(lock_client_view_y)
return
if(!viewport_queued)
viewport_queued = TRUE
- addtimer(CALLBACK(src, .proc/_request_viewport_update), 0)
+ addtimer(CALLBACK(src, PROC_REF(_request_viewport_update)), 0)
UNTIL(!viewport_queued)
// todo : locks are probably bad when working with request fit
diff --git a/code/modules/clothing/accessories/halo.dm b/code/modules/clothing/accessories/halo.dm
index d6bccf5b81b..926a95291bc 100644
--- a/code/modules/clothing/accessories/halo.dm
+++ b/code/modules/clothing/accessories/halo.dm
@@ -72,7 +72,7 @@
/obj/item/clothing/accessory/halo_projector/proc/generate_styles()
var/obj/item/clothing/accessory/halo_projector/parsing
- var/list/parsing_types = tim_sort(subtypesof(/obj/item/clothing/accessory/halo_projector), /proc/cmp_initial_name_asc)
+ var/list/parsing_types = tim_sort(subtypesof(/obj/item/clothing/accessory/halo_projector), GLOBAL_PROC_REF(cmp_initial_name_asc))
global_halo_styles = list()
for(parsing as anything in parsing_types)
global_halo_styles[initial(parsing.name)] = initial(parsing.icon_state)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index d3631cf8e70..09cd54ffc78 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -56,7 +56,7 @@
if(name in .) // STILL?
name += " \[[++i]\]"
.[name] = path
- tim_sort(., /proc/cmp_text_asc)
+ tim_sort(., GLOBAL_PROC_REF(cmp_text_asc))
/obj/item/clothing/under/chameleon
//starts off as black
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index b27cb6f697b..ed1481f0a0e 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -389,7 +389,7 @@
/obj/item/clothing/gloves/fingerless/ablative/equipped(mob/user, slot, flags)
. = ..()
if(worn_slot == SLOT_GLOVES)
- RegisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START, .proc/get_component_parry_data)
+ RegisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START, PROC_REF(get_component_parry_data))
wornonce = TRUE
/obj/item/clothing/gloves/fingerless/ablative/dropped(mob/user, flags, atom/newLoc)
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 2d162d159b7..71bca28fbda 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -293,7 +293,7 @@
paper_mask_icons = sortList(paper_mask_icons)
- var/choice = show_radial_menu(L, src , paper_mask_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
+ var/choice = show_radial_menu(L, src , paper_mask_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), L), radius = 42, require_near = TRUE)
if(!choice || !check_menu(L))
return
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6edf6b4af8f..d547de6ad8a 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -296,7 +296,7 @@
if(M != user)
return TRUE
. = FALSE
- INVOKE_ASYNC(user, /mob/living/carbon/human/proc/escape_straight_jacket)
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/carbon/human, escape_straight_jacket))
/obj/item/clothing/suit/straight_jacket/equipped(var/mob/living/user,var/slot)
. = ..()
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 552c6bed393..ea485dc3a2f 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -649,7 +649,7 @@
if(!jingled)
usr.audible_message("[usr] jingles the [src]'s bell.")
jingled = 1
- addtimer(CALLBACK(src, .proc/jingledreset), 50)
+ addtimer(CALLBACK(src, PROC_REF(jingledreset)), 50)
return
/obj/item/clothing/accessory/collar/bell/proc/jingledreset()
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 80e5a9063cd..072178188b8 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(carp_count,list())// a list of Z levels (string), associated wi
I += 3
LAZYADD(GLOB.carp_count["[Z]"], M)
spawned_carp ++
- M.throw_at_old(get_random_edge_turf(global.reverse_dir[dir],TRANSITIONEDGE + 2, Z), 5, speed)//, callback = CALLBACK(src,/datum/event/carp_migration/proc/check_gib,M))
+ M.throw_at_old(get_random_edge_turf(global.reverse_dir[dir],TRANSITIONEDGE + 2, Z), 5, speed)//, callback = CALLBACK(src, TYPE_PROC_REF(/datum/event/carp_migration, check_gib),M))
if(no_show)
break
diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm
index 4c306f10bce..48ffced22af 100644
--- a/code/modules/events/meteor_strike_vr.dm
+++ b/code/modules/events/meteor_strike_vr.dm
@@ -26,7 +26,7 @@
/obj/effect/meteor_falling/Initialize(mapload)
. = ..()
SpinAnimation()
- INVOKE_ASYNC(src, .proc/meteor_fall)
+ INVOKE_ASYNC(src, PROC_REF(meteor_fall))
/obj/effect/meteor_falling/proc/meteor_fall()
var/turf/current = get_turf(src)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 00d52f74c19..8985b548765 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -261,7 +261,7 @@ proc/check_panel(mob/M)
. = ..()
QDEL_IN(src, 30 SECONDS)
step_away(src,my_target,2)
- INVOKE_ASYNC(src, .proc/attack_loop)
+ INVOKE_ASYNC(src, PROC_REF(attack_loop))
/obj/effect/fake_attacker/Destroy()
if(my_target)
diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm
index 52c1e85ae63..3a8f9e4830b 100644
--- a/code/modules/food/food/lunch.dm
+++ b/code/modules/food/food/lunch.dm
@@ -111,7 +111,7 @@ var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
for(var/lunch in lunches)
var/obj/O = lunch
.[initial(O.name)] = lunch
- return tim_sort(., /proc/cmp_text_asc, TRUE)
+ return tim_sort(., GLOBAL_PROC_REF(cmp_text_asc), TRUE)
/proc/init_lunchable_reagent_list(var/list/banned_reagents, var/reagent_types)
. = list()
@@ -120,4 +120,4 @@ var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
continue
var/datum/reagent/reagent = reagent_type
.[initial(reagent.name)] = initial(reagent.id)
- return tim_sort(., /proc/cmp_text_asc, TRUE)
+ return tim_sort(., GLOBAL_PROC_REF(cmp_text_asc), TRUE)
diff --git a/code/modules/food/recipe_dump.dm b/code/modules/food/recipe_dump.dm
index a60f83e2900..c0ac61f26d8 100644
--- a/code/modules/food/recipe_dump.dm
+++ b/code/modules/food/recipe_dump.dm
@@ -104,8 +104,8 @@
for(var/Rp in drink_recipes)
drinks_to_paths["[drink_recipes[Rp]["Result"]] [Rp]"] = Rp
- foods_to_paths = tim_sort(foods_to_paths, /proc/cmp_text_asc, TRUE)
- drinks_to_paths = tim_sort(drinks_to_paths, /proc/cmp_text_asc, TRUE)
+ foods_to_paths = tim_sort(foods_to_paths, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
+ drinks_to_paths = tim_sort(drinks_to_paths, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
var/list/foods_newly_sorted = list()
var/list/drinks_newly_sorted = list()
diff --git a/code/modules/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm
index b1aa9a5408a..e5e9246ce8d 100644
--- a/code/modules/ghostroles/instantiator.dm
+++ b/code/modules/ghostroles/instantiator.dm
@@ -95,7 +95,7 @@
/datum/ghostrole_instantiator/human/random/AfterSpawn(mob/created, list/params)
. = ..()
if(can_change_appearance) //I think it's either this or the line above.
- INVOKE_ASYNC(src, /datum/ghostrole_instantiator/human/random/proc/PickAppearance, created, params)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/ghostrole_instantiator/human/random, PickAppearance), created, params)
/datum/ghostrole_instantiator/human/random/proc/PickAppearance(mob/living/carbon/human/H)
var/new_name = input(H, "Your mind feels foggy, and you recall your name might be [H.real_name]. Would you like to change your name?")
diff --git a/code/modules/ghostroles/menu.dm b/code/modules/ghostroles/menu.dm
index 792481272b7..14e914526a5 100644
--- a/code/modules/ghostroles/menu.dm
+++ b/code/modules/ghostroles/menu.dm
@@ -63,4 +63,4 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new)
* Call this whenever ghostrole data changes, we don't keep resending to save performance.
*/
/datum/ghostrole_menu/proc/queue_update()
- addtimer(CALLBACK(src, /datum/proc/update_static_data), 0, TIMER_UNIQUE | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data)), 0, TIMER_UNIQUE | TIMER_OVERRIDE)
diff --git a/code/modules/ghostroles/roles/demonic_friend.dm b/code/modules/ghostroles/roles/demonic_friend.dm
index b170806734e..ae60b55ed16 100644
--- a/code/modules/ghostroles/roles/demonic_friend.dm
+++ b/code/modules/ghostroles/roles/demonic_friend.dm
@@ -19,9 +19,9 @@
created.name = created.real_name
created.real_name = "[owner.name]'s best friend"
if(QDELETED(owner.current) || owner.current.stat == DEAD)
- addtimer(CALLBACK(created, /mob/proc/dust), 15 SECONDS)
+ addtimer(CALLBACK(created, TYPE_PROC_REF(/mob, dust)), 15 SECONDS)
else
- addtimer(CALLBACK(created, /mob/proc/dust), 15 SECONDS)
+ addtimer(CALLBACK(created, TYPE_PROC_REF(/mob, dust)), 15 SECONDS)
/datum/role/ghostrole/demonic_friend/Greet(mob/created, datum/component/ghostrole_spawnpoint/spawnpoint, list/params)
. = ..()
diff --git a/code/modules/ghostroles/spawner.dm b/code/modules/ghostroles/spawner.dm
index 59322690e6b..c6d98f835e3 100644
--- a/code/modules/ghostroles/spawner.dm
+++ b/code/modules/ghostroles/spawner.dm
@@ -38,7 +38,7 @@
if(mapload)
stack_trace("No role type")
else
- AddComponent(/datum/component/ghostrole_spawnpoint, role_type, role_spawns, role_params, /obj/structure/ghost_role_spawner/proc/on_spawn, null, special_spawntext)
+ AddComponent(/datum/component/ghostrole_spawnpoint, role_type, role_spawns, role_params, TYPE_PROC_REF(/obj/structure/ghost_role_spawner, on_spawn), null, special_spawntext)
/obj/structure/ghost_role_spawner/proc/on_spawn(mob/created, datum/role/ghostrole/role, list/params, datum/component/ghostrole_spawnpoint/spawnpoint)
if(qdel_on_deplete && !spawnpoint.SpawnsLeft())
diff --git a/code/modules/ghostroles/spawnpoint.dm b/code/modules/ghostroles/spawnpoint.dm
index 7792d5727b5..04755d3043c 100644
--- a/code/modules/ghostroles/spawnpoint.dm
+++ b/code/modules/ghostroles/spawnpoint.dm
@@ -39,8 +39,8 @@ GLOBAL_LIST_EMPTY(ghostrole_spawnpoints)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
. = ..()
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/GhostInteract)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(GhostInteract))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine))
RegisterGlobal()
/datum/component/ghostrole_spawnpoint/UnregisterFromParent()
diff --git a/code/modules/hardsuits/modules/combat.dm b/code/modules/hardsuits/modules/combat.dm
index 04e5e12baed..43f3f4d4efa 100644
--- a/code/modules/hardsuits/modules/combat.dm
+++ b/code/modules/hardsuits/modules/combat.dm
@@ -293,7 +293,7 @@
. = ..()
held_blade = new /obj/item/material/knife/machete/armblade/hardsuit
held_blade.storing_module = src
- RegisterSignal(held_blade, COMSIG_ITEM_DROPPED, .proc/magnetic_catch)
+ RegisterSignal(held_blade, COMSIG_ITEM_DROPPED, PROC_REF(magnetic_catch))
/obj/item/hardsuit_module/armblade/proc/magnetic_catch(datum/source)
var/obj/item/I = source
diff --git a/code/modules/hardsuits/modules/utility_vr.dm b/code/modules/hardsuits/modules/utility_vr.dm
index 56193b83acf..f6245e32111 100644
--- a/code/modules/hardsuits/modules/utility_vr.dm
+++ b/code/modules/hardsuits/modules/utility_vr.dm
@@ -38,7 +38,7 @@
var/mob/living/carbon/human/H = holder.wearer
to_chat(H,"You activate the P.A.T. module.")
- RegisterSignal(H, COMSIG_MOVABLE_MOVED, .proc/boop)
+ RegisterSignal(H, COMSIG_MOVABLE_MOVED, PROC_REF(boop))
/obj/item/hardsuit_module/pat_module/deactivate()
if(!..())
diff --git a/code/modules/holidays/christmas.dm b/code/modules/holidays/christmas.dm
index f2bd39ab796..ff109c1ab2f 100644
--- a/code/modules/holidays/christmas.dm
+++ b/code/modules/holidays/christmas.dm
@@ -15,7 +15,7 @@
// return "Have a merry Christmas!"
// /datum/holiday/xmas/celebrate()
-// SSticker.OnRoundstart(CALLBACK(src, .proc/roundstart_celebrate))
+// SSticker.OnRoundstart(CALLBACK(src, PROC_REF(roundstart_celebrate)))
// /datum/holiday/xmas/proc/roundstart_celebrate()
// for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm
index d1f740418da..d89f025a7ae 100644
--- a/code/modules/holomap/station_holomap.dm
+++ b/code/modules/holomap/station_holomap.dm
@@ -120,9 +120,9 @@
user.client.images |= holomap_datum.station_map
watching_mob = user
- RegisterSignal(watching_mob, COMSIG_ATOM_DIR_CHANGE, .proc/checkPosition)
- RegisterSignal(watching_mob, COMSIG_MOVABLE_MOVED, .proc/checkPosition)
- RegisterSignal(watching_mob, COMSIG_PARENT_QDELETING, .proc/stopWatching)
+ RegisterSignal(watching_mob, COMSIG_ATOM_DIR_CHANGE, PROC_REF(checkPosition))
+ RegisterSignal(watching_mob, COMSIG_MOVABLE_MOVED, PROC_REF(checkPosition))
+ RegisterSignal(watching_mob, COMSIG_PARENT_QDELETING, PROC_REF(stopWatching))
update_use_power(USE_POWER_ACTIVE)
if(bogus)
diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm
index 9fbb3d5a8b5..d79b7a58413 100644
--- a/code/modules/instruments/instrument_data/_instrument_data.dm
+++ b/code/modules/instruments/instrument_data/_instrument_data.dm
@@ -84,7 +84,7 @@
samples = list()
for(var/key in real_samples)
real_keys += text2num(key)
- tim_sort(real_keys, /proc/cmp_numeric_asc, associative = FALSE)
+ tim_sort(real_keys, GLOBAL_PROC_REF(cmp_numeric_asc), associative = FALSE)
for(var/i in 1 to (length(real_keys) - 1))
var/from_key = real_keys[i]
diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm
index fb57de6ed60..92365366b09 100644
--- a/code/modules/instruments/instruments/item.dm
+++ b/code/modules/instruments/instruments/item.dm
@@ -249,7 +249,7 @@
/obj/item/instrument/harmonica/equipped(mob/M, slot)
. = ..()
- RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/obj/item/instrument/harmonica/dropped(mob/user, flags, atom/newLoc)
. = ..()
diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm
index 957adac7351..18b5682cc2d 100644
--- a/code/modules/instruments/songs/editor.dm
+++ b/code/modules/instruments/songs/editor.dm
@@ -154,7 +154,7 @@
tempo = sanitize_tempo(tempo + text2num(href_list["tempo"]))
else if(href_list["play"])
- INVOKE_ASYNC(src, .proc/start_playing, usr)
+ INVOKE_ASYNC(src, PROC_REF(start_playing), usr)
else if(href_list["newline"])
var/newline = html_encode(input("Enter your line: ", parent.name) as text|null)
diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm
index 27cbff30896..1b33e1f4d06 100644
--- a/code/modules/integrated_electronics/core/printer.dm
+++ b/code/modules/integrated_electronics/core/printer.dm
@@ -340,7 +340,7 @@
to_chat(usr, SPAN_NOTICE("You begin printing a custom assembly. This will take approximately [DisplayTimeText(cloning_time)]. You can still print \
off normal parts during this time."))
playsound(src, 'sound/items/poster_being_created.ogg', 50, TRUE)
- addtimer(CALLBACK(src, .proc/print_program, usr), cloning_time)
+ addtimer(CALLBACK(src, PROC_REF(print_program), usr), cloning_time)
return TRUE
if("cancel")
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index b06588cdfc2..12b86b0c35a 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -695,7 +695,7 @@
set_frequency(frequency)
set_pin_data(IC_INPUT, 1, frequency)
set_pin_data(IC_INPUT, 2, code)
- addtimer(CALLBACK(src, .proc/set_frequency, frequency), 40)
+ addtimer(CALLBACK(src, PROC_REF(set_frequency), frequency), 40)
/obj/item/integrated_circuit/input/signaler/Destroy()
if(radio_controller)
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 4641dbaa02f..04747baa1ac 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -509,7 +509,7 @@
)
/obj/item/integrated_circuit/manipulation/matman/ComponentInitialize()
- var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, mtypes, 100000, FALSE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
+ var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, mtypes, 100000, FALSE, /obj/item/stack, CALLBACK(src, PROC_REF(is_insertion_ready)), CALLBACK(src, PROC_REF(AfterMaterialInsert)))
materials.precise_insertion = TRUE
.=..()
@@ -677,7 +677,7 @@
targx = target.loc.x
targy = target.loc.y
playsound(src, 'sound/items/drill_use.ogg',50,1)
- addtimer(CALLBACK(src, .proc/drill), drill_delay)
+ addtimer(CALLBACK(src, PROC_REF(drill)), drill_delay)
/obj/item/integrated_circuit/mining/mining_drill/proc/drill()
@@ -988,7 +988,7 @@
/// These procs do not relocate the grenade, that's the callers responsibility
/obj/item/integrated_circuit/manipulation/grenade/proc/attach_grenade(var/obj/item/grenade/G)
attached_grenade = G
- RegisterSignal(attached_grenade, COMSIG_PARENT_QDELETING, .proc/detach_grenade)
+ RegisterSignal(attached_grenade, COMSIG_PARENT_QDELETING, PROC_REF(detach_grenade))
size += G.w_class
desc += " \An [attached_grenade] is attached to it!"
diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm
index 04ae5d7901c..eb1267d710b 100644
--- a/code/modules/integrated_electronics/subtypes/reagents.dm
+++ b/code/modules/integrated_electronics/subtypes/reagents.dm
@@ -139,7 +139,7 @@
L.visible_message("[acting_object] is trying to inject [L]!", \
"[acting_object] is trying to inject you!")
busy = TRUE
- if(do_atom(src, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,null,0)))
+ if(do_atom(src, L, extra_checks=CALLBACK(L, TYPE_PROC_REF(/mob/living, can_inject),null,0)))
reagents.trans_to(L, transfer_amount)
log_attack(src, L, "attempted to inject [L] which had [contained]")
L.visible_message("[acting_object] injects [L] with its needle!", \
@@ -164,7 +164,7 @@
L.visible_message("[acting_object] is trying to take a blood sample from [L]!", \
"[acting_object] is trying to take a blood sample from you!")
busy = TRUE
- if(do_atom(src, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject,null,0)))
+ if(do_atom(src, L, extra_checks=CALLBACK(L, TYPE_PROC_REF(/mob/living, can_inject),null,0)))
var/mob/living/carbon/LB = L
if(LB.take_blood(src, tramount))
L.visible_message("[acting_object] takes a blood sample from [L]!", \
diff --git a/code/modules/integrated_electronics/subtypes/time.dm b/code/modules/integrated_electronics/subtypes/time.dm
index 45134d0db86..ffd8651f912 100644
--- a/code/modules/integrated_electronics/subtypes/time.dm
+++ b/code/modules/integrated_electronics/subtypes/time.dm
@@ -17,7 +17,7 @@
power_draw_per_use = 2
/obj/item/integrated_circuit/time/delay/do_work()
- addtimer(CALLBACK(src, .proc/activate_pin, 2), delay)
+ addtimer(CALLBACK(src, PROC_REF(activate_pin), 2), delay)
/obj/item/integrated_circuit/time/delay/five_sec
name = "five-sec delay circuit"
@@ -99,7 +99,7 @@
/obj/item/integrated_circuit/time/ticker/proc/tick()
if(is_running)
- addtimer(CALLBACK(src, .proc/tick), delay)
+ addtimer(CALLBACK(src, PROC_REF(tick)), delay)
if(world.time > next_fire)
next_fire = world.time + delay
activate_pin(1)
diff --git a/code/modules/loadout/accessories/armband.dm b/code/modules/loadout/accessories/armband.dm
index 00cee556c24..fe90152acb3 100644
--- a/code/modules/loadout/accessories/armband.dm
+++ b/code/modules/loadout/accessories/armband.dm
@@ -8,7 +8,7 @@
for(var/armband in (typesof(/obj/item/clothing/accessory/armband) - typesof(/obj/item/clothing/accessory/armband/med/color)))
var/obj/item/clothing/accessory/armband_type = armband
armbands[initial(armband_type.name)] = armband_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(armbands, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(armbands, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/armband/colored
name = "Armband - Colorable"
diff --git a/code/modules/loadout/loadout_accessories.dm b/code/modules/loadout/loadout_accessories.dm
index 3095c97b03a..fd6847e908b 100644
--- a/code/modules/loadout/loadout_accessories.dm
+++ b/code/modules/loadout/loadout_accessories.dm
@@ -41,7 +41,7 @@
for(var/wcoat in typesof(/obj/item/clothing/accessory/wcoat))
var/obj/item/clothing/accessory/wcoat_type = wcoat
wcoats[initial(wcoat_type.name)] = wcoat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(wcoats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(wcoats, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/tie
name = "Tie - Selection"
@@ -53,7 +53,7 @@
for(var/tie in typesof(/obj/item/clothing/accessory/tie))
var/obj/item/clothing/accessory/tie_type = tie
ties[initial(tie_type.name)] = tie_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(ties, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(ties, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/scarf
name = "Scarf - Selection"
@@ -65,7 +65,7 @@
for(var/scarf in typesof(/obj/item/clothing/accessory/scarf))
var/obj/item/clothing/accessory/scarf_type = scarf
scarfs[initial(scarf_type.name)] = scarf_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(scarfs, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(scarfs, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/scarfcolor
name = "Scarf Colorable"
@@ -81,7 +81,7 @@
for(var/jacket in typesof(/obj/item/clothing/accessory/jacket))
var/obj/item/clothing/accessory/jacket_type = jacket
jackets[initial(jacket_type.name)] = jacket_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(jackets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(jackets, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/suitvest
name = "Suit Vest"
@@ -103,7 +103,7 @@
for(var/fanny in typesof(/obj/item/storage/belt/fannypack))
var/obj/item/storage/belt/fannypack/fanny_type = fanny
fannys[initial(fanny_type.name)] = fanny_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(fannys, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(fannys, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/chaps
name = "Chaps - Brown"
@@ -136,7 +136,7 @@
for(var/sweater in typesof(/obj/item/clothing/accessory/sweater))
var/obj/item/clothing/suit/sweater_type = sweater
sweaters[initial(sweater_type.name)] = sweater_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(sweaters, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(sweaters, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/bracelet
abstract_type = /datum/loadout_entry/accessory/bracelet
@@ -187,7 +187,7 @@
for(var/asym in typesof(/obj/item/clothing/accessory/asymmetric))
var/obj/item/clothing/accessory/asymmetric_type = asym
asyms[initial(asymmetric_type.name)] = asymmetric_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(asyms, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(asyms, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/cowledvest
name = "Cowled Vest"
@@ -223,7 +223,7 @@
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(gaiters, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(gaiters, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/laconic
name = "Laconic Field Pouch System"
@@ -288,7 +288,7 @@
var/list/halos = list()
for(var/obj/item/clothing/accessory/halo_projector/halo as anything in typesof(/obj/item/clothing/accessory/halo_projector))
halos[initial(halo.name)] = halo
- tweaks += new/datum/loadout_tweak/path(tim_sort(halos, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(halos, GLOBAL_PROC_REF(cmp_text_asc)))
//Tajaran wears
@@ -306,7 +306,7 @@
for(var/tscarf in (typesof(/obj/item/clothing/accessory/tajaran/scarf)))
var/obj/item/clothing/accessory/tajaran/scarf/tscarf_type = tscarf
tscarfs[initial(tscarf_type.name)] = tscarf_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tscarfs, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tscarfs, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/accessory/civ_exos_mob
name = "medical exoframe"
diff --git a/code/modules/loadout/loadout_eyes.dm b/code/modules/loadout/loadout_eyes.dm
index f6b208c5f09..4c7690fd15b 100644
--- a/code/modules/loadout/loadout_eyes.dm
+++ b/code/modules/loadout/loadout_eyes.dm
@@ -19,7 +19,7 @@
for(var/tinted in (typesof(/obj/item/clothing/glasses/tinted/color) - typesof(/obj/item/clothing/glasses/tinted/color/purple)))
var/obj/item/clothing/glasses/tinted_type = tinted
tints[initial(tinted_type.name)] = tinted_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tints, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tints, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/eyes/glasses/regular
name = "Glasses - Prescription"
diff --git a/code/modules/loadout/loadout_general.dm b/code/modules/loadout/loadout_general.dm
index f3c16bfc75c..57637c3f035 100644
--- a/code/modules/loadout/loadout_general.dm
+++ b/code/modules/loadout/loadout_general.dm
@@ -60,7 +60,7 @@
for(var/plushie in subtypesof(/obj/item/toy/plushie/) - /obj/item/toy/plushie/therapy)
var/obj/item/toy/plushie/plushie_type = plushie
plushies[initial(plushie_type.name)] = plushie_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(plushies, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(plushies, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/flask
name = "Flask"
@@ -91,7 +91,7 @@
var/obj/item/storage/toolbox/lunchbox/lunchbox = lunchbox_type
if(!initial(lunchbox.filled))
lunchboxes[initial(lunchbox.name)] = lunchbox_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(lunchboxes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(lunchboxes, GLOBAL_PROC_REF(cmp_text_asc)))
tweaks += new/datum/loadout_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())
/datum/loadout_entry/towel
@@ -118,7 +118,7 @@
for(var/tball in typesof(/obj/item/toy/tennis) - typesof(/obj/item/toy/tennis/rainbow))
var/obj/item/toy/tennis/ball_type = tball
tennis_balls[initial(ball_type.name)] = ball_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tennis_balls, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tennis_balls, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/swimsuitcaps
name = "Swimsuit Capsule Selection"
@@ -130,4 +130,4 @@
for(var/swimsuit in typesof(/obj/item/storage/box/fluff/swimsuit))
var/obj/item/storage/box/fluff/swimsuit/swimsuit_type = swimsuit
swimsuits[initial(swimsuit_type.name)] = swimsuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(swimsuits, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(swimsuits, GLOBAL_PROC_REF(cmp_text_asc)))
diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm
index 4cc2749deea..fff9ef63c90 100644
--- a/code/modules/loadout/loadout_head.dm
+++ b/code/modules/loadout/loadout_head.dm
@@ -127,7 +127,7 @@
for(var/pin in typesof(/obj/item/clothing/head/pin))
var/obj/item/clothing/head/pin/pin_type = pin
pins[initial(pin_type.name)] = pin_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(pins, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(pins, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/head/hardhat
name = "Hardhat Selection"
@@ -140,7 +140,7 @@
for(var/hardhat in typesof(/obj/item/clothing/head/hardhat))
var/obj/item/clothing/head/hardhat/hardhat_type = hardhat
hardhats[initial(hardhat_type.name)] = hardhat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(hardhats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(hardhats, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/head/boater
name = "Hat, Boatsman"
@@ -185,7 +185,7 @@
for(var/santahat in typesof(/obj/item/clothing/head/santa))
var/obj/item/clothing/head/santa/santahat_type = santahat
santahats[initial(santahat_type.name)] = santahat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(santahats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(santahats, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/head/hijab
name = "Hijab (Colorable)"
@@ -261,7 +261,7 @@
for(var/orion_style in typesof(/obj/item/clothing/head/beret/orion))
var/obj/item/clothing/head/beret/orion/orion = orion_style
orions[initial(orion.name)] = orion
- tweaks += new/datum/loadout_tweak/path(tim_sort(orions, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(orions, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/head/surgery
name = "Surgical Cap Selection"
description = "Choose from a number of rings of different Caps."
@@ -354,7 +354,7 @@
for(var/tberet in (typesof(/obj/item/clothing/head/beret/tajaran)))
var/obj/item/clothing/head/beret/tajaran/tberet_type = tberet
tberets[initial(tberet_type.name)] = tberet_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tberets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tberets, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/head/tajaran/circlet
name = "Adhomian circlet selection"
@@ -367,5 +367,5 @@
for(var/tcirclet in (typesof(/obj/item/clothing/head/tajaran/circlet)))
var/obj/item/clothing/head/tajaran/circlet/tcirclet_type = tcirclet
tcirclets[initial(tcirclet_type.name)] = tcirclet_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tcirclets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tcirclets, GLOBAL_PROC_REF(cmp_text_asc)))
diff --git a/code/modules/loadout/loadout_shoes.dm b/code/modules/loadout/loadout_shoes.dm
index 7d382bccf5c..134e1708e66 100644
--- a/code/modules/loadout/loadout_shoes.dm
+++ b/code/modules/loadout/loadout_shoes.dm
@@ -59,7 +59,7 @@
for(var/lace in typesof(/obj/item/clothing/shoes/laceup))
var/obj/item/clothing/shoes/laceup/lace_type = lace
laces[initial(lace_type.name)] = lace_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(laces, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(laces, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/shoes/green
name = "Shoes - Green"
@@ -99,7 +99,7 @@
for(var/hitop in typesof(/obj/item/clothing/shoes/hitops))
var/obj/item/clothing/shoes/hitops/hitop_type = hitop
hitops[initial(hitop_type.name)] = hitop_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(hitops, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(hitops, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/shoes/flipflops
name = "Flip Flops"
diff --git a/code/modules/loadout/loadout_smoking.dm b/code/modules/loadout/loadout_smoking.dm
index 384f842d7d4..72257587cea 100644
--- a/code/modules/loadout/loadout_smoking.dm
+++ b/code/modules/loadout/loadout_smoking.dm
@@ -9,7 +9,7 @@
for(var/pipe_style in typesof(/obj/item/clothing/mask/smokable/pipe))
var/obj/item/clothing/mask/smokable/pipe/pipe = pipe_style
pipes[initial(pipe.name)] = pipe
- tweaks += new/datum/loadout_tweak/path(tim_sort(pipes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(pipes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/matchbook
name = "Matchbook"
@@ -31,7 +31,7 @@
continue
var/obj/item/flame/lighter/zippo/zippo_type = zippo
zippos[initial(zippo_type.name)] = zippo_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(zippos, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(zippos, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/ashtray
name = "Plastic Ashtray"
@@ -56,4 +56,4 @@
for(var/cigarette in (typesof(/obj/item/storage/fancy/cigarettes) - typesof(/obj/item/storage/fancy/cigarettes/killthroat)))
var/obj/item/storage/fancy/cigarettes/cigarette_brand = cigarette
cigarettes[initial(cigarette_brand.name)] = cigarette_brand
- tweaks += new/datum/loadout_tweak/path(tim_sort(cigarettes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cigarettes, GLOBAL_PROC_REF(cmp_text_asc)))
diff --git a/code/modules/loadout/loadout_suit.dm b/code/modules/loadout/loadout_suit.dm
index e9b0b242aa8..efa0c07d421 100644
--- a/code/modules/loadout/loadout_suit.dm
+++ b/code/modules/loadout/loadout_suit.dm
@@ -87,7 +87,7 @@
for(var/military_style in typesof(/obj/item/clothing/suit/storage/miljacket))
var/obj/item/clothing/suit/storage/miljacket/miljacket = military_style
mil_jackets[initial(miljacket.name)] = miljacket
- tweaks += new/datum/loadout_tweak/path(tim_sort(mil_jackets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(mil_jackets, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/greyjacket
name = "Jacket - Grey"
@@ -115,7 +115,7 @@
for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest))
var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style
hazards[initial(hazardvest.name)] = hazardvest
- tweaks += new/datum/loadout_tweak/path(tim_sort(hazards, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(hazards, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/hoodie
name = "Hoodie - Selection"
@@ -127,7 +127,7 @@
for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/toggle/hoodie))
var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style
hoodies[initial(hoodie.name)] = hoodie
- tweaks += new/datum/loadout_tweak/path(tim_sort(hoodies, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(hoodies, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/labcoat
name = "Labcoat"
@@ -151,7 +151,7 @@
for(var/poncho_style in (typesof(/obj/item/clothing/accessory/poncho) - typesof(/obj/item/clothing/accessory/poncho/roles)))
var/obj/item/clothing/accessory/poncho/poncho = poncho_style
ponchos[initial(poncho.name)] = poncho
- tweaks += new/datum/loadout_tweak/path(tim_sort(ponchos, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(ponchos, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/dust_cloak_selection
name = "Dust cloak Selection"
@@ -163,7 +163,7 @@
for(var/dustcloak in typesof(/obj/item/clothing/accessory/poncho/dust_cloak))
var/obj/item/clothing/accessory/poncho/dustcloak_type = dustcloak
dustcloak_selection[initial(dustcloak_type.name)] = dustcloak_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(dustcloak_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(dustcloak_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/cyberpunk_coat_selection
name = "Cyberpunk Coat Selection"
@@ -175,7 +175,7 @@
for(var/cybercoat in typesof(/obj/item/clothing/suit/storage/cyberpunk))
var/obj/item/clothing/accessory/poncho/cybercoat_type = cybercoat
cybercoat_selection[initial(cybercoat_type.name)] = cybercoat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cybercoat_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cybercoat_selection, GLOBAL_PROC_REF(cmp_text_asc)))
// A colorable cloak
@@ -254,7 +254,7 @@
for(var/varsity_style in typesof(/obj/item/clothing/suit/varsity))
var/obj/item/clothing/suit/varsity/varsity = varsity_style
varsities[initial(varsity.name)] = varsity
- tweaks += new/datum/loadout_tweak/path(tim_sort(varsities, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(varsities, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/varsity_worn
name = "Varsity Jacket - Worn"
@@ -270,7 +270,7 @@
for(var/track_style in typesof(/obj/item/clothing/suit/storage/toggle/track))
var/obj/item/clothing/suit/storage/toggle/track/track = track_style
tracks[initial(track.name)] = track
- tweaks += new/datum/loadout_tweak/path(tim_sort(tracks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tracks, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/flannel
name = "Flannel - Grey"
@@ -374,7 +374,7 @@
for(var/the_jacket in typesof(/obj/item/clothing/suit/storage/fluff/jacket))
var/obj/item/clothing/suit/jacket_type = the_jacket
the_jackets[initial(jacket_type.name)] = jacket_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(the_jackets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(the_jackets, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/gntop
name = "GN Crop Jacket"
@@ -434,7 +434,7 @@
for(var/pullover_style in typesof(/obj/item/clothing/suit/storage/pullover))
var/obj/item/clothing/suit/storage/pullover/pullover = pullover_style
pullovers[initial(pullover.name)] = pullover
- tweaks += new/datum/loadout_tweak/path(tim_sort(pullovers, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(pullovers, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/antediluvian
name = "Antediluvian Cloak"
@@ -595,7 +595,7 @@
for(var/tajarancloak in (typesof(/obj/item/clothing/accessory/tponcho/tajarancloak)))
var/obj/item/clothing/accessory/tponcho/tajarancloak/tajarancloak_type = tajarancloak
tajarancloaks[initial(tajarancloak_type.name)] = tajarancloak_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajarancloaks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajarancloaks, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/tajarancloakhood
name = "Adhomian hooded cloak selection"
@@ -608,7 +608,7 @@
for(var/tajarancloakhood in (typesof(/obj/item/clothing/suit/storage/hooded/tajaran/cloak)))
var/obj/item/clothing/suit/storage/hooded/tajaran/cloak/tajarancloakhood_type = tajarancloakhood
tajarancloakhoods[initial(tajarancloakhood_type.name)] = tajarancloakhood_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajarancloakhoods, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajarancloakhoods, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/tajara_coat
name = "Adhomian coat selection"
@@ -621,7 +621,7 @@
for(var/tajara_coat in (typesof(/obj/item/clothing/suit/storage/toggle/tajaran/coat)))
var/obj/item/clothing/suit/storage/toggle/tajaran/coat/tajara_coat_type = tajara_coat
tajara_coats[initial(tajara_coat_type.name)] = tajara_coat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_coats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_coats, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/tajara_coat_alt //No toggle
name = "Adhomian coat alt selection"
@@ -634,7 +634,7 @@
for(var/tajara_coat_alt in (typesof(/obj/item/clothing/suit/storage/tajaran/coat)))
var/obj/item/clothing/suit/storage/tajaran/coat/tajara_coat_alt_type = tajara_coat_alt
tajara_coat_alts[initial(tajara_coat_alt_type.name)] = tajara_coat_alt_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_coat_alts, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_coat_alts, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/suit/tajara_jacket
name = "Adhomian jacket selection"
@@ -647,4 +647,4 @@
for(var/tajara_jacket in (typesof(/obj/item/clothing/suit/storage/tajaran/jacket)))
var/obj/item/clothing/suit/storage/tajaran/jacket/tajara_jacket_type = tajara_jacket
tajara_jackets[initial(tajara_jacket_type.name)] = tajara_jacket_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_jackets, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_jackets, GLOBAL_PROC_REF(cmp_text_asc)))
diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm
index e23ffeb111e..1358eeba3a2 100644
--- a/code/modules/loadout/loadout_uniform.dm
+++ b/code/modules/loadout/loadout_uniform.dm
@@ -19,7 +19,7 @@
for(var/cheongsam in typesof(/obj/item/clothing/under/cheongsam))
var/obj/item/clothing/under/cheongsam/cheongsam_type = cheongsam
cheongsams[initial(cheongsam_type.name)] = cheongsam_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cheongsams, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cheongsams, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/cheongsam_male
name = "Cheongsam (Male) - Black"
@@ -55,7 +55,7 @@
for(var/croptop in typesof(/obj/item/clothing/under/croptop))
var/obj/item/clothing/under/croptop/croptop_type = croptop
croptops[initial(croptop_type.name)] = croptop_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(croptops, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(croptops, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/kilt
name = "Kilt"
@@ -79,7 +79,7 @@
for(var/jump in typesof(/obj/item/clothing/under/color))
var/obj/item/clothing/under/color/jumps = jump
jumpclothes[initial(jumps.name)] = jumps
- tweaks += new/datum/loadout_tweak/path(tim_sort(jumpclothes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(jumpclothes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/blueshortskirt
name = "Short Skirt"
@@ -95,7 +95,7 @@
for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
var/obj/item/clothing/under/skirt/skirt_type = skirt
skirts[initial(skirt_type.name)] = skirt_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(skirts, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(skirts, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/pants
name = "Pants Selection"
@@ -107,7 +107,7 @@
for(var/pant in typesof(/obj/item/clothing/under/pants))
var/obj/item/clothing/under/pants/pant_type = pant
pants[initial(pant_type.name)] = pant_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(pants, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(pants, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/shorts
name = "Shorts Selection"
@@ -119,7 +119,7 @@
for(var/short in typesof(/obj/item/clothing/under/shorts))
var/obj/item/clothing/under/pants/short_type = short
shorts[initial(short_type.name)] = short_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(shorts, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(shorts, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/lawyer
name = "Suit One-Piece Selection"
@@ -131,7 +131,7 @@
for(var/lsuit in typesof(/obj/item/clothing/under/lawyer))
var/obj/item/clothing/suit/lsuit_type = lsuit
lsuits[initial(lsuit_type.name)] = lsuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(lsuits, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(lsuits, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/suit_jacket
name = "Suit Modular Selection"
@@ -143,7 +143,7 @@
for(var/msuit in typesof(/obj/item/clothing/under/suit_jacket))
var/obj/item/clothing/suit/msuit_type = msuit
msuits[initial(msuit_type.name)] = msuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(msuits, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(msuits, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/amish
name = "Suit - Amish"
@@ -175,7 +175,7 @@
for(var/scrub in typesof(/obj/item/clothing/under/rank/medical/scrubs))
var/obj/item/clothing/under/rank/medical/scrubs/scrub_type = scrub
scrubs[initial(scrub_type.name)] = scrub_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(scrubs, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(scrubs, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/scrub_fem
name = "Scrubs Selection - Female"
@@ -187,7 +187,7 @@
for(var/scrub_fem in typesof(/obj/item/clothing/under/rank/medical/scrubs_fem))
var/obj/item/clothing/under/rank/medical/scrubs_fem/scrub_type = scrub_fem
scrubs_fem[initial(scrub_type.name)] = scrub_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(scrubs_fem, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(scrubs_fem, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/oldwoman
name = "Old Woman Attire"
@@ -211,7 +211,7 @@
for(var/turtlebaggy in typesof(/obj/item/clothing/under/turtlebaggy))
var/obj/item/clothing/under/turtlebaggy_type = turtlebaggy
turtlebaggy_selection[initial(turtlebaggy_type.name)] = turtlebaggy_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(turtlebaggy_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(turtlebaggy_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/pentagramdress
name = "Pentagram Dress"
@@ -251,7 +251,7 @@
for(var/wedding in typesof(/obj/item/clothing/under/wedding))
var/obj/item/clothing/under/wedding/wedding_type = wedding
weddings[initial(wedding_type.name)] = wedding_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(weddings, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(weddings, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/reallyblack
@@ -280,7 +280,7 @@
for(var/maid in typesof(/obj/item/clothing/under/dress/maid))
var/obj/item/clothing/under/dress/maid/maid_type = maid
maids[initial(maid_type.name)] = maid_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(maids, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(maids, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/utility
name = "Utility - Black"
@@ -308,7 +308,7 @@
for(var/brandjumpsuit in typesof(/obj/item/clothing/under/brandjumpsuit))
var/obj/item/clothing/under/brandjumpsuit_type = brandjumpsuit
brandjumpsuit_selection[initial(brandjumpsuit_type.name)] = brandjumpsuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(brandjumpsuit_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(brandjumpsuit_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/yogapants
name = "Yoga Pants"
@@ -408,7 +408,7 @@
for(var/kimono in typesof(/obj/item/clothing/under/kimono))
var/obj/item/clothing/under/kimono/kimono_type = kimono
kimonos[initial(kimono_type.name)] = kimono_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(kimonos, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(kimonos, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/pyjamas_red
name = "Pyjamas - Red"
@@ -556,7 +556,7 @@
for(var/future_fashion in typesof(/obj/item/clothing/under/future_fashion))
var/obj/item/clothing/under/future_fashion/future_fashion_type = future_fashion
future_fashion_selection[initial(future_fashion_type.name)] = future_fashion_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(future_fashion_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(future_fashion_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/permit
name = "Nudity Permit"
@@ -577,7 +577,7 @@ Swimsuits
for(var/swimsuit in typesof(/obj/item/clothing/under/swimsuit))
var/obj/item/clothing/under/swimsuit/swimsuit_type = swimsuit
swimsuits[initial(swimsuit_type.name)] = swimsuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(swimsuits, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(swimsuits, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/suit/gnshorts
name = "GN Shorts"
@@ -807,7 +807,7 @@ Swimsuits
for(var/summerdress in typesof(/obj/item/clothing/under/dress/summer))
var/obj/item/clothing/under/summerdress_type = summerdress
summerdress_selection[initial(summerdress_type.name)] = summerdress_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(summerdress_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(summerdress_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/skinsuit_selection
name = "Skinsuit Selection - Male"
@@ -819,7 +819,7 @@ Swimsuits
for(var/skinsuit in typesof(/obj/item/clothing/under/skinsuit))
var/obj/item/clothing/under/skinsuit_type = skinsuit
skinsuit_selection[initial(skinsuit_type.name)] = skinsuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(skinsuit_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(skinsuit_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/skinsuitfem_selection
name = "Skinsuit Selection - Female"
@@ -831,7 +831,7 @@ Swimsuits
for(var/skinsuitfem in typesof(/obj/item/clothing/under/skinsuit_fem))
var/obj/item/clothing/under/skinsuitfem_type = skinsuitfem
skinsuitfem_selection[initial(skinsuitfem_type.name)] = skinsuitfem_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(skinsuitfem_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(skinsuitfem_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/altbodysuit_selection
name = "Alternate Bodysuit Selection - Male"
@@ -843,7 +843,7 @@ Swimsuits
for(var/altbodysuit in typesof(/obj/item/clothing/under/bodysuit/alt))
var/obj/item/clothing/under/altbodysuit_type = altbodysuit
altbodysuit_selection[initial(altbodysuit_type.name)] = altbodysuit_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(altbodysuit_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(altbodysuit_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/altbodysuitfem_selection
name = "Alternate Bodysuit Selection - Female"
@@ -855,7 +855,7 @@ Swimsuits
for(var/altbodysuitfem in typesof(/obj/item/clothing/under/bodysuit/alt_fem))
var/obj/item/clothing/under/altbodysuitfem_type = altbodysuitfem
altbodysuitfem_selection[initial(altbodysuitfem_type.name)] = altbodysuitfem_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(altbodysuitfem_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(altbodysuitfem_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/ballet
name = "Antheia Tutu"
@@ -873,7 +873,7 @@ Swimsuits
for(var/summercloths in (typesof(/obj/item/clothing/under/tajaran/summer)))
var/obj/item/clothing/under/summercloths_type = summercloths
summercloths_selection[initial(summercloths_type.name)] = summercloths_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(summercloths_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(summercloths_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/tajaran/tajara_dress_selection
name = "Adhomian dresses selection"
@@ -886,7 +886,7 @@ Swimsuits
for(var/tajara_dress in (typesof(/obj/item/clothing/under/dress/tajaran)))
var/obj/item/clothing/under/dress/tajaran/tajara_dress_type = tajara_dress
tajara_dress_selection[initial(tajara_dress_type.name)] = tajara_dress_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_dress_selection, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_dress_selection, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/uniform/tajaran/laborer
name = "Generic Adhomian laborer clothes"
diff --git a/code/modules/loadout/loadout_utility.dm b/code/modules/loadout/loadout_utility.dm
index 2bab8ddc8df..2cc87f57261 100644
--- a/code/modules/loadout/loadout_utility.dm
+++ b/code/modules/loadout/loadout_utility.dm
@@ -24,7 +24,7 @@
for(var/communicator in typesof(/obj/item/communicator) - list(/obj/item/communicator/integrated,/obj/item/communicator/commlink))
var/obj/item/communicator_type = communicator
communicators[initial(communicator_type.name)] = communicator_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(communicators, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(communicators, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/utility/camera
name = "Camera"
diff --git a/code/modules/loadout/loadout_xeno.dm b/code/modules/loadout/loadout_xeno.dm
index 34fcea8a961..2cd94952fef 100644
--- a/code/modules/loadout/loadout_xeno.dm
+++ b/code/modules/loadout/loadout_xeno.dm
@@ -299,7 +299,7 @@
for(var/tajara_wrap in (typesof(/obj/item/clothing/accessory/tajaran_wrap)))
var/obj/item/clothing/accessory/tajaran_wrap/tajara_wrap_type = tajara_wrap
tajara_wraps[initial(tajara_wrap_type.name)] = tajara_wrap_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_wraps, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tajara_wraps, GLOBAL_PROC_REF(cmp_text_asc)))
//Foot wear
@@ -314,7 +314,7 @@
for(var/tworkboot in (typesof(/obj/item/clothing/shoes/tajara/workboots)))
var/obj/item/clothing/shoes/tajara/workboots/tworkboot_type = tworkboot
tworkboots[initial(tworkboot_type.name)] = tworkboot_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tworkboots, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tworkboots, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/tajaran/shoes/footwraps
name = "Tajaran - Native foot-wear"
@@ -337,7 +337,7 @@
for(var/tflat in (typesof(/obj/item/clothing/shoes/flats/tajara)))
var/obj/item/clothing/shoes/flats/tajara/tflat_type = tflat
tflats[initial(tflat_type.name)] = tflat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tflats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tflats, GLOBAL_PROC_REF(cmp_text_asc)))
//*Promethean
/datum/loadout_entry/xeno/promethean/uniform/cohesion_suit
@@ -350,7 +350,7 @@
for(var/cohesionsuit in (typesof(/obj/item/clothing/under/cohesion)))
var/obj/item/clothing/under/cohesion/cohesion_type = cohesionsuit
cohesionsuits[initial(cohesion_type.name)] = cohesion_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cohesionsuits, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cohesionsuits, GLOBAL_PROC_REF(cmp_text_asc)))
//*Vox
@@ -489,7 +489,7 @@
for(var/plasman in (typesof(/obj/item/clothing/accessory/plasman)))
var/obj/item/clothing/accessory/plasman/plasaccessory_type = plasman
plasaccessories[initial(plasaccessory_type.name)] = plasaccessory_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(plasaccessories, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(plasaccessories, GLOBAL_PROC_REF(cmp_text_asc)))
@@ -506,7 +506,7 @@
for(var/chain_style in typesof(/obj/item/clothing/ears/skrell/chain))
var/obj/item/clothing/ears/skrell/chain/chain = chain_style
chaintypes[initial(chain.name)] = chain
- tweaks += new/datum/loadout_tweak/path(tim_sort(chaintypes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(chaintypes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/skrell/bands
@@ -519,7 +519,7 @@
for(var/band_style in typesof(/obj/item/clothing/ears/skrell/band))
var/obj/item/clothing/ears/skrell/band/band = band_style
bandtypes[initial(band.name)] = band
- tweaks += new/datum/loadout_tweak/path(tim_sort(bandtypes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(bandtypes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/skrell/cloth/short
@@ -532,7 +532,7 @@
for(var/short_style in typesof(/obj/item/clothing/ears/skrell/cloth_male))
var/obj/item/clothing/ears/skrell/cloth_male/short = short_style
shorttypes[initial(short.name)] = short
- tweaks += new/datum/loadout_tweak/path(tim_sort(shorttypes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(shorttypes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/skrell/cloth/long
@@ -545,7 +545,7 @@
for(var/long_style in typesof(/obj/item/clothing/ears/skrell/cloth_female))
var/obj/item/clothing/ears/skrell/cloth_female/long = long_style
longtypes[initial(long.name)] = long
- tweaks += new/datum/loadout_tweak/path(tim_sort(longtypes, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(longtypes, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/skrell/colored/band
@@ -571,7 +571,7 @@
for(var/smock in typesof(/obj/item/clothing/under/teshari/smock))
var/obj/item/clothing/under/teshari/smock/smock_type = smock
smocks[initial(smock_type.name)] = smock_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(smocks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(smocks, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/teshari/uniform/standard_undercoat_selection
name = "Teshari - Standard Undercoat Selection"
@@ -583,7 +583,7 @@
for(var/undercoat in typesof(/obj/item/clothing/under/teshari/undercoat/standard))
var/obj/item/clothing/under/teshari/undercoat/standard/undercoat_type = undercoat
undercoats[initial(undercoat_type.name)] = undercoat_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(undercoats, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(undercoats, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/teshari/uniform/dress_smock_selection
@@ -596,7 +596,7 @@
for(var/dresssmock in typesof(/obj/item/clothing/under/teshari/dresssmock))
var/obj/item/clothing/under/teshari/dresssmock/dresssmock_type = dresssmock
dresssmocks[initial(dresssmock_type.name)] = dresssmock_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(dresssmocks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(dresssmocks, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/teshari/uniform/role_undercoat
name = "Teshari - Facility Director Undercoat"
@@ -724,7 +724,7 @@
for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/standard))
var/obj/item/clothing/suit/storage/teshari/cloak/standard/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cloaks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cloaks, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/teshari/suit/role_cloak
@@ -843,7 +843,7 @@
for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard))
var/obj/item/clothing/suit/storage/teshari/cloak/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cloaks, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cloaks, GLOBAL_PROC_REF(cmp_text_asc)))
@@ -893,7 +893,7 @@
for(var/puffy_pant in typesof(/obj/item/clothing/under/moth/puffy_pants))
var/obj/item/clothing/under/moth/puffy_pants/puffy_pant_type = puffy_pant
puffy_pants[initial(puffy_pant_type.name)] = puffy_pant_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(puffy_pants, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(puffy_pants, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/uniform/tight_pants
name = "Moth - Pants Selection"
@@ -905,7 +905,7 @@
for(var/tight_pant in typesof(/obj/item/clothing/under/moth/tight_pants))
var/obj/item/clothing/under/moth/tight_pants/tight_pant_type = tight_pant
tight_pants[initial(tight_pant_type.name)] = tight_pant_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tight_pants, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tight_pants, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/uniform/moth_skirt
name = "Moth - Skirt Selection"
@@ -917,7 +917,7 @@
for(var/moth_skirts in typesof(/obj/item/clothing/under/moth/moth_skirt))
var/obj/item/clothing/under/moth/moth_skirt/moth_skirts_type = moth_skirts
moth_skirt[initial(moth_skirts_type.name)] = moth_skirts_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(moth_skirt, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(moth_skirt, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/abdomen_guard
name = "Moth - Abdomen Guards Selection"
@@ -929,7 +929,7 @@
for(var/abdomen_guards in typesof(/obj/item/clothing/accessory/vest/moth/abdomen_guard))
var/obj/item/clothing/accessory/vest/moth/abdomen_guard/abdomen_guards_type = abdomen_guards
abdomen_guard[initial(abdomen_guards_type.name)] = abdomen_guards_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(abdomen_guard, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(abdomen_guard, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/tunic_top
name = "Moth - Tunic Tops Selection"
@@ -941,7 +941,7 @@
for(var/tunic_tops in typesof(/obj/item/clothing/accessory/vest/moth/tunic_top))
var/obj/item/clothing/accessory/vest/moth/tunic_top/tunic_tops_type = tunic_tops
tunic_top[initial(tunic_tops_type.name)] = tunic_tops_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(tunic_top, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(tunic_top, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/cloth_strap_top
name = "Moth - Cloth Strap Tops Selection"
@@ -953,7 +953,7 @@
for(var/cloth_strap_tops in typesof(/obj/item/clothing/accessory/vest/moth/cloth_strap_top))
var/obj/item/clothing/accessory/vest/moth/cloth_strap_top/cloth_strap_tops_type = cloth_strap_tops
cloth_strap_top[initial(cloth_strap_tops_type.name)] = cloth_strap_tops_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(cloth_strap_top, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(cloth_strap_top, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/shoulder_pad_right
name = "Moth - Right Shoulder Pads Selection"
@@ -965,7 +965,7 @@
for(var/shoulder_pad_rights in typesof(/obj/item/clothing/accessory/vest/moth/shoulder_pad_right))
var/obj/item/clothing/accessory/vest/moth/shoulder_pad_right/shoulder_pad_rights_type = shoulder_pad_rights
shoulder_pad_right[initial(shoulder_pad_rights_type.name)] = shoulder_pad_rights_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(shoulder_pad_right, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(shoulder_pad_right, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/shoulder_pad_left
name = "Moth - Left Shoulder Pads Selection"
@@ -977,7 +977,7 @@
for(var/shoulder_pad_lefts in typesof(/obj/item/clothing/accessory/vest/moth/shoulder_pad_left))
var/obj/item/clothing/accessory/vest/moth/shoulder_pad_left/shoulder_pad_lefts_type = shoulder_pad_lefts
shoulder_pad_left[initial(shoulder_pad_lefts_type.name)] = shoulder_pad_lefts_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(shoulder_pad_left, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(shoulder_pad_left, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/front_tunic
name = "Moth - Front Tunics Selection"
@@ -989,7 +989,7 @@
for(var/front_tunics in typesof(/obj/item/clothing/accessory/vest/moth/front_tunic))
var/obj/item/clothing/accessory/vest/moth/front_tunic/front_tunics_type = front_tunics
front_tunic[initial(front_tunics_type.name)] = front_tunics_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(front_tunic, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(front_tunic, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/accessories/gaiter
name = "Moth - Gaiters Selection"
@@ -1001,7 +1001,7 @@
for(var/gaiters in typesof(/obj/item/clothing/accessory/vest/moth/gaiter))
var/obj/item/clothing/accessory/vest/moth/gaiter/gaiters_type = gaiters
gaiter[initial(gaiters_type.name)] = gaiters_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(gaiter, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(gaiter, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/shoes/legwrap
name = "Moth - Legwraps Selection"
@@ -1013,7 +1013,7 @@
for(var/legwraps in typesof(/obj/item/clothing/shoes/moth/legwrap))
var/obj/item/clothing/shoes/moth/legwrap/legwraps_type = legwraps
legwrap[initial(legwraps_type.name)] = legwraps_type
- tweaks += new/datum/loadout_tweak/path(tim_sort(legwrap, /proc/cmp_text_asc))
+ tweaks += new/datum/loadout_tweak/path(tim_sort(legwrap, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/loadout_entry/xeno/shoes/moth/jackboots
name = "Moth - Jackboots"
diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 104ae221fc1..49bcf79f46e 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -62,8 +62,8 @@
/obj/item/kinetic_crusher/Initialize(mapload)
. = ..()
if(requires_Wield)
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/kinetic_crusher/ComponentInitialize()
. = ..()
if(requires_wield)
@@ -159,7 +159,7 @@
D.fire()
charged = FALSE
update_icon()
- addtimer(CALLBACK(src, .proc/Recharge), charge_time * (user?.ConflictElementCount(CONFLICT_ELEMENT_CRUSHER) || 1))
+ addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time * (user?.ConflictElementCount(CONFLICT_ELEMENT_CRUSHER) || 1))
return
if((clickchain_flags & CLICKCHAIN_HAS_PROXIMITY) && isliving(target))
detonate(target, user)
@@ -483,7 +483,7 @@
continue
playsound(L, 'sound/magic/fireball.ogg', 20, 1)
new /obj/effect/temp_visual/fire(L.loc)
- addtimer(CALLBACK(src, .proc/pushback, L, user), 1) //no free backstabs, we push AFTER module stuff is done
+ addtimer(CALLBACK(src, PROC_REF(pushback), L, user), 1) //no free backstabs, we push AFTER module stuff is done
L.adjustFireLoss(bonus_value, forced = TRUE)
/obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user)
if(!QDELETED(target) && !QDELETED(user) && (!target.anchored || ismegafauna(target))) //megafauna will always be pushed
@@ -541,7 +541,7 @@
deadly_shot = FALSE
/obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)
deadly_shot = TRUE
- addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(reset_deadly_shot)), 300, TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/item/crusher_trophy/blaster_tubes/proc/reset_deadly_shot()
deadly_shot = FALSE
//hierophant
diff --git a/code/modules/mob/floating_message.dm b/code/modules/mob/floating_message.dm
index cbadd9b9540..19c86871091 100644
--- a/code/modules/mob/floating_message.dm
+++ b/code/modules/mob/floating_message.dm
@@ -62,8 +62,8 @@ var/list/floating_chat_colors = list()
animate(old, 2, pixel_y = old.pixel_y + 8)
LAZYADD(holder.stored_chat_text, I)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_floating_text, holder, I), duration + 16)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_clients, I, show_to), duration + 18)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_floating_text), holder, I), duration + 16)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_image_from_clients), I, show_to), duration + 18)
return I
diff --git a/code/modules/mob/freelook/mask/update_triggers.dm b/code/modules/mob/freelook/mask/update_triggers.dm
index 0c79ea083b5..a039359b0dd 100644
--- a/code/modules/mob/freelook/mask/update_triggers.dm
+++ b/code/modules/mob/freelook/mask/update_triggers.dm
@@ -11,7 +11,7 @@
if(GLOB.cultnet.provides_vision(src))
if(!updating_cult_vision)
updating_cult_vision = 1
- addtimer(CALLBACK(src, .proc/__update_cultnet_vision, oldLoc), CULT_UPDATE_BUFFER)
+ addtimer(CALLBACK(src, PROC_REF(__update_cultnet_vision), oldLoc), CULT_UPDATE_BUFFER)
/mob/living/proc/__update_cultnet_vision(oldLoc)
updating_cult_vision = FALSE
diff --git a/code/modules/mob/inventory/slot_meta.dm b/code/modules/mob/inventory/slot_meta.dm
index db9702f534b..6a01f85a681 100644
--- a/code/modules/mob/inventory/slot_meta.dm
+++ b/code/modules/mob/inventory/slot_meta.dm
@@ -19,8 +19,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
.[M.id || M.type] = M
if(!(M.inventory_slot_flags & INV_SLOT_ALLOW_RANDOM_ID))
GLOB.inventory_slot_type_cache[M.type] = M
- tim_sort(., /proc/cmp_inventory_slot_meta_dsc, TRUE)
- tim_sort(GLOB.inventory_slot_type_cache, /proc/cmp_inventory_slot_meta_dsc, TRUE)
+ tim_sort(., GLOBAL_PROC_REF(cmp_inventory_slot_meta_dsc), TRUE)
+ tim_sort(GLOB.inventory_slot_type_cache, GLOBAL_PROC_REF(cmp_inventory_slot_meta_dsc), TRUE)
/proc/all_inventory_slot_ids()
. = list()
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index 32d60110dd3..c013db16065 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -327,7 +327,7 @@
/mob/living/bot/proc/startPatrol()
var/turf/T = getPatrolTurf()
if(T)
- patrol_path = AStar(get_turf(loc), T, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, max_patrol_dist, id = botcard, exclude = obstacle)
+ patrol_path = AStar(get_turf(loc), T, TYPE_PROC_REF(/turf, CardinalTurfsWithAccess), TYPE_PROC_REF(/turf, Distance), 0, max_patrol_dist, id = botcard, exclude = obstacle)
if(!patrol_path)
patrol_path = list()
obstacle = null
@@ -359,7 +359,7 @@
return
/mob/living/bot/proc/calcTargetPath()
- target_path = AStar(get_turf(loc), get_turf(target), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, max_target_dist, id = botcard, exclude = obstacle)
+ target_path = AStar(get_turf(loc), get_turf(target), TYPE_PROC_REF(/turf, CardinalTurfsWithAccess), TYPE_PROC_REF(/turf, Distance), 0, max_target_dist, id = botcard, exclude = obstacle)
if(!target_path)
if(target && target.loc)
ignore_list |= target
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index fa83e1f04e2..f5dd5025230 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -256,7 +256,7 @@
say("Down on the floor, [suspect_name]! You have [SECBOT_WAIT_TIME*2] seconds to comply.")
playsound(src.loc, pick(preparing_arrest_sounds), 50)
// Register to be told when the target moves
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/target_moved)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(target_moved))
// Callback invoked if the registered target moves
/mob/living/bot/secbot/proc/target_moved(atom/movable/moving_instance, atom/old_loc, atom/new_loc)
diff --git a/code/modules/mob/living/carbon/cpr.dm b/code/modules/mob/living/carbon/cpr.dm
index bd1902927ef..644f68539fe 100644
--- a/code/modules/mob/living/carbon/cpr.dm
+++ b/code/modules/mob/living/carbon/cpr.dm
@@ -42,7 +42,7 @@
if(HAS_TRAIT(src, TRAIT_CPR_IN_PROGRESS))
to_chat(user, SPAN_WARNING("Someone is already doing CPR on [src]!"))
return
- INVOKE_ASYNC(src, .proc/attempt_cpr, user)
+ INVOKE_ASYNC(src, PROC_REF(attempt_cpr), user)
/mob/living/carbon/proc/attempt_cpr(atom/actor, delay_mod = 1)
actor.visible_message(SPAN_NOTICE("[actor] is trying to perform CPR on [src]!"))
@@ -98,7 +98,7 @@
if(clipping)
to_chat(actor, SPAN_WARNING("Too fast! Wait [(CPR_NOMINAL_COOLDOWN - CPR_ACTION_TIME) * 0.1] seconds after finishing a set of compressions to start another!"))
- addtimer(CALLBACK(src, .proc/__cpr_ventilation_end), CPR_VENTILATION_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
- addtimer(CALLBACK(src, .proc/__cpr_off_cooldown), CPR_NOMINAL_COOLDOWN, TIMER_OVERRIDE | TIMER_UNIQUE)
- addtimer(CALLBACK(src, .proc/__cpr_organ_stasis_end), CPR_BRAIN_STASIS_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
- addtimer(CALLBACK(src, .proc/__cpr_circulation_end), CPR_CIRCULATION_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(__cpr_ventilation_end)), CPR_VENTILATION_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(__cpr_off_cooldown)), CPR_NOMINAL_COOLDOWN, TIMER_OVERRIDE | TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(__cpr_organ_stasis_end)), CPR_BRAIN_STASIS_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(__cpr_circulation_end)), CPR_CIRCULATION_TIME, TIMER_OVERRIDE | TIMER_UNIQUE)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index aef3d732174..aea4291454c 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -584,11 +584,11 @@
var/list/laughsounds = list('sound/voice/laughs/masclaugh1.ogg', 'sound/voice/laughs/masclaugh2.ogg')
playsound(loc, pick(laughsounds), 50, 1, -1)
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
else
playsound(loc, 'sound/voice/laughs/femlaugh.ogg', 50, 1, -1)
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
m_type = 2
else
message = "makes a noise."
@@ -908,13 +908,13 @@
if(!spam_flag)
playsound(loc, "[pick(species.female_scream_sound)]", 80, 1)
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
else
if(!spam_flag)
playsound(loc, "[pick(species.male_scream_sound)]", 80, 1) //default to male screams if no gender is present.
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
else
message = "makes a very loud noise."
m_type = 2
@@ -1143,7 +1143,7 @@
var/list/catlaugh = list('sound/voice/catpeople/nyaha.ogg', 'sound/voice/catpeople/nyahaha1.ogg', 'sound/voice/catpeople/nyahaha2.ogg', 'sound/voice/catpeople/nyahehe.ogg')
playsound(loc, pick(catlaugh), 50, 1, -1)
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
var/list/laughs = list("laughs deviously.", "lets out a catty laugh.", "nya ha ha's.")
message = "[pick(laughs)]"
m_type = 2
@@ -1217,7 +1217,7 @@
src.SpinAnimation(7,1)
message = "does a flip!"
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
else
if(prob(30)) // Little known fact: HRP is /tg/ + 10
src.afflict_paralyze(20 * 2)
@@ -1230,7 +1230,7 @@
src.SpinAnimation(7,1)
message = "lands another flip. Smooth!"
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
// New emotes below this line
if ("purr")
@@ -1243,7 +1243,7 @@
message = "[pick(msg)]"
playsound(loc, 'sound/spooky/boneclak.ogg', 50, 1, 1)
spam_flag = TRUE
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18)
m_type = 2
if (message)
custom_emote(m_type,message)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 93ae4137580..7872038ac06 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -66,10 +66,10 @@ meteor_act
msg_admin_attack("[key_name(src)] was disarmed by a stun effect")
drop_active_held_item()
if (affected.robotic >= ORGAN_ROBOT)
- INVOKE_ASYNC(src, /mob/proc/custom_emote, 1, "drops what they were holding, their [affected.name] malfunctioning!")
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, custom_emote), 1, "drops what they were holding, their [affected.name] malfunctioning!")
else
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
- INVOKE_ASYNC(src, /mob/proc/custom_emote, 1, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, custom_emote), 1, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
..(stun_amount, agony_amount, def_zone)
diff --git a/code/modules/mob/living/carbon/human/human_modular_limbs.dm b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
index 768f1594100..6c2691a049c 100644
--- a/code/modules/mob/living/carbon/human/human_modular_limbs.dm
+++ b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
@@ -75,13 +75,13 @@
// Called in robotize(), replaced() and removed() to update our modular limb verbs.
/mob/living/carbon/human/proc/refresh_modular_limb_verbs()
if(length(get_modular_limbs(return_first_found = TRUE, validate_proc = /obj/item/organ/external/proc/can_attach_modular_limb_here)))
- add_verb(src, .proc/attach_limb_verb)
+ add_verb(src, /mob/living/carbon/human/proc/attach_limb_verb)
else
- remove_verb(src, .proc/attach_limb_verb)
+ remove_verb(src, /mob/living/carbon/human/proc/attach_limb_verb)
if(length(get_modular_limbs(return_first_found = TRUE, validate_proc = /obj/item/organ/external/proc/can_remove_modular_limb)))
- add_verb(src, .proc/detach_limb_verb)
+ add_verb(src, /mob/living/carbon/human/proc/detach_limb_verb)
else
- remove_verb(src, .proc/detach_limb_verb)
+ remove_verb(src, /mob/living/carbon/human/proc/detach_limb_verb)
// Proc helper for attachment verb.
/mob/living/carbon/human/proc/check_can_attach_modular_limb(var/obj/item/organ/external/E)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 627b54e67d9..f330fb27366 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -343,7 +343,7 @@
if(radiation >= RAD_MOB_HAIRLOSS_THRESHOLD)
if(prob(RAD_MOB_HAIRLOSS_CHANCE(radiation, seconds)))
to_chat(src, SPAN_WARNING("Your hair starts falling out in clumps..."))
- addtimer(CALLBACK(src, .proc/radiation_hairloss), 8 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(radiation_hairloss)), 8 SECONDS)
if(radiation >= RAD_MOB_DECLONE_THRESHOLD)
if(prob(RAD_MOB_DECLONE_CHANCE(radiation, seconds)))
to_chat(src, SPAN_WARNING("You feel a sharp pain, and a strange, numb feeling."))
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index d2ffeead29c..624ba9b9a7f 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -544,7 +544,7 @@ var/list/ai_verbs_default = list(
for(var/i in tempnetwork)
cameralist[i] = i
- cameralist = tim_sort(cameralist, /proc/cmp_text_asc, TRUE)
+ cameralist = tim_sort(cameralist, GLOBAL_PROC_REF(cmp_text_asc), TRUE)
return cameralist
/mob/living/silicon/ai/proc/ai_network_change(var/network in get_camera_network_list())
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index d22cebaebf9..b34abc953f1 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -245,7 +245,7 @@
// pass attack self on to the card regardless of our shell
if(!istype(new_shell, /obj/item/paicard))
- RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, .proc/pass_attack_self_to_card)
+ RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(pass_attack_self_to_card))
// changing the shell into clothing
/mob/living/silicon/pai/proc/change_shell_by_path(obj/item/clothing/object_path)
diff --git a/code/modules/mob/living/silicon/robot/robot_animation_vr.dm b/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
index 654e7b2ba14..5eb6bf03dec 100644
--- a/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/robot/proc/transform_with_anim()
- INVOKE_ASYNC(src, .proc/do_transform_animation)
+ INVOKE_ASYNC(src, PROC_REF(do_transform_animation))
/mob/living/silicon/robot/proc/do_transform_animation()
notransform = TRUE
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index e79fd8dae05..e0bcc284396 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(robot_modules, list(
R.set_module_sprites(sprites)
// TODO: REFACTOR CYBORGS THEY ARE ALL SHITCODE
- INVOKE_ASYNC(R, /mob/living/silicon/robot/proc/choose_icon, R.module_sprites.len + 1, R.module_sprites)
+ INVOKE_ASYNC(R, TYPE_PROC_REF(/mob/living/silicon/robot, choose_icon), R.module_sprites.len + 1, R.module_sprites)
// Setup synths, modules, and modules with custom init code.
synths_by_kind = get_synths(R)
diff --git a/code/modules/mob/living/silicon/subystems.dm b/code/modules/mob/living/silicon/subystems.dm
index f49a018abe0..26d9e992af7 100644
--- a/code/modules/mob/living/silicon/subystems.dm
+++ b/code/modules/mob/living/silicon/subystems.dm
@@ -39,7 +39,7 @@
return
for(var/datum/alarm_handler/AH in SSalarms.all_handlers)
- AH.register_alarm(src, /mob/living/silicon/proc/receive_alarm)
+ AH.register_alarm(src, TYPE_PROC_REF(/mob/living/silicon, receive_alarm))
queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order
/********************
diff --git a/code/modules/mob/living/silicon/translation.dm b/code/modules/mob/living/silicon/translation.dm
index 12cc241be80..b4af68166b1 100644
--- a/code/modules/mob/living/silicon/translation.dm
+++ b/code/modules/mob/living/silicon/translation.dm
@@ -24,4 +24,4 @@
translation_context = new path
if(istype(translation_context, /datum/translation_context/variable/learning/silicons))
var/datum/translation_context/variable/learning/silicons/CTX = translation_context
- CTX.on_train = CALLBACK(src, .proc/translation_train_hook)
+ CTX.on_train = CALLBACK(src, PROC_REF(translation_train_hook))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
index 8e77d850db2..f3287131270 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
@@ -69,7 +69,7 @@
true_name = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]"
if(!roundstart)
- INVOKE_ASYNC(src, .proc/request_player)
+ INVOKE_ASYNC(src, PROC_REF(request_player))
return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/lavaland/goliath.dm b/code/modules/mob/living/simple_mob/subtypes/lavaland/goliath.dm
index efe94317922..3e575402fc3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/lavaland/goliath.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/lavaland/goliath.dm
@@ -263,7 +263,7 @@
/obj/effect/temporary_effect/goliath_tentacle/proc/trip()
var/latched = FALSE
- var/timerid = addtimer(CALLBACK(src, .proc/retract), 5, TIMER_STOPPABLE)
+ var/timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 5, TIMER_STOPPABLE)
for(var/mob/living/carbon/C in loc)
if(C.stat == DEAD)
continue
@@ -281,7 +281,7 @@
/obj/effect/temporary_effect/goliath_tentacle/proc/tripanim()
icon_state = "goliath_tentacle_wiggle"
- var/timerid = addtimer(CALLBACK(src, .proc/trip), 3, TIMER_STOPPABLE)
+ var/timerid = addtimer(CALLBACK(src, PROC_REF(trip)), 3, TIMER_STOPPABLE)
deltimer(timerid)
/obj/effect/temporary_effect/goliath_tentacle/proc/retract()
diff --git a/code/modules/mob/new_player/join_menu.dm b/code/modules/mob/new_player/join_menu.dm
index 3cf7826f4e6..7504ad42ab3 100644
--- a/code/modules/mob/new_player/join_menu.dm
+++ b/code/modules/mob/new_player/join_menu.dm
@@ -12,7 +12,7 @@ GLOBAL_DATUM_INIT(join_menu, /datum/join_menu, new)
ui.open()
/datum/join_menu/proc/queue_update()
- addtimer(CALLBACK(src, /datum/proc/update_static_data), 0, TIMER_UNIQUE | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data)), 0, TIMER_UNIQUE | TIMER_OVERRIDE)
/datum/join_menu/ui_state(mob/user, datum/tgui_module/module)
return GLOB.explicit_new_player_state
diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm
index 5acd195158d..ab7936ea2ff 100644
--- a/code/modules/modular_computers/hardware/nano_printer.dm
+++ b/code/modules/modular_computers/hardware/nano_printer.dm
@@ -38,7 +38,7 @@
return 1
/obj/item/computer_hardware/nano_printer/proc/count_fields(var/info)
-//Count the fields. This is taken directly from paper.dm, /obj/item/paper/proc/parsepencode(). -Hawk_v3
+//Count the fields. This is taken directly from paper.dm, TYPE_PROC_REF(/obj/item/paper, parsepencode)(). -Hawk_v3
var/fields = 0
var/t = info
var/laststart = 1
diff --git a/code/modules/multiz/zmimic/mimic_movable.dm b/code/modules/multiz/zmimic/mimic_movable.dm
index 0bccce61e87..b4bd3815acb 100644
--- a/code/modules/multiz/zmimic/mimic_movable.dm
+++ b/code/modules/multiz/zmimic/mimic_movable.dm
@@ -48,7 +48,7 @@
SSzmimic.queued_overlays += bound_overlay
bound_overlay.queued += 1
else if (bound_overlay && !bound_overlay.destruction_timer)
- bound_overlay.destruction_timer = addtimer(CALLBACK(bound_overlay, /datum/.proc/qdel_self), 10 SECONDS, TIMER_STOPPABLE)
+ bound_overlay.destruction_timer = addtimer(CALLBACK(bound_overlay, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE)
// Grabs a list of every openspace object that's directly or indirectly mimicking this object. Returns an empty list if none found.
/atom/movable/proc/get_above_oo()
@@ -200,12 +200,12 @@
deltimer(destruction_timer)
destruction_timer = null
else if (!destruction_timer)
- destruction_timer = addtimer(CALLBACK(src, /datum/.proc/qdel_self), 10 SECONDS, TIMER_STOPPABLE)
+ destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE)
// Called when the turf we're on is deleted/changed.
/atom/movable/openspace/mimic/proc/owning_turf_changed()
if (!destruction_timer)
- destruction_timer = addtimer(CALLBACK(src, /datum/.proc/qdel_self), 10 SECONDS, TIMER_STOPPABLE)
+ destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE)
// -- TURF PROXY --
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index 7dbd7764080..f92f2d7f8e1 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -651,7 +651,7 @@ GLOBAL_LIST_INIT(nif_id_lookup, init_nif_id_lookup())
durability = 50
bioadap = TRUE
id = NIF_ID_BIOADAPTIVE
-
+
/obj/item/nif/authenticbioadap
name = "\improper Vey-Med bioadaptive NIF"
desc = "A genuine Vey-Med nanotechnology fabricator, designed for strange body types. \
diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm
index 559dd4073e9..882c5a88e77 100644
--- a/code/modules/nifsoft/nif_tgui.dm
+++ b/code/modules/nifsoft/nif_tgui.dm
@@ -31,7 +31,7 @@
/datum/component/nif_menu/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button)
+ RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(create_mob_button))
var/mob/owner = parent
if(owner.client)
create_mob_button(parent)
@@ -53,7 +53,7 @@
var/datum/hud/HUD = user.hud_used
if(!screen_icon)
screen_icon = new()
- RegisterSignal(screen_icon, COMSIG_CLICK, .proc/nif_menu_click)
+ RegisterSignal(screen_icon, COMSIG_CLICK, PROC_REF(nif_menu_click))
screen_icon.icon = HUD.ui_style
screen_icon.color = HUD.ui_color
screen_icon.alpha = HUD.ui_alpha
@@ -65,7 +65,7 @@
/datum/component/nif_menu/proc/nif_menu_click(mob/user)
var/mob/living/carbon/human/H = user
if(istype(H) && H.nif)
- INVOKE_ASYNC(H.nif, .proc/ui_interact, user)
+ INVOKE_ASYNC(H.nif, PROC_REF(ui_interact), user)
/**
* Screen atom for NIF menu access
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index 156a0eefbad..097ea48ca28 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -522,7 +522,7 @@
real_name = brainmob.real_name //And the OTHER name
forceMove(get_turf(parent_human))
- RegisterSignal(parent_human, COMSIG_MOVABLE_MOVED, .proc/human_moved)
+ RegisterSignal(parent_human, COMSIG_MOVABLE_MOVED, PROC_REF(human_moved))
//Time to play dressup
if(brainmob.client.prefs)
diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm
index dbf947ab73a..e09e6c6820d 100644
--- a/code/modules/organs/external/external.dm
+++ b/code/modules/organs/external/external.dm
@@ -138,7 +138,7 @@
if(istype(owner))
replaced(owner)
sync_colour_to_human(owner)
- addtimer(CALLBACK(src, .proc/get_icon), 1)
+ addtimer(CALLBACK(src, PROC_REF(get_icon)), 1)
/obj/item/organ/external/Destroy()
@@ -1064,7 +1064,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"You hear a sickening crack.")
jostle_bone()
if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && !isbelly(owner.loc))
- INVOKE_ASYNC(owner, /mob/proc/emote, "scream")
+ INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream")
playsound(src.loc, "fracture", 10, 1, -2)
status |= ORGAN_BROKEN
@@ -1417,7 +1417,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/queue_syringe_infection()
if(!syringe_infection_queued)
syringe_infection_queued = 100
- addtimer(CALLBACK(src, .proc/do_syringe_infection), rand(5, 10) MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(do_syringe_infection)), rand(5, 10) MINUTES)
else
syringe_infection_queued = clamp(syringe_infection_queued + 10, 0, 300)
diff --git a/code/modules/organs/internal/species/xenos.dm b/code/modules/organs/internal/species/xenos.dm
index 8e41b7aab95..3739c430178 100644
--- a/code/modules/organs/internal/species/xenos.dm
+++ b/code/modules/organs/internal/species/xenos.dm
@@ -15,7 +15,7 @@
/obj/item/organ/internal/xenos/eggsac/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/xenos/eggsac/grey/colormatch/proc/sync_color()
if(ishuman(owner))
@@ -58,7 +58,7 @@
/obj/item/organ/internal/xenos/plasmavessel/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/xenos/plasmavessel/grey/colormatch/proc/sync_color()
if(ishuman(owner))
@@ -97,7 +97,7 @@
/obj/item/organ/internal/xenos/acidgland/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/xenos/acidgland/grey/colormatch/proc/sync_color()
if(ishuman(owner))
@@ -116,7 +116,7 @@
/obj/item/organ/internal/xenos/hivenode/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/xenos/hivenode/grey/colormatch/proc/sync_color()
if(ishuman(owner))
@@ -147,7 +147,7 @@
/obj/item/organ/internal/xenos/resinspinner/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/xenos/resinspinner/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/augment.dm b/code/modules/organs/internal/subtypes/augment.dm
index a95b335ab6e..851229b75b9 100644
--- a/code/modules/organs/internal/subtypes/augment.dm
+++ b/code/modules/organs/internal/subtypes/augment.dm
@@ -57,8 +57,8 @@
return
if(integrated_object)
unregister_item(integrated_object)
- RegisterSignal(I, COMSIG_MOVABLE_MOVED, .proc/on_item_moved)
- RegisterSignal(I, COMSIG_ITEM_DROPPED, .proc/on_item_dropped)
+ RegisterSignal(I, COMSIG_MOVABLE_MOVED, PROC_REF(on_item_moved))
+ RegisterSignal(I, COMSIG_ITEM_DROPPED, PROC_REF(on_item_dropped))
if(I.loc != src)
I.forceMove(src)
integrated_object = I
@@ -75,7 +75,7 @@
SIGNAL_HANDLER
// gives a chance for dropped to fire
- addtimer(CALLBACK(src, .proc/check_item_yank, source), 0)
+ addtimer(CALLBACK(src, PROC_REF(check_item_yank), source), 0)
/obj/item/organ/internal/augment/proc/on_item_dropped(datum/source)
SIGNAL_HANDLER
@@ -98,7 +98,7 @@
items_list += I
// ayy only dropped signal for performance, we can't possibly have shitcode that doesn't call it when removing items from a mob, right?
// .. right??!
- RegisterSignal(I, COMSIG_ITEM_DROPPED, .proc/magnetic_catch)
+ RegisterSignal(I, COMSIG_ITEM_DROPPED, PROC_REF(magnetic_catch))
/obj/item/organ/cyberimp/arm/proc/magnetic_catch(datum/source, mob/user)
. = COMPONENT_DROPPED_RELOCATION
diff --git a/code/modules/organs/internal/subtypes/brain.dm b/code/modules/organs/internal/subtypes/brain.dm
index fdd6a7cde87..910a3dc4156 100644
--- a/code/modules/organs/internal/subtypes/brain.dm
+++ b/code/modules/organs/internal/subtypes/brain.dm
@@ -21,7 +21,7 @@
/obj/item/organ/internal/brain/Initialize(mapload, ...)
. = ..()
health = config_legacy.default_brain_health
- addtimer(CALLBACK(src, .proc/clear_brainmob_hud), 15)
+ addtimer(CALLBACK(src, PROC_REF(clear_brainmob_hud)), 15)
/obj/item/organ/internal/brain/Destroy()
QDEL_NULL(brainmob)
@@ -175,7 +175,7 @@
. = ..()
create_reagents(50)
set_owner_vars()
- addtimer(CALLBACK(src, .proc/sync_color), 10 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 10 SECONDS)
/obj/item/organ/internal/brain/slime/proc/set_owner_vars()
if(!ishuman(owner))
@@ -303,7 +303,7 @@
/obj/item/organ/internal/brain/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/brain/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/eyes.dm b/code/modules/organs/internal/subtypes/eyes.dm
index 72605dd4d2e..25c71d50b2a 100644
--- a/code/modules/organs/internal/subtypes/eyes.dm
+++ b/code/modules/organs/internal/subtypes/eyes.dm
@@ -25,7 +25,7 @@
/obj/item/organ/internal/eyes/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/eyes/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/heart.dm b/code/modules/organs/internal/subtypes/heart.dm
index 1705e66818f..7411fe2fd6d 100644
--- a/code/modules/organs/internal/subtypes/heart.dm
+++ b/code/modules/organs/internal/subtypes/heart.dm
@@ -31,7 +31,7 @@
/obj/item/organ/internal/heart/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/heart/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/kidneys.dm b/code/modules/organs/internal/subtypes/kidneys.dm
index ffd920ffcec..88ee1c7a198 100644
--- a/code/modules/organs/internal/subtypes/kidneys.dm
+++ b/code/modules/organs/internal/subtypes/kidneys.dm
@@ -33,7 +33,7 @@
if(!owner?.client) // we don't care
return
-
+
//Pyelonephritis
if (. >= 1)
if(prob(1))
@@ -49,7 +49,7 @@
/obj/item/organ/internal/kidneys/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/kidneys/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/liver.dm b/code/modules/organs/internal/subtypes/liver.dm
index 8322ba0eff8..8fa79107371 100644
--- a/code/modules/organs/internal/subtypes/liver.dm
+++ b/code/modules/organs/internal/subtypes/liver.dm
@@ -61,7 +61,7 @@
/obj/item/organ/internal/liver/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/liver/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/internal/subtypes/lungs.dm b/code/modules/organs/internal/subtypes/lungs.dm
index a0066ef5e04..87623c136f5 100644
--- a/code/modules/organs/internal/subtypes/lungs.dm
+++ b/code/modules/organs/internal/subtypes/lungs.dm
@@ -56,7 +56,7 @@
/obj/item/organ/internal/lungs/grey/colormatch/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/sync_color), 15)
+ addtimer(CALLBACK(src, PROC_REF(sync_color)), 15)
/obj/item/organ/internal/lungs/grey/colormatch/proc/sync_color()
if(ishuman(owner))
diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm
index ff476af9db9..70dc9c4f6ae 100644
--- a/code/modules/organs/subtypes/machine.dm
+++ b/code/modules/organs/subtypes/machine.dm
@@ -50,7 +50,7 @@
if(istype(M))
return
stored_mmi = new brain_type(src)
- addtimer(CALLBACK(src, .proc/update_from_mmi), 0)
+ addtimer(CALLBACK(src, PROC_REF(update_from_mmi)), 0)
/obj/item/organ/internal/mmi_holder/proc/get_control_efficiency()
. = max(0, 1 - round(damage / max_damage, 0.1))
diff --git a/code/modules/overmap/legacy/sectors.dm b/code/modules/overmap/legacy/sectors.dm
index dafecb94b35..ef79f4d3008 100644
--- a/code/modules/overmap/legacy/sectors.dm
+++ b/code/modules/overmap/legacy/sectors.dm
@@ -211,7 +211,7 @@
I.appearance_flags = KEEP_APART|RESET_TRANSFORM|RESET_COLOR
add_overlay(I)
- addtimer(CALLBACK(src, .proc/distress_update), 5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(distress_update)), 5 MINUTES)
return TRUE
/obj/overmap/entity/visitable/proc/get_distress_info()
diff --git a/code/modules/overmap/legacy/ships/computers/ship.dm b/code/modules/overmap/legacy/ships/computers/ship.dm
index 7eccaa4c700..22a1601538e 100644
--- a/code/modules/overmap/legacy/ships/computers/ship.dm
+++ b/code/modules/overmap/legacy/ships/computers/ship.dm
@@ -73,8 +73,8 @@
var/WR = WEAKREF(user)
if(WR in viewers)
return
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, /obj/machinery/computer/ship/proc/unlook)
- // TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/obj/machinery/computer/ship, unlook))
+ // TODO GLOB.stat_set_event.register(user, src, TYPE_PROC_REF(/obj/machinery/computer/ship, unlook))
LAZYDISTINCTADD(viewers, WR)
if(linked)
user.reset_perspective(linked)
@@ -89,13 +89,13 @@
/obj/machinery/computer/ship/proc/unlook(mob/user, vis_update)
user.reset_perspective()
user.client?.reset_temporary_view()
- UnregisterSignal(user, COMSIG_MOVABLE_MOVED, /obj/machinery/computer/ship/proc/unlook)
+ UnregisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/obj/machinery/computer/ship, unlook))
if(isliving(user))
var/mob/living/L = user
L.looking_elsewhere = 0
if(!vis_update)
L.handle_vision()
- // TODO GLOB.stat_set_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook)
+ // TODO GLOB.stat_set_event.unregister(user, src, TYPE_PROC_REF(/obj/machinery/computer/ship, unlook))
LAZYREMOVE(viewers, WEAKREF(user))
/obj/machinery/computer/ship/proc/viewing_overmap(mob/user)
diff --git a/code/modules/overmap/legacy/ships/landable.dm b/code/modules/overmap/legacy/ships/landable.dm
index 38e0adc5f61..69f52a2a0a5 100644
--- a/code/modules/overmap/legacy/ships/landable.dm
+++ b/code/modules/overmap/legacy/ships/landable.dm
@@ -70,8 +70,8 @@
if(istype(shuttle_datum,/datum/shuttle/autodock/overmap))
var/datum/shuttle/autodock/overmap/oms = shuttle_datum
oms.myship = src
- GLOB.shuttle_pre_move_event.register(shuttle_datum, src, .proc/pre_shuttle_jump)
- GLOB.shuttle_moved_event.register(shuttle_datum, src, .proc/on_shuttle_jump)
+ GLOB.shuttle_pre_move_event.register(shuttle_datum, src, PROC_REF(pre_shuttle_jump))
+ GLOB.shuttle_moved_event.register(shuttle_datum, src, PROC_REF(on_shuttle_jump))
on_landing(landmark, shuttle_datum.current_location) // We "land" at round start to properly place ourselves on the overmap.
@@ -122,7 +122,7 @@
core_landmark = master
name = _name
landmark_tag = master.shuttle_name + _name
- RegisterSignal(master, COMSIG_PARENT_QDELETING, /datum/proc/qdel_self)
+ RegisterSignal(master, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum, qdel_self))
. = ..()
@@ -144,7 +144,7 @@
/obj/effect/shuttle_landmark/visiting_shuttle/shuttle_arrived(datum/shuttle/shuttle)
LAZYSET(core_landmark.visitors, src, shuttle)
- GLOB.shuttle_moved_event.register(shuttle, src, .proc/shuttle_left)
+ GLOB.shuttle_moved_event.register(shuttle, src, PROC_REF(shuttle_left))
/obj/effect/shuttle_landmark/visiting_shuttle/proc/shuttle_left(datum/shuttle/shuttle, obj/effect/shuttle_landmark/old_landmark, obj/effect/shuttle_landmark/new_landmark)
if(old_landmark == src)
diff --git a/code/modules/paperwork/paper/paper.dm b/code/modules/paperwork/paper/paper.dm
index 65dada19f90..650e6e82bdc 100644
--- a/code/modules/paperwork/paper/paper.dm
+++ b/code/modules/paperwork/paper/paper.dm
@@ -73,7 +73,7 @@
if(info != initial(info))
info = html_encode(info)
info = replacetext(info, "\n", "
")
- INVOKE_ASYNC(src, .proc/init_parsepencode, info)
+ INVOKE_ASYNC(src, PROC_REF(init_parsepencode), info)
else
// TODO: REFACTOR PAPER
spawn(0)
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index d4933968e0d..c1718a9e7ac 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -105,7 +105,7 @@
if(href_list["copy"])
if(machine_stat & (BROKEN|NOPOWER))
return
- addtimer(CALLBACK(src, .proc/copy_operation, usr), 0)
+ addtimer(CALLBACK(src, PROC_REF(copy_operation), usr), 0)
else if(href_list["remove"])
if(copyitem)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 94b33e7ee10..2e33634e47b 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -449,7 +449,7 @@ GLOBAL_LIST_EMPTY(apcs)
make_terminal()
- addtimer(CALLBACK(src, .proc/update), 5)
+ addtimer(CALLBACK(src, PROC_REF(update)), 5)
/obj/machinery/power/apc/examine(mob/user, dist)
. = ..()
@@ -1122,7 +1122,7 @@ GLOBAL_LIST_EMPTY(apcs)
for(var/obj/machinery/light/L in area)
if(!initial(L.no_emergency)) //If there was an override set on creation, keep that override
L.no_emergency = emergency_lights
- INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
+ INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE)
CHECK_TICK
if("overload")
if(locked_exception) // Reusing for simplicity!
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 40ec7979a53..2dc86b78f65 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -604,7 +604,7 @@
"You hear a loud electrical crack!")
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 50)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
/obj/machinery/power/rtg/abductor/bullet_act(obj/projectile/Proj)
. = ..()
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 244ac16f4ff..22394e97e65 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -42,7 +42,7 @@
. = ..()
src.loc = loc
src.setDir(dir)
- INVOKE_ASYNC(src, .proc/move, 1)
+ INVOKE_ASYNC(src, PROC_REF(move), 1)
/obj/effect/accelerated_particle/Moved()
. = ..()
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 249354f75f1..be531a988a8 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -74,7 +74,7 @@
flick("coilhit", src)
playsound(src.loc, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_produced)
- //addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+ //addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
spawn(10) reset_shocked()
else
..()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index c5b65a1a4ff..c1e0d1bcf17 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -102,7 +102,7 @@
energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/effects/lightning_chargeup.ogg', 100, 1, extrarange = 30)
- addtimer(CALLBACK(src, .proc/new_mini_ball), 100)
+ addtimer(CALLBACK(src, PROC_REF(new_mini_ball)), 100)
else if(energy < energy_to_lower && orbiting_balls.len)
energy_to_raise = energy_to_raise / 1.25
diff --git a/code/modules/power/tesla/tesla_act.dm b/code/modules/power/tesla/tesla_act.dm
index e421b28226e..b26232bc036 100644
--- a/code/modules/power/tesla/tesla_act.dm
+++ b/code/modules/power/tesla/tesla_act.dm
@@ -9,8 +9,8 @@
being_shocked = TRUE
var/power_bounced = power / 2
tesla_zap(src, 3, power_bounced)
- //addtimer(CALLBACK(src, .proc/reset_shocked), 10)
- //schedule_task_with_source_in(10, src, .proc/reset_shocked)
+ //addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
+ //schedule_task_with_source_in(10, src, PROC_REF(reset_shocked))
spawn(10) reset_shocked()
/obj/proc/reset_shocked()
diff --git a/code/modules/preferences/_preferences.dm b/code/modules/preferences/_preferences.dm
index 794599c365b..b484fad163f 100644
--- a/code/modules/preferences/_preferences.dm
+++ b/code/modules/preferences/_preferences.dm
@@ -233,8 +233,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/datum/preferences/proc/Initialize()
// todo: refactor
player_setup = new(src)
- tim_sort(preference_by_key, /proc/cmp_preference_load_order, TRUE)
- tim_sort(preference_by_type, /proc/cmp_preference_load_order, TRUE)
+ tim_sort(preference_by_key, GLOBAL_PROC_REF(cmp_preference_load_order), TRUE)
+ tim_sort(preference_by_type, GLOBAL_PROC_REF(cmp_preference_load_order), TRUE)
// set defaults before load
reset_everything_to_default()
diff --git a/code/modules/preferences/migration.dm b/code/modules/preferences/migration.dm
index a1220b03b74..a40fabc77c0 100644
--- a/code/modules/preferences/migration.dm
+++ b/code/modules/preferences/migration.dm
@@ -9,7 +9,7 @@
/datum/controller/subsystem/characters/proc/perform_global_migrations(savefile/S, current_version, list/errors, list/options, datum/preferences/prefs)
if(current_version < 13)
if(prefs)
- addtimer(CALLBACK(prefs, /datum/preferences/proc/force_reset_keybindings), 5 SECONDS)
+ addtimer(CALLBACK(prefs, TYPE_PROC_REF(/datum/preferences, force_reset_keybindings)), 5 SECONDS)
else
var/list/new_bindings = deep_copy_list(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds
WRITE_FILE(S["key_bindings"], new_bindings)
diff --git a/code/modules/preferences/preference_setup/preference_setup.dm b/code/modules/preferences/preference_setup/preference_setup.dm
index 852725fed21..6d26493f4ec 100644
--- a/code/modules/preferences/preference_setup/preference_setup.dm
+++ b/code/modules/preferences/preference_setup/preference_setup.dm
@@ -29,7 +29,7 @@
src.preferences = preferences
..()
selected_category = categories[1]
- tim_sort(preferences.preference_by_key, /proc/cmp_preference_load_order, TRUE)
+ tim_sort(preferences.preference_by_key, GLOBAL_PROC_REF(cmp_preference_load_order), TRUE)
/datum/category_collection/player_setup_collection/Destroy()
preferences = null
diff --git a/code/modules/preferences/preferences_toggle_procs.dm b/code/modules/preferences/preferences_toggle_procs.dm
index edc0c067e19..f1b5e8da6cc 100644
--- a/code/modules/preferences/preferences_toggle_procs.dm
+++ b/code/modules/preferences/preferences_toggle_procs.dm
@@ -386,7 +386,7 @@
make_jittery(duration + 100)
if(duration)
- addtimer(CALLBACK(src, .proc/acting_expiry), duration SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(acting_expiry)), duration SECONDS)
var/aduration = duration SECONDS / 10
to_chat(src,"You will now performatively act as if you were experiencing [impairment] for [aduration] seconds. (Do NOT abuse this)")
feedback_add_details("admin_verb","actimpaired") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index d7039f36f53..669cbbf30bb 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -156,7 +156,7 @@
if(!QDELING(src) && !holds_charge)
// Put it on a delay because moving item from slot to hand
// calls dropped().
- addtimer(CALLBACK(src, .proc/empty_if_not_held), 2)
+ addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 2)
/obj/item/gun/energy/kinetic_accelerator/proc/empty_if_not_held()
if(!ismob(loc) && !istype(loc, /obj/item/integrated_circuit))
@@ -180,7 +180,7 @@
var/carried = max(1, loc.ConflictElementCount(CONFLICT_ELEMENT_KA))
deltimer(recharge_timerid)
- recharge_timerid = addtimer(CALLBACK(src, .proc/reload), recharge_time * carried, TIMER_STOPPABLE)
+ recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE)
/obj/item/gun/energy/kinetic_accelerator/emp_act(severity)
return
diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm
index 247361b18a5..b4c6c1c9a41 100644
--- a/code/modules/projectiles/targeting/targeting_triggers.dm
+++ b/code/modules/projectiles/targeting/targeting_triggers.dm
@@ -23,6 +23,6 @@
owner.visible_message("\The [owner] pulls the trigger reflexively!")
var/obj/item/gun/G = aiming_with
if(istype(G))
- INVOKE_ASYNC(G, /obj/item/gun/proc/Fire, aiming_at, owner, null, null, TRUE)
+ INVOKE_ASYNC(G, TYPE_PROC_REF(/obj/item/gun, Fire), aiming_at, owner, null, null, TRUE)
locked = 0
lock_time = world.time+10
diff --git a/code/modules/projectiles/unsorted/magic.dm b/code/modules/projectiles/unsorted/magic.dm
index b7fa6f538e5..48100e30f1f 100644
--- a/code/modules/projectiles/unsorted/magic.dm
+++ b/code/modules/projectiles/unsorted/magic.dm
@@ -382,7 +382,7 @@
/obj/structure/closet/decay/proc/decay()
animate(src, alpha = 0, time = 30)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 30)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), 30)
/obj/structure/closet/decay/open(mob/living/user)
. = ..()
@@ -390,12 +390,12 @@
if(icon_state == magic_icon) //check if we used the magic icon at all before giving it the lesser magic icon
unmagify()
else
- addtimer(CALLBACK(src, .proc/decay), 15 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS)
/obj/structure/closet/decay/proc/unmagify()
icon_state = weakened_icon
update_icon()
- addtimer(CALLBACK(src, .proc/decay), 15 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS)
/obj/projectile/magic/aoe
name = "Area Bolt"
@@ -483,7 +483,7 @@
return
var/turf/T = get_turf(target)
for(var/i=0, i<50, i+=10)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i)
/obj/projectile/magic/nuclear
name = "\proper blazing manliness"
diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm
index c4b959129eb..e6b6c02f072 100644
--- a/code/modules/random_map/drop/droppod_doors.dm
+++ b/code/modules/random_map/drop/droppod_doors.dm
@@ -13,7 +13,7 @@
/obj/structure/droppod_door/Initialize(mapload, autoopen = FALSE)
. = ..()
if(autoopen)
- addtimer(CALLBACK(src, .proc/deploy), 10 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(deploy)), 10 SECONDS)
/obj/structure/droppod_door/attack_ai(var/mob/user)
if(!user.Adjacent(src))
diff --git a/code/modules/reagents/chemistry/wiki_generation.dm b/code/modules/reagents/chemistry/wiki_generation.dm
index be664392d4c..2d05ac18cef 100644
--- a/code/modules/reagents/chemistry/wiki_generation.dm
+++ b/code/modules/reagents/chemistry/wiki_generation.dm
@@ -12,7 +12,7 @@
LAZYADD(reagents_by_category[initial(path.wiki_category)], new path)
// todo: styling for tables
for(var/category in reagents_by_category)
- tim_sort(reagents_by_category[category], /proc/cmp_reagents_wiki)
+ tim_sort(reagents_by_category[category], GLOBAL_PROC_REF(cmp_reagents_wiki))
var/list/sub_built = list()
sub_built += {"
{| class="wikitable" style="margin: auto"
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8da3a8e5f0e..c533d84c85c 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -103,7 +103,7 @@
return
use_power(10)
var/list/affecting = loc.contents - src // moved items will be all in loc
- addtimer(CALLBACK(src, .proc/convey, affecting), 1)
+ addtimer(CALLBACK(src, PROC_REF(convey), affecting), 1)
/obj/machinery/conveyor/proc/convey(list/affecting)
var/turf/T = get_step(src, movedir)
diff --git a/code/modules/research/machinery/destructive_analyzer.dm b/code/modules/research/machinery/destructive_analyzer.dm
index f057153b371..687470470cf 100644
--- a/code/modules/research/machinery/destructive_analyzer.dm
+++ b/code/modules/research/machinery/destructive_analyzer.dm
@@ -113,7 +113,7 @@ Note: Must be placed within 3 tiles of the R&D Console
qdel(B)
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
rped_recycler_ready = FALSE
- addtimer(CALLBACK(src, .proc/rped_ready), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(rped_ready)), 5 SECONDS)
to_chat(user, "You deconstruct all the parts of rating [lowest_rating] in [replacer] with [src].")
return 1
else
diff --git a/code/modules/research/machinery/rdconsole_tgui.dm b/code/modules/research/machinery/rdconsole_tgui.dm
index 41ebfe47035..8b268a75286 100644
--- a/code/modules/research/machinery/rdconsole_tgui.dm
+++ b/code/modules/research/machinery/rdconsole_tgui.dm
@@ -238,7 +238,7 @@
"chem_list" = chem_list,
)))
- data = tim_sort(data, /proc/cmp_designs_rdconsole, FALSE)
+ data = tim_sort(data, GLOBAL_PROC_REF(cmp_designs_rdconsole), FALSE)
if(LAZYLEN(data) > ENTRIES_PER_RDPAGE)
var/first_index = clamp(ENTRIES_PER_RDPAGE * page, 1, LAZYLEN(data))
var/last_index = min((ENTRIES_PER_RDPAGE * page) + ENTRIES_PER_RDPAGE, LAZYLEN(data) + 1)
@@ -276,7 +276,7 @@
"chem_list" = chem_list,
)))
- data = tim_sort(data, /proc/cmp_designs_rdconsole, FALSE)
+ data = tim_sort(data, GLOBAL_PROC_REF(cmp_designs_rdconsole), FALSE)
if(LAZYLEN(data) > ENTRIES_PER_RDPAGE)
var/first_index = clamp(ENTRIES_PER_RDPAGE * page, 1, LAZYLEN(data))
var/last_index = min((ENTRIES_PER_RDPAGE * page) + ENTRIES_PER_RDPAGE, LAZYLEN(data) + 1)
@@ -299,7 +299,7 @@
"id" = D.id,
)))
- data = tim_sort(data, /proc/cmp_designs_rdconsole, FALSE)
+ data = tim_sort(data, GLOBAL_PROC_REF(cmp_designs_rdconsole), FALSE)
if(LAZYLEN(data) > ENTRIES_PER_RDPAGE)
var/first_index = clamp(ENTRIES_PER_RDPAGE * page, 1, LAZYLEN(data))
var/last_index = clamp((ENTRIES_PER_RDPAGE * page) + ENTRIES_PER_RDPAGE, 1, LAZYLEN(data) + 1)
diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm
index bf16d35435c..ccba16db02a 100644
--- a/code/modules/shieldgen/directional_shield.dm
+++ b/code/modules/shieldgen/directional_shield.dm
@@ -112,7 +112,7 @@
START_PROCESSING(SSobj, src)
if(always_on)
create_shields()
- RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/moved_event)
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(moved_event))
return ..()
/obj/item/shield_projector/Destroy()
@@ -123,7 +123,7 @@
/obj/item/shield_projector/pickup(mob/user, flags, atom/oldLoc)
. = ..()
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/moved_event)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(moved_event))
/obj/item/shield_projector/dropped(mob/user, flags, atom/newLoc)
. = ..()
diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm
index 4d672731600..2da8f809504 100644
--- a/code/modules/shieldgen/energy_shield.dm
+++ b/code/modules/shieldgen/energy_shield.dm
@@ -153,7 +153,7 @@
continue
// Note: Range is a non-exact aproximation of the spread effect. If it doesn't look good
// we'll need to switch to actually walking along the shields to get exact number of steps away.
- addtimer(CALLBACK(S, .proc/impact_flash), get_dist(src, S) * 2)
+ addtimer(CALLBACK(S, PROC_REF(impact_flash)), get_dist(src, S) * 2)
impact_flash()
// Small visual effect, makes the shield tiles brighten up by becoming more opaque for a moment
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 542feb35533..b51afe5e5da 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -408,10 +408,10 @@
/obj/shuttle_connector/Initialize(mapload)
. = ..()
- GLOB.shuttle_added.register_global(src, .proc/setup_routes)
+ GLOB.shuttle_added.register_global(src, PROC_REF(setup_routes))
/obj/shuttle_connector/Destroy()
- GLOB.shuttle_added.unregister_global(src, .proc/setup_routes)
+ GLOB.shuttle_added.unregister_global(src, PROC_REF(setup_routes))
. = ..()
// This is called whenever a shuttle is initialized. If its our shuttle, do our thing!
diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm
index 3d95d1fb18a..88107cedd63 100644
--- a/code/modules/species/station/xenochimera.dm
+++ b/code/modules/species/station/xenochimera.dm
@@ -734,7 +734,7 @@
return
var/mob/living/carbon/human/H = owner
toggle_sight(owner)
- addtimer(CALLBACK(src, .proc/toggle_sight,H), duration, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(toggle_sight),H), duration, TIMER_UNIQUE)
/datum/ability/species/xenochimera/thermal_sight/proc/toggle_sight(mob/living/carbon/human/H)
if(!active)
@@ -872,13 +872,13 @@
//These are only messages to give the player and everyone around them an idea of which stage they're at
//visible_message doesn't seem to relay selfmessages if you're paralysed, so we use to_chat
- addtimer(CALLBACK(H, /atom/.proc/visible_message," [H]'s skin begins to ripple and move, as if something was crawling underneath."), 4 MINUTES)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat,H,"We begin to recycle the dead tissue."), 2 MINUTES)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, visible_message)," [H]'s skin begins to ripple and move, as if something was crawling underneath."), 4 MINUTES)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat),H,"We begin to recycle the dead tissue."), 2 MINUTES)
- addtimer(CALLBACK(H, /atom/.proc/visible_message," [H]'s body begins to lose its shape, skin sloughing off and melting, losing form and composure.","There is little left. We will soon be ready."), 8 SECONDS)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat,H,"There is little left. We will soon be ready."), 4 MINUTES)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, visible_message)," [H]'s body begins to lose its shape, skin sloughing off and melting, losing form and composure.","There is little left. We will soon be ready."), 8 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat),H,"There is little left. We will soon be ready."), 4 MINUTES)
- addtimer(CALLBACK(src, .proc/add_pop,H,), 5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(add_pop),H,), 5 MINUTES)
/datum/ability/species/xenochimera/hatch/proc/add_pop()
if(ishuman(owner))
diff --git a/code/modules/species/virtual_reality/avatar.dm b/code/modules/species/virtual_reality/avatar.dm
index 32341e9c990..d5c53b530c8 100644
--- a/code/modules/species/virtual_reality/avatar.dm
+++ b/code/modules/species/virtual_reality/avatar.dm
@@ -115,4 +115,4 @@
if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
var/obj/machinery/vr_sleeper/V = vr_holder.loc
- INVOKE_ASYNC(V, /obj/machinery/vr_sleeper/proc/go_out, TRUE)
+ INVOKE_ASYNC(V, TYPE_PROC_REF(/obj/machinery/vr_sleeper, go_out), TRUE)
diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm
index 4e65214f0fa..9e5b077e3db 100644
--- a/code/modules/spells/artifacts.dm
+++ b/code/modules/spells/artifacts.dm
@@ -149,7 +149,7 @@
insaneinthemembrane.sanity = 0
for(var/lore in typesof(/datum/brain_trauma/severe))
C.gain_trauma(lore)
- addtimer(CALLBACK(src, /obj/singularity/wizard.proc/deranged, C), 100)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/singularity/wizard, deranged), C), 100)
/obj/singularity/wizard/proc/deranged(mob/living/carbon/C)
if(!C || C.stat == DEAD)
diff --git a/code/modules/spells/targeted/chimera_spells.dm b/code/modules/spells/targeted/chimera_spells.dm
index 3dce5fb3464..96af1c35a55 100644
--- a/code/modules/spells/targeted/chimera_spells.dm
+++ b/code/modules/spells/targeted/chimera_spells.dm
@@ -81,13 +81,13 @@
//These are only messages to give the player and everyone around them an idea of which stage they're at
//visible_message doesn't seem to relay selfmessages if you're paralysed, so we use to_chat
- addtimer(CALLBACK(H, /atom/.proc/visible_message," [H]'s skin begins to ripple and move, as if something was crawling underneath."), 4 MINUTES)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat,H,"We begin to recycle the dead tissue."),4 MINUTES)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, visible_message)," [H]'s skin begins to ripple and move, as if something was crawling underneath."), 4 MINUTES)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat),H,"We begin to recycle the dead tissue."),4 MINUTES)
- addtimer(CALLBACK(H, /atom/.proc/visible_message," [H]'s body begins to lose its shape, skin sloughing off and melting, losing form and composure.","There is little left. We will soon be ready."), 8 SECONDS)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat,H,"There is little left. We will soon be ready."), 8 MINUTES)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, visible_message)," [H]'s body begins to lose its shape, skin sloughing off and melting, losing form and composure.","There is little left. We will soon be ready."), 8 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat),H,"There is little left. We will soon be ready."), 8 MINUTES)
- addtimer(CALLBACK(src, .proc/add_pop,H,), 10 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(add_pop),H,), 10 MINUTES)
/spell/targeted/chimera/hatch/proc/add_pop(mob/user = usr)
if(ishuman(user))
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 5cac9bdf1da..8e430c51bd3 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -176,7 +176,7 @@
. = list()
for(var/path in subtypesof(/datum/surgery_step))
. += new path
- tim_sort(., cmp = /proc/cmp_surgery_priority_asc)
+ tim_sort(., cmp = GLOBAL_PROC_REF(cmp_surgery_priority_asc))
/datum/surgery_status/
var/eyes = 0
diff --git a/code/modules/telesci/hyper_pad.dm b/code/modules/telesci/hyper_pad.dm
index 8777f64c7dc..693f9672bea 100644
--- a/code/modules/telesci/hyper_pad.dm
+++ b/code/modules/telesci/hyper_pad.dm
@@ -109,10 +109,10 @@
return
playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
teleporting = 1
- addtimer(CALLBACK(src, .proc/doteleport, user), teleport_speed)
+ addtimer(CALLBACK(src, PROC_REF(doteleport), user), teleport_speed)
var/speed = teleport_speed/8
for(var/obj/machinery/hyperpad/P in linked)
- addtimer(CALLBACK(src, .proc/animate_discharge, P), speed)
+ addtimer(CALLBACK(src, PROC_REF(animate_discharge), P), speed)
speed += teleport_speed/8
/obj/machinery/hyperpad/centre/proc/animate_discharge(var/obj/machinery/hyperpad/Pad)
@@ -171,7 +171,7 @@
color_overlay.color = newcolor
var/timer = teleport_cooldown/8
for(var/obj/machinery/hyperpad/P in linked)
- addtimer(CALLBACK(src, .proc/animate_charge, P, color_overlay), timer)
+ addtimer(CALLBACK(src, PROC_REF(animate_charge), P, color_overlay), timer)
timer += teleport_cooldown/8
/obj/machinery/hyperpad/centre/proc/animate_charge(var/obj/machinery/hyperpad/Pad, var/mutable_appearance/color)
diff --git a/code/modules/tgui/module.dm b/code/modules/tgui/module.dm
index c10ae6bbf6a..2f5ce0b17dd 100644
--- a/code/modules/tgui/module.dm
+++ b/code/modules/tgui/module.dm
@@ -44,7 +44,7 @@
if(expected_type && !istype(host, expected_type))
CRASH("bad host: [host] not [expected_type] instead [isdatum(host)? host.type : "(not datum)"]")
if(autodel && host)
- RegisterSignal(host, COMSIG_PARENT_QDELETING, /datum/tgui_module/proc/on_host_del)
+ RegisterSignal(host, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/tgui_module, on_host_del))
ASSERT(!ephemeral || autodel)
/datum/tgui_module/Destroy()
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index d8ed66c7319..d0e1ee1aaf6 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -64,13 +64,13 @@
owner = H
if(owner)
- GLOB.moved_event.register(owner, src, .proc/update_active_camera_screen)
+ GLOB.moved_event.register(owner, src, PROC_REF(update_active_camera_screen))
check_whitelist = check_species_whitelist
whitelist = species_whitelist
blacklist = species_blacklist
/datum/tgui_module_old/appearance_changer/Destroy()
- GLOB.moved_event.unregister(owner, src, .proc/update_active_camera_screen)
+ GLOB.moved_event.unregister(owner, src, PROC_REF(update_active_camera_screen))
last_camera_turf = null
qdel(cam_screen)
QDEL_LIST(cam_plane_masters)
diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm
index 78124a6ffc9..7ea016037af 100644
--- a/code/modules/tgui/modules/camera.dm
+++ b/code/modules/tgui/modules/camera.dm
@@ -142,7 +142,7 @@
UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED)
active_camera = C
START_PROCESSING(SSmoving_cameras, src)
- RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, .proc/update_active_camera_screen)
+ RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen))
playsound(ui_host(), get_sfx(SFX_ALIAS_TERMINAL), 25, FALSE)
update_active_camera_screen()
return TRUE
@@ -169,7 +169,7 @@
if(active_camera)
UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED)
active_camera = target
- RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, .proc/update_active_camera_screen)
+ RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen))
playsound(ui_host(), get_sfx(SFX_ALIAS_TERMINAL), 25, FALSE)
update_active_camera_screen()
. = TRUE
diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm
index 824ce738d21..469a95e7e43 100644
--- a/code/modules/tgui/modules/ntos-only/uav.dm
+++ b/code/modules/tgui/modules/ntos-only/uav.dm
@@ -95,7 +95,7 @@
signal_strength = 0
current_uav = U
- RegisterSignal(U, COMSIG_MOVABLE_Z_CHANGED, .proc/current_uav_changed_z)
+ RegisterSignal(U, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(current_uav_changed_z))
if(LAZYLEN(viewers))
for(var/datum/weakref/W in viewers)
diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm
index 5ce24895be0..6b103836152 100644
--- a/code/modules/tgui/modules/overmap.dm
+++ b/code/modules/tgui/modules/overmap.dm
@@ -57,7 +57,7 @@
user.reset_perspective(linked)
var/list/view_size = decode_view_size(world.view)
user.client?.set_temporary_view(view_size[1] + extra_view, view_size[2] + extra_view)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/unlook)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(unlook))
LAZYDISTINCTADD(viewers, WEAKREF(user))
/datum/tgui_module_old/ship/proc/unlook(var/mob/user)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index fdba7fd97b0..d1994a231d2 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -206,7 +206,7 @@
return
if(!COOLDOWN_FINISHED(src, refresh_cooldown))
refreshing = max(refreshing, hard_refresh? UI_HARD_REFRESHING : UI_SOFT_REFRESHING)
- addtimer(CALLBACK(src, .proc/send_full_update), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(send_full_update)), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
return
refreshing = UI_NOT_REFRESHING
var/should_update_data = force || status >= UI_UPDATE
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index c6af80de4c2..adb201c618e 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -16,7 +16,7 @@
/datum/tgui_panel/New(client/client, id)
src.client = client
window = new(client, id)
- window.subscribe(src, .proc/on_message)
+ window.subscribe(src, PROC_REF(on_message))
/datum/tgui_panel/Del()
window.unsubscribe(src)
@@ -54,7 +54,7 @@
window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat))
// Other setup
request_telemetry()
- addtimer(CALLBACK(src, .proc/on_initialize_timed_out), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS)
/**
* private
diff --git a/code/modules/tools/_tool_system.dm b/code/modules/tools/_tool_system.dm
index 3a22a19e8bd..b9e2030c2d5 100644
--- a/code/modules/tools/_tool_system.dm
+++ b/code/modules/tools/_tool_system.dm
@@ -58,7 +58,7 @@
if(isnull(reachability_check))
if(clickchain_flags & CLICKCHAIN_TOOL_ACT)
// provided_item should never be null
- reachability_check = CALLBACK(user, /atom/movable/proc/Reachability, src, null, provided_item.reach, provided_item)
+ reachability_check = CALLBACK(user, TYPE_PROC_REF(/atom/movable, Reachability), src, null, provided_item.reach, provided_item)
if(reachability_check && !reachability_check.Invoke())
return NONE
// from click chain
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index 0e07254c3ae..238159f0e78 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -89,7 +89,7 @@ Notes:
queueHide = showing ? TRUE : FALSE
if (queueHide)
- addtimer(CALLBACK(src, .proc/do_hide), 1)
+ addtimer(CALLBACK(src, PROC_REF(do_hide)), 1)
else
do_hide()
diff --git a/code/modules/unit_tests/elements/connect_loc.dm b/code/modules/unit_tests/elements/connect_loc.dm
index bcba5299304..14bee79d9ad 100644
--- a/code/modules/unit_tests/elements/connect_loc.dm
+++ b/code/modules/unit_tests/elements/connect_loc.dm
@@ -63,7 +63,7 @@
. = ..()
var/static/list/connections = list(
- COMSIG_MOCK_SIGNAL = .proc/on_receive_mock_signal,
+ COMSIG_MOCK_SIGNAL = PROC_REF(on_receive_mock_signal),
)
AddElement(/datum/element/connect_loc, connections)
diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm
index 5795ab34374..7111107b709 100644
--- a/code/modules/unit_tests/emoting.dm
+++ b/code/modules/unit_tests/emoting.dm
@@ -3,7 +3,7 @@
/datum/unit_test/emoting/Run()
var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human)
- RegisterSignal(human, COMSIG_MOB_EMOTE, .proc/on_emote_used)
+ RegisterSignal(human, COMSIG_MOB_EMOTE, PROC_REF(on_emote_used))
human.say("*shrug")
TEST_ASSERT_EQUAL(emotes_used, 1, "Human did not shrug")
diff --git a/code/modules/unit_tests/surgeries.dm b/code/modules/unit_tests/surgeries.dm
index 6348057f79e..d175bfde568 100644
--- a/code/modules/unit_tests/surgeries.dm
+++ b/code/modules/unit_tests/surgeries.dm
@@ -64,7 +64,7 @@
var/datum/surgery_step/incise/surgery_step = new
var/datum/surgery/organ_manipulation/surgery_for_zero = new
- INVOKE_ASYNC(surgery_step, /datum/surgery_step/proc/initiate, user, patient_zero, BODY_ZONE_CHEST, scalpel, surgery_for_zero)
+ INVOKE_ASYNC(surgery_step, TYPE_PROC_REF(/datum/surgery_step, initiate), user, patient_zero, BODY_ZONE_CHEST, scalpel, surgery_for_zero)
TEST_ASSERT(surgery_for_zero.step_in_progress, "Surgery on patient zero was not initiated")
var/datum/surgery/organ_manipulation/surgery_for_one = new
@@ -74,7 +74,7 @@
TEST_ASSERT(!surgery_for_one.step_in_progress, "Surgery for patient one is somehow in progress, despite not initiating")
user.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH)
- INVOKE_ASYNC(surgery_step, /datum/surgery_step/proc/initiate, user, patient_one, BODY_ZONE_CHEST, scalpel, surgery_for_one)
+ INVOKE_ASYNC(surgery_step, TYPE_PROC_REF(/datum/surgery_step, initiate), user, patient_one, BODY_ZONE_CHEST, scalpel, surgery_for_one)
TEST_ASSERT(surgery_for_one.step_in_progress, "Surgery on patient one was not initiated, despite having rod of asclepius")
/datum/unit_test/tend_wounds/Run()
diff --git a/code/modules/vehicles_legacy/skateboard.dm b/code/modules/vehicles_legacy/skateboard.dm
index d454378fb83..3b63bc5e91c 100644
--- a/code/modules/vehicles_legacy/skateboard.dm
+++ b/code/modules/vehicles_legacy/skateboard.dm
@@ -139,7 +139,7 @@
playsound(src, 'sound/weapons/skateboard_ollie.ogg', 50, TRUE)
if(prob (50))
sparks.start() //the most radical way to start plasma fires
- addtimer(CALLBACK(src, .proc/grind), 2)
+ addtimer(CALLBACK(src, PROC_REF(grind)), 2)
return
else
grinding = FALSE
@@ -194,7 +194,7 @@
if(locate(/obj/structure/table) in V.loc.contents)
V.grinding = TRUE
V.icon_state = "[V.board_icon]-grind"
- addtimer(CALLBACK(V, /obj/vehicle_old/skateboard/.proc/grind), 2)
+ addtimer(CALLBACK(V, TYPE_PROC_REF(/obj/vehicle_old/skateboard, grind)), 2)
next_ollie = world.time + 5
*/
diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm
index 1b5d343d20c..9e08915a4b1 100644
--- a/code/modules/vore/fluffstuff/custom_items.dm
+++ b/code/modules/vore/fluffstuff/custom_items.dm
@@ -1000,7 +1000,7 @@
if(!teleport_checks(target, user)) // no using this to bypass range checks
to_chat(user, "[src] malfunctions and fizzles out uselessly!")
// penalty: 10 second recharge, but no using charge.
- addtimer(CALLBACK(src, .proc/recharge), 10 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 10 SECONDS)
return
else
to_chat(user,"\The [src] malfunctions and sends you to the wrong beacon!")
@@ -1057,7 +1057,7 @@
//Phase-in effect for grabbed person
phase_in(G.affecting,get_turf(G.affecting))
- addtimer(CALLBACK(src, .proc/recharge), 30 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 30 SECONDS)
logged_events["[world.time]"] = "[user] teleported [target] to [real_dest] [televored ? "(Belly: [lowertext(real_dest.name)])" : null]"