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 += "
  1. [path]