diff --git a/.github/guides/HARDDELETES.md b/.github/guides/HARDDELETES.md index 8113805bacb..a33108d4caa 100644 --- a/.github/guides/HARDDELETES.md +++ b/.github/guides/HARDDELETES.md @@ -245,7 +245,7 @@ Here's an example UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared target = new_target if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_target) //Call clear_target if target is ever qdel()'d + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d /somemob/proc/clear_target(datum/source) SIGNAL_HANDLER diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index bd13dcedf32..35c8ffee91a 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -67,7 +67,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) @@ -80,7 +80,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/qdel.dm b/code/__DEFINES/qdel.dm index d6a08b3174f..750626b2df2 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -47,10 +47,10 @@ #define QDELETED(X) (!X || QDELING(X)) #define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) -#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, (time) > GC_FILTER_QUEUE ? WEAKREF(item) : 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), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : 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_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/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 91b5949f2c5..768a4373c90 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -512,20 +512,20 @@ ///for sorting clients or mobs by ckey /proc/sort_key(list/ckey_list, order=1) - return sortTim(ckey_list, order >= 0 ? /proc/cmp_ckey_asc : /proc/cmp_ckey_dsc) + return sortTim(ckey_list, order >= 0 ? GLOBAL_PROC_REF(cmp_ckey_asc) : GLOBAL_PROC_REF(cmp_ckey_dsc)) ///Specifically for record datums in a list. /proc/sort_record(list/record_list, field = "name", order = 1) GLOB.cmp_field = field - return sortTim(record_list, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc) + return sortTim(record_list, order >= 0 ? GLOBAL_PROC_REF(cmp_records_asc) : GLOBAL_PROC_REF(cmp_records_dsc)) ///sort any value in a list -/proc/sort_list(list/list_to_sort, cmp=/proc/cmp_text_asc) +/proc/sort_list(list/list_to_sort, cmp = GLOBAL_PROC_REF(cmp_text_asc)) return sortTim(list_to_sort.Copy(), cmp) ///uses sort_list() but uses the var's name specifically. This should probably be using mergeAtom() instead /proc/sort_names(list/list_to_sort, order=1) - return sortTim(list_to_sort.Copy(), order >= 0 ? /proc/cmp_name_asc : /proc/cmp_name_dsc) + return sortTim(list_to_sort.Copy(), order >= 0 ? GLOBAL_PROC_REF(cmp_name_asc) : GLOBAL_PROC_REF(cmp_name_dsc)) ///Converts a bitfield to a list of numbers (or words if a wordlist is provided) /proc/bitfield_to_list(bitfield = 0, list/wordlist) diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm index a1331c8ea04..e0ff247a1c3 100644 --- a/code/__HELPERS/_string_lists.dm +++ b/code/__HELPERS/_string_lists.dm @@ -14,7 +14,7 @@ GLOBAL_VAR(string_filename_current_key) if((filepath in GLOB.string_cache) && (key in GLOB.string_cache[filepath])) var/response = pick(GLOB.string_cache[filepath][key]) var/regex/r = regex("@pick\\((\\D+?)\\)", "g") - response = r.Replace(response, /proc/strings_subkey_lookup) + response = r.Replace(response, GLOBAL_PROC_REF(strings_subkey_lookup)) return response else CRASH("strings list not found: [STRING_DIRECTORY]/[filepath], index=[key]") diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index b6c5739f8cf..4c5892019d3 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -111,11 +111,11 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engineerin for(var/area/A in world) GLOB.sortedAreas.Add(A) - sortTim(GLOB.sortedAreas, /proc/cmp_name_asc) + sortTim(GLOB.sortedAreas, GLOBAL_PROC_REF(cmp_name_asc)) /area/proc/addSorted() GLOB.sortedAreas.Add(src) - sortTim(GLOB.sortedAreas, /proc/cmp_name_asc) + sortTim(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/game.dm b/code/__HELPERS/game.dm index 4c4d001ce4c..0f514bbe0d4 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -126,7 +126,7 @@ /proc/flick_overlay(image/image_to_show, list/show_to, duration) for(var/client/add_to in show_to) add_to.images += image_to_show - addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, image_to_show, show_to), duration, TIMER_CLIENT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(remove_images_from_clients), image_to_show, show_to), duration, TIMER_CLIENT_TIME) ///wrapper for flick_overlay(), flicks to everyone who can see the target atom /proc/flick_overlay_view(image/image_to_show, atom/target, duration) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 34f35f11521..bc73f91e164 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -38,12 +38,12 @@ for(var/spath in subtypesof(/datum/species)) var/datum/species/S = new spath() GLOB.species_list[S.id] = spath - sort_list(GLOB.species_list, /proc/cmp_typepaths_asc) + sort_list(GLOB.species_list, GLOBAL_PROC_REF(cmp_typepaths_asc)) //Surgeries for(var/path in subtypesof(/datum/surgery)) GLOB.surgeries_list += new path() - sort_list(GLOB.surgeries_list, /proc/cmp_typepaths_asc) + sort_list(GLOB.surgeries_list, GLOBAL_PROC_REF(cmp_typepaths_asc)) // Hair Gradients - Initialise all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name for(var/path in subtypesof(/datum/sprite_accessory/gradient)) @@ -64,7 +64,7 @@ /proc/init_crafting_recipes(list/crafting_recipes) for(var/path in subtypesof(/datum/crafting_recipe)) var/datum/crafting_recipe/recipe = new path() - recipe.reqs = sort_list(recipe.reqs, /proc/cmp_crafting_req_priority) + recipe.reqs = sort_list(recipe.reqs, GLOBAL_PROC_REF(cmp_crafting_req_priority)) crafting_recipes += recipe return crafting_recipes diff --git a/code/__HELPERS/hearted.dm b/code/__HELPERS/hearted.dm index bfc487254f3..8df71e35eff 100644 --- a/code/__HELPERS/hearted.dm +++ b/code/__HELPERS/hearted.dm @@ -14,7 +14,7 @@ if(!check_mob?.mind || !check_mob.client) continue // maybe some other filters like bans or whatever - INVOKE_ASYNC(check_mob, /mob.proc/query_heart, 1) + INVOKE_ASYNC(check_mob, TYPE_PROC_REF(/mob, query_heart), 1) number_to_ask-- if(number_to_ask <= 0) break diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index cbfc6e254f2..45ea5a41d8b 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1252,7 +1252,7 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) for(var/A in transformation_objects) vis_contents += A if(reset_after) - addtimer(CALLBACK(src,.proc/_reset_transformation_animation,filter_index),time) + addtimer(CALLBACK(src, PROC_REF(_reset_transformation_animation), filter_index),time) /* * Resets filters and removes transformation animations helper objects from vis contents. @@ -1329,7 +1329,7 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) animate(transform = transforms[2], time=0.2) animate(transform = transforms[3], time=0.4) animate(transform = transforms[4], time=0.6) - addtimer(CALLBACK(src, .proc/Stop_Shaking), duration) + addtimer(CALLBACK(src, PROC_REF(Stop_Shaking)), duration) /atom/proc/Stop_Shaking() update_appearance() diff --git a/code/__HELPERS/nameof.dm b/code/__HELPERS/nameof.dm new file mode 100644 index 00000000000..5a2fd60e710 --- /dev/null +++ b/code/__HELPERS/nameof.dm @@ -0,0 +1,11 @@ +/** + * NAMEOF: Compile time checked variable name to string conversion + * evaluates to a string equal to "X", but compile errors if X isn't a var on datum. + * datum may be null, but it does need to be a typed var. + **/ +#define NAMEOF(datum, X) (#X || ##datum.##X) + +/** + * NAMEOF that actually works in static definitions because src::type requires src to be defined + */ +#define NAMEOF_STATIC(datum, X) (nameof(type::##X)) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index a1ef1e3117a..acb356c2865 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -69,7 +69,7 @@ to_chat(mob_to_teleport, announcement) SEND_SOUND(mob_to_teleport, meeting_sound) //no preferences here, you must hear the funny sound mob_to_teleport.overlay_fullscreen("emergency_meeting", /atom/movable/screen/fullscreen/emergency_meeting, 1) - addtimer(CALLBACK(mob_to_teleport, /mob/.proc/clear_fullscreen, "emergency_meeting"), 3 SECONDS) + addtimer(CALLBACK(mob_to_teleport, TYPE_PROC_REF(/mob, clear_fullscreen), "emergency_meeting"), 3 SECONDS) if (is_station_level(mob_to_teleport.z)) //teleport the mob to the crew meeting var/turf/target diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 21dd707cbd2..004f48c0ee1 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -604,7 +604,7 @@ var/currrent_category var/datum/antagonist/previous_category - sortTim(all_antagonists, /proc/cmp_antag_category) + sortTim(all_antagonists, GLOBAL_PROC_REF(cmp_antag_category)) for(var/datum/antagonist/A in all_antagonists) if(!A.show_in_roundend) diff --git a/code/__HELPERS/sorts/InsertSort.dm b/code/__HELPERS/sorts/InsertSort.dm index 2d5ca408ce3..0a862cfe3b9 100644 --- a/code/__HELPERS/sorts/InsertSort.dm +++ b/code/__HELPERS/sorts/InsertSort.dm @@ -1,5 +1,5 @@ //simple insertion sort - generally faster than merge for runs of 7 or smaller -/proc/sortInsert(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex=0) +/proc/sortInsert(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 4692534edff..9787451b8f8 100644 --- a/code/__HELPERS/sorts/MergeSort.dm +++ b/code/__HELPERS/sorts/MergeSort.dm @@ -1,5 +1,5 @@ //merge-sort - gernerally faster than insert sort, for runs of 7 or larger -/proc/sortMerge(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex) +/proc/sortMerge(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 44f6d170df4..36df474d2d2 100644 --- a/code/__HELPERS/sorts/TimSort.dm +++ b/code/__HELPERS/sorts/TimSort.dm @@ -1,5 +1,5 @@ //TimSort interface -/proc/sortTim(list/L, cmp=/proc/cmp_numeric_asc, associative, fromIndex=1, toIndex=0) +/proc/sortTim(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 cc642998229..bdf91d3692e 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(sortInstance, /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/stat_tracking.dm b/code/__HELPERS/stat_tracking.dm index 007cd2695d0..525d1a8c844 100644 --- a/code/__HELPERS/stat_tracking.dm +++ b/code/__HELPERS/stat_tracking.dm @@ -1,4 +1,4 @@ -/proc/render_stats(list/stats, user, sort = /proc/cmp_generic_stat_item_time) +/proc/render_stats(list/stats, user, sort = GLOBAL_PROC_REF(cmp_generic_stat_item_time)) sortTim(stats, sort, TRUE) var/list/lines = list() diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 068b147b3d5..75526f7d86d 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -1,5 +1,5 @@ -#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitAdd, ##target, ##trait, ##source) -#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source) +#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitAdd), ##target, ##trait, ##source) +#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitRemove), ##target, ##trait, ##source) ///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback. /proc/___TraitAdd(target,trait,source) diff --git a/code/__HELPERS/varset_callback.dm b/code/__HELPERS/varset_callback.dm index 8748af5ebe8..54fc821cacc 100644 --- a/code/__HELPERS/varset_callback.dm +++ b/code/__HELPERS/varset_callback.dm @@ -1,9 +1,6 @@ -///datum may be null, but it does need to be a typed var -#define NAMEOF(datum, X) (#X || ##datum.##X) - -#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) //dupe code because dm can't handle 3 level deep macros -#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) /proc/___callbackvarset(list_or_datum, var_name, var_value) if(length(list_or_datum)) diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm new file mode 100644 index 00000000000..aa3eb3eca18 --- /dev/null +++ b/code/__byond_version_compat.dm @@ -0,0 +1,30 @@ +// This file contains defines allowing targeting byond versions newer than the supported + +//Update this whenever you need to take advantage of more recent byond features +#define MIN_COMPILER_VERSION 515 +#define MIN_COMPILER_BUILD 1630 +#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) +//Don't forget to update this part +#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. +#error You need version 515.1630 or higher +#endif + +// Keep savefile compatibilty at minimum supported level +/savefile/byond_version = MIN_COMPILER_VERSION + +// So we want to have compile time guarantees these methods exist on local type +// We use wrappers for this in case some part of the api ever changes, and to make their function more clear +// For the record: GLOBAL_VERB_REF would be useless as verbs can't be global. + +/// Call by name proc references, checks if the proc exists on either this type or as a global proc. +#define PROC_REF(X) (nameof(.proc/##X)) +/// Call by name verb references, checks if the verb exists on either this type or as a global verb. +#define VERB_REF(X) (nameof(.verb/##X)) + +/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc +#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X)) +/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb +#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X)) + +/// Call by name proc reference, checks if the proc is an existing global proc +#define GLOBAL_PROC_REF(X) (/proc/##X) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 9ce72621b59..0bc3833614b 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -68,21 +68,6 @@ #define FORCE_MAP_DIRECTORY "_maps" #endif -//Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 514 -#define MIN_COMPILER_BUILD 1556 -#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) -//Don't forget to update this part -#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 514.1556 or higher -#endif - -#if (DM_VERSION == 514 && DM_BUILD > 1575 && DM_BUILD <= 1577) -#error Your version of BYOND currently has a crashing issue that will prevent you from running Dream Daemon test servers. -#error We require developers to test their content, so an inability to test means we cannot allow the compile. -#error Please consider downgrading to 514.1575 or lower. -#endif - //Additional code for the above flags. #ifdef TESTING #warn compiling in TESTING mode. testing() debug messages will be visible. diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index db44740b9e3..7788aa03926 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -75,7 +75,7 @@ // animate(thealert, transform = matrix(), time = 2.5, easing = CUBIC_EASING) // MS disable screen obj easing in if(thealert.timeout) - addtimer(CALLBACK(src, .proc/alert_timeout, thealert, category), thealert.timeout) + addtimer(CALLBACK(src, PROC_REF(alert_timeout), thealert, category), thealert.timeout) thealert.timeout = world.time + thealert.timeout - world.tick_lag return thealert @@ -361,7 +361,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." add_overlay(receiving) src.receiving = receiving src.offerer = offerer - RegisterSignal(taker, COMSIG_MOVABLE_MOVED, .proc/check_in_range, override = TRUE) //Override to prevent runtimes when people offer a item multiple times + RegisterSignal(taker, COMSIG_MOVABLE_MOVED, PROC_REF(check_in_range), override = TRUE) //Override to prevent runtimes when people offer a item multiple times /atom/movable/screen/alert/give/Click(location, control, params) . = ..() @@ -390,7 +390,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." . = ..() name = "[offerer] is offering a high-five!" desc = "[offerer] is offering a high-five! Click this alert to slap it." - RegisterSignal(offerer, COMSIG_PARENT_EXAMINE_MORE, .proc/check_fake_out) + RegisterSignal(offerer, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out)) /atom/movable/screen/alert/give/highfive/handle_transfer() var/mob/living/carbon/taker = owner @@ -409,7 +409,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." offerer.visible_message(span_notice("[rube] rushes in to high-five [offerer], but-"), span_nicegreen("[rube] falls for your trick just as planned, lunging for a high-five that no longer exists! Classic!"), ignored_mobs=rube) to_chat(rube, span_nicegreen("You go in for [offerer]'s high-five, but-")) - addtimer(CALLBACK(src, .proc/too_slow_p2, offerer, rube), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(too_slow_p2), offerer, rube), 0.5 SECONDS) /// Part two of the ultimate prank /atom/movable/screen/alert/give/highfive/proc/too_slow_p2() @@ -445,7 +445,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." add_overlay(receiving) src.receiving = receiving src.offerer = offerer - RegisterSignal(taker, COMSIG_MOVABLE_MOVED, .proc/check_in_range, override = TRUE) //Override to prevent runtimes when people offer a item multiple times + RegisterSignal(taker, COMSIG_MOVABLE_MOVED, PROC_REF(check_in_range), override = TRUE) //Override to prevent runtimes when people offer a item multiple times /// Gives the player the option to succumb while in critical condition /atom/movable/screen/alert/succumb diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index a21293345f0..7dc57670b41 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -53,7 +53,7 @@ animate(src, transform = M, time = CREDIT_ROLL_SPEED) target = M animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(src, .proc/FadeOut), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION) + addtimer(CALLBACK(src, PROC_REF(FadeOut)), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION) QDEL_IN(src, CREDIT_ROLL_SPEED) if(parent) parent.screen += src diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index f3882e7054d..acbe5ccfc1d 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -25,7 +25,7 @@ if(animated) animate(screen, alpha = 0, time = animated) - addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(clear_fullscreen_after_animate), screen), animated, TIMER_CLIENT_TIME) else if(client) client.screen -= screen diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index caf977df587..4e0918f7692 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list( viewmob.hud_used.plane_masters_update() // MOJAVE SUN EDIT START - changes for HUD - INVOKE_ASYNC(screenmob.client, /client/.proc/setHudBarVisible ) + INVOKE_ASYNC(screenmob.client, TYPE_PROC_REF(/client, setHudBarVisible)) // MOJAVE SUN EDIT END - changes for HUD return TRUE diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index 373a4e1cda9..7b6d2c77604 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -111,10 +111,10 @@ . = ..() switch(SSticker.current_state) if(GAME_STATE_PREGAME, GAME_STATE_STARTUP) - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/hide_ready_button) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(hide_ready_button)) if(GAME_STATE_SETTING_UP) set_button_status(FALSE) - RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, .proc/show_ready_button) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(show_ready_button)) else set_button_status(FALSE) @@ -122,13 +122,13 @@ SIGNAL_HANDLER set_button_status(FALSE) UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, .proc/show_ready_button) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(show_ready_button)) /atom/movable/screen/lobby/button/ready/proc/show_ready_button() SIGNAL_HANDLER set_button_status(TRUE) UnregisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/hide_ready_button) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(hide_ready_button)) /atom/movable/screen/lobby/button/ready/Click(location, control, params) . = ..() @@ -156,10 +156,10 @@ . = ..() switch(SSticker.current_state) if(GAME_STATE_PREGAME, GAME_STATE_STARTUP) - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/show_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(show_join_button)) if(GAME_STATE_SETTING_UP) set_button_status(TRUE) - RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, .proc/hide_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(hide_join_button)) else set_button_status(TRUE) @@ -200,13 +200,13 @@ SIGNAL_HANDLER set_button_status(TRUE) UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, .proc/hide_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(hide_join_button)) /atom/movable/screen/lobby/button/join/proc/hide_join_button() SIGNAL_HANDLER set_button_status(FALSE) UnregisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/show_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(show_join_button)) /atom/movable/screen/lobby/button/observe screen_loc = "TOP:-40,CENTER:-54" @@ -220,7 +220,7 @@ if(SSticker.current_state > GAME_STATE_STARTUP) set_button_status(TRUE) else - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, .proc/enable_observing) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, PROC_REF(enable_observing)) /atom/movable/screen/lobby/button/observe/Click(location, control, params) . = ..() @@ -233,7 +233,7 @@ SIGNAL_HANDLER flick("[base_icon_state]_enabled", src) set_button_status(TRUE) - UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, .proc/enable_observing) + UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, PROC_REF(enable_observing)) /atom/movable/screen/lobby/button/settings icon = 'icons/hud/lobby/bottom_buttons.dmi' diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index 47cb3645cf3..f8dd64cab2a 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -134,7 +134,7 @@ C.parallax_movedir = new_parallax_movedir if (C.parallax_animate_timer) deltimer(C.parallax_animate_timer) - var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform) + var/datum/callback/CB = CALLBACK(src, PROC_REF(update_parallax_motionblur), C, animatedir, new_parallax_movedir, newtransform) if(skip_windups) CB.Invoke() else diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index c67a45136a7..7fa05923664 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(radial_menus) UnregisterSignal(parent, COMSIG_PARENT_QDELETING) parent = new_value if(parent) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/handle_parent_del) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del)) /atom/movable/screen/radial/proc/handle_parent_del() SIGNAL_HANDLER diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index ecce267c496..3ea7f8a1b7d 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -793,7 +793,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) /atom/movable/screen/combo/proc/clear_streak() animate(src, alpha = 0, 2 SECONDS, SINE_EASING) - timerid = addtimer(CALLBACK(src, .proc/reset_icons), 2 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_icons)), 2 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) /atom/movable/screen/combo/proc/reset_icons() cut_overlays() @@ -806,7 +806,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) alpha = 255 if(!streak) return ..() - timerid = addtimer(CALLBACK(src, .proc/clear_streak), time, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(clear_streak)), time, TIMER_UNIQUE | TIMER_STOPPABLE) icon_state = "combo" for(var/i = 1; i <= length(streak); ++i) var/intent_text = copytext(streak, i, i + 1) diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm index 2e6b1f3a598..7a79c72a972 100644 --- a/code/controllers/admin.dm +++ b/code/controllers/admin.dm @@ -11,7 +11,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick) name = text src.target = target if(istype(target, /datum)) //Harddel man bad - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/cleanup) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(cleanup)) /obj/effect/statclick/Destroy() target = null @@ -70,22 +70,22 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick) if(!holder) return - + var/list/controllers = list() var/list/controller_choices = list() - + for (var/datum/controller/controller in world) if (istype(controller, /datum/controller/subsystem)) continue controllers["[controller] (controller.type)"] = controller //we use an associated list to ensure clients can't hold references to controllers controller_choices += "[controller] (controller.type)" - + var/datum/controller/controller_string = input("Select controller to debug", "Debug Controller") as null|anything in controller_choices var/datum/controller/controller = controllers[controller_string] - + if (!istype(controller)) return debug_variables(controller) - + SSblackbox.record_feedback("tally", "admin_verb", 1, "Restart Failsafe Controller") message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 99d1c3270d3..35eb07c5b47 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -62,7 +62,7 @@ . &= !(protection & CONFIG_ENTRY_HIDDEN) /datum/config_entry/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list(NAMEOF(src, name), NAMEOF(src, vv_VAS), NAMEOF(src, default), NAMEOF(src, resident_file), NAMEOF(src, protection), NAMEOF(src, abstract_type), NAMEOF(src, modified), NAMEOF(src, dupes_allowed)) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed)) if(var_name == NAMEOF(src, config_entry_value)) if(protection & CONFIG_ENTRY_LOCKED) return FALSE @@ -129,7 +129,7 @@ return FALSE /datum/config_entry/number/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list(NAMEOF(src, max_val), NAMEOF(src, min_val), NAMEOF(src, integer)) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer)) return !(var_name in banned_edits) && ..() /datum/config_entry/flag diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index fd0eb3551a6..426efbc6454 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -379,13 +379,13 @@ Example config: return log_config("Loading config file word_filter.toml...") - - var/list/word_filter = rustg_read_toml_file("[directory]/word_filter.toml") - if (!islist(word_filter)) - var/message = "The word filter configuration did not output a list, contact someone with configuration access to make sure it's setup properly." + var/list/result = rustg_raw_read_toml_file("[directory]/word_filter.toml") + if(!result["success"]) + var/message = "The word filter is not configured correctly! [result["content"]]" log_config(message) DelayedMessageAdmins(message) return + var/list/word_filter = json_decode(result["content"]) ic_filter_reasons = try_extract_from_word_filter(word_filter, "ic") ic_outside_pda_filter_reasons = try_extract_from_word_filter(word_filter, "ic_outside_pda") @@ -470,4 +470,4 @@ Example config: //Message admins when you can. /datum/controller/configuration/proc/DelayedMessageAdmins(text) - addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 04b88eb3be2..43127b17779 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -148,7 +148,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) /proc/recover_all_SS_and_recreate_master() del(Master) var/list/subsytem_types = subtypesof(/datum/controller/subsystem) - sortTim(subsytem_types, /proc/cmp_subsystem_init) + sortTim(subsytem_types, GLOBAL_PROC_REF(cmp_subsystem_init)) for(var/I in subsytem_types) new I . = Recreate_MC() diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 88dadb8b52e..510474bf193 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -102,14 +102,14 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //Code used for first master on game boot or if existing master got deleted Master = src var/list/subsystem_types = subtypesof(/datum/controller/subsystem) - sortTim(subsystem_types, /proc/cmp_subsystem_init) + sortTim(subsystem_types, GLOBAL_PROC_REF(cmp_subsystem_init)) //Find any abandoned subsystem from the previous master (if there was any) var/list/existing_subsystems = list() for(var/global_var in global.vars) if (istype(global.vars[global_var], /datum/controller/subsystem)) existing_subsystems += global.vars[global_var] - + //Either init a new SS or if an existing one was found use that for(var/I in subsystem_types) var/ss_idx = existing_subsystems.Find(I) @@ -128,7 +128,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master/Shutdown() processing = FALSE - sortTim(subsystems, /proc/cmp_subsystem_init) + sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) reverse_range(subsystems) for(var/datum/controller/subsystem/ss in subsystems) log_world("Shutting down [ss.name] subsystem...") @@ -212,7 +212,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. - sortTim(subsystems, /proc/cmp_subsystem_init) + sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) var/start_timeofday = REALTIMEOFDAY // Initialize subsystems. @@ -235,7 +235,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new SetRunLevel(1) // Sort subsystems by display setting for easy access. - sortTim(subsystems, /proc/cmp_subsystem_display) + sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display)) // Set world options. world.change_fps(CONFIG_GET(number/fps)) var/initialized_tod = REALTIMEOFDAY @@ -320,9 +320,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new queue_tail = null //these sort by lower priorities first to reduce the number of loops needed to add subsequent SS's to the queue //(higher subsystems will be sooner in the queue, adding them later in the loop means we don't have to loop thru them next queue add) - sortTim(tickersubsystems, /proc/cmp_subsystem_priority) + sortTim(tickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority)) for(var/I in runlevel_sorted_subsystems) - sortTim(runlevel_sorted_subsystems, /proc/cmp_subsystem_priority) + sortTim(I, GLOBAL_PROC_REF(cmp_subsystem_priority)) I += tickersubsystems var/cached_runlevel = current_runlevel diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 922e65e0e74..6c76e99f83b 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(augury) /datum/controller/subsystem/augury/proc/register_doom(atom/A, severity) doombringers[A] = severity - RegisterSignal(A, COMSIG_PARENT_QDELETING, .proc/unregister_doom) + RegisterSignal(A, COMSIG_PARENT_QDELETING, PROC_REF(unregister_doom)) /datum/controller/subsystem/augury/proc/unregister_doom(atom/A) SIGNAL_HANDLER diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 5902d7f02d4..d7cb6807288 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -327,9 +327,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/eigenstate.dm b/code/controllers/subsystem/eigenstate.dm index b6a01265f05..5d013907292 100644 --- a/code/controllers/subsystem/eigenstate.dm +++ b/code/controllers/subsystem/eigenstate.dm @@ -37,10 +37,10 @@ SUBSYSTEM_DEF(eigenstates) for(var/atom/target as anything in targets) eigen_targets["[id_counter]"] += target eigen_id[target] = "[id_counter]" - RegisterSignal(target, COMSIG_CLOSET_INSERT, .proc/use_eigenlinked_atom) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/remove_eigen_entry) - RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/tool_interact) - target.RegisterSignal(target, COMSIG_EIGENSTATE_ACTIVATE, /obj/structure/closet/proc/bust_open) + RegisterSignal(target, COMSIG_CLOSET_INSERT, PROC_REF(use_eigenlinked_atom)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_eigen_entry)) + RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(tool_interact)) + target.RegisterSignal(target, COMSIG_EIGENSTATE_ACTIVATE, TYPE_PROC_REF(/obj/structure/closet, bust_open)) ADD_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, src) var/obj/item = target if(item) diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index a7e5a40ac98..07dcb71ca9e 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -145,7 +145,7 @@ SUBSYSTEM_DEF(explosions) else continue - addtimer(CALLBACK(GLOBAL_PROC, .proc/wipe_color_and_text, wipe_colours), 100) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(wipe_color_and_text), wipe_colours), 100) /proc/wipe_color_and_text(list/atom/wiping) for(var/i in wiping) @@ -552,7 +552,7 @@ SUBSYSTEM_DEF(explosions) listener.playsound_local(epicenter, null, echo_volume, TRUE, frequency, S = echo_sound, distance_multiplier = 0) if(creaking) // 5 seconds after the bang, the station begins to creak - addtimer(CALLBACK(listener, /mob/proc/playsound_local, epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), TRUE, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY) + addtimer(CALLBACK(listener, TYPE_PROC_REF(/mob, playsound_local), epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), TRUE, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY) #undef CREAK_DELAY #undef QUAKE_CREAK_PROB diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 238103bd07c..ae2d34bab91 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -84,7 +84,7 @@ SUBSYSTEM_DEF(garbage) var/list/dellog = list() //sort by how long it's wasted hard deleting - sortTim(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE) + sortTim(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]" @@ -194,11 +194,11 @@ SUBSYSTEM_DEF(garbage) if (GC_QUEUE_CHECK) #ifdef REFERENCE_TRACKING if(reference_find_on_fail[refID]) - INVOKE_ASYNC(D, /datum/proc/find_references) + INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references)) ref_searching = TRUE #ifdef GC_FAILURE_HARD_LOOKUP else - INVOKE_ASYNC(D, /datum/proc/find_references) + INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references)) ref_searching = TRUE #endif reference_find_on_fail -= refID diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index ed0ad90c795..529634d9ab3 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -139,22 +139,22 @@ SUBSYSTEM_DEF(job) new_joinable_departments_by_type[department_type] = department department.add_job(job) - sortTim(new_all_occupations, /proc/cmp_job_display_asc) + sortTim(new_all_occupations, GLOBAL_PROC_REF(cmp_job_display_asc)) for(var/datum/job/job as anything in new_all_occupations) if(!job.exp_granted_type) continue new_experience_jobs_map[job.exp_granted_type] += list(job) - sortTim(new_joinable_departments_by_type, /proc/cmp_department_display_asc, associative = TRUE) + sortTim(new_joinable_departments_by_type, GLOBAL_PROC_REF(cmp_department_display_asc), associative = TRUE) for(var/department_type in new_joinable_departments_by_type) var/datum/job_department/department = new_joinable_departments_by_type[department_type] - sortTim(department.department_jobs, /proc/cmp_job_display_asc) + sortTim(department.department_jobs, GLOBAL_PROC_REF(cmp_job_display_asc)) new_joinable_departments += department if(department.department_experience_type) new_experience_jobs_map[department.department_experience_type] = department.department_jobs.Copy() all_occupations = new_all_occupations - joinable_occupations = sortTim(new_joinable_occupations, /proc/cmp_job_display_asc) + joinable_occupations = sortTim(new_joinable_occupations, GLOBAL_PROC_REF(cmp_job_display_asc)) joinable_departments = new_joinable_departments joinable_departments_by_type = new_joinable_departments_by_type experience_jobs_map = new_experience_jobs_map @@ -660,7 +660,7 @@ SUBSYSTEM_DEF(job) var/oldjobs = SSjob.all_occupations sleep(20) for (var/datum/job/job as anything in oldjobs) - INVOKE_ASYNC(src, .proc/RecoverJob, job) + INVOKE_ASYNC(src, PROC_REF(RecoverJob), job) /datum/controller/subsystem/job/proc/RecoverJob(datum/job/J) var/datum/job/newjob = GetJob(J.title) diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm index 0c3780750ea..600409b08d0 100644 --- a/code/controllers/subsystem/lag_switch.dm +++ b/code/controllers/subsystem/lag_switch.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(lag_switch) if(auto_switch_pop) auto_switch = TRUE trigger_pop = auto_switch_pop - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected)) return ..() /datum/controller/subsystem/lag_switch/proc/client_connected(datum/source, client/connected) @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(lag_switch) auto_switch = FALSE UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT) - veto_timer_id = addtimer(CALLBACK(src, .proc/set_all_measures, TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE) + veto_timer_id = addtimer(CALLBACK(src, PROC_REF(set_all_measures), TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE) message_admins("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds. (CANCEL)") log_admin("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds.") @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(lag_switch) /datum/controller/subsystem/lag_switch/proc/toggle_auto_enable() auto_switch = !auto_switch if(auto_switch) - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected)) else UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 0a19cc60089..ba12919d897 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -127,7 +127,7 @@ SUBSYSTEM_DEF(mapping) setup_map_transitions() generate_station_area_list() initialize_reserved_level(transit.z_value) - SSticker.OnRoundstart(CALLBACK(src, .proc/spawn_maintenance_loot)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(spawn_maintenance_loot))) return ..() /datum/controller/subsystem/mapping/proc/wipe_reservations(wipe_safety_delay = 100) @@ -147,7 +147,7 @@ SUBSYSTEM_DEF(mapping) message_admins("Shuttles in transit detected. Attempting to fast travel. Timeout is [wipe_safety_delay/10] seconds.") var/list/cleared = list() for(var/i in in_transit) - INVOKE_ASYNC(src, .proc/safety_clear_transit_dock, i, in_transit[i], cleared) + INVOKE_ASYNC(src, PROC_REF(safety_clear_transit_dock), i, in_transit[i], cleared) UNTIL((go_ahead < world.time) || (cleared.len == in_transit.len)) do_wipe_turf_reservations() clearing_reserved_turfs = FALSE @@ -415,7 +415,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) banned += generateMapList("spaceruinblacklist.txt") banned += generateMapList("iceruinblacklist.txt") - for(var/item in sort_list(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority)) + for(var/item in sort_list(subtypesof(/datum/map_template/ruin), GLOBAL_PROC_REF(cmp_ruincost_priority))) var/datum/map_template/ruin/ruin_type = item // screen out the abstract subtypes if(!initial(ruin_type.id)) diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 244ba96fde9..8fc94b7625f 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(materials) for(var/x in materials_declaration) var/datum/material/mat = x combo_params += "[istype(mat) ? mat.id : mat]=[materials_declaration[mat] * multiplier]" - sortTim(combo_params, /proc/cmp_text_asc) // We have to sort now in case the declaration was not in order + sortTim(combo_params, GLOBAL_PROC_REF(cmp_text_asc)) // We have to sort now in case the declaration was not in order var/combo_index = combo_params.Join("-") var/list/combo = material_combos[combo_index] if(!combo) diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm index d1ea92376fd..2b32eec043f 100644 --- a/code/controllers/subsystem/movement/movement_types.dm +++ b/code/controllers/subsystem/movement/movement_types.dm @@ -31,7 +31,7 @@ src.controller = controller src.extra_info = extra_info if(extra_info) - RegisterSignal(extra_info, COMSIG_PARENT_QDELETING, .proc/info_deleted) + RegisterSignal(extra_info, COMSIG_PARENT_QDELETING, PROC_REF(info_deleted)) src.moving = moving src.priority = priority src.flags = flags @@ -216,7 +216,7 @@ target = chasing if(!isturf(target)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/handle_no_target) //Don't do this for turfs, because we don't care + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_no_target)) //Don't do this for turfs, because we don't care /datum/move_loop/has_target/Destroy() target = null @@ -340,11 +340,11 @@ src.avoid = avoid src.skip_first = skip_first if(istype(id, /obj/item/card/id)) - RegisterSignal(id, COMSIG_PARENT_QDELETING, .proc/handle_no_id) //I prefer erroring to harddels. If this breaks anything consider making id info into a datum or something + RegisterSignal(id, COMSIG_PARENT_QDELETING, PROC_REF(handle_no_id)) //I prefer erroring to harddels. If this breaks anything consider making id info into a datum or something /datum/move_loop/has_target/jps/start_loop() . = ..() - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) /datum/move_loop/has_target/jps/Destroy() id = null //Kill me @@ -365,7 +365,7 @@ /datum/move_loop/has_target/jps/move() if(!length(movement_path)) - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) if(!length(movement_path)) return FALSE @@ -379,7 +379,7 @@ if(get_turf(moving) == next_step) movement_path.Cut(1,2) else - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) return FALSE @@ -533,8 +533,8 @@ if(home) if(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/update_slope) //If it can move, update your slope when it does - RegisterSignal(moving, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(update_slope)) //If it can move, update your slope when it does + RegisterSignal(moving, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) update_slope() /datum/move_loop/has_target/move_towards/Destroy() diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 3c66d28dc15..96709b7d6d3 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(pai) to_chat(user, span_notice("You have requested pAI assistance.")) var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/aicards.dmi', "pai") notify_ghosts("[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.", source=user, alert_overlay = alert_overlay, action=NOTIFY_ORBIT, header="pAI Request!", ignore_key = POLL_IGNORE_PAI) - addtimer(CALLBACK(src, .proc/request_again), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(request_again)), 10 SECONDS) return TRUE /** @@ -144,7 +144,7 @@ SUBSYSTEM_DEF(pai) if(!paicard.pai) paicard.alertUpdate() to_chat(usr, span_notice("Your pAI candidacy has been submitted!")) - addtimer(CALLBACK(src, .proc/submit_again), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(submit_again)), 10 SECONDS) return TRUE /datum/controller/subsystem/pai/proc/request_again() diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index 26f54245732..12ed31d0af7 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -29,7 +29,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/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index ac9b891a7d5..f4f211edbe3 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -42,7 +42,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) /datum/controller/subsystem/processing/quirks/proc/SetupQuirks() // Sort by Positive, Negative, Neutral; and then by name - var/list/quirk_list = sort_list(subtypesof(/datum/quirk), /proc/cmp_quirk_asc) + var/list/quirk_list = sort_list(subtypesof(/datum/quirk), GLOBAL_PROC_REF(cmp_quirk_asc)) for(var/type in quirk_list) var/datum/quirk/quirk_type = type diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index b378b7fb19d..cae0f795b8c 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -238,10 +238,10 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/block_recall(lockout_timer) if(admin_emergency_no_recall) priority_announce("Error!", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg') - addtimer(CALLBACK(src, .proc/unblock_recall), lockout_timer) + addtimer(CALLBACK(src, PROC_REF(unblock_recall)), lockout_timer) return emergency_no_recall = TRUE - addtimer(CALLBACK(src, .proc/unblock_recall), lockout_timer) + addtimer(CALLBACK(src, PROC_REF(unblock_recall)), lockout_timer) /datum/controller/subsystem/shuttle/proc/unblock_recall() if(admin_emergency_no_recall) diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm index dedec6cd910..d6d469f8a06 100644 --- a/code/controllers/subsystem/spatial_gridmap.dm +++ b/code/controllers/subsystem/spatial_gridmap.dm @@ -136,12 +136,12 @@ SUBSYSTEM_DEF(spatial_grid) pregenerate_more_oranges_ears(NUMBER_OF_PREGENERATED_ORANGES_EARS) - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, .proc/propogate_spatial_grid_to_new_z) - RegisterSignal(SSdcs, COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, .proc/after_world_bounds_expanded) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(propogate_spatial_grid_to_new_z)) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, PROC_REF(after_world_bounds_expanded)) ///add a movable to the pre init queue for whichever type is specified so that when the subsystem initializes they get added to the grid /datum/controller/subsystem/spatial_grid/proc/enter_pre_init_queue(atom/movable/waiting_movable, type) - RegisterSignal(waiting_movable, COMSIG_PARENT_PREQDELETED, .proc/queued_item_deleted, override = TRUE) + RegisterSignal(waiting_movable, COMSIG_PARENT_PREQDELETED, PROC_REF(queued_item_deleted), override = TRUE) //override because something can enter the queue for two different types but that is done through unrelated procs that shouldnt know about eachother waiting_to_add_by_type[type] += waiting_movable diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 0dcaff6435d..08f75f2b63a 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(statpanels) var/turf_content_ref = REF(turf_content) if(!(turf_content_ref in cached_images)) cached_images += turf_content_ref - turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, /atom/.proc/remove_from_cache) // we reset cache if anything in it gets deleted + turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/atom, remove_from_cache)) // we reset cache if anything in it gets deleted if(ismob(turf_content) || length(turf_content.overlays) > 2) turfitems[++turfitems.len] = list("[turf_content.name]", turf_content_ref, costly_icon2html(turf_content, target, sourceonly=TRUE)) diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 4516d5aa049..62f4cf5429b 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -92,7 +92,7 @@ SUBSYSTEM_DEF(throwing) /datum/thrownthing/New(thrownthing, target, init_dir, maxrange, speed, thrower, diagonals_first, force, gentle, callback, target_zone) . = ..() src.thrownthing = thrownthing - RegisterSignal(thrownthing, COMSIG_PARENT_QDELETING, .proc/on_thrownthing_qdel) + RegisterSignal(thrownthing, COMSIG_PARENT_QDELETING, PROC_REF(on_thrownthing_qdel)) src.target_turf = get_turf(target) if(target_turf != target) src.initial_target = WEAKREF(target) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 6c139e6e317..5a619f1d563 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -407,7 +407,7 @@ SUBSYSTEM_DEF(ticker) captainless = FALSE var/acting_captain = !is_captain_job(player_assigned_role) SSjob.promote_to_captain(new_player_living, acting_captain) - OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, player_assigned_role.get_captaincy_announcement(new_player_living))) + OnRoundstart(CALLBACK(GLOBAL_PROC, PROC_REF(minor_announce), player_assigned_role.get_captaincy_announcement(new_player_living))) if((player_assigned_role.job_flags & JOB_ASSIGN_QUIRKS) && ishuman(new_player_living) && CONFIG_GET(flag/roundstart_traits)) if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind)) new_player_mob.client.prefs.hardcore_random_setup(new_player_living) @@ -461,7 +461,7 @@ SUBSYSTEM_DEF(ticker) living.client.init_verbs() livings += living if(livings.len) - addtimer(CALLBACK(src, .proc/release_characters, livings), 30, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(release_characters), livings), 30, TIMER_CLIENT_TIME) /datum/controller/subsystem/ticker/proc/release_characters(list/livings) for(var/I in livings) @@ -506,7 +506,7 @@ SUBSYSTEM_DEF(ticker) return if(world.time - SSticker.round_start_time < 10 MINUTES) //Not forcing map rotation for very short rounds. return - INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) + INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, maprotate)) /datum/controller/subsystem/ticker/proc/HasRoundStarted() return current_state >= GAME_STATE_PLAYING diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 5e548c1a8c7..6a9f64484a3 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -277,7 +277,7 @@ SUBSYSTEM_DEF(timer) return // Sort all timers by time to run - sortTim(alltimers, .proc/cmp_timer) + sortTim(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/traitor.dm b/code/controllers/subsystem/traitor.dm index db9e687e9ec..a0244439bc3 100644 --- a/code/controllers/subsystem/traitor.dm +++ b/code/controllers/subsystem/traitor.dm @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(traitor) uplink_handlers |= uplink_handler // An uplink handler can be registered multiple times if they get assigned to new uplinks, so // override is set to TRUE here because it is intentional that they could get added multiple times. - RegisterSignal(uplink_handler, COMSIG_PARENT_QDELETING, .proc/uplink_handler_deleted, override = TRUE) + RegisterSignal(uplink_handler, COMSIG_PARENT_QDELETING, PROC_REF(uplink_handler_deleted), override = TRUE) /datum/controller/subsystem/traitor/proc/uplink_handler_deleted(datum/uplink_handler/uplink_handler) SIGNAL_HANDLER diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 8afd2550f89..a25401d817e 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(weather) run_weather(our_event, list(text2num(z))) eligible_zlevels -= z var/randTime = rand(3000, 6000) - next_hit_by_zlevel["[z]"] = addtimer(CALLBACK(src, .proc/make_eligible, z, possible_weather), randTime + initial(our_event.weather_duration_upper), TIMER_UNIQUE|TIMER_STOPPABLE) //Around 5-10 minutes between weathers + next_hit_by_zlevel["[z]"] = addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(our_event.weather_duration_upper), TIMER_UNIQUE|TIMER_STOPPABLE) //Around 5-10 minutes between weathers /datum/controller/subsystem/weather/Initialize(start_timeofday) for(var/V in subtypesof(/datum/weather)) diff --git a/code/datums/action.dm b/code/datums/action.dm index cb55f77cdbf..ec17393ea7d 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -28,8 +28,8 @@ /datum/action/proc/link_to(Target) target = Target - RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/OnUpdatedIcon) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE) + RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(OnUpdatedIcon)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref), override = TRUE) /datum/action/Destroy() if(owner) @@ -45,7 +45,7 @@ return Remove(owner) owner = M - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref), override = TRUE) //button id generation var/counter = 0 @@ -93,7 +93,7 @@ if(owner) UnregisterSignal(owner, COMSIG_PARENT_QDELETING) if(target == owner) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_ref) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref)) owner = null if(button) button.moved = FALSE //so the button appears in its normal position when given to another owner. @@ -314,7 +314,7 @@ /datum/action/item_action/toggle_spacesuit/New(Target) . = ..() - RegisterSignal(target, COMSIG_SUIT_SPACE_TOGGLE, .proc/toggle) + RegisterSignal(target, COMSIG_SUIT_SPACE_TOGGLE, PROC_REF(toggle)) /datum/action/item_action/toggle_spacesuit/Destroy() UnregisterSignal(target, COMSIG_SUIT_SPACE_TOGGLE) @@ -581,7 +581,7 @@ /datum/action/item_action/agent_box/Grant(mob/M) . = ..() if(owner) - RegisterSignal(owner, COMSIG_HUMAN_SUICIDE_ACT, .proc/suicide_act) + RegisterSignal(owner, COMSIG_HUMAN_SUICIDE_ACT, PROC_REF(suicide_act)) /datum/action/item_action/agent_box/Remove(mob/M) if(owner) diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm index de2330673f0..b578fcafbdf 100644 --- a/code/datums/actions/mobs/charge.dm +++ b/code/datums/actions/mobs/charge.dm @@ -62,9 +62,9 @@ charging += charger SEND_SIGNAL(owner, COMSIG_STARTED_CHARGE) - RegisterSignal(charger, COMSIG_MOVABLE_BUMP, .proc/on_bump) - RegisterSignal(charger, COMSIG_MOVABLE_PRE_MOVE, .proc/on_move) - RegisterSignal(charger, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(charger, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump)) + RegisterSignal(charger, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(on_move)) + RegisterSignal(charger, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) DestroySurroundings(charger) charger.setDir(dir) do_charge_indicator(charger, target) @@ -76,11 +76,11 @@ var/datum/move_loop/new_loop = SSmove_manager.home_onto(charger, target, delay = charge_speed, timeout = time_to_hit, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) if(!new_loop) return - RegisterSignal(new_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(new_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, .proc/charge_end) + RegisterSignal(new_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(new_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, PROC_REF(charge_end)) if(ismob(charger)) - RegisterSignal(charger, COMSIG_MOB_STATCHANGE, .proc/stat_changed) + RegisterSignal(charger, COMSIG_MOB_STATCHANGE, PROC_REF(stat_changed)) // Yes this is disgusting. But we need to queue this stuff, and this code just isn't setup to support that right now. So gotta do it with sleeps sleep(time_to_hit + charge_speed) @@ -121,12 +121,12 @@ if(!actively_moving) return COMPONENT_MOVABLE_BLOCK_PRE_MOVE new /obj/effect/temp_visual/decoy/fading(source.loc, source) - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) /datum/action/cooldown/mob_cooldown/charge/proc/on_moved(atom/source) SIGNAL_HANDLER playsound(source, 'sound/effects/meteorimpact.ogg', 200, TRUE, 2, TRUE) - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) /datum/action/cooldown/mob_cooldown/charge/proc/DestroySurroundings(atom/movable/charger) if(!destroy_objects) @@ -165,7 +165,7 @@ if(isobj(target) && target.density) SSexplosions.med_mov_atom += target - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) hit_target(source, target, charge_damage) /datum/action/cooldown/mob_cooldown/charge/proc/hit_target(atom/movable/source, atom/target, damage_dealt) diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm index f3df8f86df1..6a3b851e1ac 100644 --- a/code/datums/actions/mobs/fire_breath.dm +++ b/code/datums/actions/mobs/fire_breath.dm @@ -40,7 +40,7 @@ /datum/action/cooldown/mob_cooldown/fire_breath/cone/attack_sequence(atom/target) playsound(owner.loc, fire_sound, 200, TRUE) for(var/offset in angles) - INVOKE_ASYNC(src, .proc/fire_line, target, offset) + INVOKE_ASYNC(src, PROC_REF(fire_line), target, offset) /datum/action/cooldown/mob_cooldown/fire_breath/mass_fire name = "Mass Fire" @@ -58,6 +58,6 @@ playsound(owner.loc, fire_sound, 200, TRUE) var/increment = 360 / spiral_count for(var/j = 1 to spiral_count) - INVOKE_ASYNC(src, .proc/fire_line, target, j * increment + i * increment / 2) + INVOKE_ASYNC(src, PROC_REF(fire_line), target, j * increment + i * increment / 2) SLEEP_CHECK_DEATH(delay_time, owner) diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm index 220e44d28b2..b6cf426439c 100644 --- a/code/datums/actions/mobs/lava_swoop.dm +++ b/code/datums/actions/mobs/lava_swoop.dm @@ -31,7 +31,7 @@ if(enraged) swoop_attack(target, TRUE) return - INVOKE_ASYNC(src, .proc/lava_pools, target) + INVOKE_ASYNC(src, PROC_REF(lava_pools), target) swoop_attack(target) /datum/action/cooldown/mob_cooldown/lava_swoop/proc/swoop_attack(atom/target, lava_arena = FALSE) @@ -211,7 +211,7 @@ /obj/effect/temp_visual/dragon_flight/Initialize(mapload, negative) . = ..() - INVOKE_ASYNC(src, .proc/flight, negative) + INVOKE_ASYNC(src, PROC_REF(flight), negative) /obj/effect/temp_visual/dragon_flight/proc/flight(negative) if(negative) diff --git a/code/datums/actions/mobs/projectileattack.dm b/code/datums/actions/mobs/projectileattack.dm index dba06851d30..9f2f1051356 100644 --- a/code/datums/actions/mobs/projectileattack.dm +++ b/code/datums/actions/mobs/projectileattack.dm @@ -97,7 +97,7 @@ /datum/action/cooldown/mob_cooldown/projectile_attack/rapid_fire/shrapnel/attack_sequence(mob/living/firer, atom/target) for(var/i in 1 to shot_count) var/obj/projectile/to_explode = shoot_projectile(firer, target, null, firer, rand(-default_projectile_spread, default_projectile_spread), null) - addtimer(CALLBACK(src, .proc/explode_into_shrapnel, firer, target, to_explode), break_time) + addtimer(CALLBACK(src, PROC_REF(explode_into_shrapnel), firer, target, to_explode), break_time) SLEEP_CHECK_DEATH(shot_delay, src) /datum/action/cooldown/mob_cooldown/projectile_attack/rapid_fire/shrapnel/proc/explode_into_shrapnel(mob/living/firer, atom/target, obj/projectile/to_explode) @@ -122,7 +122,7 @@ /datum/action/cooldown/mob_cooldown/projectile_attack/spiral_shots/attack_sequence(mob/living/firer, atom/target) if(enraged) SLEEP_CHECK_DEATH(1 SECONDS, firer) - INVOKE_ASYNC(src, .proc/create_spiral_attack, firer, target, TRUE) + INVOKE_ASYNC(src, PROC_REF(create_spiral_attack), firer, target, TRUE) create_spiral_attack(firer, target, FALSE) return create_spiral_attack(firer, target) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 9298ff91b3e..1e0f3c8d55d 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -104,7 +104,7 @@ multiple modular subtrees with behaviors else set_ai_status(AI_STATUS_ON) - RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) ///Abstract proc for initializing the pawn to the new controller /datum/ai_controller/proc/TryPossessPawn(atom/new_pawn) @@ -248,13 +248,13 @@ multiple modular subtrees with behaviors UnregisterSignal(pawn, COMSIG_MOB_LOGIN) if(!continue_processing_when_client) set_ai_status(AI_STATUS_OFF) //Can't do anything while player is connected - RegisterSignal(pawn, COMSIG_MOB_LOGOUT, .proc/on_sentience_lost) + RegisterSignal(pawn, COMSIG_MOB_LOGOUT, PROC_REF(on_sentience_lost)) /datum/ai_controller/proc/on_sentience_lost() SIGNAL_HANDLER UnregisterSignal(pawn, COMSIG_MOB_LOGOUT) set_ai_status(AI_STATUS_ON) //Can't do anything while player is connected - RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) /// Use this proc to define how your controller defines what access the pawn has for the sake of pathfinding, likely pointing to whatever ID slot is relevant /datum/ai_controller/proc/get_access() diff --git a/code/datums/ai/basic_mobs/base_basic_controller.dm b/code/datums/ai/basic_mobs/base_basic_controller.dm index cc74b412105..ad50572c39f 100644 --- a/code/datums/ai/basic_mobs/base_basic_controller.dm +++ b/code/datums/ai/basic_mobs/base_basic_controller.dm @@ -8,7 +8,7 @@ update_speed(basic_mob) - RegisterSignal(basic_mob, POST_BASIC_MOB_UPDATE_VARSPEED, .proc/update_speed) + RegisterSignal(basic_mob, POST_BASIC_MOB_UPDATE_VARSPEED, PROC_REF(update_speed)) return ..() //Run parent at end diff --git a/code/datums/ai/cursed/cursed_controller.dm b/code/datums/ai/cursed/cursed_controller.dm index 11501a3f9fb..44177b2761c 100644 --- a/code/datums/ai/cursed/cursed_controller.dm +++ b/code/datums/ai/cursed/cursed_controller.dm @@ -18,8 +18,8 @@ /datum/ai_controller/cursed/TryPossessPawn(atom/new_pawn) if(!isitem(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_MOVABLE_IMPACT, .proc/on_throw_hit) - RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(new_pawn, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_hit)) + RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) return ..() //Run parent at end /datum/ai_controller/cursed/UnpossessPawn() @@ -32,12 +32,12 @@ if(!iscarbon(hit_atom)) return //equipcode has sleeps all over it. - INVOKE_ASYNC(src, .proc/try_equipping_to_target_slot, hit_atom) + INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), hit_atom) ///signal called by picking up the pawn, will try to equip to where it should actually be and start the curse /datum/ai_controller/cursed/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_equipping_to_target_slot, equipper, slot) + INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), equipper, slot) /** * curse of hunger component; for very hungry items. diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 744bf3891de..3550a503c2c 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -25,11 +25,11 @@ if(!isliving(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, .proc/on_examined) - RegisterSignal(new_pawn, COMSIG_CLICK_ALT, .proc/check_altclicked) - RegisterSignal(new_pawn, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), .proc/on_death) - RegisterSignal(SSdcs, COMSIG_GLOB_CARBON_THROW_THING, .proc/listened_throw) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + RegisterSignal(new_pawn, COMSIG_CLICK_ALT, PROC_REF(check_altclicked)) + RegisterSignal(new_pawn, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(on_death)) + RegisterSignal(SSdcs, COMSIG_GLOB_CARBON_THROW_THING, PROC_REF(listened_throw)) return ..() //Run parent at end /datum/ai_controller/dog/UnpossessPawn(destroy) @@ -70,7 +70,7 @@ if(blackboard[BB_FETCH_IGNORE_LIST][WEAKREF(thrown_thing)]) return - RegisterSignal(thrown_thing, COMSIG_MOVABLE_THROW_LANDED, .proc/listen_throw_land) + RegisterSignal(thrown_thing, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(listen_throw_land)) /// A throw we were listening to has finished, see if it's in range for us to try grabbing it /datum/ai_controller/dog/proc/listen_throw_land(obj/item/thrown_thing, datum/thrownthing/throwing_datum) @@ -117,8 +117,8 @@ if(in_range(pawn, new_friend)) new_friend.visible_message("[pawn] licks at [new_friend] in a friendly manner!", span_notice("[pawn] licks at you in a friendly manner!")) friends[friend_ref] = TRUE - RegisterSignal(new_friend, COMSIG_MOB_POINTED, .proc/check_point) - RegisterSignal(new_friend, COMSIG_MOB_SAY, .proc/check_verbal_command) + RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) + RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/dog/proc/unfriend(mob/living/ex_friend) @@ -161,7 +161,7 @@ if(!istype(clicker) || !blackboard[BB_DOG_FRIENDS][WEAKREF(clicker)]) return . = COMPONENT_CANCEL_CLICK_ALT - INVOKE_ASYNC(src, .proc/command_radial, clicker) + INVOKE_ASYNC(src, PROC_REF(command_radial), clicker) /// Show the command radial menu /datum/ai_controller/dog/proc/command_radial(mob/living/clicker) @@ -172,7 +172,7 @@ COMMAND_DIE = image(icon = 'icons/mob/pets.dmi', icon_state = "puppy_dead") ) - var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, .proc/check_menu, clicker), tooltips = TRUE) + var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, PROC_REF(check_menu), clicker), tooltips = TRUE) if(!choice || !check_menu(clicker)) return set_command_mode(clicker, choice) diff --git a/code/datums/ai/generic/generic_behaviors.dm b/code/datums/ai/generic/generic_behaviors.dm index 89f6d933c64..1f5ef2e6ff5 100644 --- a/code/datums/ai/generic/generic_behaviors.dm +++ b/code/datums/ai/generic/generic_behaviors.dm @@ -12,7 +12,7 @@ /datum/ai_behavior/battle_screech/perform(delta_time, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick(screeches)) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(screeches)) finish_action(controller, TRUE) ///Moves to target then finishes diff --git a/code/datums/ai/hauntium/haunted_controller.dm b/code/datums/ai/hauntium/haunted_controller.dm index 9613ae0ea95..8783fff5296 100644 --- a/code/datums/ai/hauntium/haunted_controller.dm +++ b/code/datums/ai/hauntium/haunted_controller.dm @@ -13,7 +13,7 @@ /datum/ai_controller/haunted/TryPossessPawn(atom/new_pawn) if(!isitem(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) return ..() //Run parent at end /datum/ai_controller/haunted/UnpossessPawn() @@ -36,12 +36,12 @@ else blackboard[BB_LIKES_EQUIPPER] = TRUE - RegisterSignal(pawn, COMSIG_ITEM_DROPPED, .proc/on_dropped) + RegisterSignal(pawn, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) ///Flip it so we listen for equip again but not for drop. /datum/ai_controller/haunted/proc/on_dropped(datum/source, mob/user) SIGNAL_HANDLER - RegisterSignal(pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) blackboard[BB_LIKES_EQUIPPER] = FALSE UnregisterSignal(pawn, COMSIG_ITEM_DROPPED) diff --git a/code/datums/ai/idle_behaviors/idle_monkey.dm b/code/datums/ai/idle_behaviors/idle_monkey.dm index 3b12e1f275e..66b630c35e1 100644 --- a/code/datums/ai/idle_behaviors/idle_monkey.dm +++ b/code/datums/ai/idle_behaviors/idle_monkey.dm @@ -5,6 +5,6 @@ var/move_dir = pick(GLOB.alldirs) living_pawn.Move(get_step(living_pawn, move_dir), move_dir) else if(DT_PROB(5, delta_time)) - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick("screech")) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick("screech")) else if(DT_PROB(1, delta_time)) - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick("scratch","jump","roll","tail")) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick("scratch","jump","roll","tail")) diff --git a/code/datums/ai/making_your_ai.md b/code/datums/ai/making_your_ai.md index e5242f10914..95f8339f8ac 100644 --- a/code/datums/ai/making_your_ai.md +++ b/code/datums/ai/making_your_ai.md @@ -151,7 +151,7 @@ Example: ```dm /datum/ai_planning_subtree/item_ghost_resist/SetupSubtree(datum/ai_controller/controller) - RegisterSignal(controller.pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(controller.pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) controller.blackboard[BB_LIKES_EQUIPPER] = FALSE controller.blackboard[BB_ITEM_AGGRO_LIST] = list() diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm index be386a3b692..1b7e0e6d81d 100644 --- a/code/datums/ai/monkey/monkey_behaviors.dm +++ b/code/datums/ai/monkey/monkey_behaviors.dm @@ -73,7 +73,7 @@ . = ..() if(controller.blackboard[BB_MONKEY_PICKPOCKETING]) //We are pickpocketing, don't do ANYTHING!!!! return - INVOKE_ASYNC(src, .proc/attempt_pickpocket, controller) + INVOKE_ASYNC(src, PROC_REF(attempt_pickpocket), controller) /datum/ai_behavior/monkey_equip/pickpocket/proc/attempt_pickpocket(datum/ai_controller/controller) var/obj/item/target = controller.blackboard[BB_MONKEY_PICKUPTARGET] @@ -269,7 +269,7 @@ controller.current_movement_target = disposal if(living_pawn.Adjacent(disposal)) - INVOKE_ASYNC(src, .proc/try_disposal_mob, controller, attack_target_key, disposal_target_key) //put him in! + INVOKE_ASYNC(src, PROC_REF(try_disposal_mob), controller, attack_target_key, disposal_target_key) //put him in! else //This means we might be getting pissed! return diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index 264585a1b1c..5cc12c50409 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -28,7 +28,7 @@ have ways of interacting with a specific mob and control it. BB_SONG_LINES = MONKEY_SONG, ) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) idle_behavior = /datum/idle_behavior/idle_monkey @@ -45,18 +45,18 @@ have ways of interacting with a specific mob and control it. return AI_CONTROLLER_INCOMPATIBLE var/mob/living/living_pawn = new_pawn - RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_paw) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_ANIMAL, .proc/on_attack_animal) - RegisterSignal(new_pawn, COMSIG_MOB_ATTACK_ALIEN, .proc/on_attack_alien) - RegisterSignal(new_pawn, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act) - RegisterSignal(new_pawn, COMSIG_ATOM_HITBY, .proc/on_hitby) - RegisterSignal(new_pawn, COMSIG_LIVING_START_PULL, .proc/on_startpulling) - RegisterSignal(new_pawn, COMSIG_LIVING_TRY_SYRINGE, .proc/on_try_syringe) - RegisterSignal(new_pawn, COMSIG_ATOM_HULK_ATTACK, .proc/on_attack_hulk) - RegisterSignal(new_pawn, COMSIG_CARBON_CUFF_ATTEMPTED, .proc/on_attempt_cuff) - RegisterSignal(new_pawn, COMSIG_MOB_MOVESPEED_UPDATED, .proc/update_movespeed) + RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_PAW, PROC_REF(on_attack_paw)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(on_attack_animal)) + RegisterSignal(new_pawn, COMSIG_MOB_ATTACK_ALIEN, PROC_REF(on_attack_alien)) + RegisterSignal(new_pawn, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) + RegisterSignal(new_pawn, COMSIG_ATOM_HITBY, PROC_REF(on_hitby)) + RegisterSignal(new_pawn, COMSIG_LIVING_START_PULL, PROC_REF(on_startpulling)) + RegisterSignal(new_pawn, COMSIG_LIVING_TRY_SYRINGE, PROC_REF(on_try_syringe)) + RegisterSignal(new_pawn, COMSIG_ATOM_HULK_ATTACK, PROC_REF(on_attack_hulk)) + RegisterSignal(new_pawn, COMSIG_CARBON_CUFF_ATTEMPTED, PROC_REF(on_attempt_cuff)) + RegisterSignal(new_pawn, COMSIG_MOB_MOVESPEED_UPDATED, PROC_REF(update_movespeed)) AddComponent(/datum/component/connect_loc_behalf, new_pawn, loc_connections) movement_delay = living_pawn.cached_multiplicative_slowdown diff --git a/code/datums/ai/movement/ai_movement_basic_avoidance.dm b/code/datums/ai/movement/ai_movement_basic_avoidance.dm index 78dae03b270..8a774ce81d9 100644 --- a/code/datums/ai/movement/ai_movement_basic_avoidance.dm +++ b/code/datums/ai/movement/ai_movement_basic_avoidance.dm @@ -8,8 +8,8 @@ var/min_dist = controller.blackboard[BB_CURRENT_MIN_MOVE_DISTANCE] var/delay = controller.movement_delay var/datum/move_loop/loop = SSmove_manager.move_to(moving, current_movement_target, min_dist, delay, subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) /datum/ai_movement/basic_avoidance/proc/pre_move(datum/move_loop/has_target/dist_bound/source) SIGNAL_HANDLER diff --git a/code/datums/ai/movement/ai_movement_dumb.dm b/code/datums/ai/movement/ai_movement_dumb.dm index 53cbf9dc456..fe18160d564 100644 --- a/code/datums/ai/movement/ai_movement_dumb.dm +++ b/code/datums/ai/movement/ai_movement_dumb.dm @@ -8,8 +8,8 @@ var/atom/movable/moving = controller.pawn var/delay = controller.movement_delay var/datum/move_loop/loop = SSmove_manager.move_towards_legacy(moving, current_movement_target, delay, subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) /datum/ai_movement/dumb/proc/pre_move(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm index e0a1402f98b..d5520f91112 100644 --- a/code/datums/ai/movement/ai_movement_jps.dm +++ b/code/datums/ai/movement/ai_movement_jps.dm @@ -19,9 +19,9 @@ subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_MOVELOOP_JPS_REPATH, .proc/repath_incoming) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_JPS_REPATH, PROC_REF(repath_incoming)) /datum/ai_movement/jps/proc/pre_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm index 9be56a05558..de0ab6d622b 100644 --- a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm +++ b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm @@ -19,7 +19,7 @@ controller.blackboard[BB_VENDING_BUSY_TILTING] = TRUE var/turf/target_turf = get_turf(controller.blackboard[BB_VENDING_CURRENT_TARGET]) new /obj/effect/temp_visual/telegraphing/vending_machine_tilt(target_turf) - addtimer(CALLBACK(src, .proc/tiltonmob, controller, target_turf), time_to_tilt) + addtimer(CALLBACK(src, PROC_REF(tiltonmob), controller, target_turf), time_to_tilt) /datum/ai_behavior/vendor_crush/proc/tiltonmob(datum/ai_controller/controller, turf/target_turf) var/obj/machinery/vending/vendor_pawn = controller.pawn diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 1e64280eb45..40f50b62fb8 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -26,10 +26,10 @@ if(!ishostile(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, .proc/on_examined) - RegisterSignal(new_pawn, COMSIG_CLICK_ALT, .proc/check_altclicked) - RegisterSignal(new_pawn, COMSIG_RIDDEN_DRIVER_MOVE, .proc/on_ridden_driver_move) - RegisterSignal(new_pawn, COMSIG_MOVABLE_PREBUCKLE, .proc/on_prebuckle) + RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + RegisterSignal(new_pawn, COMSIG_CLICK_ALT, PROC_REF(check_altclicked)) + RegisterSignal(new_pawn, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(on_ridden_driver_move)) + RegisterSignal(new_pawn, COMSIG_MOVABLE_PREBUCKLE, PROC_REF(on_prebuckle)) return ..() //Run parent at end /datum/ai_controller/hostile_friend/UnpossessPawn(destroy) @@ -81,8 +81,8 @@ if(in_range(pawn, new_friend)) new_friend.visible_message("[pawn] looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!")) blackboard[BB_HOSTILE_FRIEND] = friend_ref - RegisterSignal(new_friend, COMSIG_MOB_POINTED, .proc/check_point) - RegisterSignal(new_friend, COMSIG_MOB_SAY, .proc/check_verbal_command) + RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) + RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/hostile_friend/proc/unfriend() @@ -112,7 +112,7 @@ if(!istype(clicker) || blackboard[BB_HOSTILE_FRIEND] == WEAKREF(clicker)) return . = COMPONENT_CANCEL_CLICK_ALT - INVOKE_ASYNC(src, .proc/command_radial, clicker) + INVOKE_ASYNC(src, PROC_REF(command_radial), clicker) /// Show the command radial menu /datum/ai_controller/hostile_friend/proc/command_radial(mob/living/clicker) @@ -122,7 +122,7 @@ COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"), ) - var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, .proc/check_menu, clicker), tooltips = TRUE) + var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, PROC_REF(check_menu), clicker), tooltips = TRUE) if(!choice || !check_menu(clicker)) return set_command_mode(clicker, choice) diff --git a/code/datums/ai/robot_customer/robot_customer_controller.dm b/code/datums/ai/robot_customer/robot_customer_controller.dm index 01bee770340..10b2b3ebcc2 100644 --- a/code/datums/ai/robot_customer/robot_customer_controller.dm +++ b/code/datums/ai/robot_customer/robot_customer_controller.dm @@ -14,9 +14,9 @@ /datum/ai_controller/robot_customer/TryPossessPawn(atom/new_pawn) if(!istype(new_pawn, /mob/living/simple_animal/robot_customer)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(new_pawn, COMSIG_LIVING_GET_PULLED, .proc/on_get_pulled) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_get_punched) + RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(new_pawn, COMSIG_LIVING_GET_PULLED, PROC_REF(on_get_pulled)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_get_punched)) return ..() //Run parent at end /datum/ai_controller/robot_customer/UnpossessPawn(destroy) @@ -31,7 +31,7 @@ eat_order(I, attending_venue) return COMPONENT_NO_AFTERATTACK else - INVOKE_ASYNC(src, .proc/warn_greytider, user) + INVOKE_ASYNC(src, PROC_REF(warn_greytider), user) /datum/ai_controller/robot_customer/proc/eat_order(obj/item/order_item, datum/venue/attending_venue) @@ -45,7 +45,7 @@ SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_on_get_pulled, source, puller) + INVOKE_ASYNC(src, PROC_REF(async_on_get_pulled), source, puller) /datum/ai_controller/robot_customer/proc/async_on_get_pulled(datum/source, mob/living/puller) var/mob/living/simple_animal/robot_customer/customer = pawn @@ -94,4 +94,4 @@ return if(living_hitter.combat_mode) - INVOKE_ASYNC(src, .proc/warn_greytider, living_hitter) + INVOKE_ASYNC(src, PROC_REF(warn_greytider), living_hitter) diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index 63dc6abfae4..73ecf4c3253 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -114,8 +114,8 @@ src.allowed_z_levels = allowed_z_levels src.allowed_areas = allowed_areas for(var/alarm_type in alarms_to_listen_for) - RegisterSignal(SSdcs, COMSIG_ALARM_FIRE(alarm_type), .proc/add_alarm) - RegisterSignal(SSdcs, COMSIG_ALARM_CLEAR(alarm_type), .proc/clear_alarm) + RegisterSignal(SSdcs, COMSIG_ALARM_FIRE(alarm_type), PROC_REF(add_alarm)) + RegisterSignal(SSdcs, COMSIG_ALARM_CLEAR(alarm_type), PROC_REF(clear_alarm)) return ..() @@ -149,7 +149,7 @@ var/list/cameras = source_area.cameras if(optional_camera) cameras = list(optional_camera) // This will cause harddels, so we need to clear manually - RegisterSignal(optional_camera, COMSIG_PARENT_QDELETING, .proc/clear_camera_ref, override = TRUE) //It's just fine to override, cause we clear all refs in the proc + RegisterSignal(optional_camera, COMSIG_PARENT_QDELETING, PROC_REF(clear_camera_ref), override = TRUE) //It's just fine to override, cause we clear all refs in the proc //This does mean that only the first alarm of that camera type in the area will send a ping, but jesus what else can ya do alarms_of_our_type[source_area.name] = list(source_area, cameras, list(handler)) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index f0149edf7ad..a362b166e2f 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -47,8 +47,8 @@ visuals.icon = icon visuals.icon_state = icon_state Draw() - RegisterSignal(origin, COMSIG_MOVABLE_MOVED, .proc/redrawing) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/redrawing) + RegisterSignal(origin, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing)) /** * Triggered by signals set up when the beam is set up. If it's still sane to create a beam, it removes the old beam, creates a new one. Otherwise it kills the beam. @@ -62,7 +62,7 @@ SIGNAL_HANDLER if(origin && target && get_dist(origin,target) world.time)) diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 3ecc9202e47..c088e2028ea 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -5,10 +5,10 @@ * ## USAGE * * ``` - * var/datum/callback/C = new(object|null, /proc/type/path|"procstring", arg1, arg2, ... argn) + * var/datum/callback/C = new(object|null, PROC_REF(procname), arg1, arg2, ... argn) * var/timerid = addtimer(C, time, timertype) * you can also use the compiler define shorthand - * var/timerid = addtimer(CALLBACK(object|null, /proc/type/path|procstring, arg1, arg2, ... argn), time, timertype) + * var/timerid = addtimer(CALLBACK(object|null, PROC_REF(procname), arg1, arg2, ... argn), time, timertype) * ``` * * Note: proc strings can only be given for datum proc calls, global procs must be proc paths @@ -26,27 +26,19 @@ * ## PROC TYPEPATH SHORTCUTS * (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 + * ### proc defined on current(src) object OR overridden at src or any of it's parents: + * PROC_REF(procname) * - * `CALLBACK(GLOBAL_PROC, .some_proc_here)` + * `CALLBACK(src, 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 + * ### global proc + * GLOBAL_PROC_REF(procname) * - * `CALLBACK(src, .some_proc_here)` + * `CALLBACK(src, GLOBAL_PROC_REF(some_proc_here))` * - * ### when the above doesn't apply: - *.proc/procname * - * `CALLBACK(src, .proc/some_proc_here)` - * - * - * proc defined on a parent of a some type - * - * `/some/type/.proc/some_proc_here` - * - * Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname) + * ### proc defined on some type + * TYPE_PROC_REF(/some/type/, some_proc_here) */ /datum/callback diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 599c4cd6d7f..bf46337a4e1 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -74,7 +74,7 @@ stack_trace("/datum/chatmessage created with [isnull(owner) ? "null" : "invalid"] mob owner") qdel(src) return - INVOKE_ASYNC(src, .proc/generate_image, text, target, owner, language, extra_classes, lifespan) + INVOKE_ASYNC(src, PROC_REF(generate_image), text, target, owner, language, extra_classes, lifespan) /datum/chatmessage/Destroy() if (owned_by) @@ -110,7 +110,7 @@ // Register client who owns this message owned_by = owner.client - RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel) + RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel)) // Remove spans in the message from things like the recorder var/static/regex/span_check = new(@"<\/?span[^>]*>", "gi") @@ -188,7 +188,7 @@ var/remaining_time = (sched_remaining) * (CHAT_MESSAGE_EXP_DECAY ** idx++) * (CHAT_MESSAGE_HEIGHT_DECAY ** combined_height) if (remaining_time) deltimer(m.fadertimer, SSrunechat) - m.fadertimer = addtimer(CALLBACK(m, .proc/end_of_life), remaining_time, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) + m.fadertimer = addtimer(CALLBACK(m, PROC_REF(end_of_life)), remaining_time, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) else m.end_of_life() @@ -215,7 +215,7 @@ // Register with the runechat SS to handle EOL and destruction var/duration = lifespan - CHAT_MESSAGE_EOL_FADE - fadertimer = addtimer(CALLBACK(src, .proc/end_of_life), duration, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) + fadertimer = addtimer(CALLBACK(src, PROC_REF(end_of_life)), duration, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) /** * Applies final animations to overlay CHAT_MESSAGE_EOL_FADE deciseconds prior to message deletion, @@ -227,7 +227,7 @@ /datum/chatmessage/proc/end_of_life(fadetime = CHAT_MESSAGE_EOL_FADE) isFading = TRUE animate(message, alpha = 0, time = fadetime, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, src), fadetime, TIMER_DELETE_ME, SSrunechat) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), fadetime, TIMER_DELETE_ME, SSrunechat) /** * Creates a message overlay at a defined location for a given speaker diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm index eae91a847c2..a61e1883415 100644 --- a/code/datums/cinematic.dm +++ b/code/datums/cinematic.dm @@ -65,7 +65,7 @@ //We are now playing this cinematic //Handle what happens when a different cinematic tries to play over us - RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, .proc/replacement_cinematic) + RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, PROC_REF(replacement_cinematic)) //Pause OOC var/ooc_toggled = FALSE @@ -77,7 +77,7 @@ for(var/MM in watchers) var/mob/M = MM show_to(M, M.client) - RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, .proc/show_to) + RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(show_to)) //Close watcher ui's SStgui.close_user_uis(M) diff --git a/code/datums/components/COMPONENT_TEMPLATE.md b/code/datums/components/COMPONENT_TEMPLATE.md index 223347578e2..7b082058885 100644 --- a/code/datums/components/COMPONENT_TEMPLATE.md +++ b/code/datums/components/COMPONENT_TEMPLATE.md @@ -16,8 +16,8 @@ See _component.dm for detailed explanations send_to_playing_players(myargtwo) /datum/component/mycomponent/RegisterWithParent() - RegisterSignal(parent, COMSIG_NOT_REAL, ./proc/signalproc) // RegisterSignal can take a signal name by itself, - RegisterSignal(parent, list(COMSIG_NOT_REAL_EITHER, COMSIG_ALMOST_REAL), ./proc/otherproc) // or a list of them to assign to the same proc + RegisterSignal(parent, COMSIG_NOT_REAL, PROC_REF(signalproc)) // RegisterSignal can take a signal name by itself, + RegisterSignal(parent, list(COMSIG_NOT_REAL_EITHER, COMSIG_ALMOST_REAL), PROC_REF(otherproc)) // or a list of them to assign to the same proc /datum/component/mycomponent/UnregisterFromParent() UnregisterSignal(parent, COMSIG_NOT_REAL) // UnregisterSignal has similar behavior diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index 2a857a0aaa3..4a96313513a 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -36,19 +36,19 @@ return COMPONENT_INCOMPATIBLE max_volume = OBJ_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_obj, parent) + process_effect = CALLBACK(src, PROC_REF(process_obj), parent) else if(isliving(parent)) max_volume = MOB_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_mob, parent) + process_effect = CALLBACK(src, PROC_REF(process_mob), parent) else if(isturf(parent)) max_volume = TURF_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_turf, parent) + process_effect = CALLBACK(src, PROC_REF(process_turf), parent) acid_power = _acid_power set_volume(_acid_volume) var/atom/parent_atom = parent - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) parent_atom.update_appearance() sizzle = new(parent, TRUE) START_PROCESSING(SSacid, src) @@ -65,12 +65,12 @@ return ..() /datum/component/acid/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(parent, COMSIG_ATOM_EXPOSE_REAGENT, .proc/on_expose_reagent) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(parent, COMSIG_ATOM_EXPOSE_REAGENT, PROC_REF(on_expose_reagent)) if(isturf(parent)) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) /datum/component/acid/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm index 0fff57863e3..af405e15852 100644 --- a/code/datums/components/admin_popup.dm +++ b/code/datums/components/admin_popup.dm @@ -23,7 +23,7 @@ COMSIG_ADMIN_HELP_REPLIED, COMSIG_PARENT_QDELETING, ), - .proc/delete_self, + PROC_REF(delete_self), ) /datum/component/admin_popup/Destroy(force, silent) diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm index e4b0ba9cde3..af85e756e0a 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 @@ -34,7 +34,7 @@ if(!(allowed_slots & slot)) //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) SIGNAL_HANDLER diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm index 93baff31112..0bb0b972895 100644 --- a/code/datums/components/aquarium.dm +++ b/code/datums/components/aquarium.dm @@ -29,7 +29,7 @@ properties.parent = src ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/enter_aquarium) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium)) //If component is added to something already in aquarium at the time initialize it properly. var/atom/movable/movable_parent = parent @@ -69,10 +69,10 @@ /datum/component/aquarium_content/proc/on_inserted(atom/aquarium) current_aquarium = aquarium - RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, .proc/on_removed) - RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, .proc/on_surface_changed) - RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED,.proc/on_fluid_changed) - RegisterSignal(current_aquarium, COMSIG_PARENT_ATTACKBY, .proc/attack_reaction) + RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed)) + RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, PROC_REF(on_surface_changed)) + RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed)) + RegisterSignal(current_aquarium, COMSIG_PARENT_ATTACKBY, PROC_REF(attack_reaction)) properties.on_inserted() //If we don't have vc object yet build it diff --git a/code/datums/components/area_sound_manager.dm b/code/datums/components/area_sound_manager.dm index 50bb77772f7..cb6b7bef74f 100644 --- a/code/datums/components/area_sound_manager.dm +++ b/code/datums/components/area_sound_manager.dm @@ -16,10 +16,10 @@ accepted_zs = acceptable_zs change_the_track() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/react_to_move) - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/react_to_z_move) - RegisterSignal(parent, change_on, .proc/handle_change) - RegisterSignal(parent, remove_on, .proc/handle_removal) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(react_to_move)) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(react_to_z_move)) + RegisterSignal(parent, change_on, PROC_REF(handle_change)) + RegisterSignal(parent, remove_on, PROC_REF(handle_removal)) /datum/component/area_sound_manager/Destroy(force, silent) QDEL_NULL(our_loop) @@ -66,7 +66,7 @@ //If we're still playing, wait a bit before changing the sound so we don't double up if(time_remaining) - timerid = addtimer(CALLBACK(src, .proc/start_looping_sound), time_remaining, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_NO_HASH_WAIT | TIMER_DELETE_ME, SSsound_loops) + timerid = addtimer(CALLBACK(src, PROC_REF(start_looping_sound)), time_remaining, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_NO_HASH_WAIT | TIMER_DELETE_ME, SSsound_loops) return timerid = null our_loop.start() diff --git a/code/datums/components/areabound.dm b/code/datums/components/areabound.dm index 90b2e3007ee..f952d5db2e1 100644 --- a/code/datums/components/areabound.dm +++ b/code/datums/components/areabound.dm @@ -10,7 +10,7 @@ return COMPONENT_INCOMPATIBLE bound_area = get_area(parent) reset_turf = get_turf(parent) - move_tracker = new(parent,CALLBACK(src,.proc/check_bounds)) + move_tracker = new(parent,CALLBACK(src, PROC_REF(check_bounds))) /datum/component/areabound/proc/check_bounds() var/atom/movable/AM = parent diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm index a246f6f0e92..db2ff56763b 100644 --- a/code/datums/components/armor_plate.dm +++ b/code/datums/components/armor_plate.dm @@ -9,11 +9,11 @@ if(!isobj(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate) - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(applyplate)) + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(dropplates)) if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley)) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_mech_overlays)) if(_maxamount) maxamount = _maxamount diff --git a/code/datums/components/atmospheric_scanner.dm b/code/datums/components/atmospheric_scanner.dm index f33a941e8bf..fd2fcd101c6 100644 --- a/code/datums/components/atmospheric_scanner.dm +++ b/code/datums/components/atmospheric_scanner.dm @@ -10,7 +10,7 @@ src.requires_sight = requires_sight /datum/component/atmospheric_scanner/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/analyzer_scan) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(analyzer_scan)) /datum/component/atmospheric_scanner/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_ATTACK_SELF) diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index 71e15e7a938..38a413fce16 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -33,8 +33,8 @@ src.positive_result = positive_result /datum/component/bakeable/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_BAKED, .proc/OnBake) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine) + RegisterSignal(parent, COMSIG_ITEM_BAKED, PROC_REF(OnBake)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) /datum/component/bakeable/UnregisterFromParent() . = ..() diff --git a/code/datums/components/beetlejuice.dm b/code/datums/components/beetlejuice.dm index c8b4b53c26b..1b7bc8b3afc 100644 --- a/code/datums/components/beetlejuice.dm +++ b/code/datums/components/beetlejuice.dm @@ -23,7 +23,7 @@ keyword = M.real_name update_regex() - RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, .proc/say_react) + RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, PROC_REF(say_react)) /datum/component/beetlejuice/proc/update_regex() R = regex("[REGEX_QUOTE(keyword)]","g[case_sensitive ? "" : "i"]") diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index 6ce7a3e88e1..e0569c42dd6 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -26,9 +26,9 @@ return COMPONENT_INCOMPATIBLE parent_atom = parent - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) /** * Unregisters from the wielder if necessary @@ -105,8 +105,8 @@ equipped_slot = slot wielder = equipper - RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood) + RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood)) /** * Called when the parent item has been dropped @@ -234,11 +234,11 @@ if(!bloody_feet) bloody_feet = mutable_appearance('mojave/icons/effects/blood.dmi', "shoeblood", SHOES_LAYER) //MOJAVE SUN EDIT - Blood Sprites - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood) - RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, .proc/unequip_shoecover) - RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, .proc/equip_shoecover) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood)) + RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, PROC_REF(unequip_shoecover)) + RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, PROC_REF(equip_shoecover)) /datum/component/bloodysoles/feet/update_icon() if(ishuman(wielder)) diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm index 844baf475fc..2fb98d49be3 100644 --- a/code/datums/components/boomerang.dm +++ b/code/datums/components/boomerang.dm @@ -24,9 +24,9 @@ src.thrower_easy_catch_enabled = thrower_easy_catch_enabled /datum/component/boomerang/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/prepare_throw) //Collect data on current thrower and the throwing datum - RegisterSignal(parent, COMSIG_MOVABLE_THROW_LANDED, .proc/return_missed_throw) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/return_hit_throw) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(prepare_throw)) //Collect data on current thrower and the throwing datum + RegisterSignal(parent, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(return_missed_throw)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(return_hit_throw)) /datum/component/boomerang/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_POST_THROW, COMSIG_MOVABLE_THROW_LANDED, COMSIG_MOVABLE_IMPACT)) @@ -78,7 +78,7 @@ /datum/component/boomerang/proc/aerodynamic_swing(datum/thrownthing/throwing_datum, obj/item/true_parent) var/mob/thrown_by = true_parent.thrownby?.resolve() if(thrown_by) - addtimer(CALLBACK(true_parent, /atom/movable.proc/throw_at, thrown_by, boomerang_throw_range, throwing_datum.speed, null, TRUE), 1) + addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, boomerang_throw_range, throwing_datum.speed, null, TRUE), 1) COOLDOWN_START(src, last_boomerang_throw, BOOMERANG_REBOUND_INTERVAL) true_parent.visible_message(span_danger("[true_parent] is flying back at [throwing_datum.thrower]!"), \ span_danger("You see [true_parent] fly back at you!"), \ diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index ace608c38b0..55a4222722f 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -30,14 +30,14 @@ if(_butcher_callback) butcher_callback = _butcher_callback if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/onItemAttack) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(onItemAttack)) /datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user) SIGNAL_HANDLER if(M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it? if(butchering_enabled && (can_be_blunt || source.get_sharpness())) - INVOKE_ASYNC(src, .proc/startButcher, source, M, user) + INVOKE_ASYNC(src, PROC_REF(startButcher), source, M, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(ishuman(M) && source.force && source.get_sharpness()) @@ -47,7 +47,7 @@ user.show_message(span_warning("[H]'s neck has already been already cut, you can't make the bleeding any worse!"), MSG_VISUAL, \ span_warning("Their neck has already been already cut, you can't make the bleeding any worse!")) return COMPONENT_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(src, .proc/startNeckSlice, source, H, user) + INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user) @@ -147,7 +147,7 @@ return var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 590c7e84f7d..8a2adc4c507 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -21,7 +21,7 @@ ///given to connect_loc to listen for something moving over target var/static/list/crossed_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) ///So we can update ant damage @@ -41,7 +41,7 @@ if(ismovable(parent)) AddComponent(/datum/component/connect_loc_behalf, parent, crossed_connections) else - RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) // Inherit the new values passed to the component /datum/component/caltrop/InheritComponent(datum/component/caltrop/new_comp, original, min_damage, max_damage, probability, flags, soundfile) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 125b528bd03..6b35a4bc771 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -29,7 +29,7 @@ )) /datum/component/chasm/Initialize(turf/target) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Entered)) target_turf = target START_PROCESSING(SSobj, src) // process on create, in case stuff is still there @@ -63,7 +63,7 @@ for (var/thing in to_check) if (droppable(thing)) . = TRUE - INVOKE_ASYNC(src, .proc/drop, thing) + INVOKE_ASYNC(src, PROC_REF(drop), thing) /datum/component/chasm/proc/droppable(atom/movable/AM) var/datum/weakref/falling_ref = WEAKREF(AM) diff --git a/code/datums/components/clickbox.dm b/code/datums/components/clickbox.dm index 72aa4ebdcc5..88815cf2550 100644 --- a/code/datums/components/clickbox.dm +++ b/code/datums/components/clickbox.dm @@ -33,15 +33,15 @@ src.max_scale = max_scale src.min_scale = min_scale - RegisterSignal(parent, COMSIG_ATOM_VV_MODIFY_TRANSFORM, .proc/on_modify_or_update_transform) + RegisterSignal(parent, COMSIG_ATOM_VV_MODIFY_TRANSFORM, PROC_REF(on_modify_or_update_transform)) var/clickbox_icon_state = icon_state if(dead_state && isliving(parent)) var/mob/living/living_parent = parent src.dead_state = dead_state - RegisterSignal(living_parent, COMSIG_LIVING_POST_UPDATE_TRANSFORM, .proc/on_modify_or_update_transform) - RegisterSignal(living_parent, COMSIG_LIVING_DEATH, .proc/on_death) - RegisterSignal(living_parent, COMSIG_LIVING_REVIVE, .proc/on_revive) + RegisterSignal(living_parent, COMSIG_LIVING_POST_UPDATE_TRANSFORM, PROC_REF(on_modify_or_update_transform)) + RegisterSignal(living_parent, COMSIG_LIVING_DEATH, PROC_REF(on_death)) + RegisterSignal(living_parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) if(living_parent.stat == DEAD) clickbox_icon_state = dead_state update_underlay(clickbox_icon_state) diff --git a/code/datums/components/clothing_fov_visor.dm b/code/datums/components/clothing_fov_visor.dm index 2ea793bd5fd..5943c87ca32 100644 --- a/code/datums/components/clothing_fov_visor.dm +++ b/code/datums/components/clothing_fov_visor.dm @@ -16,9 +16,9 @@ src.visor_up = clothing_parent.up //Initial values could vary, so we need to get it. /datum/component/clothing_fov_visor/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, .proc/on_visor_toggle) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, PROC_REF(on_visor_toggle)) /datum/component/clothing_fov_visor/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_CLOTHING_VISOR_TOGGLE)) diff --git a/code/datums/components/codeword_hearing.dm b/code/datums/components/codeword_hearing.dm index a4bb24f4d3f..a0d0ea967ca 100644 --- a/code/datums/components/codeword_hearing.dm +++ b/code/datums/components/codeword_hearing.dm @@ -28,7 +28,7 @@ return ..() /datum/component/codeword_hearing/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) + RegisterSignal(parent, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing)) /datum/component/codeword_hearing/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_HEAR) diff --git a/code/datums/components/combustible_flooder.dm b/code/datums/components/combustible_flooder.dm index 98c88e3290d..a2bcdb9346a 100644 --- a/code/datums/components/combustible_flooder.dm +++ b/code/datums/components/combustible_flooder.dm @@ -11,12 +11,12 @@ src.gas_amount = initialize_gas_amount src.temp_amount = initialize_temp_amount - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react) - RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react) - RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, .proc/projectile_react) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/welder_react) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react)) + RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, PROC_REF(projectile_react)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(welder_react)) if(isturf(parent)) - RegisterSignal(parent, COMSIG_TURF_EXPOSE, .proc/hotspots_react) + RegisterSignal(parent, COMSIG_TURF_EXPOSE, PROC_REF(hotspots_react)) /datum/component/combustible_flooder/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) diff --git a/code/datums/components/connect_containers.dm b/code/datums/components/connect_containers.dm index c386a096410..f8018168a13 100644 --- a/code/datums/components/connect_containers.dm +++ b/code/datums/components/connect_containers.dm @@ -37,8 +37,8 @@ tracked = new_tracked if(!tracked) return - 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(tracked) /datum/component/connect_containers/proc/handle_tracked_qdel() @@ -50,7 +50,7 @@ return for(var/atom/movable/container as anything in get_nested_locs(listener)) - RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) for(var/signal in connections) parent.RegisterSignal(container, signal, connections[signal]) 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/connect_range.dm b/code/datums/components/connect_range.dm index b40643c5749..c87d203a2d6 100644 --- a/code/datums/components/connect_range.dm +++ b/code/datums/components/connect_range.dm @@ -58,8 +58,8 @@ if(!tracked) return //Register signals on the new tracked atom and its surroundings. - 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(tracked) /datum/component/connect_range/proc/handle_tracked_qdel() @@ -79,7 +79,7 @@ return //Keep track of possible movement of all movables the target is in. for(var/atom/movable/container as anything in get_nested_locs(target)) - RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) if(on_same_turf && !forced) return diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm index 34fa7a0cd7c..313b199ad89 100644 --- a/code/datums/components/construction.dm +++ b/code/datums/components/construction.dm @@ -15,8 +15,8 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/action) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(action)) update_parent(index) /datum/component/construction/proc/examine(datum/source, mob/user, list/examine_list) @@ -34,7 +34,7 @@ /datum/component/construction/proc/action(datum/source, obj/item/I, mob/living/user) SIGNAL_HANDLER - return INVOKE_ASYNC(src, .proc/check_step, I, user) + return INVOKE_ASYNC(src, PROC_REF(check_step), I, user) /datum/component/construction/proc/update_index(diff) index += diff diff --git a/code/datums/components/container_item/container_item.dm b/code/datums/components/container_item/container_item.dm index f1eb742a4f8..af76b3116d4 100644 --- a/code/datums/components/container_item/container_item.dm +++ b/code/datums/components/container_item/container_item.dm @@ -3,7 +3,7 @@ /datum/component/container_item/Initialize() . = ..() - RegisterSignal(parent, COMSIG_CONTAINER_TRY_ATTACH, .proc/try_attach) + RegisterSignal(parent, COMSIG_CONTAINER_TRY_ATTACH, PROC_REF(try_attach)) /// Called when parent is added to the container. /datum/component/container_item/proc/try_attach(datum/source, atom/container, mob/user) diff --git a/code/datums/components/conveyor_movement.dm b/code/datums/components/conveyor_movement.dm index 689863c537e..99baf5be941 100644 --- a/code/datums/components/conveyor_movement.dm +++ b/code/datums/components/conveyor_movement.dm @@ -16,8 +16,8 @@ start_delay = speed var/atom/movable/moving_parent = parent var/datum/move_loop/loop = SSmove_manager.move(moving_parent, direction, delay = start_delay, subsystem = SSconveyors, flags=MOVEMENT_LOOP_IGNORE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/should_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_ended) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(should_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) /datum/component/convey/proc/should_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/datums/components/cracked.dm b/code/datums/components/cracked.dm index f534d3fc13e..901f847cd06 100644 --- a/code/datums/components/cracked.dm +++ b/code/datums/components/cracked.dm @@ -18,7 +18,7 @@ /datum/component/cracked/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/IntegrityChanged) + RegisterSignal(parent, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(IntegrityChanged)) var/obj/master = parent var/integrity = master.get_integrity() IntegrityChanged(parent, integrity, integrity) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index cb5484fc5cc..055cca13fbf 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -3,9 +3,9 @@ src.crafting_interface = crafting_interface // MOJAVE EDIT - CRAFTING BENCHES if(ismob(parent)) return // no hand crafting - // RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button) + // RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(create_mob_button)) else // Alt click because workbenches are tables, so putting items on them triggers a click - RegisterSignal(parent, COMSIG_CLICK_CTRL, .proc/component_ui_interact_workbench) + RegisterSignal(parent, COMSIG_CLICK_CTRL, PROC_REF(component_ui_interact_workbench)) // MOJAVE EDIT - CRAFTING BENCHES END /datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL) @@ -16,7 +16,7 @@ C.icon = H.ui_style H.static_inventory += 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 @@ -389,13 +389,13 @@ //MOJAVE EDIT - Only require user to be the component owner, for hand crafting if(source == parent) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user) SIGNAL_HANDLER if(user == parent) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) // MOJAVE SUN EDIT BEGIN /datum/component/personal_crafting/ui_state(mob/user) diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm index 12e2f3e1660..0043698cccd 100644 --- a/code/datums/components/creamed.dm +++ b/code/datums/components/creamed.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( RegisterSignal(parent, list( COMSIG_COMPONENT_CLEAN_ACT, COMSIG_COMPONENT_CLEAN_FACE_ACT), - .proc/clean_up) + PROC_REF(clean_up)) /datum/component/creamed/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index 493677f49e9..966c6a09ec4 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -44,13 +44,13 @@ return ..() /datum/component/cult_ritual_item/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/try_scribe_rune) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_purge_holywater) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/try_hit_object) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, .proc/try_clear_rune) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(try_scribe_rune)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_purge_holywater)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(try_hit_object)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, PROC_REF(try_clear_rune)) if(examine_message) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/cult_ritual_item/UnregisterFromParent() UnregisterSignal(parent, list( @@ -91,7 +91,7 @@ to_chat(user, span_warning("You are already drawing a rune.")) return - INVOKE_ASYNC(src, .proc/start_scribe_rune, source, user) + INVOKE_ASYNC(src, PROC_REF(start_scribe_rune), source, user) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -111,7 +111,7 @@ if(!target.has_reagent(/datum/reagent/water/holywater)) return - INVOKE_ASYNC(src, .proc/do_purge_holywater, target, user) + INVOKE_ASYNC(src, PROC_REF(do_purge_holywater), target, user) /* * Signal proc for [COMSIG_ITEM_ATTACK_OBJ]. @@ -124,11 +124,11 @@ return if(istype(target, /obj/structure/girder/cult)) - INVOKE_ASYNC(src, .proc/do_destroy_girder, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_destroy_girder), target, cultist) return COMPONENT_NO_AFTERATTACK if(istype(target, /obj/structure/destructible/cult)) - INVOKE_ASYNC(src, .proc/do_unanchor_structure, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_unanchor_structure), target, cultist) return COMPONENT_NO_AFTERATTACK /* @@ -142,7 +142,7 @@ return if(istype(target, /obj/effect/rune)) - INVOKE_ASYNC(src, .proc/do_scrape_rune, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_scrape_rune), target, cultist) return COMPONENT_NO_AFTERATTACK diff --git a/code/datums/components/curse_of_hunger.dm b/code/datums/components/curse_of_hunger.dm index c37224f7344..1b17d8e9675 100644 --- a/code/datums/components/curse_of_hunger.dm +++ b/code/datums/components/curse_of_hunger.dm @@ -29,13 +29,13 @@ /datum/component/curse_of_hunger/RegisterWithParent() . = ..() var/obj/item/cursed_item = parent - RegisterSignal(cursed_item, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(cursed_item, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) //checking slot_equipment_priority is the better way to decide if it should be an equip-curse (alternative being if it has slot_flags) //because it needs to know where to equip to (and stuff like buckets and cones can be on_pickup curses despite having slots to equip to) if(cursed_item.slot_equipment_priority) - RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) else - RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, .proc/on_pickup) + RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) /datum/component/curse_of_hunger/UnregisterFromParent() . = ..() @@ -85,9 +85,9 @@ cursed_item.item_flags |= DROPDEL return if(cursed_item.slot_equipment_priority) - RegisterSignal(cursed_item, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequip) + RegisterSignal(cursed_item, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequip)) else - RegisterSignal(cursed_item, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(cursed_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/component/curse_of_hunger/proc/the_curse_ends(mob/uncursed) var/obj/item/at_least_item = parent @@ -103,7 +103,7 @@ new /obj/effect/decal/cleanable/vomit(vomit_turf) if(!add_dropdel) //gives a head start for the person to get away from the cursed item before it begins hunting again! - addtimer(CALLBACK(src, .proc/seek_new_target), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(seek_new_target)), 10 SECONDS) ///proc called after a timer to awaken the AI in the cursed item if it doesn't have a target already. /datum/component/curse_of_hunger/proc/seek_new_target() diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index ecf9c1a5723..3214b29aa7f 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -56,9 +56,9 @@ /datum/component/customizable_reagent_holder/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/customizable_attack) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ATOM_PROCESSED, .proc/on_processed) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(customizable_attack)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_PROCESSED, PROC_REF(on_processed)) ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, src) diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm index 16b37877f6a..5be674f7bb6 100644 --- a/code/datums/components/deadchat_control.dm +++ b/code/datums/components/deadchat_control.dm @@ -16,7 +16,7 @@ /// The id for the DEMOCRACY_MODE looping vote timer. var/timerid - /// Assoc list of key-chat command string, value-callback pairs. list("right" = CALLBACK(GLOBAL_PROC, .proc/_step, src, EAST)) + /// Assoc list of key-chat command string, value-callback pairs. list("right" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), src, EAST)) var/list/datum/callback/inputs = list() /// Assoc list of ckey:value pairings. In DEMOCRACY_MODE, value is the player's vote. In ANARCHY_MODE, value is world.time when their cooldown expires. var/list/ckey_to_cooldown = list() @@ -33,10 +33,10 @@ /datum/component/deadchat_control/Initialize(_deadchat_mode, _inputs, _input_cooldown = 12 SECONDS, _on_removal) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/orbit_begin) - RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, .proc/orbit_stop) - RegisterSignal(parent, COMSIG_VV_TOPIC, .proc/handle_vv_topic) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, PROC_REF(orbit_begin)) + RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, PROC_REF(orbit_stop)) + RegisterSignal(parent, COMSIG_VV_TOPIC, PROC_REF(handle_vv_topic)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) deadchat_mode = _deadchat_mode inputs = _inputs input_cooldown = _input_cooldown @@ -44,7 +44,7 @@ if(deadchat_mode & DEMOCRACY_MODE) if(deadchat_mode & ANARCHY_MODE) // Choose one, please. stack_trace("deadchat_control component added to [parent.type] with both democracy and anarchy modes enabled.") - timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) + timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) notify_ghosts("[parent] is now deadchat controllable!", source = parent, action = NOTIFY_ORBIT, header="Something Interesting!") /datum/component/deadchat_control/Destroy(force, silent) @@ -122,14 +122,14 @@ return ckey_to_cooldown = list() if(var_value == DEMOCRACY_MODE) - timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) + timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) else deltimer(timerid) /datum/component/deadchat_control/proc/orbit_begin(atom/source, atom/orbiter) SIGNAL_HANDLER - RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, .proc/deadchat_react) + RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, PROC_REF(deadchat_react)) orbiters |= orbiter /datum/component/deadchat_control/proc/orbit_stop(atom/source, atom/orbiter) @@ -145,7 +145,7 @@ if(!href_list[VV_HK_DEADCHAT_PLAYS] || !check_rights(R_FUN)) return . = COMPONENT_VV_HANDLED - INVOKE_ASYNC(src, .proc/async_handle_vv_topic, user, href_list) + INVOKE_ASYNC(src, PROC_REF(async_handle_vv_topic), user, href_list) /// Async proc handling the alert input and associated logic for an admin removing this component via the VV dropdown. /datum/component/deadchat_control/proc/async_handle_vv_topic(mob/user, list/href_list) @@ -195,10 +195,10 @@ . = ..() - inputs["up"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, NORTH) - inputs["down"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, SOUTH) - inputs["left"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, WEST) - inputs["right"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, EAST) + inputs["up"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, NORTH) + inputs["down"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, SOUTH) + inputs["left"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, WEST) + inputs["right"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, EAST) /** * Deadchat Moves Things @@ -212,7 +212,7 @@ . = ..() - inputs["up"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, NORTH) - inputs["down"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, SOUTH) - inputs["left"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, WEST) - inputs["right"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, EAST) + inputs["up"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), NORTH) + inputs["down"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), SOUTH) + inputs["left"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), WEST) + inputs["right"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), EAST) diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm index 7517f86f929..2f317d388bd 100644 --- a/code/datums/components/dejavu.dm +++ b/code/datums/components/dejavu.dm @@ -48,22 +48,22 @@ tox_loss = L.getToxLoss() oxy_loss = L.getOxyLoss() brain_loss = L.getOrganLoss(ORGAN_SLOT_BRAIN) - rewind_type = .proc/rewind_living + rewind_type = PROC_REF(rewind_living) if(iscarbon(parent)) var/mob/living/carbon/C = parent saved_bodyparts = C.save_bodyparts() - rewind_type = .proc/rewind_carbon + rewind_type = PROC_REF(rewind_carbon) else if(isanimal(parent)) var/mob/living/simple_animal/M = parent brute_loss = M.bruteloss - rewind_type = .proc/rewind_animal + rewind_type = PROC_REF(rewind_animal) else if(isobj(parent)) var/obj/O = parent integrity = O.get_integrity() - rewind_type = .proc/rewind_obj + rewind_type = PROC_REF(rewind_obj) addtimer(CALLBACK(src, rewind_type), rewind_interval) diff --git a/code/datums/components/deployable.dm b/code/datums/components/deployable.dm index f652c25de74..5308c847cd5 100644 --- a/code/datums/components/deployable.dm +++ b/code/datums/components/deployable.dm @@ -27,8 +27,8 @@ src.thing_to_be_deployed = thing_to_be_deployed src.delete_on_use = delete_on_use - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_hand) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_hand)) var/obj/item/typecast = thing_to_be_deployed deployed_name = initial(typecast.name) @@ -40,7 +40,7 @@ /datum/component/deployable/proc/on_attack_hand(datum/source, mob/user, location, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/deploy, source, user, location, direction) + INVOKE_ASYNC(src, PROC_REF(deploy), source, user, location, direction) /datum/component/deployable/proc/deploy(obj/source, mob/user, location, direction) //If there's no user, location and direction are used var/obj/deployed_object //Used for spawning the deployed object diff --git a/code/datums/components/drift.dm b/code/datums/components/drift.dm index 4cfc1372a79..71aa8d7bc6a 100644 --- a/code/datums/components/drift.dm +++ b/code/datums/components/drift.dm @@ -21,11 +21,11 @@ if(!drifting_loop) //Really want to qdel here but can't return COMPONENT_INCOMPATIBLE - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_START, .proc/drifting_start) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_STOP, .proc/drifting_stop) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/before_move) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/after_move) - RegisterSignal(drifting_loop, COMSIG_PARENT_QDELETING, .proc/loop_death) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_START, PROC_REF(drifting_start)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_STOP, PROC_REF(drifting_stop)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(before_move)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_move)) + RegisterSignal(drifting_loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_death)) if(drifting_loop.running) drifting_start(drifting_loop) // There's a good chance it'll autostart, gotta catch that @@ -51,8 +51,8 @@ SIGNAL_HANDLER var/atom/movable/movable_parent = parent inertia_last_loc = movable_parent.loc - RegisterSignal(movable_parent, COMSIG_MOVABLE_MOVED, .proc/handle_move) - RegisterSignal(movable_parent, COMSIG_MOVABLE_NEWTONIAN_MOVE, .proc/newtonian_impulse) + RegisterSignal(movable_parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) + RegisterSignal(movable_parent, COMSIG_MOVABLE_NEWTONIAN_MOVE, PROC_REF(newtonian_impulse)) /datum/component/drift/proc/drifting_stop() SIGNAL_HANDLER @@ -112,7 +112,7 @@ block_inputs_until = world.time + glide_for QDEL_IN(src, glide_for + 1) qdel(drifting_loop) - RegisterSignal(parent, COMSIG_MOB_CLIENT_PRE_MOVE, .proc/allow_final_movement) + RegisterSignal(parent, COMSIG_MOB_CLIENT_PRE_MOVE, PROC_REF(allow_final_movement)) /datum/component/drift/proc/allow_final_movement(datum/source) if(world.time < block_inputs_until) diff --git a/code/datums/components/earprotection.dm b/code/datums/components/earprotection.dm index 9256c4310a7..6439e49b831 100644 --- a/code/datums/components/earprotection.dm +++ b/code/datums/components/earprotection.dm @@ -1,7 +1,7 @@ /datum/component/wearertargeting/earprotection signals = list(COMSIG_CARBON_SOUNDBANG) mobtype = /mob/living/carbon - proctype = .proc/reducebang + proctype = PROC_REF(reducebang) /datum/component/wearertargeting/earprotection/Initialize(_valid_slots) . = ..() diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm index da801bc9e0b..aaac9aed2d4 100644 --- a/code/datums/components/edit_complainer.dm +++ b/code/datums/components/edit_complainer.dm @@ -16,7 +16,7 @@ ) say_lines = text || default_lines - RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react) + RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, PROC_REF(var_edit_react)) /datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments) SIGNAL_HANDLER diff --git a/code/datums/components/effect_remover.dm b/code/datums/components/effect_remover.dm index 210e240abd8..98d1ec7487a 100644 --- a/code/datums/components/effect_remover.dm +++ b/code/datums/components/effect_remover.dm @@ -34,7 +34,7 @@ src.effects_we_clear = typecacheof(effects_we_clear) /datum/component/effect_remover/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, .proc/try_remove_effect) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, PROC_REF(try_remove_effect)) /datum/component/effect_remover/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT) @@ -49,7 +49,7 @@ return if(effects_we_clear[target.type]) // Make sure we get all subtypes and everything - INVOKE_ASYNC(src, .proc/do_remove_effect, target, user) + INVOKE_ASYNC(src, PROC_REF(do_remove_effect), target, user) return COMPONENT_NO_AFTERATTACK /* diff --git a/code/datums/components/egg_layer.dm b/code/datums/components/egg_layer.dm index 26231256ac6..f47fa17c20f 100644 --- a/code/datums/components/egg_layer.dm +++ b/code/datums/components/egg_layer.dm @@ -41,7 +41,7 @@ /datum/component/egg_layer/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/feed_food) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(feed_food)) /datum/component/egg_layer/UnregisterFromParent() . = ..() diff --git a/code/datums/components/electrified_buckle.dm b/code/datums/components/electrified_buckle.dm index 41dd3edef71..7b9393b3c13 100644 --- a/code/datums/components/electrified_buckle.dm +++ b/code/datums/components/electrified_buckle.dm @@ -58,25 +58,25 @@ if(usage_flags & SHOCK_REQUIREMENT_ITEM) required_object = input_item required_object.Move(parent_as_movable) - RegisterSignal(required_object, COMSIG_PARENT_PREQDELETED, .proc/delete_self) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/move_required_object_from_contents) + RegisterSignal(required_object, COMSIG_PARENT_PREQDELETED, PROC_REF(delete_self)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(move_required_object_from_contents)) if(usage_flags & SHOCK_REQUIREMENT_ON_SIGNAL_RECEIVED) shock_on_loop = FALSE - RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, .proc/shock_on_demand) + RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, PROC_REF(shock_on_demand)) else if(usage_flags & SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE) - RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, .proc/toggle_shock_loop) + RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_shock_loop)) if((usage_flags & SHOCK_REQUIREMENT_PARENT_MOB_ISALIVE) && ismob(parent)) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/delete_self) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(delete_self)) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/on_buckle) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(on_buckle)) ADD_TRAIT(parent_as_movable, TRAIT_ELECTRIFIED_BUCKLE, INNATE_TRAIT) //if parent wants us to manually shock on some specified action if(signal_to_register_from_parent) - RegisterSignal(parent, signal_to_register_from_parent, .proc/shock_on_demand) + RegisterSignal(parent, signal_to_register_from_parent, PROC_REF(shock_on_demand)) requested_signal_parent_emits = signal_to_register_from_parent if(overlays_to_add) diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index 342a5a59f40..043221d76d5 100644 --- a/code/datums/components/embedded.dm +++ b/code/datums/components/embedded.dm @@ -86,7 +86,7 @@ limb.embedded_objects |= weapon // on the inside... on the inside... weapon.forceMove(victim) - RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/weaponDeleted) + RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(weaponDeleted)) victim.visible_message(span_danger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] [victim]'s [limb.name]!"), span_userdanger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] your [limb.name]!")) var/damage = weapon.throwforce @@ -113,10 +113,10 @@ return ..() /datum/component/embedded/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/jostleCheck) - RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, .proc/ripOut) - RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, .proc/safeRemove) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/checkTweeze) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOut)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemove)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(checkTweeze)) /datum/component/embedded/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_ATTACKBY)) @@ -191,7 +191,7 @@ return var/mob/living/carbon/victim = parent var/time_taken = rip_time * weapon.w_class - INVOKE_ASYNC(src, .proc/complete_rip_out, victim, I, limb, time_taken) + INVOKE_ASYNC(src, PROC_REF(complete_rip_out), victim, I, limb, time_taken) /// everything async that ripOut used to do /datum/component/embedded/proc/complete_rip_out(mob/living/carbon/victim, obj/item/I, obj/item/bodypart/limb, time_taken) @@ -221,7 +221,7 @@ if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) if(to_hands) - INVOKE_ASYNC(to_hands, /mob.proc/put_in_hands, weapon) + INVOKE_ASYNC(to_hands, TYPE_PROC_REF(/mob, put_in_hands), weapon) else weapon.forceMove(get_turf(victim)) @@ -254,7 +254,7 @@ if(!victim_human.try_inject(user, limb.body_zone, INJECT_CHECK_IGNORE_SPECIES | INJECT_TRY_SHOW_ERROR_MESSAGE)) return TRUE - INVOKE_ASYNC(src, .proc/tweezePluck, possible_tweezers, user) + INVOKE_ASYNC(src, PROC_REF(tweezePluck), possible_tweezers, user) return COMPONENT_NO_AFTERATTACK /// The actual action for pulling out an embedded object with a hemostat diff --git a/code/datums/components/engraved.dm b/code/datums/components/engraved.dm index d91be0efc90..d06d9532854 100644 --- a/code/datums/components/engraved.dm +++ b/code/datums/components/engraved.dm @@ -47,7 +47,7 @@ engraved_wall.AddElement(/datum/element/beauty, beauty_value / ENGRAVING_PERSISTENCE_BEAUTY_LOSS_FACTOR) //Old age does them harm icon_state_append = rand(1, 2) //must be here to allow overlays to be updated - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) engraved_wall.update_appearance() /datum/component/engraved/Destroy(force, silent) @@ -60,7 +60,7 @@ parent_atom.update_appearance() /datum/component/engraved/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) //supporting component transfer means putting these here instead of initialize SSpersistence.wall_engravings += src ADD_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC) diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 1d7998e6aed..1b2b3e94153 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -23,17 +23,17 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/explodable_attack) - RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/explodable_insert_item) - RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/detonate) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/welder_react) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(explodable_attack)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, PROC_REF(explodable_insert_item)) + RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(detonate)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(welder_react)) if(ismovable(parent)) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/explodable_impact) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/explodable_bump) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(explodable_impact)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(explodable_bump)) if(isitem(parent)) - RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/explodable_attack) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(explodable_attack)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) if (devastation_range) src.devastation_range = devastation_range @@ -91,7 +91,7 @@ /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, .proc/explodable_attack_zone, TRUE) + RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(explodable_attack_zone), TRUE) /datum/component/explodable/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER @@ -154,7 +154,7 @@ if(EXPLODABLE_DELETE_PARENT) qdel(bomb) else - addtimer(CALLBACK(src, .proc/reset_exploding), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_exploding)), 0.1 SECONDS) /** * Resets the expoding flag diff --git a/code/datums/components/faction_granter.dm b/code/datums/components/faction_granter.dm index cbc9542e517..4ab7c098c4e 100644 --- a/code/datums/components/faction_granter.dm +++ b/code/datums/components/faction_granter.dm @@ -26,8 +26,8 @@ src.grant_message = grant_message /datum/component/faction_granter/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_self_attack) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_self_attack)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/faction_granter/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index 17085208d74..c8e70a01ee0 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -38,16 +38,16 @@ if(!ant_attracting) produce_ants = FALSE - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/handle_movement) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_movement)) RegisterSignal(parent, list( COMSIG_ITEM_PICKUP, //person picks up an item COMSIG_STORAGE_ENTERED), //Object enters a storage object (boxes, etc.) - .proc/picked_up) + PROC_REF(picked_up)) RegisterSignal(parent, list( COMSIG_ITEM_DROPPED, //Object is dropped anywhere COMSIG_STORAGE_EXITED), //Object exits a storage object (boxes, etc) - .proc/dropped) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) + PROC_REF(dropped)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) if(decomp_flags & RAW) // Raw food overrides gross time_remaining = DECOMPOSITION_TIME_RAW @@ -86,7 +86,7 @@ return // If all other checks fail, then begin decomposition. - timerid = addtimer(CALLBACK(src, .proc/decompose), time_remaining, TIMER_STOPPABLE | TIMER_UNIQUE) + timerid = addtimer(CALLBACK(src, PROC_REF(decompose)), time_remaining, TIMER_STOPPABLE | TIMER_UNIQUE) /datum/component/decomposition/Destroy() remove_timer() diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index f7e861424c0..88778450e63 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -64,34 +64,34 @@ Behavior that's still missing from this component that original food items had t if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, .proc/UseByAnimal) - RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, .proc/OnCraft) - RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, .proc/OnProcessed) - RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_COOKED, .proc/OnMicrowaveCooked) - RegisterSignal(parent, COMSIG_EDIBLE_INGREDIENT_ADDED, .proc/edible_ingredient_added) - RegisterSignal(parent, COMSIG_OOZE_EAT_ATOM, .proc/on_ooze_eat) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(UseByAnimal)) + RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, PROC_REF(OnCraft)) + RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, PROC_REF(OnProcessed)) + RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(OnMicrowaveCooked)) + RegisterSignal(parent, COMSIG_EDIBLE_INGREDIENT_ADDED, PROC_REF(edible_ingredient_added)) + RegisterSignal(parent, COMSIG_OOZE_EAT_ATOM, PROC_REF(on_ooze_eat)) if(!isturf(parent)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) else - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand) - RegisterSignal(parent, COMSIG_ITEM_FRIED, .proc/OnFried) - RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_ACT, .proc/OnMicrowaved) - RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, .proc/used_to_customize) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand)) + RegisterSignal(parent, COMSIG_ITEM_FRIED, PROC_REF(OnFried)) + RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(OnMicrowaved)) + RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(used_to_customize)) var/obj/item/item = parent if (!item.grind_results) item.grind_results = list() //If this doesn't already exist, add it as an empty list. This is needed for the grinder to accept it. else if(isturf(parent) || isstructure(parent)) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatIt) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatIt)) src.bite_consumption = bite_consumption src.food_flags = food_flags @@ -346,7 +346,7 @@ Behavior that's still missing from this component that original food items had t /* MOJAVE SUN EDIT BEGIN //If we're not force-feeding and there's an eat delay, try take another bite if(eater == feeder && eat_time) - INVOKE_ASYNC(src, .proc/TryToEat, eater, feeder) + INVOKE_ASYNC(src, PROC_REF(TryToEat), eater, feeder) MOJAVE SUN EDIT END */ ///This function lets the eater take a bite and transfers the reagents to the eater. diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm index a9a117cafd2..50370ccb474 100644 --- a/code/datums/components/food/ice_cream_holder.dm +++ b/code/datums/components/food/ice_cream_holder.dm @@ -55,14 +55,14 @@ src.y_offset = y_offset src.sweetener = sweetener - RegisterSignal(owner, COMSIG_ITEM_ATTACK_OBJ, .proc/on_item_attack_obj) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(owner, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(on_item_attack_obj)) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) if(change_name) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_NAME, .proc/on_update_name) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_NAME, PROC_REF(on_update_name)) if(!change_desc) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, .proc/on_examine_more) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more)) else - RegisterSignal(owner, COMSIG_ATOM_UPDATE_DESC, .proc/on_update_desc) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_DESC, PROC_REF(on_update_desc)) if(prefill_flavours) for(var/entry in prefill_flavours) @@ -143,7 +143,7 @@ if(flavour.add_flavour(src, dispenser.beaker?.reagents.total_volume ? dispenser.beaker.reagents : null)) dispenser.visible_message("[icon2html(dispenser, viewers(source))] [span_info("[user] scoops delicious [dispenser.selected_flavour] ice cream into [source].")]") dispenser.product_types[dispenser.selected_flavour]-- - INVOKE_ASYNC(dispenser, /obj/machinery/icecream_vat.proc/updateDialog) + INVOKE_ASYNC(dispenser, TYPE_PROC_REF(/obj/machinery/icecream_vat, updateDialog)) else to_chat(user, span_warning("There is not enough ice cream left!")) else diff --git a/code/datums/components/footstep_changer.dm b/code/datums/components/footstep_changer.dm index 5ab6c7046d5..16030df79f7 100644 --- a/code/datums/components/footstep_changer.dm +++ b/code/datums/components/footstep_changer.dm @@ -21,9 +21,9 @@ /datum/component/footstep_changer/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/parent_deleted) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleted)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) connect_loc_behalf = AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) @@ -68,8 +68,8 @@ old_barefootstep = source.barefootstep source.footstep = footstep source.barefootstep = barefootstep - RegisterSignal(source, COMSIG_FOOTSTEP_CHANGER_IS_FOOTSTEP_CHANGED, .proc/is_footstep_changed) - RegisterSignal(source, COMSIG_FOOTSTEP_CHANGER_CLEAR_FOOTSTEP, .proc/clear_footstep) + RegisterSignal(source, COMSIG_FOOTSTEP_CHANGER_IS_FOOTSTEP_CHANGED, PROC_REF(is_footstep_changed)) + RegisterSignal(source, COMSIG_FOOTSTEP_CHANGER_CLEAR_FOOTSTEP, PROC_REF(clear_footstep)) /datum/component/footstep_changer/proc/clear_footstep(turf/open/source) SIGNAL_HANDLER diff --git a/code/datums/components/force_move.dm b/code/datums/components/force_move.dm index 23e4926f101..3c3cebbb7be 100644 --- a/code/datums/components/force_move.dm +++ b/code/datums/components/force_move.dm @@ -10,11 +10,11 @@ var/mob/mob_parent = parent var/dist = get_dist(mob_parent, target) var/datum/move_loop/loop = SSmove_manager.move_towards(mob_parent, target, delay = 1, timeout = dist) - RegisterSignal(mob_parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, .proc/stop_move) - RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, .proc/stop_pressure) + RegisterSignal(mob_parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(stop_move)) + RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure)) if(spin) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/slip_spin) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_ended) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(slip_spin)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) /datum/component/force_move/proc/stop_move(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm index 1b3ea517dd9..82d797d263c 100644 --- a/code/datums/components/forensics.dm +++ b/code/datums/components/forensics.dm @@ -25,7 +25,7 @@ /datum/component/forensics/RegisterWithParent() check_blood() - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_act) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_act)) /datum/component/forensics/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT)) diff --git a/code/datums/components/fov_handler.dm b/code/datums/components/fov_handler.dm index 0caf4de0652..9ad39b368fc 100644 --- a/code/datums/components/fov_handler.dm +++ b/code/datums/components/fov_handler.dm @@ -117,12 +117,12 @@ /datum/component/fov_handler/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/update_mask) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, .proc/update_fov_size) - RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_LOGOUT, .proc/mob_logout) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, PROC_REF(update_fov_size)) + RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_LOGOUT, PROC_REF(mob_logout)) /datum/component/fov_handler/UnregisterFromParent() . = ..() diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 2a2dc596b10..d076d46dce0 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -18,7 +18,7 @@ if(!isgun(parent)) return COMPONENT_INCOMPATIBLE var/obj/item/gun = parent - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/wake_up) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up)) if(_autofire_shot_delay) autofire_shot_delay = _autofire_shot_delay if(autofire_stat == AUTOFIRE_STAT_IDLE && ismob(gun.loc)) @@ -59,13 +59,13 @@ if(!QDELETED(usercli)) clicker = usercli shooter = clicker.mob - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down)) if(!QDELETED(shooter)) - RegisterSignal(shooter, COMSIG_MOB_LOGOUT, .proc/autofire_off) + RegisterSignal(shooter, COMSIG_MOB_LOGOUT, PROC_REF(autofire_off)) UnregisterSignal(shooter, COMSIG_MOB_LOGIN) - RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED), .proc/autofire_off) - parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, /obj/item/gun/.proc/autofire_bypass_check) - parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, /obj/item/gun/.proc/do_autofire) + RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED), PROC_REF(autofire_off)) + parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, TYPE_PROC_REF(/obj/item/gun, autofire_bypass_check)) + parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, TYPE_PROC_REF(/obj/item/gun, do_autofire)) /datum/component/automatic_fire/proc/autofire_off(datum/source) @@ -82,7 +82,7 @@ mouse_status = AUTOFIRE_MOUSEUP //In regards to the component there's no click anymore to care about. clicker = null if(!QDELETED(shooter)) - RegisterSignal(shooter, COMSIG_MOB_LOGIN, .proc/on_client_login) + RegisterSignal(shooter, COMSIG_MOB_LOGIN, PROC_REF(on_client_login)) UnregisterSignal(shooter, COMSIG_MOB_LOGOUT) UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED)) shooter = null @@ -145,7 +145,7 @@ target = _target target_loc = get_turf(target) mouse_parameters = params - INVOKE_ASYNC(src, .proc/start_autofiring) + INVOKE_ASYNC(src, PROC_REF(start_autofiring)) //Dakka-dakka @@ -158,10 +158,10 @@ clicker.mouse_pointer_icon = clicker.mouse_override_icon if(mouse_status == AUTOFIRE_MOUSEUP) //See mouse_status definition for the reason for this. - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, .proc/on_mouse_up) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, PROC_REF(on_mouse_up)) mouse_status = AUTOFIRE_MOUSEDOWN - RegisterSignal(shooter, COMSIG_MOB_SWAP_HANDS, .proc/stop_autofiring) + RegisterSignal(shooter, COMSIG_MOB_SWAP_HANDS, PROC_REF(stop_autofiring)) if(isgun(parent)) var/obj/item/gun/shoota = parent @@ -175,7 +175,7 @@ return //If it fails, such as when the gun is empty, then there's no need to schedule a second shot. START_PROCESSING(SSprojectiles, src) - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDRAG, .proc/on_mouse_drag) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDRAG, PROC_REF(on_mouse_drag)) /datum/component/automatic_fire/proc/on_mouse_up(datum/source, atom/object, turf/location, control, params) @@ -278,7 +278,7 @@ if(!can_shoot()) shoot_with_empty_chamber(shooter) return NONE - INVOKE_ASYNC(src, .proc/do_autofire_shot, source, target, shooter, params) + INVOKE_ASYNC(src, PROC_REF(do_autofire_shot), source, target, shooter, params) return COMPONENT_AUTOFIRE_SHOT_SUCCESS //All is well, we can continue shooting. @@ -288,7 +288,7 @@ if(istype(akimbo_gun) && weapon_weight < WEAPON_MEDIUM) if(akimbo_gun.weapon_weight < WEAPON_MEDIUM && akimbo_gun.can_trigger_gun(shooter)) bonus_spread = dual_wield_spread - addtimer(CALLBACK(akimbo_gun, /obj/item/gun.proc/process_fire, target, shooter, TRUE, params, null, bonus_spread), 1) + addtimer(CALLBACK(akimbo_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, shooter, TRUE, params, null, bonus_spread), 1) process_fire(target, shooter, TRUE, params, null, bonus_spread) #undef AUTOFIRE_MOUSEUP diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm index 71565bb29f4..d7d160416d0 100644 --- a/code/datums/components/gas_leaker.dm +++ b/code/datums/components/gas_leaker.dm @@ -36,7 +36,7 @@ /datum/component/gas_leaker/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, .proc/start_processing) + RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(start_processing)) /datum/component/gas_leaker/UnregisterFromParent() . = ..() diff --git a/code/datums/components/geiger_sound.dm b/code/datums/components/geiger_sound.dm index 30e879b6668..166ce20378a 100644 --- a/code/datums/components/geiger_sound.dm +++ b/code/datums/components/geiger_sound.dm @@ -21,13 +21,13 @@ /datum/component/geiger_sound/RegisterWithParent() sound = new(parent) - RegisterSignal(parent, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(parent, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) ADD_TRAIT(parent, TRAIT_BYPASS_EARLY_IRRADIATED_CHECK, REF(src)) if (isitem(parent)) var/atom/atom_parent = parent - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) register_to_loc(atom_parent.loc) /datum/component/geiger_sound/UnregisterFromParent() @@ -61,7 +61,7 @@ last_parent = new_loc if (!isnull(new_loc)) - RegisterSignal(new_loc, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(new_loc, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /datum/looping_sound/geiger mid_sounds = list( diff --git a/code/datums/components/genetic_damage.dm b/code/datums/components/genetic_damage.dm index 1092f444b65..0aecad02a96 100644 --- a/code/datums/components/genetic_damage.dm +++ b/code/datums/components/genetic_damage.dm @@ -29,7 +29,7 @@ START_PROCESSING(SSprocessing, src) /datum/component/genetic_damage/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_HEALTHSCAN, .proc/on_healthscan) + RegisterSignal(parent, COMSIG_LIVING_HEALTHSCAN, PROC_REF(on_healthscan)) /datum/component/genetic_damage/UnregisterFromParent() UnregisterSignal(parent, COMSIG_LIVING_HEALTHSCAN) diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index 865ac8b8120..fa6960356f6 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -36,18 +36,18 @@ GLOBAL_LIST_EMPTY(GPS_list) if(overlay_state) A.add_overlay(overlay_state) A.name = "[initial(A.name)] ([gpstag])" - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) if(!emp_proof) - RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_AltClick) + RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_AltClick)) ///Called on COMSIG_ITEM_ATTACK_SELF /datum/component/gps/item/proc/interact(datum/source, mob/user) SIGNAL_HANDLER if(user) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) ///Called on COMSIG_PARENT_EXAMINE /datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list) @@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(GPS_list) var/atom/A = parent A.cut_overlay("working") A.add_overlay("emp") - addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early + addtimer(CALLBACK(src, PROC_REF(reboot)), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early SStgui.close_uis(src) //Close the UI control if it is open. ///Restarts the GPS after getting turned off by an EMP. diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 566b220b1c5..3c251ec37de 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -26,8 +26,8 @@ src.positive_result = positive_result src.use_large_steam_sprite = use_large_steam_sprite - RegisterSignal(parent, COMSIG_ITEM_GRILLED, .proc/OnGrill) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine) + RegisterSignal(parent, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) // Inherit the new values passed to the component /datum/component/grillable/InheritComponent(datum/component/grillable/new_comp, original, cook_result, required_cook_time, positive_result, use_large_steam_sprite) @@ -58,8 +58,8 @@ ///Ran when an object starts grilling on something /datum/component/grillable/proc/StartGrilling(atom/grill_source) currently_grilling = TRUE - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/OnMoved) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/AddGrilledItemOverlay) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(OnMoved)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(AddGrilledItemOverlay)) var/atom/A = parent A.update_appearance() diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 6b49174636a..3485f6c13b8 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -33,9 +33,9 @@ var/mob/living/shooter = parent target = targ weapon = wep - RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), .proc/trigger_reaction) + RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), PROC_REF(trigger_reaction)) - RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), .proc/cancel) + RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), PROC_REF(cancel)) shooter.visible_message(span_danger("[shooter] aims [weapon] point blank at [target]!"), \ span_danger("You aim [weapon] point blank at [target]!"), ignored_mobs = target) @@ -53,7 +53,7 @@ target.playsound_local(target.loc, 'sound/machines/chime.ogg', 50, TRUE) SEND_SIGNAL(target, COMSIG_ADD_MOOD_EVENT, "gunpoint", /datum/mood_event/gunpoint) - addtimer(CALLBACK(src, .proc/update_stage, 2), GUNPOINT_DELAY_STAGE_2) + addtimer(CALLBACK(src, PROC_REF(update_stage), 2), GUNPOINT_DELAY_STAGE_2) /datum/component/gunpoint/Destroy(force, silent) var/mob/living/shooter = parent @@ -63,10 +63,10 @@ return ..() /datum/component/gunpoint/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_deescalate) - RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, .proc/flinch) - RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, .proc/check_shove) - RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), .proc/check_bump) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_deescalate)) + RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(flinch)) + RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, PROC_REF(check_shove)) + RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), PROC_REF(check_bump)) /datum/component/gunpoint/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) @@ -104,7 +104,7 @@ to_chat(parent, span_danger("You steady [weapon] on [target].")) to_chat(target, span_userdanger("[parent] has steadied [weapon] on you!")) damage_mult = GUNPOINT_MULT_STAGE_2 - addtimer(CALLBACK(src, .proc/update_stage, 3), GUNPOINT_DELAY_STAGE_3) + addtimer(CALLBACK(src, PROC_REF(update_stage), 3), GUNPOINT_DELAY_STAGE_3) else if(stage == 3) to_chat(parent, span_danger("You have fully steadied [weapon] on [target].")) to_chat(target, span_userdanger("[parent] has fully steadied [weapon] on you!")) @@ -120,7 +120,7 @@ ///Bang bang, we're firing a charged shot off /datum/component/gunpoint/proc/trigger_reaction() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_trigger_reaction) + INVOKE_ASYNC(src, PROC_REF(async_trigger_reaction)) /datum/component/gunpoint/proc/async_trigger_reaction() var/mob/living/shooter = parent @@ -187,7 +187,7 @@ if(prob(flinch_chance)) shooter.visible_message(span_danger("[shooter] flinches!"), \ span_danger("You flinch!")) - INVOKE_ASYNC(src, .proc/trigger_reaction) + INVOKE_ASYNC(src, PROC_REF(trigger_reaction)) #undef GUNPOINT_SHOOTER_STRAY_RANGE #undef GUNPOINT_DELAY_STAGE_2 diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 091a8d59b45..0c71dd6fa86 100644 --- a/code/datums/components/heirloom.dm +++ b/code/datums/components/heirloom.dm @@ -12,7 +12,7 @@ owner = new_owner family_name = new_family_name - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/heirloom/Destroy(force, silent) owner = null diff --git a/code/datums/components/holderloving.dm b/code/datums/components/holderloving.dm index 03dcb1da2d9..491d67068f9 100644 --- a/code/datums/components/holderloving.dm +++ b/code/datums/components/holderloving.dm @@ -30,14 +30,14 @@ src.del_parent_with_holder = del_parent_with_holder /datum/component/holderloving/RegisterWithParent() - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, .proc/check_my_loc) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/holder_deleting) + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(check_my_loc)) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleting)) RegisterSignal(parent, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_STORAGE_EXITED, - ), .proc/check_my_loc) + ), PROC_REF(check_my_loc)) /datum/component/holderloving/UnregisterFromParent() UnregisterSignal(holder, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) diff --git a/code/datums/components/igniter.dm b/code/datums/components/igniter.dm index 2d9d21022b1..6a5d7547708 100644 --- a/code/datums/components/igniter.dm +++ b/code/datums/components/igniter.dm @@ -9,11 +9,11 @@ /datum/component/igniter/RegisterWithParent() if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(parent)) - RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) /datum/component/igniter/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_POST_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT)) diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm index 3656f9eb388..5c96eb0b82e 100644 --- a/code/datums/components/infective.dm +++ b/code/datums/components/infective.dm @@ -17,25 +17,25 @@ return COMPONENT_INCOMPATIBLE var/static/list/disease_connections = list( - COMSIG_ATOM_ENTERED = .proc/try_infect_crossed, + COMSIG_ATOM_ENTERED = PROC_REF(try_infect_crossed), ) AddComponent(/datum/component/connect_loc_behalf, parent, disease_connections) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/try_infect_collide) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean)) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(try_infect_buckle)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(try_infect_collide)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(try_infect_impact_zone)) if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_infect_attack) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped) - RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(try_infect_attack_zone)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped)) + RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat)) if(istype(parent, /obj/item/reagent_containers/food/drinks)) - RegisterSignal(parent, COMSIG_DRINK_DRANK, .proc/try_infect_drink) + RegisterSignal(parent, COMSIG_DRINK_DRANK, PROC_REF(try_infect_drink)) else if(istype(parent, /obj/item/reagent_containers/glass)) - RegisterSignal(parent, COMSIG_GLASS_DRANK, .proc/try_infect_drink) + RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink)) else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs)) - RegisterSignal(parent, COMSIG_GIBS_STREAK, .proc/try_infect_streak) + RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak)) /datum/component/infective/proc/try_infect_eat(datum/source, mob/living/eater, mob/living/feeder) SIGNAL_HANDLER diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index fb80a974480..44da5a35e1f 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -49,8 +49,8 @@ human_parent.throw_alert(ALERT_IRRADIATED, /atom/movable/screen/alert/irradiated) /datum/component/irradiated/RegisterWithParent() - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_GEIGER_COUNTER_SCAN, .proc/on_geiger_counter_scan) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_GEIGER_COUNTER_SCAN, PROC_REF(on_geiger_counter_scan)) /datum/component/irradiated/UnregisterFromParent() UnregisterSignal(parent, list( @@ -115,7 +115,7 @@ COOLDOWN_START(src, last_tox_damage, RADIATION_TOX_INTERVAL) /datum/component/irradiated/proc/start_burn_splotch_timer() - addtimer(CALLBACK(src, .proc/give_burn_splotches), rand(RADIATION_BURN_INTERVAL_MIN, RADIATION_BURN_INTERVAL_MAX), TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(give_burn_splotches)), rand(RADIATION_BURN_INTERVAL_MIN, RADIATION_BURN_INTERVAL_MAX), TIMER_STOPPABLE) /datum/component/irradiated/proc/give_burn_splotches() // This shouldn't be possible, but just in case. @@ -152,7 +152,7 @@ return parent_movable.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2)) - addtimer(CALLBACK(src, .proc/start_glow_loop, parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) // Things should look uneven + addtimer(CALLBACK(src, PROC_REF(start_glow_loop), parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) // Things should look uneven /datum/component/irradiated/proc/start_glow_loop(atom/movable/parent_movable) var/filter = parent_movable.get_filter("rad_glow") diff --git a/code/datums/components/itempicky.dm b/code/datums/components/itempicky.dm index 49a12ef8193..74fbdff1caa 100644 --- a/code/datums/components/itempicky.dm +++ b/code/datums/components/itempicky.dm @@ -14,7 +14,7 @@ src.message = message /datum/component/itempicky/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND, .proc/particularly) + RegisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND, PROC_REF(particularly)) /datum/component/itempicky/UnregisterFromParent() UnregisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND) diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index 32aa0678a53..abde9cefaa6 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -18,14 +18,14 @@ /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) SIGNAL_HANDLER - 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) @@ -76,7 +76,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/knockoff.dm b/code/datums/components/knockoff.dm index 08f0a1f578f..de3248671f8 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -10,8 +10,8 @@ /datum/component/knockoff/Initialize(knockoff_chance,zone_override,slots_knockoffable) if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED,.proc/OnEquipped) - RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(OnEquipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(OnDropped)) src.knockoff_chance = knockoff_chance @@ -61,8 +61,8 @@ UnregisterSignal(H, COMSIG_HUMAN_DISARM_HIT) UnregisterSignal(H, COMSIG_LIVING_STATUS_KNOCKDOWN) return - RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE) - RegisterSignal(H, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/Knockoff_knockdown, TRUE) + RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, PROC_REF(Knockoff), TRUE) + RegisterSignal(H, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(Knockoff_knockdown), TRUE) /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M) SIGNAL_HANDLER diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm index 87e82de8d3f..822841af22d 100644 --- a/code/datums/components/label.dm +++ b/code/datums/components/label.dm @@ -22,8 +22,8 @@ apply_label() /datum/component/label/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackby) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackby)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine)) /datum/component/label/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/light_eater.dm b/code/datums/components/light_eater.dm index 0c0b1c6246f..c3712939dad 100644 --- a/code/datums/components/light_eater.dm +++ b/code/datums/components/light_eater.dm @@ -20,7 +20,7 @@ var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) LAZYSET(cached_eaten_lights, morsel, TRUE) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) /datum/component/light_eater/Destroy(force, silent) for(var/light in eaten_lights) @@ -32,7 +32,7 @@ /datum/component/light_eater/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_LIGHT_EATER_DEVOUR, .proc/on_devour) + RegisterSignal(parent, COMSIG_LIGHT_EATER_DEVOUR, PROC_REF(on_devour)) parent.AddElement(/datum/element/light_eater) /datum/component/light_eater/UnregisterFromParent() @@ -48,14 +48,14 @@ LAZYINITLIST(eaten_lights) var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) LAZYSET(cached_eaten_lights, morsel, TRUE) /// Handles storing references to lights eaten by the light eater. /datum/component/light_eater/proc/on_devour(datum/source, atom/morsel) SIGNAL_HANDLER LAZYSET(eaten_lights, morsel, TRUE) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) return NONE /// Handles dereferencing deleted lights. diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index 7e55754ffc8..03087962871 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -26,7 +26,7 @@ if(target_callback) can_target_callback = target_callback else - can_target_callback = CALLBACK(src, .proc/can_target) + can_target_callback = CALLBACK(src, PROC_REF(can_target)) if(range) lock_cursor_range = range if(typecache) diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm index a47f003e275..93f48f4d822 100644 --- a/code/datums/components/manual_blinking.dm +++ b/code/datums/components/manual_blinking.dm @@ -29,11 +29,11 @@ return ..() /datum/component/manual_blinking/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) - RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ) - RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/pause) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) + RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ)) + RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(pause)) /datum/component/manual_blinking/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_EMOTE) diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm index 9de66565362..805e48f6f8d 100644 --- a/code/datums/components/manual_breathing.dm +++ b/code/datums/components/manual_breathing.dm @@ -29,11 +29,11 @@ return ..() /datum/component/manual_breathing/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) - RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ) - RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/pause) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) + RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ)) + RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(pause)) /datum/component/manual_breathing/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_EMOTE) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 8241234d775..c4f5667a525 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -78,9 +78,9 @@ . = ..() if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) if(mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/material_container/vv_edit_var(var_name, var_value) @@ -88,12 +88,12 @@ . = ..() if(var_name == NAMEOF(src, mat_container_flags) && parent) if(!(old_flags & MATCONTAINER_EXAMINE) && mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) else if(old_flags & MATCONTAINER_EXAMINE && !(mat_container_flags & MATCONTAINER_EXAMINE)) UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) if(old_flags & MATCONTAINER_NO_INSERT && !(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) else if(!(old_flags & MATCONTAINER_NO_INSERT) && mat_container_flags & MATCONTAINER_NO_INSERT) UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) @@ -140,7 +140,7 @@ to_chat(user, span_warning("[parent] can't hold any more of [I] sheets.")) return //split the amount we don't need off - INVOKE_ASYNC(stack_to_split, /obj/item/stack.proc/split_stack, user, stack_to_split.amount - sheets_to_insert) + INVOKE_ASYNC(stack_to_split, TYPE_PROC_REF(/obj/item/stack, split_stack), user, stack_to_split.amount - sheets_to_insert) else to_chat(user, span_warning("[I] contains more materials than [parent] has space to hold.")) return diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index 209a0c431ac..2e4a31ce75c 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -85,7 +85,7 @@ /datum/component/mind_linker/RegisterWithParent() if(signals_which_destroy_us) - RegisterSignal(parent, signals_which_destroy_us, .proc/destroy_link) + RegisterSignal(parent, signals_which_destroy_us, PROC_REF(destroy_link)) /datum/component/mind_linker/UnregisterFromParent() if(signals_which_destroy_us) @@ -120,7 +120,7 @@ new_link.Grant(to_link) linked_mobs[to_link] = new_link - RegisterSignal(to_link, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MINDSHIELD_IMPLANTED), .proc/unlink_mob) + RegisterSignal(to_link, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MINDSHIELD_IMPLANTED), PROC_REF(unlink_mob)) return TRUE diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm index 198a9336f24..670bf703ca8 100644 --- a/code/datums/components/mirv.dm +++ b/code/datums/components/mirv.dm @@ -16,7 +16,7 @@ /datum/component/mirv/RegisterWithParent() if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) /datum/component/mirv/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PROJECTILE_ON_HIT)) @@ -24,7 +24,7 @@ /datum/component/mirv/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_shrapnel, firer, target) + INVOKE_ASYNC(src, PROC_REF(do_shrapnel), firer, target) /datum/component/mirv/proc/do_shrapnel(mob/firer, atom/target) if(radius < 1) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index d48d45edf55..16bc0dd5d5b 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -18,14 +18,14 @@ START_PROCESSING(SSmood, src) - RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event) - RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event) - RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/check_area_mood) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive) - RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud) - RegisterSignal(parent, COMSIG_JOB_RECEIVED, .proc/register_job_signals) - RegisterSignal(parent, COMSIG_HERETIC_MASK_ACT, .proc/direct_sanity_drain) - RegisterSignal(parent, COMSIG_ON_CARBON_SLIP, .proc/on_slip) + RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, PROC_REF(add_event)) + RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, PROC_REF(clear_event)) + RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(check_area_mood)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) + RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, PROC_REF(modify_hud)) + RegisterSignal(parent, COMSIG_JOB_RECEIVED, PROC_REF(register_job_signals)) + RegisterSignal(parent, COMSIG_HERETIC_MASK_ACT, PROC_REF(direct_sanity_drain)) + RegisterSignal(parent, COMSIG_ON_CARBON_SLIP, PROC_REF(on_slip)) var/mob/living/owner = parent owner.become_area_sensitive(MOOD_COMPONENT_TRAIT) @@ -45,7 +45,7 @@ SIGNAL_HANDLER if(job in list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST)) - RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, .proc/add_event) //Mood events that are only for RnD members + RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, PROC_REF(add_event)) //Mood events that are only for RnD members /datum/component/mood/proc/print_mood(mob/user) var/msg = "[span_info("*---------*\nMy current mental status:")]\n" @@ -279,7 +279,7 @@ clear_event(null, category) else if(the_event.timeout) - addtimer(CALLBACK(src, .proc/clear_event, null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(clear_event), null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE) return //Don't have to update the event. var/list/params = args.Copy(4) params.Insert(1, parent) @@ -290,7 +290,7 @@ update_mood() if(the_event.timeout) - addtimer(CALLBACK(src, .proc/clear_event, null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(clear_event), null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE) /datum/component/mood/proc/clear_event(datum/source, category) SIGNAL_HANDLER @@ -323,8 +323,8 @@ screen_obj = new //screen_obj.color = "#4b96c4" - MOJAVE SUN EDIT - Green face removal hud.infodisplay += screen_obj - RegisterSignal(hud, COMSIG_PARENT_QDELETING, .proc/unmodify_hud) - RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click) + RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(unmodify_hud)) + RegisterSignal(screen_obj, COMSIG_CLICK, PROC_REF(hud_click)) /datum/component/mood/proc/unmodify_hud(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/multiple_lives.dm b/code/datums/components/multiple_lives.dm index f0db99f0f56..dc95a126152 100644 --- a/code/datums/components/multiple_lives.dm +++ b/code/datums/components/multiple_lives.dm @@ -15,9 +15,9 @@ src.lives_left = lives_left /datum/component/multiple_lives/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/respawn) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_LIVING_WRITE_MEMORY, .proc/on_write_memory) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(respawn)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_LIVING_WRITE_MEMORY, PROC_REF(on_write_memory)) /datum/component/multiple_lives/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_EXAMINE, COMSIG_LIVING_WRITE_MEMORY)) diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index ce2740d81b0..15e2545f478 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -37,9 +37,9 @@ return ..() /datum/component/omen/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_accident) - RegisterSignal(parent, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/check_slip) - RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/check_bless) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_accident)) + RegisterSignal(parent, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(check_slip)) + RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, PROC_REF(check_bless)) /datum/component/omen/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_STATUS_KNOCKDOWN, COMSIG_MOVABLE_MOVED, COMSIG_ADD_MOOD_EVENT)) @@ -66,7 +66,7 @@ to_chat(living_guy, span_warning("A malevolent force launches your body to the floor...")) var/obj/machinery/door/airlock/darth_airlock = turf_content living_guy.apply_status_effect(/datum/status_effect/incapacitating/paralyzed, 10) - INVOKE_ASYNC(darth_airlock, /obj/machinery/door/airlock.proc/close, TRUE) + INVOKE_ASYNC(darth_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, close), TRUE) if(!permanent) qdel(src) return @@ -82,7 +82,7 @@ for(var/obj/machinery/vending/darth_vendor in the_turf) if(darth_vendor.tiltable) to_chat(living_guy, span_warning("A malevolent force tugs at the [darth_vendor]...")) - INVOKE_ASYNC(darth_vendor, /obj/machinery/vending.proc/tilt, living_guy) + INVOKE_ASYNC(darth_vendor, TYPE_PROC_REF(/obj/machinery/vending, tilt), living_guy) if(!permanent) qdel(src) return diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 48c09a05302..0e1b7299bca 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -22,9 +22,9 @@ target.orbiters = src if(ismovable(target)) - tracker = new(target, CALLBACK(src, .proc/move_react)) + tracker = new(target, CALLBACK(src, PROC_REF(move_react))) - RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/orbiter_glide_size_update) + RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(orbiter_glide_size_update)) /datum/component/orbiter/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE) @@ -51,7 +51,7 @@ incoming_orbiter.orbiting = src // It is important to transfer the signals so we don't get locked to the new orbiter component for all time newcomp.UnregisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED) - RegisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react) + RegisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react)) orbiter_list += newcomp.orbiter_list newcomp.orbiter_list = null @@ -71,7 +71,7 @@ orbiter.orbiting = src ADD_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT) - RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react) + RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react)) SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter) diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm index 2a0f971e970..cd3b28fe18d 100644 --- a/code/datums/components/overlay_lighting.dm +++ b/code/datums/components/overlay_lighting.dm @@ -112,15 +112,15 @@ /datum/component/overlay_lighting/RegisterWithParent() . = ..() if(directional) - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_parent_dir_change) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_moved) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_RANGE, .proc/set_range) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_POWER, .proc/set_power) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_COLOR, .proc/set_color) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_ON, .proc/on_toggle) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_FLAGS, .proc/on_light_flags_change) - RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted) - RegisterSignal(parent, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_parent_dir_change)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_moved)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_RANGE, PROC_REF(set_range)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_POWER, PROC_REF(set_power)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_COLOR, PROC_REF(set_color)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_ON, PROC_REF(on_toggle)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_FLAGS, PROC_REF(on_light_flags_change)) + RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted)) + RegisterSignal(parent, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) var/atom/movable/movable_parent = parent if(movable_parent.light_flags & LIGHT_ATTACHED) overlay_lighting_flags |= LIGHTING_ATTACHED @@ -218,15 +218,15 @@ var/atom/movable/old_parent_attached_to = . UnregisterSignal(old_parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) if(old_parent_attached_to == current_holder) - RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) - RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) - RegisterSignal(old_parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) + RegisterSignal(old_parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) if(parent_attached_to) if(parent_attached_to == current_holder) UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) - RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_parent_attached_to_qdel) - RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_parent_attached_to_moved) - RegisterSignal(parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_attached_to_qdel)) + RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_attached_to_moved)) + RegisterSignal(parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) check_holder() @@ -246,11 +246,11 @@ clean_old_turfs() return if(new_holder != parent && new_holder != parent_attached_to) - RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) - RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) - RegisterSignal(new_holder, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) + RegisterSignal(new_holder, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) if(directional) - RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, .proc/on_holder_dir_change) + RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_holder_dir_change)) set_direction(new_holder.dir) if(overlay_lighting_flags & LIGHTING_ON) add_dynamic_lumi() @@ -511,7 +511,7 @@ return UnregisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT) - RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted) + RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted)) set_parent_attached_to(new_craft) /// Handles putting the source for overlay lights into the light eater queue since we aren't tracked by [/atom/var/light_sources] diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm index 49375c63079..dea12836ea5 100644 --- a/code/datums/components/payment.dm +++ b/code/datums/components/payment.dm @@ -25,8 +25,8 @@ cost = _cost transaction_style = _style - RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, .proc/attempt_charge) - RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, .proc/change_cost) + RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, PROC_REF(attempt_charge)) + RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, PROC_REF(change_cost)) /datum/component/payment/proc/attempt_charge(datum/source, atom/movable/target, extra_fees = 0) SIGNAL_HANDLER diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 098d059b800..190892dccbb 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -78,16 +78,16 @@ return ..() /datum/component/pellet_cloud/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/nullspace_parent) + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(nullspace_parent)) if(isammocasing(parent)) - RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, .proc/create_casing_pellets) + RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, PROC_REF(create_casing_pellets)) else if(isgrenade(parent)) - RegisterSignal(parent, COMSIG_GRENADE_ARMED, .proc/grenade_armed) - RegisterSignal(parent, COMSIG_GRENADE_DETONATE, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_GRENADE_ARMED, PROC_REF(grenade_armed)) + RegisterSignal(parent, COMSIG_GRENADE_DETONATE, PROC_REF(create_blast_pellets)) else if(islandmine(parent)) - RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_MINE_TRIGGERED, PROC_REF(create_blast_pellets)) else if(issupplypod(parent)) - RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets)) /datum/component/pellet_cloud/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_DETONATE, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) @@ -119,8 +119,8 @@ else //Smart spread spread = round((i / num_pellets - 0.5) * distro) - RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) - RegisterSignal(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) + RegisterSignal(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) shell.loaded_projectile.damage = original_damage shell.loaded_projectile.wound_bonus = original_wb shell.loaded_projectile.bare_wound_bonus = original_bwb @@ -128,7 +128,7 @@ var/turf/current_loc = get_turf(user) if (!istype(target_loc) || !istype(current_loc) || !(shell.loaded_projectile)) return - INVOKE_ASYNC(shell, /obj/item/ammo_casing.proc/throw_proj, target, target_loc, shooter, params, spread) + INVOKE_ASYNC(shell, TYPE_PROC_REF(/obj/item/ammo_casing, throw_proj), target, target_loc, shooter, params, spread) if(i != num_pellets) shell.newshot() @@ -149,13 +149,13 @@ var/atom/A = parent if(isgrenade(parent)) // handle_martyrs can reduce the radius and thus the number of pellets we produce if someone dives on top of a frag grenade - INVOKE_ASYNC(src, .proc/handle_martyrs, triggerer) // note that we can modify radius in this proc + INVOKE_ASYNC(src, PROC_REF(handle_martyrs), triggerer) // note that we can modify radius in this proc else if(islandmine(parent)) var/obj/effect/mine/shrapnel/triggered_mine = parent if(triggered_mine.shred_triggerer && istype(triggerer)) // free shrapnel for the idiot who stepped on it if we're a mine that shreds the triggerer pellet_delta += radius // so they don't count against the later total for(var/i in 1 to radius) - INVOKE_ASYNC(src, .proc/pew, triggerer, TRUE) + INVOKE_ASYNC(src, PROC_REF(pew), triggerer, TRUE) if(radius < 1) return @@ -165,7 +165,7 @@ for(var/T in all_the_turfs_were_gonna_lacerate) var/turf/shootat_turf = T - INVOKE_ASYNC(src, .proc/pew, shootat_turf) + INVOKE_ASYNC(src, PROC_REF(pew), shootat_turf) /** * handle_martyrs() is used for grenades that shoot shrapnel to check if anyone threw themselves/were thrown on top of the grenade, thus absorbing a good chunk of the shrapnel @@ -215,7 +215,7 @@ if(martyr.stat != DEAD && martyr.client) LAZYADD(purple_hearts, martyr) - RegisterSignal(martyr, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + RegisterSignal(martyr, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) for(var/i in 1 to round(pellets_absorbed * 0.5)) pew(martyr) @@ -254,7 +254,7 @@ LAZYADDASSOC(targets_hit[target], "hits", 1) LAZYSET(targets_hit[target], "no damage", no_damage) if(targets_hit[target]["hits"] == 1) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) if(terminated == num_pellets) finalize() @@ -280,8 +280,8 @@ P.impacted = list(parent = TRUE) // don't hit the target we hit already with the flak P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message P.preparePixelProjectile(target, parent) - RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) - RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) + RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) pellets += P P.fire() if(landmine_victim) @@ -331,10 +331,10 @@ if(ismob(nade.loc)) shooter = nade.loc LAZYINITLIST(bodies) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/grenade_dropped) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/grenade_moved) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(grenade_dropped)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(grenade_moved)) var/static/list/loc_connections = list( - COMSIG_ATOM_EXITED =.proc/grenade_uncrossed, + COMSIG_ATOM_EXITED = PROC_REF(grenade_uncrossed), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) @@ -351,7 +351,7 @@ LAZYCLEARLIST(bodies) for(var/mob/living/L in get_turf(parent)) - RegisterSignal(L, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + RegisterSignal(L, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) bodies += L /// Someone who was originally "under" the grenade has moved off the tile and is now eligible for being a martyr and "covering" it diff --git a/code/datums/components/plumbing/IV_drip.dm b/code/datums/components/plumbing/IV_drip.dm index 2f35b3edd02..cc5be40a62c 100644 --- a/code/datums/components/plumbing/IV_drip.dm +++ b/code/datums/components/plumbing/IV_drip.dm @@ -13,8 +13,8 @@ /datum/component/plumbing/iv_drip/RegisterWithParent() . = ..() - RegisterSignal(parent, list(COMSIG_IV_ATTACH), .proc/update_attached) - RegisterSignal(parent, list(COMSIG_IV_DETACH), .proc/clear_attached) + RegisterSignal(parent, list(COMSIG_IV_ATTACH), PROC_REF(update_attached)) + RegisterSignal(parent, list(COMSIG_IV_DETACH), PROC_REF(clear_attached)) /datum/component/plumbing/iv_drip/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_IV_ATTACH)) diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index 394e3824a31..8663e0c5782 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -47,14 +47,14 @@ if(start) //We're registering here because I need to check whether we start active or not, and this is just easier //Should be called after we finished. Done this way because other networks need to finish setting up aswell - RegisterSignal(parent, list(COMSIG_COMPONENT_ADDED), .proc/enable) + RegisterSignal(parent, list(COMSIG_COMPONENT_ADDED), PROC_REF(enable)) /datum/component/plumbing/RegisterWithParent() - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED,COMSIG_PARENT_PREQDELETED), .proc/disable) - RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), .proc/toggle_active) - RegisterSignal(parent, list(COMSIG_OBJ_HIDE), .proc/hide) - RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), .proc/create_overlays) //called by lateinit on startup - RegisterSignal(parent, list(COMSIG_MOVABLE_CHANGE_DUCT_LAYER), .proc/change_ducting_layer) + RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED,COMSIG_PARENT_PREQDELETED), PROC_REF(disable)) + RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active)) + RegisterSignal(parent, list(COMSIG_OBJ_HIDE), PROC_REF(hide)) + RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), PROC_REF(create_overlays)) //called by lateinit on startup + RegisterSignal(parent, list(COMSIG_MOVABLE_CHANGE_DUCT_LAYER), PROC_REF(change_ducting_layer)) /datum/component/plumbing/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED,COMSIG_PARENT_PREQDELETED, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH,COMSIG_OBJ_HIDE, \ @@ -320,7 +320,7 @@ if(recipient_reagents_holder) UnregisterSignal(recipient_reagents_holder, COMSIG_PARENT_QDELETING) //stop tracking whoever we were tracking if(receiver) - RegisterSignal(receiver, COMSIG_PARENT_QDELETING, .proc/handle_reagent_del) //on deletion call a wrapper proc that clears us, and maybe reagents too + RegisterSignal(receiver, COMSIG_PARENT_QDELETING, PROC_REF(handle_reagent_del)) //on deletion call a wrapper proc that clears us, and maybe reagents too recipient_reagents_holder = receiver diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm index 0a5a37c3367..c8dc15f92a2 100644 --- a/code/datums/components/pricetag.dm +++ b/code/datums/components/pricetag.dm @@ -23,9 +23,9 @@ src.delete_on_unwrap = delete_on_unwrap /datum/component/pricetag/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EXPORTED, .proc/on_parent_sold) + RegisterSignal(parent, COMSIG_ITEM_EXPORTED, PROC_REF(on_parent_sold)) // Register this regardless of delete_on_unwrap because it could change by inherited components. - RegisterSignal(parent, list(COMSIG_STRUCTURE_UNWRAPPED, COMSIG_ITEM_UNWRAPPED), .proc/on_parent_unwrap) + RegisterSignal(parent, list(COMSIG_STRUCTURE_UNWRAPPED, COMSIG_ITEM_UNWRAPPED), PROC_REF(on_parent_unwrap)) /datum/component/pricetag/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/punchcooldown.dm b/code/datums/components/punchcooldown.dm index 1a3b9bb515c..df7567dd66e 100644 --- a/code/datums/components/punchcooldown.dm +++ b/code/datums/components/punchcooldown.dm @@ -2,7 +2,7 @@ /datum/component/wearertargeting/punchcooldown signals = list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK) mobtype = /mob/living/carbon - proctype = .proc/reducecooldown + proctype = PROC_REF(reducecooldown) valid_slots = list(ITEM_SLOT_GLOVES) ///The warcry this generates var/warcry = "AT" @@ -11,7 +11,7 @@ . = ..() if(. == COMPONENT_INCOMPATIBLE) return - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/changewarcry) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(changewarcry)) ///Called on COMSIG_HUMAN_MELEE_UNARMED_ATTACK. Yells the warcry and and reduces punch cooldown. /datum/component/wearertargeting/punchcooldown/proc/reducecooldown(mob/living/carbon/M, atom/target) @@ -23,7 +23,7 @@ ///Called on COMSIG_ITEM_ATTACK_SELF. Allows you to change the warcry. /datum/component/wearertargeting/punchcooldown/proc/changewarcry(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_changewarcry, user) + INVOKE_ASYNC(src, PROC_REF(do_changewarcry), user) /datum/component/wearertargeting/punchcooldown/proc/do_changewarcry(mob/user) var/input = tgui_input_text(user, "What do you want your battlecry to be?", "Battle Cry", max_length = 6) diff --git a/code/datums/components/radiation_countdown.dm b/code/datums/components/radiation_countdown.dm index dfb77d360af..b39a3e0cbf2 100644 --- a/code/datums/components/radiation_countdown.dm +++ b/code/datums/components/radiation_countdown.dm @@ -25,7 +25,7 @@ start_deletion_timer() /datum/component/radiation_countdown/proc/start_deletion_timer() - addtimer(CALLBACK(src, .proc/remove_self), TIME_UNTIL_DELETION, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_self)), TIME_UNTIL_DELETION, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/component/radiation_countdown/proc/remove_self() if (!HAS_TRAIT(parent, TRAIT_IRRADIATED)) @@ -34,7 +34,7 @@ qdel(src) /datum/component/radiation_countdown/RegisterWithParent() - RegisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION, .proc/on_pre_potential_irradiation_within_range) + RegisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation_within_range)) /datum/component/radiation_countdown/UnregisterFromParent() UnregisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION) diff --git a/code/datums/components/religious_tool.dm b/code/datums/components/religious_tool.dm index dcf64a899e3..189f457ed26 100644 --- a/code/datums/components/religious_tool.dm +++ b/code/datums/components/religious_tool.dm @@ -29,8 +29,8 @@ catalyst_type = override_catalyst_type /datum/component/religious_tool/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/AttemptActions) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(AttemptActions)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/religious_tool/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) @@ -57,7 +57,7 @@ SIGNAL_HANDLER if(istype(the_item, catalyst_type)) - INVOKE_ASYNC(src, /datum.proc/ui_interact, user) //asynchronous to avoid sleeping in a signal + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) //asynchronous to avoid sleeping in a signal /**********Sacrificing**********/ else if(operation_flags & RELIGION_TOOL_SACRIFICE) diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 223b483f8e4..7a5867bebce 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -26,12 +26,12 @@ handles linking back and forth. src.allow_standalone = allow_standalone src.mat_container_flags = mat_container_flags - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/OnMultitool) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(OnMultitool)) var/turf/T = get_turf(parent) if (force_connect || (mapload && is_station_level(T.z))) - addtimer(CALLBACK(src, .proc/LateInitialize)) + addtimer(CALLBACK(src, PROC_REF(LateInitialize))) else if (allow_standalone) _MakeLocal() diff --git a/code/datums/components/riding/riding.dm b/code/datums/components/riding/riding.dm index e6adb2d19c6..4d1b0a46b3f 100644 --- a/code/datums/components/riding/riding.dm +++ b/code/datums/components/riding/riding.dm @@ -58,12 +58,12 @@ /datum/component/riding/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/vehicle_turned) - RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/vehicle_bump) - RegisterSignal(parent, COMSIG_BUCKLED_CAN_Z_MOVE, .proc/riding_can_z_move) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(vehicle_turned)) + RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(vehicle_mob_unbuckle)) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(vehicle_mob_buckle)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(vehicle_moved)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(vehicle_bump)) + RegisterSignal(parent, COMSIG_BUCKLED_CAN_Z_MOVE, PROC_REF(riding_can_z_move)) /** * This proc handles all of the proc calls to things like set_vehicle_dir_layer() that a type of riding datum needs to call on creation @@ -230,10 +230,10 @@ if(!istype(possible_bumped_door)) return for(var/occupant in movable_parent.buckled_mobs) - INVOKE_ASYNC(possible_bumped_door, /obj/machinery/door/.proc/bumpopen, occupant) + INVOKE_ASYNC(possible_bumped_door, TYPE_PROC_REF(/obj/machinery/door, bumpopen), occupant) /datum/component/riding/proc/Unbuckle(atom/movable/M) - addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE) + addtimer(CALLBACK(parent, TYPE_PROC_REF(/atom/movable, unbuckle_mob), M), 0, TIMER_UNIQUE) /datum/component/riding/proc/Process_Spacemove(direction) var/atom/movable/AM = parent diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index de10e6cad4f..218c7aefc5d 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -34,9 +34,9 @@ /datum/component/riding/creature/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) if(can_be_driven) - RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, .proc/driver_move) // this isn't needed on riding humans or cyborgs since the rider can't control them + RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(driver_move)) // this isn't needed on riding humans or cyborgs since the rider can't control them /// Creatures need to be logged when being mounted /datum/component/riding/creature/proc/log_riding(mob/living/living_parent, mob/living/rider) @@ -191,8 +191,8 @@ /datum/component/riding/creature/human/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_host_unarmed_melee) - RegisterSignal(parent, COMSIG_LIVING_SET_BODY_POSITION, .proc/check_carrier_fall_over) + RegisterSignal(parent, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_host_unarmed_melee)) + RegisterSignal(parent, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(check_carrier_fall_over)) /datum/component/riding/creature/human/log_riding(mob/living/living_parent, mob/living/rider) if(!istype(living_parent) || !istype(rider)) diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index 8e6d518053a..86b02942c78 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -7,7 +7,7 @@ /datum/component/riding/vehicle/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, .proc/driver_move) + RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(driver_move)) /datum/component/riding/vehicle/riding_can_z_move(atom/movable/movable_parent, direction, turf/start, turf/destination, z_move_flags, mob/living/rider) if(!(z_move_flags & ZMOVE_CAN_FLY_CHECKS)) diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index 5a1cabcff29..4e99d27cee4 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -18,7 +18,7 @@ var/blockers = NONE var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) @@ -36,25 +36,25 @@ scaling_delay = scaling strength = severity - RegisterSignal(parent, list(COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND), .proc/rot_react_touch) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/rot_hit_react) + RegisterSignal(parent, list(COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND), PROC_REF(rot_react_touch)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(rot_hit_react)) if(ismovable(parent)) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/rot_react) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(rot_react)) if(isliving(parent)) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/react_to_revive) //mobs stop this when they come to life - RegisterSignal(parent, COMSIG_LIVING_GET_PULLED, .proc/rot_react_touch) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(react_to_revive)) //mobs stop this when they come to life + RegisterSignal(parent, COMSIG_LIVING_GET_PULLED, PROC_REF(rot_react_touch)) if(iscarbon(parent)) var/mob/living/carbon/carbon_parent = parent RegisterSignal(carbon_parent.reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT, - COMSIG_REAGENTS_DEL_REAGENT), .proc/check_reagent) - RegisterSignal(parent, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), .proc/check_husk_trait) + COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(check_reagent)) + RegisterSignal(parent, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(check_husk_trait)) check_reagent(carbon_parent.reagents, null) check_husk_trait(null) if(ishuman(parent)) var/mob/living/carbon/human/human_parent = parent - RegisterSignal(parent, COMSIG_HUMAN_CORETEMP_CHANGE, .proc/check_for_temperature) + RegisterSignal(parent, COMSIG_HUMAN_CORETEMP_CHANGE, PROC_REF(check_for_temperature)) check_for_temperature(null, 0, human_parent.coretemperature) start_up(NONE) //If nothing's blocking it, start diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index fc561626413..dd695a74ffa 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -34,12 +34,12 @@ return COMPONENT_INCOMPATIBLE src.rotation_flags = rotation_flags - src.AfterRotation = AfterRotation || CALLBACK(src, .proc/DefaultAfterRotation) + src.AfterRotation = AfterRotation || CALLBACK(src, PROC_REF(DefaultAfterRotation)) /datum/component/simple_rotation/proc/AddSignals() - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/RotateLeft) - RegisterSignal(parent, COMSIG_CLICK_ALT_SECONDARY, .proc/RotateRight) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(RotateLeft)) + RegisterSignal(parent, COMSIG_CLICK_ALT_SECONDARY, PROC_REF(RotateRight)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(ExamineMessage)) /datum/component/simple_rotation/proc/AddVerbs() var/obj/rotated_obj = parent diff --git a/code/datums/components/scope.dm b/code/datums/components/scope.dm index 693028a823c..4886ecfb5e2 100644 --- a/code/datums/components/scope.dm +++ b/code/datums/components/scope.dm @@ -15,10 +15,10 @@ return ..() /datum/component/scope/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK_SECONDARY, .proc/on_secondary_afterattack) - RegisterSignal(parent, COMSIG_GUN_TRY_FIRE, .proc/on_gun_fire) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK_SECONDARY, PROC_REF(on_secondary_afterattack)) + RegisterSignal(parent, COMSIG_GUN_TRY_FIRE, PROC_REF(on_gun_fire)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/scope/UnregisterFromParent() UnregisterSignal(parent, list( @@ -57,7 +57,7 @@ if(!tracker?.given_turf || target == get_target(tracker.given_turf)) return NONE - INVOKE_ASYNC(source, /obj/item/gun.proc/fire_gun, get_target(tracker.given_turf), user) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item/gun, fire_gun), get_target(tracker.given_turf), user) return COMPONENT_CANCEL_GUN_FIRE /datum/component/scope/proc/on_examine(datum/source, mob/user, list/examine_list) @@ -110,8 +110,8 @@ tracker = user.overlay_fullscreen("scope", /atom/movable/screen/fullscreen/scope, 0) tracker.range_modifier = range_modifier tracker.marksman = user - tracker.RegisterSignal(user, COMSIG_MOVABLE_MOVED, /atom/movable/screen/fullscreen/scope.proc/on_move) - RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/stop_zooming) + tracker.RegisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/fullscreen/scope, on_move)) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(stop_zooming)) START_PROCESSING(SSfastprocess, src) /** diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm index e976450a262..a2f8be4cd01 100644 --- a/code/datums/components/shell.dm +++ b/code/datums/components/shell.dm @@ -40,18 +40,18 @@ attach_circuit(starting_circuit) /datum/component/shell/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/on_attack_ghost) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(on_attack_ghost)) if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNMODIFIABLE)) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/on_multitool_act) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attack_by) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_multitool_act)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attack_by)) if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE)) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/on_screwdriver_act) - RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_object_deconstruct) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(on_screwdriver_act)) + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_object_deconstruct)) if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) - RegisterSignal(parent, COMSIG_MOVABLE_SET_ANCHORED, .proc/on_set_anchored) - RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) - RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, .proc/on_load) + RegisterSignal(parent, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) + RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, PROC_REF(on_atom_usb_cable_try_attach)) + RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, PROC_REF(on_load)) /datum/component/shell/proc/set_unremovable_circuit_components(list/components) if(unremovable_circuit_components) @@ -64,7 +64,7 @@ circuit_component = new circuit_component() circuit_component.removable = FALSE circuit_component.set_circuit_size(0) - RegisterSignal(circuit_component, COMSIG_CIRCUIT_COMPONENT_SAVE, .proc/save_component) + RegisterSignal(circuit_component, COMSIG_CIRCUIT_COMPONENT_SAVE, PROC_REF(save_component)) unremovable_circuit_components += circuit_component /datum/component/shell/proc/save_component(datum/source, list/objects) @@ -121,7 +121,7 @@ return if(attached_circuit) - INVOKE_ASYNC(attached_circuit, /datum.proc/ui_interact, ghost) + INVOKE_ASYNC(attached_circuit, TYPE_PROC_REF(/datum, ui_interact), ghost) /datum/component/shell/proc/on_examine(atom/movable/source, mob/user, list/examine_text) SIGNAL_HANDLER @@ -170,7 +170,7 @@ if(istype(item, /obj/item/inducer)) var/obj/item/inducer/inducer = item - INVOKE_ASYNC(inducer, /obj/item.proc/attack_atom, attached_circuit, attacker, list()) + INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_atom), attached_circuit, attacker, list()) return COMPONENT_NO_AFTERATTACK if(attached_circuit) @@ -306,14 +306,14 @@ locked = FALSE attached_circuit = circuitboard if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE) && !circuitboard.admin_only) - RegisterSignal(circuitboard, COMSIG_MOVABLE_MOVED, .proc/on_circuit_moved) + RegisterSignal(circuitboard, COMSIG_MOVABLE_MOVED, PROC_REF(on_circuit_moved)) if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) - RegisterSignal(circuitboard, COMSIG_CIRCUIT_PRE_POWER_USAGE, .proc/override_power_usage) - RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, .proc/on_circuit_delete) + RegisterSignal(circuitboard, COMSIG_CIRCUIT_PRE_POWER_USAGE, PROC_REF(override_power_usage)) + RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_delete)) for(var/obj/item/circuit_component/to_add as anything in unremovable_circuit_components) to_add.forceMove(attached_circuit) attached_circuit.add_component(to_add) - RegisterSignal(circuitboard, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, .proc/on_circuit_add_component_manually) + RegisterSignal(circuitboard, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, PROC_REF(on_circuit_add_component_manually)) if(attached_circuit.display_name != "") parent_atom.name = "[initial(parent_atom.name)] ([attached_circuit.display_name])" attached_circuit.set_locked(FALSE) diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index d314899171c..e9f8b1652bb 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -45,7 +45,7 @@ src.shield_icon_file = shield_icon_file src.shield_icon = shield_icon src.shield_inhand = shield_inhand - src.on_hit_effects = run_hit_callback || CALLBACK(src, .proc/default_run_hit_callback) + src.on_hit_effects = run_hit_callback || CALLBACK(src, PROC_REF(default_run_hit_callback)) if(isnull(starting_charges)) current_charges = max_charges else @@ -63,10 +63,10 @@ return ..() /datum/component/shielded/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/lost_wearer) - RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, .proc/on_hit_react) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/check_recharge_rune) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(lost_wearer)) + RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_react)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(check_recharge_rune)) var/atom/shield = parent if(ismob(shield.loc)) var/mob/holder = shield.loc @@ -123,8 +123,8 @@ /datum/component/shielded/proc/set_wearer(mob/user) wearer = user - RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) - RegisterSignal(wearer, COMSIG_PARENT_QDELETING, .proc/lost_wearer) + RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) + RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(lost_wearer)) if(current_charges) wearer.update_appearance(UPDATE_ICON) @@ -154,7 +154,7 @@ adjust_charge(-charge_loss) - INVOKE_ASYNC(src, .proc/actually_run_hit_callback, owner, attack_text, current_charges) + INVOKE_ASYNC(src, PROC_REF(actually_run_hit_callback), owner, attack_text, current_charges) if(!recharge_start_delay) // if recharge_start_delay is 0, we don't recharge return diff --git a/code/datums/components/shy.dm b/code/datums/components/shy.dm index 3b51ea92f23..4a895cab1cd 100644 --- a/code/datums/components/shy.dm +++ b/code/datums/components/shy.dm @@ -36,11 +36,11 @@ src.machine_whitelist = machine_whitelist /datum/component/shy/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/on_clickon) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, .proc/on_try_pull) - RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), .proc/on_unarmed_attack) - RegisterSignal(parent, COMSIG_TRY_STRIP, .proc/on_try_strip) - RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, .proc/on_try_alt_action) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(on_clickon)) + RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(on_try_pull)) + RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), PROC_REF(on_unarmed_attack)) + RegisterSignal(parent, COMSIG_TRY_STRIP, PROC_REF(on_try_strip)) + RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, PROC_REF(on_try_alt_action)) /datum/component/shy/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/shy_in_room.dm b/code/datums/components/shy_in_room.dm index acad303a1fc..cf431933963 100644 --- a/code/datums/components/shy_in_room.dm +++ b/code/datums/components/shy_in_room.dm @@ -15,11 +15,11 @@ src.message = message /datum/component/shy_in_room/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/on_clickon) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, .proc/on_try_pull) - RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), .proc/on_unarmed_attack) - RegisterSignal(parent, COMSIG_TRY_STRIP, .proc/on_try_strip) - RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, .proc/on_try_alt_action) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(on_clickon)) + RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(on_try_pull)) + RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), PROC_REF(on_unarmed_attack)) + RegisterSignal(parent, COMSIG_TRY_STRIP, PROC_REF(on_try_strip)) + RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, PROC_REF(on_try_alt_action)) /datum/component/shy_in_room/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/singularity.dm b/code/datums/components/singularity.dm index 0eea5a8b2da..5372a514e92 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -49,7 +49,7 @@ /datum/component/singularity/Initialize( bsa_targetable = TRUE, consume_range = 0, - consume_callback = CALLBACK(src, .proc/default_singularity_act), + consume_callback = CALLBACK(src, PROC_REF(default_singularity_act)), disregard_failed_movements = FALSE, grav_pull = 4, notify_admins = TRUE, @@ -75,25 +75,25 @@ parent.AddElement(/datum/element/forced_gravity, FALSE) parent.AddElement(/datum/element/bsa_blocker) - RegisterSignal(parent, COMSIG_ATOM_BSA_BEAM, .proc/bluespace_reaction) + RegisterSignal(parent, COMSIG_ATOM_BSA_BEAM, PROC_REF(bluespace_reaction)) - RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, .proc/block_blob) + RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, PROC_REF(block_blob)) RegisterSignal(parent, list( COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, - ), .proc/consume_attack) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/consume_attackby) + ), PROC_REF(consume_attack)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(consume_attackby)) - RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, .proc/moved) - RegisterSignal(parent, COMSIG_ATOM_BUMPED, .proc/consume) + RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(moved)) + RegisterSignal(parent, COMSIG_ATOM_BUMPED, PROC_REF(consume)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) - RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, .proc/consume_bullets) + RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, PROC_REF(consume_bullets)) if (notify_admins) admin_investigate_setup() diff --git a/code/datums/components/sitcomlaughter.dm b/code/datums/components/sitcomlaughter.dm index 7a31c812749..8dfef21b749 100644 --- a/code/datums/components/sitcomlaughter.dm +++ b/code/datums/components/sitcomlaughter.dm @@ -1,7 +1,7 @@ /datum/component/wearertargeting/sitcomlaughter valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE) signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_ON_VENDOR_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) - proctype = .proc/EngageInComedy + proctype = PROC_REF(EngageInComedy) mobtype = /mob/living ///Sounds used for when user has a sitcom action occur var/list/comedysounds = list('sound/items/SitcomLaugh1.ogg', 'sound/items/SitcomLaugh2.ogg', 'sound/items/SitcomLaugh3.ogg') @@ -28,6 +28,6 @@ SIGNAL_HANDLER if(!COOLDOWN_FINISHED(src, laugh_cooldown)) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay) post_comedy_callback?.Invoke(source) COOLDOWN_START(src, laugh_cooldown, cooldown_time) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index d594dff9483..172c0b42245 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -17,12 +17,12 @@ var/list/slot_whitelist = list(ITEM_SLOT_OCLOTHING, ITEM_SLOT_ICLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_BELT, ITEM_SLOT_NECK) ///what we give to connect_loc by default, makes slippable mobs moving over us slip var/static/list/default_connections = list( - COMSIG_ATOM_ENTERED = .proc/Slip, + COMSIG_ATOM_ENTERED = PROC_REF(Slip), ) ///what we give to connect_loc if we're an item and get equipped by a mob. makes slippable mobs moving over our holder slip var/static/list/holder_connections = list( - COMSIG_ATOM_ENTERED = .proc/Slip_on_wearer, + COMSIG_ATOM_ENTERED = PROC_REF(Slip_on_wearer), ) /// The connect_loc_behalf component for the holder_connections list. @@ -40,10 +40,10 @@ add_connect_loc_behalf_to_parent() if(ismovable(parent)) 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 - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Slip) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Slip)) /datum/component/slippery/proc/add_connect_loc_behalf_to_parent() if(ismovable(parent)) @@ -95,7 +95,7 @@ holder = equipper qdel(GetComponent(/datum/component/connect_loc_behalf)) AddComponent(/datum/component/connect_loc_behalf, holder, holder_connections) - RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, .proc/holder_deleted) + RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, PROC_REF(holder_deleted)) /* * Detects if the holder mob is deleted. diff --git a/code/datums/components/soulstoned.dm b/code/datums/components/soulstoned.dm index f173aa28b93..d15bdec0386 100644 --- a/code/datums/components/soulstoned.dm +++ b/code/datums/components/soulstoned.dm @@ -15,7 +15,7 @@ ADD_TRAIT(S, TRAIT_HANDS_BLOCKED, SOULSTONE_TRAIT) S.status_flags |= GODMODE - RegisterSignal(S, COMSIG_MOVABLE_MOVED, .proc/free_prisoner) + RegisterSignal(S, COMSIG_MOVABLE_MOVED, PROC_REF(free_prisoner)) /datum/component/soulstoned/proc/free_prisoner() SIGNAL_HANDLER diff --git a/code/datums/components/sound_player.dm b/code/datums/components/sound_player.dm index 08d25b548b5..ecbe804a9ea 100644 --- a/code/datums/components/sound_player.dm +++ b/code/datums/components/sound_player.dm @@ -21,7 +21,7 @@ src.sounds = sounds src.uses = uses - RegisterSignal(parent, signal_list, .proc/play_sound) + RegisterSignal(parent, signal_list, PROC_REF(play_sound)) /** * Attempt to play the sound on parent diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 537f1ba6eab..1719b1a5a0e 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -21,7 +21,7 @@ if(_max_mobs) max_mobs=_max_mobs - RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning) + RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), PROC_REF(stop_spawning)) START_PROCESSING(SSprocessing, src) /datum/component/spawner/process() diff --git a/code/datums/components/spill.dm b/code/datums/components/spill.dm index 0349d155331..76fd022328d 100644 --- a/code/datums/components/spill.dm +++ b/code/datums/components/spill.dm @@ -30,8 +30,8 @@ return COMPONENT_INCOMPATIBLE /datum/component/spill/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/equip_react) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/drop_react) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(equip_react)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(drop_react)) var/obj/item/master = parent preexisting_slot_flags = master.slot_flags master.slot_flags |= ITEM_SLOT_POCKETS @@ -46,7 +46,7 @@ SIGNAL_HANDLER if(slot == ITEM_SLOT_LPOCKET || slot == ITEM_SLOT_RPOCKET) - RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/knockdown_react, TRUE) + RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(knockdown_react), TRUE) else UnregisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN) diff --git a/code/datums/components/spirit_holding.dm b/code/datums/components/spirit_holding.dm index d226c6df9f8..67ac0fac1bb 100644 --- a/code/datums/components/spirit_holding.dm +++ b/code/datums/components/spirit_holding.dm @@ -19,9 +19,9 @@ QDEL_NULL(bound_spirit) /datum/component/spirit_holding/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/on_destroy) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_destroy)) /datum/component/spirit_holding/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_QDELETING)) @@ -37,7 +37,7 @@ ///signal fired on self attacking parent /datum/component/spirit_holding/proc/on_attack_self(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_spirit_awaken, user) + INVOKE_ASYNC(src, PROC_REF(attempt_spirit_awaken), user) /** * attempt_spirit_awaken: called from on_attack_self, polls ghosts to possess the item in the form @@ -80,8 +80,8 @@ bound_spirit.fully_replace_character_name(null, "The spirit of [input]") //Add new signals for parent and stop attempting to awaken - RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE, .proc/block_buckle_message) - RegisterSignal(parent, COMSIG_BIBLE_SMACKED, .proc/on_bible_smacked) + RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE, PROC_REF(block_buckle_message)) + RegisterSignal(parent, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked)) attempting_awakening = FALSE ///signal fired from a mob moving inside the parent @@ -91,7 +91,7 @@ /datum/component/spirit_holding/proc/on_bible_smacked(datum/source, mob/living/user, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_exorcism, user) + INVOKE_ASYNC(src, PROC_REF(attempt_exorcism), user) /** * attempt_exorcism: called from on_bible_smacked, takes time and if successful @@ -108,7 +108,7 @@ return playsound(parent, 'sound/effects/pray_chaplain.ogg',60,TRUE) UnregisterSignal(exorcised_movable, list(COMSIG_ATOM_RELAYMOVE, COMSIG_BIBLE_SMACKED)) - RegisterSignal(exorcised_movable, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(exorcised_movable, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) to_chat(bound_spirit, span_userdanger("You were exorcised!")) QDEL_NULL(bound_spirit) exorcised_movable.name = initial(exorcised_movable.name) diff --git a/code/datums/components/squashable.dm b/code/datums/components/squashable.dm index ce0e91533e2..a8304320bdb 100644 --- a/code/datums/components/squashable.dm +++ b/code/datums/components/squashable.dm @@ -10,7 +10,7 @@ var/datum/callback/on_squash_callback ///signal list given to connect_loc var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 3cfff08064f..ce4649e1622 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -23,32 +23,32 @@ ///what we set connect_loc to if parent is an item var/static/list/item_connections = list( - COMSIG_ATOM_ENTERED = .proc/play_squeak_crossed, + COMSIG_ATOM_ENTERED = PROC_REF(play_squeak_crossed), ) /datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak) + RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak)) if(ismovable(parent)) - RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_BEFORE_FIRE), .proc/play_squeak) + RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_BEFORE_FIRE), PROC_REF(play_squeak)) AddComponent(/datum/component/connect_loc_behalf, parent, item_connections) - RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react) + RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react)) if(isitem(parent)) - RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/play_squeak) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(play_squeak)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(use_squeak)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) if(istype(parent, /obj/item/clothing/shoes)) - RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) + RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak)) else if(isstructure(parent)) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/use_squeak) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak)) if(istype(parent, /obj/item/organ/liver)) // Liver squeaking is depending on them functioning like a clown's liver - RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), .proc/on_comedy_metabolism_removal) + RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_comedy_metabolism_removal)) override_squeak_sounds = custom_sounds if(chance_override) @@ -111,8 +111,8 @@ /datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER holder = equipper - RegisterSignal(holder, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, override=TRUE) - RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, .proc/holder_deleted, override=TRUE) + RegisterSignal(holder, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react), override=TRUE) + RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, PROC_REF(holder_deleted), override=TRUE) //override for the preqdeleted is necessary because putting parent in hands sends the signal that this proc is registered towards, //so putting an object in hands and then equipping the item on a clothing slot (without dropping it first) //will always runtime without override = TRUE @@ -134,7 +134,7 @@ SIGNAL_HANDLER //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted - RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change) + RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(holder_dir_change)) /datum/component/squeak/proc/holder_dir_change(datum/source, old_dir, new_dir) SIGNAL_HANDLER diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index c31109ea6bc..2b209460012 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -10,11 +10,11 @@ /datum/component/stationloving/Initialize(inform_admins = FALSE, allow_item_destruction = FALSE) if(!ismovable(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/on_parent_z_change) - RegisterSignal(parent, COMSIG_MOVABLE_SECLUDED_LOCATION, .proc/on_parent_unreachable) - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/on_parent_pre_qdeleted) - RegisterSignal(parent, COMSIG_ITEM_IMBUE_SOUL, .proc/check_soul_imbue) - RegisterSignal(parent, COMSIG_ITEM_MARK_RETRIEVAL, .proc/check_mark_retrieval) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_parent_z_change)) + RegisterSignal(parent, COMSIG_MOVABLE_SECLUDED_LOCATION, PROC_REF(on_parent_unreachable)) + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(on_parent_pre_qdeleted)) + RegisterSignal(parent, COMSIG_ITEM_IMBUE_SOUL, PROC_REF(check_soul_imbue)) + RegisterSignal(parent, COMSIG_ITEM_MARK_RETRIEVAL, PROC_REF(check_mark_retrieval)) src.inform_admins = inform_admins src.allow_item_destruction = allow_item_destruction diff --git a/code/datums/components/stationstuck.dm b/code/datums/components/stationstuck.dm index f96aedab845..e6db1570b80 100644 --- a/code/datums/components/stationstuck.dm +++ b/code/datums/components/stationstuck.dm @@ -21,7 +21,7 @@ It has a punishment variable that is what happens to the parent when they leave if(!isliving(parent)) return COMPONENT_INCOMPATIBLE var/mob/living/L = parent - RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), .proc/punish) + RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), PROC_REF(punish)) punishment = _punishment message = _message stuck_zlevel = L.z diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm index b78bebba07c..ec5d38f610f 100644 --- a/code/datums/components/storage/concrete/_concrete.dm +++ b/code/datums/components/storage/concrete/_concrete.dm @@ -15,8 +15,8 @@ /datum/component/storage/concrete/Initialize() . = ..() - RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del) - RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct) + RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, PROC_REF(on_contents_del)) + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_deconstruct)) /datum/component/storage/concrete/Destroy() var/atom/real_location = real_location() diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index 0b63707d3ad..3fa3630bbfd 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -5,7 +5,7 @@ var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.get_all_contents(), typecacheof(/obj/item/storage/backpack/holding)) matching -= A if(istype(W, /obj/item/storage/backpack/holding) || matching.len) - INVOKE_ASYNC(src, .proc/recursive_insertion, W, user) + INVOKE_ASYNC(src, PROC_REF(recursive_insertion), W, user) return . = ..() diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm index 3da70fb7294..6980a8cc0c6 100644 --- a/code/datums/components/storage/concrete/wallet.dm +++ b/code/datums/components/storage/concrete/wallet.dm @@ -8,6 +8,6 @@ var/obj/item/storage/wallet/A = parent if(istype(A) && A.front_id && !issilicon(user) && !(A.item_flags & IN_STORAGE)) //if it's a wallet in storage seeing the full inventory is more useful var/obj/item/I = A.front_id - INVOKE_ASYNC(src, .proc/attempt_put_in_hands, I, user) + INVOKE_ASYNC(src, PROC_REF(attempt_put_in_hands), I, user) return TRUE return ..() diff --git a/code/datums/components/storage/food_storage.dm b/code/datums/components/storage/food_storage.dm index af5b462328e..eb9994c89dc 100644 --- a/code/datums/components/storage/food_storage.dm +++ b/code/datums/components/storage/food_storage.dm @@ -18,9 +18,9 @@ /datum/component/food_storage/Initialize(_minimum_weight_class = WEIGHT_CLASS_SMALL, _bad_chance = 0, _good_chance = 100) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/try_inserting_item) - RegisterSignal(parent, COMSIG_CLICK_CTRL, .proc/try_removing_item) - RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/consume_food_storage) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_inserting_item)) + RegisterSignal(parent, COMSIG_CLICK_CTRL, PROC_REF(try_removing_item)) + RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(consume_food_storage)) var/atom/food = parent initial_volume = food.reagents.total_volume @@ -70,7 +70,7 @@ user.visible_message(span_notice("[user.name] begins inserting [inserted_item.name] into \the [parent]."), \ span_notice("You start to insert the [inserted_item.name] into \the [parent].")) - INVOKE_ASYNC(src, .proc/insert_item, inserted_item, user) + INVOKE_ASYNC(src, PROC_REF(insert_item), inserted_item, user) return COMPONENT_CANCEL_ATTACK_CHAIN /** Begins the process of attempting to remove the stored item. @@ -94,7 +94,7 @@ user.visible_message(span_notice("[user.name] begins tearing at \the [parent]."), \ span_notice("You start to rip into \the [parent].")) - INVOKE_ASYNC(src, .proc/begin_remove_item, user) + INVOKE_ASYNC(src, PROC_REF(begin_remove_item), user) return COMPONENT_CANCEL_ATTACK_CHAIN /** Inserts the item into the food, after a do_after. @@ -171,7 +171,7 @@ update_stored_item() //make sure if the item was changed, the reference changes as well if(!QDELETED(stored_item) && discovered) - INVOKE_ASYNC(src, .proc/remove_item, user) + INVOKE_ASYNC(src, PROC_REF(remove_item), user) /** Updates the reference of the stored item. * diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 99ebe288fae..17175f8c8c3 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -64,49 +64,49 @@ closer = new(null, src) orient2hud() - RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, .proc/on_check) - RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, .proc/check_locked) - RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt) - RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt) - RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert) - RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type) - RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type) - RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked) - RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj) - RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty) - RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt) - RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all) - RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv) - - RegisterSignal(parent, COMSIG_TOPIC, .proc/topic_handle) - - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby) - - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand) - RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/emp_act) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/refresh_mob_views) - RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/_remove_and_refresh) - RegisterSignal(parent, COMSIG_ATOM_CANREACH, .proc/canreach_react) - - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/attack_self) - RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup) + RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, PROC_REF(on_check)) + RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, PROC_REF(check_locked)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, PROC_REF(signal_show_attempt)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, PROC_REF(signal_insertion_attempt)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, PROC_REF(signal_can_insert)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, PROC_REF(signal_take_type)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, PROC_REF(signal_fill_type)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, PROC_REF(set_locked)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, PROC_REF(signal_take_obj)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, PROC_REF(signal_quick_empty)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, PROC_REF(signal_hide_attempt)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, PROC_REF(close_all)) + RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, PROC_REF(signal_return_inv)) + + RegisterSignal(parent, COMSIG_TOPIC, PROC_REF(topic_handle)) + + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby)) + + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, PROC_REF(on_attack_hand)) + RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(emp_act)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(show_to_ghost)) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(refresh_mob_views)) + RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(_remove_and_refresh)) + RegisterSignal(parent, COMSIG_ATOM_CANREACH, PROC_REF(canreach_react)) + + RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(preattack_intercept)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(attack_self)) + RegisterSignal(parent, COMSIG_ITEM_PICKUP, PROC_REF(signal_on_pickup)) /* MOJAVE EDIT REMOVAL - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/update_actions) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(update_actions)) */ //MOJAVE EDIT BEGIN - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) //MOJAVE EDIT END - RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/close_all) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(close_all)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) - RegisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_ATTACK_HAND_SECONDARY), .proc/on_open_storage_click) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY_SECONDARY, .proc/on_open_storage_attackby) - RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto) - RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive) + RegisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_ATTACK_HAND_SECONDARY), PROC_REF(on_open_storage_click)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY_SECONDARY, PROC_REF(on_open_storage_attackby)) + RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, PROC_REF(mousedrop_onto)) + RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive)) update_actions() @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return var/obj/item/I = parent modeswitch_action = new(I) - RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, .proc/action_trigger) + RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, PROC_REF(action_trigger)) if(I.item_flags & IN_INVENTORY) var/mob/M = I.loc if(!istype(M)) @@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if((M.get_active_held_item() == parent) && allow_quick_empty) - INVOKE_ASYNC(src, .proc/quick_empty, M) + INVOKE_ASYNC(src, PROC_REF(quick_empty), M) /datum/component/storage/proc/preattack_intercept(datum/source, obj/O, mob/M, params) SIGNAL_HANDLER @@ -236,7 +236,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return if(!isturf(I.loc)) return - INVOKE_ASYNC(src, .proc/async_preattack_intercept, I, M) + INVOKE_ASYNC(src, PROC_REF(async_preattack_intercept), I, M) ///async functionality from preattack_intercept /datum/component/storage/proc/async_preattack_intercept(obj/item/attack_item, mob/pre_attack_mob) @@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return var/datum/progressbar/progress = new(pre_attack_mob, len, attack_item.loc) var/list/rejections = list() - while(do_after(pre_attack_mob, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, attack_item.loc, rejections, progress))) + while(do_after(pre_attack_mob, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, attack_item.loc, rejections, progress))) stoplag(1) progress.end_progress() to_chat(pre_attack_mob, span_notice("You put everything you could [insert_preposition] [parent].")) @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) var/turf/T = get_turf(A) var/list/things = contents() var/datum/progressbar/progress = new(M, length(things), T) - while (do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress))) + while (do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress))) stoplag(1) progress.end_progress() @@ -426,7 +426,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) M.client.screen |= real_location.contents M.set_active_storage(src) LAZYOR(is_using, M) - RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/mob_deleted) + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(mob_deleted)) return TRUE /datum/component/storage/proc/mob_deleted(datum/source) @@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(over_object == M) user_show_to_mob(M) if(!istype(over_object, /atom/movable/screen)) - INVOKE_ASYNC(src, .proc/dump_content_at, over_object, M) + INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, M) return if(A.loc != M) return @@ -833,12 +833,12 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) var/mob/living/carbon/human/H = user if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket. . = COMPONENT_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(H, /mob.proc/put_in_hands, A) + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob, put_in_hands), A) H.l_store = null return if(H.r_store == A && !H.get_active_held_item()) . = COMPONENT_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(H, /mob.proc/put_in_hands, A) + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob, put_in_hands), A) H.r_store = null return @@ -897,7 +897,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(!to_remove) return - INVOKE_ASYNC(src, .proc/attempt_put_in_hands, to_remove, user) + INVOKE_ASYNC(src, PROC_REF(attempt_put_in_hands), to_remove, user) /datum/component/storage/proc/on_open_storage_click(datum/source, mob/user, list/modifiers) SIGNAL_HANDLER diff --git a/code/datums/components/strong_pull.dm b/code/datums/components/strong_pull.dm index a76553a1ab6..f0cb206a650 100644 --- a/code/datums/components/strong_pull.dm +++ b/code/datums/components/strong_pull.dm @@ -17,7 +17,7 @@ Basically, the items they pull cannot be pulled (except by the puller) /datum/component/strong_pull/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_LIVING_START_PULL, .proc/on_pull) + RegisterSignal(parent, COMSIG_LIVING_START_PULL, PROC_REF(on_pull)) /** * Called when the parent grabs something, adds signals to the object to reject interactions @@ -25,8 +25,8 @@ Basically, the items they pull cannot be pulled (except by the puller) /datum/component/strong_pull/proc/on_pull(datum/source, atom/movable/pulled, state, force) SIGNAL_HANDLER strongpulling = pulled - RegisterSignal(strongpulling, COMSIG_ATOM_CAN_BE_PULLED, .proc/reject_further_pulls) - RegisterSignal(strongpulling, COMSIG_ATOM_NO_LONGER_PULLED, .proc/on_no_longer_pulled) + RegisterSignal(strongpulling, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(reject_further_pulls)) + RegisterSignal(strongpulling, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_no_longer_pulled)) if(istype(strongpulling, /obj/structure/closet) && !istype(strongpulling, /obj/structure/closet/body_bag)) var/obj/structure/closet/grabbed_closet = strongpulling grabbed_closet.strong_grab = TRUE diff --git a/code/datums/components/subtype_picker.dm b/code/datums/components/subtype_picker.dm index 71576ac7edf..5ab4785e7a7 100644 --- a/code/datums/components/subtype_picker.dm +++ b/code/datums/components/subtype_picker.dm @@ -24,7 +24,7 @@ /datum/component/subtype_picker/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) /datum/component/subtype_picker/UnregisterFromParent() . = ..() @@ -33,7 +33,7 @@ ///signal called by the stat of the target changing /datum/component/subtype_picker/proc/on_attack_self(datum/target, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/pick_subtype, target, user) + INVOKE_ASYNC(src, PROC_REF(pick_subtype), target, user) /** * pick_subtype: turns the list of types to their description into all the data radial menus need @@ -60,7 +60,7 @@ */ /datum/component/subtype_picker/proc/pick_subtype(datum/target, mob/picker) - var/name_of_type = show_radial_menu(picker, target, built_radial_list, custom_check = CALLBACK(src, .proc/check_menu, target, picker), radius = 42, require_near = TRUE) + var/name_of_type = show_radial_menu(picker, target, built_radial_list, custom_check = CALLBACK(src, PROC_REF(check_menu), target, picker), radius = 42, require_near = TRUE) if(!name_of_type || !check_menu(target, picker)) return diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm index bceaf0897e7..ff09d7c6372 100644 --- a/code/datums/components/summoning.dm +++ b/code/datums/components/summoning.dm @@ -24,11 +24,11 @@ /datum/component/summoning/RegisterWithParent() if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(parent)) - RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) /datum/component/summoning/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_POST_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT)) @@ -68,7 +68,7 @@ spawned_mobs += L if(faction != null) L.faction = faction - RegisterSignal(L, COMSIG_LIVING_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses) + RegisterSignal(L, COMSIG_LIVING_DEATH, PROC_REF(on_spawned_death)) // so we can remove them from the list, etc (for mobs with corpses) playsound(spawn_location,spawn_sound, 50, TRUE) spawn_location.visible_message(span_danger("[L] [spawn_text].")) diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index 4e41d6b2f81..8480735934a 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -18,7 +18,7 @@ return ..() /datum/component/surgery_initiator/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/initiate_surgery_moment) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(initiate_surgery_moment)) /datum/component/surgery_initiator/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_ATTACK) @@ -38,7 +38,7 @@ SIGNAL_HANDLER if(!isliving(target)) return - INVOKE_ASYNC(src, .proc/do_initiate_surgery_moment, target, user) + INVOKE_ASYNC(src, PROC_REF(do_initiate_surgery_moment), target, user) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/component/surgery_initiator/proc/do_initiate_surgery_moment(mob/living/target, mob/user) @@ -69,8 +69,8 @@ last_user_ref = WEAKREF(user) surgery_target_ref = WEAKREF(target) - RegisterSignal(user, COMSIG_MOB_SELECTED_ZONE_SET, .proc/on_set_selected_zone) - RegisterSignal(target, COMSIG_MOB_SURGERY_STARTED, .proc/on_mob_surgery_started) + RegisterSignal(user, COMSIG_MOB_SELECTED_ZONE_SET, PROC_REF(on_set_selected_zone)) + RegisterSignal(target, COMSIG_MOB_SURGERY_STARTED, PROC_REF(on_mob_surgery_started)) ui_interact(user) diff --git a/code/datums/components/swabbing.dm b/code/datums/components/swabbing.dm index 3b1ace6c23b..29dd07b44ff 100644 --- a/code/datums/components/swabbing.dm +++ b/code/datums/components/swabbing.dm @@ -21,10 +21,10 @@ This component is used in vat growing to swab for microbiological samples which if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/try_to_swab) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/handle_overlays) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/handle_icon) + RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_to_swab)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(handle_overlays)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(handle_icon)) src.can_swab_objs = can_swab_objs src.can_swab_turfs = can_swab_turfs @@ -97,7 +97,7 @@ This component is used in vat growing to swab for microbiological samples which return to_chat(user, span_notice("You start swabbing [target] for samples!")) - INVOKE_ASYNC(src, .proc/async_try_to_swab, target, user) + INVOKE_ASYNC(src, PROC_REF(async_try_to_swab), target, user) /datum/component/swabbing/proc/async_try_to_swab(atom/target, mob/user) if(!do_after(user, 3 SECONDS, target)) // Start swabbing boi diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm index 56493cd9e6a..76ba8a3548a 100644 --- a/code/datums/components/swarming.dm +++ b/code/datums/components/swarming.dm @@ -4,8 +4,8 @@ var/is_swarming = FALSE var/list/swarm_members = list() var/static/list/swarming_loc_connections = list( - COMSIG_ATOM_EXITED =.proc/leave_swarm, - COMSIG_ATOM_ENTERED = .proc/join_swarm + COMSIG_ATOM_EXITED = PROC_REF(leave_swarm), + COMSIG_ATOM_ENTERED = PROC_REF(join_swarm) ) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 4f8e6cfce25..1e284aa8cf3 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -45,7 +45,7 @@ var/mob/P = parent to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.")) - addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE) /datum/component/tackler/Destroy() var/mob/P = parent @@ -53,9 +53,9 @@ return ..() /datum/component/tackler/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack) - RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(checkTackle)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(sack)) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(registerTackle)) /datum/component/tackler/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW)) @@ -104,7 +104,7 @@ tackling = TRUE - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle)) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) var/leap_word = isfelinid(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". @@ -119,7 +119,7 @@ user.Knockdown(base_knockdown, ignore_canstun = TRUE) user.adjustStaminaLoss(stamina_cost) user.throw_at(A, range, speed, user, FALSE) - addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE) return(COMSIG_MOB_CANCEL_CLICKON) /** @@ -151,7 +151,7 @@ user.toggle_throw_mode() if(!iscarbon(hit)) if(hit.density) - INVOKE_ASYNC(src, .proc/splat, user, hit) + INVOKE_ASYNC(src, PROC_REF(splat), user, hit) return var/mob/living/carbon/target = hit @@ -212,7 +212,7 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T) + INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T) S.setGrabState(GRAB_PASSIVE) if(5 to INFINITY) // absolutely BODIED @@ -226,7 +226,7 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T) + INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T) S.setGrabState(GRAB_AGGRESSIVE) diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index 47677755acb..6656be33a1a 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -8,8 +8,8 @@ src.allowed_slot = allowed_slot /datum/component/tactical/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/modify) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unmodify) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(modify)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(unmodify)) /datum/component/tactical/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) diff --git a/code/datums/components/tameable.dm b/code/datums/components/tameable.dm index 918011637d5..34eaa649a55 100644 --- a/code/datums/components/tameable.dm +++ b/code/datums/components/tameable.dm @@ -25,8 +25,8 @@ src.after_tame = after_tame - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/try_tame) - RegisterSignal(parent, COMSIG_SIMPLEMOB_SENTIENCEPOTION, .proc/on_tame) //Instantly succeeds + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_tame)) + RegisterSignal(parent, COMSIG_SIMPLEMOB_SENTIENCEPOTION, PROC_REF(on_tame)) //Instantly succeeds /datum/component/tameable/proc/try_tame(datum/source, obj/item/food, mob/living/attacker, params) SIGNAL_HANDLER diff --git a/code/datums/components/tattoo.dm b/code/datums/components/tattoo.dm index b467b898a78..152b5971471 100644 --- a/code/datums/components/tattoo.dm +++ b/code/datums/components/tattoo.dm @@ -33,7 +33,7 @@ parent.RemoveElement(/datum/element/art/commoner) /datum/component/tattoo/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/tattoo/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) @@ -43,7 +43,7 @@ examine_list += span_boldnotice(tattoo_description) /datum/component/tattoo/proc/setup_tatted_owner(mob/living/carbon/new_owner) - RegisterSignal(new_owner, COMSIG_PARENT_EXAMINE, .proc/on_bodypart_owner_examine) + RegisterSignal(new_owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_bodypart_owner_examine)) /datum/component/tattoo/proc/clear_tatted_owner(mob/living/carbon/old_owner) UnregisterSignal(old_owner, COMSIG_PARENT_EXAMINE) diff --git a/code/datums/components/technointrovert.dm b/code/datums/components/technointrovert.dm index d49681814c5..c6f51f80416 100644 --- a/code/datums/components/technointrovert.dm +++ b/code/datums/components/technointrovert.dm @@ -14,8 +14,8 @@ src.message = message /datum/component/technointrovert/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, .proc/on_try_use_machine) - RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, .proc/on_try_wires_interact) + RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, PROC_REF(on_try_use_machine)) + RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, PROC_REF(on_try_wires_interact)) /datum/component/technointrovert/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT)) diff --git a/code/datums/components/technoshy.dm b/code/datums/components/technoshy.dm index 8a45c7d62c8..e8d4441a287 100644 --- a/code/datums/components/technoshy.dm +++ b/code/datums/components/technoshy.dm @@ -20,8 +20,8 @@ src.whitelist = whitelist /datum/component/technoshy/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, .proc/on_try_use_machine) - RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, .proc/on_try_wires_interact) + RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, PROC_REF(on_try_use_machine)) + RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, PROC_REF(on_try_wires_interact)) /datum/component/technoshy/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT)) diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm index c17293708e5..347af914752 100644 --- a/code/datums/components/tether.dm +++ b/code/datums/components/tether.dm @@ -14,7 +14,7 @@ src.tether_name = initial(tmp.name) else src.tether_name = tether_name - RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), .proc/checkTether) + RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), PROC_REF(checkTether)) /datum/component/tether/proc/checkTether(mob/mover, newloc) SIGNAL_HANDLER diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index 536f6d36e51..874c5739c09 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -46,9 +46,9 @@ overlay = mutable_appearance('icons/effects/effects.dmi', "thermite") master.add_overlay(overlay) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react) - RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react)) /datum/component/thermite/UnregisterFromParent() UnregisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT) @@ -70,7 +70,7 @@ amount += _amount if (burn_timer) // prevent people from skipping a longer timer deltimer(burn_timer) - burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) + burn_timer = addtimer(CALLBACK(src, PROC_REF(burn_parent), usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) /** * Used to begin the thermite burning process @@ -83,9 +83,9 @@ master.cut_overlay(overlay) playsound(master, 'sound/items/welder.ogg', 100, TRUE) fakefire = new(master) - burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) + burn_timer = addtimer(CALLBACK(src, PROC_REF(burn_parent), user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) UnregisterFromParent() - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/delete_fire) //in case parent gets deleted, get ready to delete the fire + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(delete_fire)) //in case parent gets deleted, get ready to delete the fire /** * Used to actually melt parent diff --git a/code/datums/components/tippable.dm b/code/datums/components/tippable.dm index ec586dc3e28..ad3c83470c5 100644 --- a/code/datums/components/tippable.dm +++ b/code/datums/components/tippable.dm @@ -54,9 +54,9 @@ src.roleplay_callback = roleplay_callback /datum/component/tippable/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, .proc/interact_with_tippable) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(interact_with_tippable)) if (roleplay_friendly) - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/accept_roleplay) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(accept_roleplay)) /datum/component/tippable/UnregisterFromParent() @@ -89,9 +89,9 @@ return if(is_tipped) - INVOKE_ASYNC(src, .proc/try_untip, source, user) + INVOKE_ASYNC(src, PROC_REF(try_untip), source, user) else - INVOKE_ASYNC(src, .proc/try_tip, source, user) + INVOKE_ASYNC(src, PROC_REF(try_tip), source, user) return COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN @@ -152,7 +152,7 @@ else if(self_right_time <= 0) right_self(tipped_mob) else - self_untip_timer = addtimer(CALLBACK(src, .proc/right_self, tipped_mob), self_right_time, TIMER_UNIQUE | TIMER_STOPPABLE) + self_untip_timer = addtimer(CALLBACK(src, PROC_REF(right_self), tipped_mob), self_right_time, TIMER_UNIQUE | TIMER_STOPPABLE) /** * Try to untip a mob that has been tipped. @@ -251,6 +251,6 @@ return var/time_left = timeleft(self_untip_timer) deltimer(self_untip_timer) - self_untip_timer = addtimer(CALLBACK(src, .proc/right_self, user), time_left * 0.75, TIMER_UNIQUE | TIMER_STOPPABLE) + self_untip_timer = addtimer(CALLBACK(src, PROC_REF(right_self), user), time_left * 0.75, TIMER_UNIQUE | TIMER_STOPPABLE) roleplayed = TRUE roleplay_callback?.Invoke(user) diff --git a/code/datums/components/toggle_suit.dm b/code/datums/components/toggle_suit.dm index 903bfbf4009..9a5ec84edbf 100644 --- a/code/datums/components/toggle_suit.dm +++ b/code/datums/components/toggle_suit.dm @@ -20,8 +20,8 @@ src.base_icon_state = atom_parent.base_icon_state || atom_parent.icon_state /datum/component/toggle_icon/RegisterWithParent() - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/toggle_icon/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm index 60adbd56b3b..186702143c3 100644 --- a/code/datums/components/transforming.dm +++ b/code/datums/components/transforming.dm @@ -80,9 +80,9 @@ /datum/component/transforming/RegisterWithParent() var/obj/item/item_parent = parent - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) if(item_parent.sharpness || sharpness_on) - RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen) + RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen)) /datum/component/transforming/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_SHARPEN_ACT)) diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index a04ca5f9ca6..07470647b57 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -41,11 +41,11 @@ /datum/component/trapdoor/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_TURF_CHANGE, .proc/turf_changed_pre) + RegisterSignal(parent, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre)) if(!src.assembly) - RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, .proc/on_link_requested) + RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) else - RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, .proc/toggle_trapdoor) + RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) /datum/component/trapdoor/UnregisterFromParent() . = ..() @@ -81,7 +81,7 @@ src.assembly = assembly assembly.linked = TRUE UnregisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK) - RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, .proc/toggle_trapdoor) + RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) ///signal called by our assembly being pulsed /datum/component/trapdoor/proc/toggle_trapdoor(datum/source) @@ -102,7 +102,7 @@ assembly.stored_decals.Cut() assembly = null return - post_change_callbacks += CALLBACK(assembly, /obj/item/assembly/trapdoor.proc/carry_over_trapdoor, trapdoor_turf_path) + post_change_callbacks += CALLBACK(assembly, TYPE_PROC_REF(/obj/item/assembly/trapdoor, carry_over_trapdoor), trapdoor_turf_path) /** * ## carry_over_trapdoor @@ -123,7 +123,7 @@ var/turf/open/trapdoor_turf = parent ///we want to save this turf's decals as they were right before deletion, so this is the point where we begin listening if(assembly) - RegisterSignal(parent, COMSIG_TURF_DECAL_DETACHED, .proc/decal_detached) + RegisterSignal(parent, COMSIG_TURF_DECAL_DETACHED, PROC_REF(decal_detached)) playsound(trapdoor_turf, 'sound/machines/trapdoor/trapdoor_open.ogg', 50) trapdoor_turf.visible_message(span_warning("[trapdoor_turf] swings open!")) trapdoor_turf.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index d1f78b56114..c8f627f6da6 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -72,13 +72,13 @@ // register signals withthe parent item /datum/component/two_handed/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(on_update_icon)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen)) // Remove all siginals registered to the parent item /datum/component/two_handed/UnregisterFromParent() @@ -159,7 +159,7 @@ return // blocked wield from item wielded = TRUE ADD_TRAIT(parent,TRAIT_WIELDED,src) - RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) // update item stats and name var/obj/item/parent_item = parent @@ -186,8 +186,8 @@ offhand_item.name = "[parent_item.name] - offhand" offhand_item.desc = "Your second grip on [parent_item]." offhand_item.wielded = TRUE - RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(offhand_item, COMSIG_PARENT_QDELETING, .proc/on_destroy) + RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(offhand_item, COMSIG_PARENT_QDELETING, PROC_REF(on_destroy)) user.put_in_inactive_hand(offhand_item) /** diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index 2428bdcbf24..c17fbf76489 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -17,8 +17,8 @@ src.on_milk_callback = on_milk_callback /datum/component/udder/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /datum/component/udder/UnregisterFromParent() QDEL_NULL(udder) @@ -135,7 +135,7 @@ return if(udder_mob.gender == FEMALE) START_PROCESSING(SSobj, src) - RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_mob_attacking) + RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_mob_attacking)) /obj/item/udder/gutlunch/process(delta_time) var/mob/living/simple_animal/hostile/asteroid/gutlunch/gutlunch = udder_mob diff --git a/code/datums/components/unbreakable.dm b/code/datums/components/unbreakable.dm index 8261dd6d3cb..b0fb4b879f7 100644 --- a/code/datums/components/unbreakable.dm +++ b/code/datums/components/unbreakable.dm @@ -11,7 +11,7 @@ return ..() /datum/component/unbreakable/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_STATCHANGE, .proc/surge) + RegisterSignal(parent, COMSIG_MOB_STATCHANGE, PROC_REF(surge)) /datum/component/unbreakable/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_STATCHANGE) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index 718a59ce311..e22e92d6479 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -51,20 +51,20 @@ if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) if(istype(parent, /obj/item/implant)) - RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, .proc/implant_activation) - RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, .proc/implanting) - RegisterSignal(parent, COMSIG_IMPLANT_OTHER, .proc/old_implant) - RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, .proc/new_implant) + RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, PROC_REF(implant_activation)) + RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, PROC_REF(implanting)) + RegisterSignal(parent, COMSIG_IMPLANT_OTHER, PROC_REF(old_implant)) + RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, PROC_REF(new_implant)) else if(istype(parent, /obj/item/pda)) - RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, .proc/new_ringtone) - RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, .proc/check_detonate) + RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, PROC_REF(new_ringtone)) + RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, PROC_REF(check_detonate)) else if(istype(parent, /obj/item/radio)) - RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency) + RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, PROC_REF(new_frequency)) else if(istype(parent, /obj/item/pen)) - RegisterSignal(parent, COMSIG_PEN_ROTATED, .proc/pen_rotation) + RegisterSignal(parent, COMSIG_PEN_ROTATED, PROC_REF(pen_rotation)) if(owner) src.owner = owner @@ -84,7 +84,7 @@ uplink_handler.purchase_log = purchase_log else uplink_handler = uplink_handler_override - RegisterSignal(uplink_handler, COMSIG_UPLINK_HANDLER_ON_UPDATE, .proc/handle_uplink_handler_update) + RegisterSignal(uplink_handler, COMSIG_UPLINK_HANDLER_ON_UPDATE, PROC_REF(handle_uplink_handler_update)) if(!lockable) active = TRUE locked = FALSE @@ -135,7 +135,7 @@ return active = TRUE if(user) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) // an unlocked uplink blocks also opening the PDA or headset menu return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/components/usb_port.dm b/code/datums/components/usb_port.dm index f4e24224268..adceb1f6d02 100644 --- a/code/datums/components/usb_port.dm +++ b/code/datums/components/usb_port.dm @@ -37,17 +37,17 @@ var/obj/item/circuit_component/component = circuit_component if(ispath(circuit_component)) component = new circuit_component(null) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_SAVE, .proc/save_component) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_SAVE, PROC_REF(save_component)) circuit_components += component if(should_register) RegisterWithParent() /datum/component/usb_port/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, .proc/on_load) + RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, PROC_REF(on_atom_usb_cable_try_attach)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, PROC_REF(on_load)) for(var/obj/item/circuit_component/component as anything in circuit_components) component.register_usb_parent(parent) @@ -118,7 +118,7 @@ /datum/component/usb_port/proc/attach_circuit_components(obj/item/integrated_circuit/circuitboard) for(var/obj/item/circuit_component/component as anything in circuit_components) circuitboard.add_component(component) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, .proc/on_circuit_component_removed) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, PROC_REF(on_circuit_component_removed)) /datum/component/usb_port/proc/on_examine(datum/source, mob/user, list/examine_text) SIGNAL_HANDLER @@ -169,9 +169,9 @@ if(!new_physical_object) new_physical_object = attached_circuit - RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SHELL_REMOVED, .proc/on_circuit_shell_removed) - RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, .proc/on_circuit_deleting) - RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SET_SHELL, .proc/on_set_shell) + RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SHELL_REMOVED, PROC_REF(on_circuit_shell_removed)) + RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_deleting)) + RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(on_set_shell)) set_physical_object(new_physical_object) return COMSIG_USB_CABLE_ATTACHED @@ -185,8 +185,8 @@ var/atom/atom_parent = parent usb_cable_beam = atom_parent.Beam(new_physical_object, "usb_cable_beam", 'icons/obj/wiremod.dmi') - RegisterSignal(new_physical_object, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(new_physical_object, COMSIG_PARENT_EXAMINE, .proc/on_examine_shell) + RegisterSignal(new_physical_object, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(new_physical_object, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_shell)) physical_object = new_physical_object // Adds support for loading circuits without shells but with usb cables, or loading circuits with shells because the shells might not load first. diff --git a/code/datums/components/vacuum.dm b/code/datums/components/vacuum.dm index 601fdc0d873..aa698cd3e70 100644 --- a/code/datums/components/vacuum.dm +++ b/code/datums/components/vacuum.dm @@ -15,9 +15,9 @@ return COMPONENT_INCOMPATIBLE if (connected_bag) attach_bag(null, connected_bag) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/suck) - RegisterSignal(parent, COMSIG_VACUUM_BAG_ATTACH, .proc/attach_bag) - RegisterSignal(parent, COMSIG_VACUUM_BAG_DETACH, .proc/detach_bag) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(suck)) + RegisterSignal(parent, COMSIG_VACUUM_BAG_ATTACH, PROC_REF(attach_bag)) + RegisterSignal(parent, COMSIG_VACUUM_BAG_DETACH, PROC_REF(detach_bag)) /** * Called when parent moves, deligates vacuuming functionality @@ -39,7 +39,7 @@ return // suck the things - INVOKE_ASYNC(src, .proc/suck_items, tile) + INVOKE_ASYNC(src, PROC_REF(suck_items), tile) /** * Sucks up items as possible from a provided turf into the connected trash bag @@ -71,7 +71,7 @@ SIGNAL_HANDLER vacuum_bag = new_bag - RegisterSignal(new_bag, COMSIG_PARENT_QDELETING, .proc/detach_bag) + RegisterSignal(new_bag, COMSIG_PARENT_QDELETING, PROC_REF(detach_bag)) /** * Handler for when a trash bag is detached diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm index cbfec78d11f..0d94e33c3d7 100644 --- a/code/datums/components/wearertargeting.dm +++ b/code/datums/components/wearertargeting.dm @@ -3,14 +3,14 @@ /datum/component/wearertargeting var/list/valid_slots = list() var/list/signals = list() - var/proctype = .proc/pass + var/proctype = PROC_REF(pass) var/mobtype = /mob/living /datum/component/wearertargeting/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_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/component/wearertargeting/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm index dc3348abf6d..f360dd9cb49 100644 --- a/code/datums/components/wet_floor.dm +++ b/code/datums/components/wet_floor.dm @@ -29,12 +29,12 @@ permanent = _permanent if(!permanent) START_PROCESSING(SSwet_floors, src) - addtimer(CALLBACK(src, .proc/gc, TRUE), 1) //GC after initialization. + addtimer(CALLBACK(src, PROC_REF(gc), TRUE), 1) //GC after initialization. last_process = world.time /datum/component/wet_floor/RegisterWithParent() - RegisterSignal(parent, COMSIG_TURF_IS_WET, .proc/is_wet) - RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, .proc/dry) + RegisterSignal(parent, COMSIG_TURF_IS_WET, PROC_REF(is_wet)) + RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, PROC_REF(dry)) /datum/component/wet_floor/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TURF_IS_WET, COMSIG_TURF_MAKE_DRY)) @@ -92,7 +92,7 @@ qdel(parent.GetComponent(/datum/component/slippery)) return - parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, .proc/AfterSlip)) + parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, PROC_REF(AfterSlip))) /datum/component/wet_floor/proc/dry(datum/source, strength = TURF_WET_WATER, immediate = FALSE, duration_decrease = INFINITY) SIGNAL_HANDLER diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index d4251b414c9..40873501175 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -47,7 +47,7 @@ spot1.Beam(spot2,beam_effect,time=2 SECONDS) current_charges-- owner.update_action_buttons_icon() - addtimer(CALLBACK(src, .proc/charge), charge_rate) + addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate) return TRUE return FALSE diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index cf9b40693af..c9a9a2d57e3 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -93,7 +93,7 @@ advance_diseases += P var/replace_num = advance_diseases.len + 1 - DISEASE_LIMIT //amount of diseases that need to be removed to fit this one if(replace_num > 0) - sortTim(advance_diseases, /proc/cmp_advdisease_resistance_asc) + sortTim(advance_diseases, GLOBAL_PROC_REF(cmp_advdisease_resistance_asc)) for(var/i in 1 to replace_num) var/datum/disease/advance/competition = advance_diseases[i] if(totalTransmittable() > competition.totalResistance()) @@ -451,7 +451,7 @@ symptoms += SSdisease.list_symptoms.Copy() do if(user) - var/symptom = tgui_input_list(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom", sort_list(symptoms, /proc/cmp_typepaths_asc)) + var/symptom = tgui_input_list(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom", sort_list(symptoms, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(symptom)) return else if(istext(symptom)) diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 6159c63eee7..a2ac18ecb61 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -75,6 +75,6 @@ BONUS if(power >= 2 && prob(30)) to_chat(M, span_userdanger("[pick("You have a coughing fit!", "You can't stop coughing!")]")) M.Immobilize(20) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 18) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 6) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 12) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 18) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index c02915cb517..9b6db1ec5ed 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -357,12 +357,12 @@ if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE - addtimer(CALLBACK(src, .proc/coma, M), 60) + addtimer(CALLBACK(src, PROC_REF(coma), M), 60) /datum/symptom/heal/coma/proc/coma(mob/living/M) M.fakedeath("regenerative_coma", !deathgasp) - addtimer(CALLBACK(src, .proc/uncoma, M), 300) + addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300) /datum/symptom/heal/coma/proc/uncoma(mob/living/M) diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index 3aba4cd5f65..38793e1f7e3 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -41,11 +41,11 @@ BONUS if(3, 4) if(!(H.hairstyle == "Bald") && !(H.hairstyle == "Balding Hair")) to_chat(H, span_warning("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50) + addtimer(CALLBACK(src, PROC_REF(Shed), H, FALSE), 50) if(5) if(!(H.facial_hairstyle == "Shaved") || !(H.hairstyle == "Bald")) to_chat(H, span_warning("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50) + addtimer(CALLBACK(src, PROC_REF(Shed), H, TRUE), 50) /datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald) if(fullbald) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index c725aa20a29..d6750b88516 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -33,7 +33,7 @@ /datum/disease/pierrot_throat/after_add() - RegisterSignal(affected_mob, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(affected_mob, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/disease/pierrot_throat/proc/handle_speech(datum/source, list/speech_args) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 0e85a6b325c..6332d8e1f10 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -857,10 +857,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) spawn_gibs() set_species(/datum/species/skeleton) if(prob(90)) - addtimer(CALLBACK(src, .proc/death), 30) + addtimer(CALLBACK(src, PROC_REF(death)), 30) if(5) to_chat(src, span_phobia("LOOK UP!")) - addtimer(CALLBACK(src, .proc/something_horrible_mindmelt), 30) + addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 30) /mob/living/carbon/human/proc/something_horrible_mindmelt() if(!is_blind()) @@ -870,4 +870,4 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) eyes.Remove(src) qdel(eyes) visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now.")) - addtimer(CALLBACK(src, .proc/adjustOrganLoss, ORGAN_SLOT_BRAIN, 200), 20) + addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index 30bd98a3268..82b51395225 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -23,7 +23,7 @@ return ELEMENT_INCOMPATIBLE SEND_SIGNAL(target, COMSIG_ELEMENT_ATTACH, src) if(element_flags & ELEMENT_DETACH) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/OnTargetDelete, override = TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(OnTargetDelete), override = TRUE) /datum/element/proc/OnTargetDelete(datum/source, force) SIGNAL_HANDLER diff --git a/code/datums/elements/art.dm b/code/datums/elements/art.dm index 4b8ba3d0751..9c22c6c7efe 100644 --- a/code/datums/elements/art.dm +++ b/code/datums/elements/art.dm @@ -8,7 +8,7 @@ if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE impressiveness = impress - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/art/Detach(datum/target) UnregisterSignal(target, COMSIG_PARENT_EXAMINE) @@ -39,7 +39,7 @@ SIGNAL_HANDLER if(!DOING_INTERACTION_WITH_TARGET(user, source)) - INVOKE_ASYNC(src, .proc/appraise, source, user) //Do not sleep the proc. + INVOKE_ASYNC(src, PROC_REF(appraise), source, user) //Do not sleep the proc. /datum/element/art/proc/appraise(atom/source, mob/user) to_chat(user, span_notice("You start appraising [source]...")) diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm index 94493a18097..03bd1b5be1a 100644 --- a/code/datums/elements/atmos_requirements.dm +++ b/code/datums/elements/atmos_requirements.dm @@ -20,7 +20,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE src.atmos_requirements = string_assoc_list(atmos_requirements) - RegisterSignal(target, COMSIG_LIVING_HANDLE_BREATHING, .proc/on_non_stasis_life) + RegisterSignal(target, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life)) /datum/element/atmos_requirements/Detach(datum/target) . = ..() diff --git a/code/datums/elements/atmos_sensitive.dm b/code/datums/elements/atmos_sensitive.dm index ca676327e26..bd6ff9e385a 100644 --- a/code/datums/elements/atmos_sensitive.dm +++ b/code/datums/elements/atmos_sensitive.dm @@ -11,7 +11,7 @@ return ELEMENT_INCOMPATIBLE var/atom/to_track = target to_track.AddElement(/datum/element/connect_loc, pass_on) - RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, .proc/react_to_move) + RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, PROC_REF(react_to_move)) if(!mapload && isopenturf(to_track.loc)) var/turf/open/new_open = to_track.loc diff --git a/code/datums/elements/backblast.dm b/code/datums/elements/backblast.dm index 14b8cf3a312..444784fe719 100644 --- a/code/datums/elements/backblast.dm +++ b/code/datums/elements/backblast.dm @@ -25,9 +25,9 @@ src.range = range if(plumes == 1) - RegisterSignal(target, COMSIG_GUN_FIRED, .proc/gun_fired_simple) + RegisterSignal(target, COMSIG_GUN_FIRED, PROC_REF(gun_fired_simple)) else - RegisterSignal(target, COMSIG_GUN_FIRED, .proc/gun_fired) + RegisterSignal(target, COMSIG_GUN_FIRED, PROC_REF(gun_fired)) /datum/element/backblast/Detach(datum/source) if(source) @@ -48,7 +48,7 @@ for(var/i in 1 to plumes) var/this_angle = SIMPLIFY_DEGREES(starting_angle + ((i - 1) * iter_offset)) var/turf/target_turf = get_turf_in_angle(this_angle, get_turf(user), 10) - INVOKE_ASYNC(src, .proc/pew, target_turf, weapon, user) + INVOKE_ASYNC(src, PROC_REF(pew), target_turf, weapon, user) /// If we're only firing one plume directly behind us, we don't need to bother with the loop or angles or anything /datum/element/backblast/proc/gun_fired_simple(obj/item/gun/weapon, mob/living/user, atom/target, params, zone_override) @@ -59,7 +59,7 @@ var/backwards_angle = get_angle(target, user) var/turf/target_turf = get_turf_in_angle(backwards_angle, get_turf(user), 10) - INVOKE_ASYNC(src, .proc/pew, target_turf, weapon, user) + INVOKE_ASYNC(src, PROC_REF(pew), target_turf, weapon, user) /// For firing an actual backblast pellet /datum/element/backblast/proc/pew(turf/target_turf, obj/item/gun/weapon, mob/living/user) diff --git a/code/datums/elements/bane.dm b/code/datums/elements/bane.dm index addf1c73b8a..6d146d005e2 100644 --- a/code/datums/elements/bane.dm +++ b/code/datums/elements/bane.dm @@ -17,9 +17,9 @@ return ELEMENT_INCOMPATIBLE if(ispath(target_type, /mob/living)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/mob_check) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(mob_check)) else if(ispath(target_type, /datum/species)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/species_check) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(species_check)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/basic_body_temp_sensitive.dm b/code/datums/elements/basic_body_temp_sensitive.dm index 08dbb301f4f..9781a2adb18 100644 --- a/code/datums/elements/basic_body_temp_sensitive.dm +++ b/code/datums/elements/basic_body_temp_sensitive.dm @@ -27,7 +27,7 @@ src.cold_damage = cold_damage if(heat_damage) src.heat_damage = heat_damage - RegisterSignal(target, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(target, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/element/basic_body_temp_sensitive/Detach(datum/source) if(source) diff --git a/code/datums/elements/beauty.dm b/code/datums/elements/beauty.dm index 06cabb96d47..a5721d7225b 100644 --- a/code/datums/elements/beauty.dm +++ b/code/datums/elements/beauty.dm @@ -23,8 +23,8 @@ if(!beauty_counter[target] && ismovable(target)) var/atom/movable/mov_target = target mov_target.become_area_sensitive(BEAUTY_ELEMENT_TRAIT) - RegisterSignal(mov_target, COMSIG_ENTER_AREA, .proc/enter_area) - RegisterSignal(mov_target, COMSIG_EXIT_AREA, .proc/exit_area) + RegisterSignal(mov_target, COMSIG_ENTER_AREA, PROC_REF(enter_area)) + RegisterSignal(mov_target, COMSIG_EXIT_AREA, PROC_REF(exit_area)) beauty_counter[target]++ diff --git a/code/datums/elements/bed_tucking.dm b/code/datums/elements/bed_tucking.dm index c8b4822e4be..53a95ab2c05 100644 --- a/code/datums/elements/bed_tucking.dm +++ b/code/datums/elements/bed_tucking.dm @@ -17,7 +17,7 @@ x_offset = x y_offset = y rotation_degree = rotation - RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, .proc/tuck_into_bed) + RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(tuck_into_bed)) /datum/element/bed_tuckable/Detach(obj/target) . = ..() @@ -44,7 +44,7 @@ tucked.pixel_y = y_offset if(rotation_degree) tucked.transform = turn(tucked.transform, rotation_degree) - RegisterSignal(tucked, COMSIG_ITEM_PICKUP, .proc/untuck) + RegisterSignal(tucked, COMSIG_ITEM_PICKUP, PROC_REF(untuck)) return COMPONENT_NO_AFTERATTACK diff --git a/code/datums/elements/blood_walk.dm b/code/datums/elements/blood_walk.dm index e27ba3ccc7c..374ed34e24c 100644 --- a/code/datums/elements/blood_walk.dm +++ b/code/datums/elements/blood_walk.dm @@ -28,7 +28,7 @@ src.sound_played = sound_played src.sound_volume = sound_volume src.blood_spawn_chance = blood_spawn_chance - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/spread_blood) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(spread_blood)) /datum/element/blood_walk/Detach(datum/target) . = ..() diff --git a/code/datums/elements/bsa_blocker.dm b/code/datums/elements/bsa_blocker.dm index 5bdf4fa9091..96606a55309 100644 --- a/code/datums/elements/bsa_blocker.dm +++ b/code/datums/elements/bsa_blocker.dm @@ -3,7 +3,7 @@ /datum/element/bsa_blocker/Attach(datum/target) if(!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, .proc/block_bsa) + RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, PROC_REF(block_bsa)) return ..() /datum/element/bsa_blocker/proc/block_bsa() diff --git a/code/datums/elements/chemical_transfer.dm b/code/datums/elements/chemical_transfer.dm index 2e1a9d4e408..4c8ac3267b0 100644 --- a/code/datums/elements/chemical_transfer.dm +++ b/code/datums/elements/chemical_transfer.dm @@ -28,8 +28,8 @@ src.transfer_prob = transfer_prob src.attacker_message = attacker_message src.victim_message = victim_message - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_attack) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/chemical_transfer/Detach(datum/target) . = ..() diff --git a/code/datums/elements/chewable.dm b/code/datums/elements/chewable.dm index 91e9a0ddac9..824956e0b2a 100644 --- a/code/datums/elements/chewable.dm +++ b/code/datums/elements/chewable.dm @@ -26,8 +26,8 @@ src.slots_to_check = slots_to_check || target_item.slot_flags - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_dropped) - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) /datum/element/chewable/Detach(datum/source, force) processing -= source diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm index b37ae8b7ce7..3f39d00eb6e 100644 --- a/code/datums/elements/cleaning.dm +++ b/code/datums/elements/cleaning.dm @@ -2,7 +2,7 @@ . = ..() if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Clean) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Clean)) /datum/element/cleaning/Detach(datum/target) . = ..() diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index d041d57e56b..63b0d104893 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -38,10 +38,10 @@ if(jump_sides) //MOJAVE SUN EDIT: Animation jump height src.jump_sides = jump_sides //MOJAVE SUN EDIT: Animation jump height - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, .proc/attack_hand) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive) - RegisterSignal(target, COMSIG_ATOM_BUMPED, .proc/try_speedrun) + RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive)) + RegisterSignal(target, COMSIG_ATOM_BUMPED, PROC_REF(try_speedrun)) ADD_TRAIT(target, TRAIT_CLIMBABLE, ELEMENT_TRAIT(type)) /datum/element/climbable/Detach(datum/target) @@ -109,7 +109,7 @@ jump_height = jump_sides playsound(user.loc, 'mojave/sound/ms13effects/vaulted.ogg', 80, TRUE) animate(user, pixel_y = jump_height, time = 1, easing = SINE_EASING) - addtimer(CALLBACK(src, .proc/climb_shift_reset, user), 2) + addtimer(CALLBACK(src, PROC_REF(climb_shift_reset), user), 2) user.visible_message(span_warning("[user] climbs onto [climbed_thing]."), \ span_notice("You climb onto [climbed_thing].")) log_combat(user, climbed_thing, "climbed onto") @@ -161,7 +161,7 @@ if (!animal.dextrous) return if(living_target.mobility_flags & MOBILITY_MOVE) - INVOKE_ASYNC(src, .proc/climb_structure, climbed_thing, living_target, params) + INVOKE_ASYNC(src, PROC_REF(climb_structure), climbed_thing, living_target, params) return ///Tries to climb onto the target if the forced movement of the mob allows it 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/crackable.dm b/code/datums/elements/crackable.dm index 16c8726dc66..63a40a4edf9 100644 --- a/code/datums/elements/crackable.dm +++ b/code/datums/elements/crackable.dm @@ -18,7 +18,7 @@ var/icon/new_crack_icon = icon(crack_icon, state) new_crack_icon.Turn(i * 10) crack_icons += new_crack_icon - RegisterSignal(target, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/IntegrityChanged) + RegisterSignal(target, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(IntegrityChanged)) /datum/element/crackable/proc/IntegrityChanged(obj/source, old_value, new_value) SIGNAL_HANDLER diff --git a/code/datums/elements/cult_eyes.dm b/code/datums/elements/cult_eyes.dm index 3ff5c8d646d..878892f6f99 100644 --- a/code/datums/elements/cult_eyes.dm +++ b/code/datums/elements/cult_eyes.dm @@ -12,8 +12,8 @@ return ELEMENT_INCOMPATIBLE // Register signals for mob transformation to prevent premature halo removal - RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), .proc/set_eyes) - addtimer(CALLBACK(src, .proc/set_eyes, target), initial_delay) + RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), PROC_REF(set_eyes)) + addtimer(CALLBACK(src, PROC_REF(set_eyes), target), initial_delay) /** * Cult eye setter proc diff --git a/code/datums/elements/cult_halo.dm b/code/datums/elements/cult_halo.dm index b62947d212e..68793f61d22 100644 --- a/code/datums/elements/cult_halo.dm +++ b/code/datums/elements/cult_halo.dm @@ -12,8 +12,8 @@ return ELEMENT_INCOMPATIBLE // Register signals for mob transformation to prevent premature halo removal - RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), .proc/set_halo) - addtimer(CALLBACK(src, .proc/set_halo, target), initial_delay) + RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), PROC_REF(set_halo)) + addtimer(CALLBACK(src, PROC_REF(set_halo), target), initial_delay) /** * Halo setter proc diff --git a/code/datums/elements/curse_announcement.dm b/code/datums/elements/curse_announcement.dm index 6462cf5ce50..4d8f5879052 100644 --- a/code/datums/elements/curse_announcement.dm +++ b/code/datums/elements/curse_announcement.dm @@ -27,9 +27,9 @@ src.new_name = new_name src.fantasy_component = WEAKREF(fantasy_component) if(cursed_item.slot_equipment_priority) //if it can equip somewhere, only go active when it is actually done - RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) + RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) else - RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, .proc/on_pickup) + RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) /datum/element/curse_announcement/Detach(datum/target) . = ..() diff --git a/code/datums/elements/death_drops.dm b/code/datums/elements/death_drops.dm index a8093493812..ea8abff07d3 100644 --- a/code/datums/elements/death_drops.dm +++ b/code/datums/elements/death_drops.dm @@ -17,7 +17,7 @@ stack_trace("death drops element added to [target] with NO LOOT") if(!src.loot) src.loot = loot.Copy() - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /datum/element/death_drops/Detach(datum/target) . = ..() diff --git a/code/datums/elements/decals/_decal.dm b/code/datums/elements/decals/_decal.dm index 3a00e321d3d..df533d52236 100644 --- a/code/datums/elements/decals/_decal.dm +++ b/code/datums/elements/decals/_decal.dm @@ -80,23 +80,23 @@ base_icon_state = _icon_state smoothing = _smoothing - RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay, TRUE) + RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE) if(target.flags_1 & INITIALIZED_1) target.update_appearance(UPDATE_OVERLAYS) //could use some queuing here now maybe. else - RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE,.proc/late_update_icon, TRUE) + RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(late_update_icon), TRUE) if(isitem(target)) - INVOKE_ASYNC(target, /obj/item/.proc/update_slot_icon, TRUE) + INVOKE_ASYNC(target, TYPE_PROC_REF(/obj/item, update_slot_icon), TRUE) if(_dir) SSdcs.RegisterSignal(target,COMSIG_ATOM_DIR_CHANGE, /datum/controller/subsystem/processing/dcs/proc/rotate_decals, TRUE) if(!isnull(_smoothing)) - RegisterSignal(target, COMSIG_ATOM_SMOOTHED_ICON, .proc/smooth_react, TRUE) + RegisterSignal(target, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smooth_react), TRUE) if(_cleanable) - RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react, TRUE) + RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react), TRUE) if(_description) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examine,TRUE) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine), TRUE) - RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, .proc/shuttle_move_react,TRUE) + RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, PROC_REF(shuttle_move_react), TRUE) /** * ## generate_appearance @@ -121,7 +121,7 @@ SSdcs.UnregisterSignal(source, COMSIG_ATOM_DIR_CHANGE) source.update_appearance(UPDATE_OVERLAYS) if(isitem(source)) - INVOKE_ASYNC(source, /obj/item/.proc/update_slot_icon) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, update_slot_icon)) SEND_SIGNAL(source, COMSIG_TURF_DECAL_DETACHED, description, cleanable, directional, pic) return ..() diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm index 1081e57f247..e9a169d8499 100644 --- a/code/datums/elements/decals/blood.dm +++ b/code/datums/elements/decals/blood.dm @@ -5,7 +5,7 @@ return ELEMENT_INCOMPATIBLE . = ..() - RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name, TRUE) + RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, PROC_REF(get_examine_name), TRUE) /datum/element/decal/blood/Detach(atom/source) UnregisterSignal(source, COMSIG_ATOM_GET_EXAMINE_NAME) diff --git a/code/datums/elements/deferred_aquarium_content.dm b/code/datums/elements/deferred_aquarium_content.dm index 5569e0359a6..bf0fd5bd2ba 100644 --- a/code/datums/elements/deferred_aquarium_content.dm +++ b/code/datums/elements/deferred_aquarium_content.dm @@ -20,7 +20,7 @@ if(istype(movable_target.loc, /obj/structure/aquarium)) create_aquarium_component(movable_target) else //otherwise the component will be created when trying to insert the thing. - RegisterSignal(target, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK, .proc/create_aquarium_component) + RegisterSignal(target, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK, PROC_REF(create_aquarium_component)) /datum/element/deferred_aquarium_content/Detach(datum/target) . = ..() diff --git a/code/datums/elements/delete_on_drop.dm b/code/datums/elements/delete_on_drop.dm index bc4d0fdccf7..b3db3bf6084 100644 --- a/code/datums/elements/delete_on_drop.dm +++ b/code/datums/elements/delete_on_drop.dm @@ -9,7 +9,7 @@ . = ..() if(!isitem(target)) return COMPONENT_INCOMPATIBLE - RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_CASING_EJECTED), .proc/del_on_drop) + RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_CASING_EJECTED), PROC_REF(del_on_drop)) /datum/element/delete_on_drop/Detach(datum/source) . = ..() diff --git a/code/datums/elements/deliver_first.dm b/code/datums/elements/deliver_first.dm index 16ab14ebc8a..a4fcf87e75d 100644 --- a/code/datums/elements/deliver_first.dm +++ b/code/datums/elements/deliver_first.dm @@ -20,10 +20,10 @@ return ELEMENT_INCOMPATIBLE src.goal_area_type = goal_area_type src.payment = payment - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(target, COMSIG_ATOM_EMAG_ACT, .proc/on_emag) - RegisterSignal(target, COMSIG_CLOSET_POST_OPEN, .proc/on_post_open) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(target, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag)) + RegisterSignal(target, COMSIG_CLOSET_POST_OPEN, PROC_REF(on_post_open)) ADD_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, src) //registers pre_open when appropriate area_check(target) @@ -52,7 +52,7 @@ UnregisterSignal(target, COMSIG_CLOSET_PRE_OPEN) return TRUE else - RegisterSignal(target, COMSIG_CLOSET_PRE_OPEN, .proc/on_pre_open, override = TRUE) //very purposefully overriding + RegisterSignal(target, COMSIG_CLOSET_PRE_OPEN, PROC_REF(on_pre_open), override = TRUE) //very purposefully overriding return FALSE /datum/element/deliver_first/proc/on_moved(obj/structure/closet/target, atom/oldloc, direction) diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm index dcfbbd3b650..b49f97a96db 100644 --- a/code/datums/elements/digitalcamo.dm +++ b/code/datums/elements/digitalcamo.dm @@ -10,8 +10,8 @@ . = ..() if(!isliving(target) || (target in attached_mobs)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, .proc/can_track) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track)) var/image/img = image(loc = target) img.override = TRUE attached_mobs[target] = img diff --git a/code/datums/elements/drag_pickup.dm b/code/datums/elements/drag_pickup.dm index 7501d552c47..c33216d43e7 100644 --- a/code/datums/elements/drag_pickup.dm +++ b/code/datums/elements/drag_pickup.dm @@ -9,7 +9,7 @@ /datum/element/drag_pickup/Attach(datum/target) if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, .proc/pick_up) + RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, PROC_REF(pick_up)) return ..() /datum/element/drag_pickup/Detach(datum/source) @@ -23,7 +23,7 @@ return if(over == picker) - INVOKE_ASYNC(picker, /mob/.proc/put_in_hands, source) + INVOKE_ASYNC(picker, TYPE_PROC_REF(/mob, put_in_hands), source) else if(istype(over, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/Selected_hand = over picker.putItemFromInventoryInHandIfPossible(source, Selected_hand.held_index) diff --git a/code/datums/elements/dryable.dm b/code/datums/elements/dryable.dm index 225e854fb6f..d6b7d97512e 100644 --- a/code/datums/elements/dryable.dm +++ b/code/datums/elements/dryable.dm @@ -11,7 +11,7 @@ return ELEMENT_INCOMPATIBLE src.dry_result = dry_result - RegisterSignal(target, COMSIG_ITEM_DRIED, .proc/finish_drying) + RegisterSignal(target, COMSIG_ITEM_DRIED, PROC_REF(finish_drying)) ADD_TRAIT(target, TRAIT_DRYABLE, ELEMENT_TRAIT(type)) diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 673230ac9d8..646edf10b9f 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -10,7 +10,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged) + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), PROC_REF(equippedChanged)) /datum/element/earhealing/Detach(datum/target) . = ..() diff --git a/code/datums/elements/easily_fragmented.dm b/code/datums/elements/easily_fragmented.dm index b1a7ff66fed..4eb5d09f200 100644 --- a/code/datums/elements/easily_fragmented.dm +++ b/code/datums/elements/easily_fragmented.dm @@ -16,7 +16,7 @@ src.break_chance = break_chance - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/element/easily_fragmented/Detach(datum/target) . = ..() diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index f667d04938d..68466d67e26 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -34,12 +34,12 @@ if(!isitem(target) && !isprojectile(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ELEMENT_ATTACH, .proc/severancePackage) + RegisterSignal(target, COMSIG_ELEMENT_ATTACH, PROC_REF(severancePackage)) if(isitem(target)) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, .proc/checkEmbed) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examined) - RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, .proc/tryForceEmbed) - RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, .proc/detachFromWeapon) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbed)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examined)) + RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, PROC_REF(tryForceEmbed)) + RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, PROC_REF(detachFromWeapon)) if(!initialized) src.embed_chance = embed_chance src.fall_chance = fall_chance @@ -55,7 +55,7 @@ initialized = TRUE else payload_type = projectile_payload - RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/checkEmbedProjectile) + RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(checkEmbedProjectile)) /datum/element/embed/Detach(obj/target) diff --git a/code/datums/elements/empprotection.dm b/code/datums/elements/empprotection.dm index 5a924057658..8d5d798c3cb 100644 --- a/code/datums/elements/empprotection.dm +++ b/code/datums/elements/empprotection.dm @@ -8,7 +8,7 @@ if(. == ELEMENT_INCOMPATIBLE || !isatom(target)) return ELEMENT_INCOMPATIBLE flags = _flags - RegisterSignal(target, COMSIG_ATOM_EMP_ACT, .proc/getEmpFlags) + RegisterSignal(target, COMSIG_ATOM_EMP_ACT, PROC_REF(getEmpFlags)) /datum/element/empprotection/Detach(atom/target) UnregisterSignal(target, COMSIG_ATOM_EMP_ACT) diff --git a/code/datums/elements/eyestab.dm b/code/datums/elements/eyestab.dm index b7d73867ea8..2006c11c453 100644 --- a/code/datums/elements/eyestab.dm +++ b/code/datums/elements/eyestab.dm @@ -18,7 +18,7 @@ if (!isnull(damage)) src.damage = damage - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_item_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) /datum/element/eyestab/Detach(datum/source, ...) . = ..() diff --git a/code/datums/elements/firestacker.dm b/code/datums/elements/firestacker.dm index da65474dcb7..634ec18f549 100644 --- a/code/datums/elements/firestacker.dm +++ b/code/datums/elements/firestacker.dm @@ -15,10 +15,10 @@ src.amount = amount - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/impact, override = TRUE) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(impact), override = TRUE) if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/item_attack, override = TRUE) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/item_attack_self, override = TRUE) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(item_attack), override = TRUE) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(item_attack_self), override = TRUE) /datum/element/firestacker/Detach(datum/source) . = ..() diff --git a/code/datums/elements/food/dunkable.dm b/code/datums/elements/food/dunkable.dm index 4a515eaa215..7de8c9f8096 100644 --- a/code/datums/elements/food/dunkable.dm +++ b/code/datums/elements/food/dunkable.dm @@ -10,7 +10,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE dunk_amount = amount_per_dunk - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/get_dunked) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(get_dunked)) /datum/element/dunkable/Detach(datum/target) . = ..() diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm index e10c0485b77..78512b15caf 100644 --- a/code/datums/elements/food/food_trash.dm +++ b/code/datums/elements/food/food_trash.dm @@ -15,17 +15,17 @@ return ELEMENT_INCOMPATIBLE src.trash = trash src.flags = flags - RegisterSignal(target, COMSIG_FOOD_CONSUMED, .proc/generate_trash) + RegisterSignal(target, COMSIG_FOOD_CONSUMED, PROC_REF(generate_trash)) if(!generate_trash_procpath && generate_trash_proc) generate_trash_procpath = generate_trash_proc if(flags & FOOD_TRASH_OPENABLE) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/open_trash) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(open_trash)) if(flags & FOOD_TRASH_POPABLE) - RegisterSignal(target, COMSIG_FOOD_CROSSED, .proc/food_crossed) - RegisterSignal(target, COMSIG_ITEM_ON_GRIND, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_ON_JUICE, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, .proc/generate_trash) + RegisterSignal(target, COMSIG_FOOD_CROSSED, PROC_REF(food_crossed)) + RegisterSignal(target, COMSIG_ITEM_ON_GRIND, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_ON_JUICE, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(generate_trash)) /datum/element/food_trash/Detach(datum/target) . = ..() @@ -35,7 +35,7 @@ SIGNAL_HANDLER ///cringy signal_handler shouldnt be needed if you dont want to return but oh well - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) /datum/element/food_trash/proc/async_generate_trash(datum/source) var/atom/edible_object = source @@ -59,7 +59,7 @@ playsound(source, 'sound/effects/chipbagpop.ogg', 100) popper.visible_message(span_danger("[popper] steps on \the [source], popping the bag!"), span_danger("You step on \the [source], popping the bag!"), span_danger("You hear a sharp crack!"), COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) qdel(source) @@ -68,6 +68,6 @@ to_chat(user, span_notice("You open the [source], revealing \a [initial(trash.name)].")) - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) qdel(source) diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm index c421acc3393..454bf43530d 100644 --- a/code/datums/elements/food/processable.dm +++ b/code/datums/elements/food/processable.dm @@ -21,8 +21,8 @@ src.time_to_process = time_to_process src.result_atom_type = result_atom_type - RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), .proc/try_process) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/OnExamine) + RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), PROC_REF(try_process)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) /datum/element/processable/Detach(datum/target) . = ..() diff --git a/code/datums/elements/food/venue_price.dm b/code/datums/elements/food/venue_price.dm index aca44f1233c..37a6bed8169 100644 --- a/code/datums/elements/food/venue_price.dm +++ b/code/datums/elements/food/venue_price.dm @@ -10,7 +10,7 @@ stack_trace("A venue_price element was attached to something without specifying an actual price.") return ELEMENT_INCOMPATIBLE src.venue_price = venue_price - RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, .proc/item_sold) + RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(item_sold)) /datum/element/venue_price/Detach(datum/target) . = ..() diff --git a/code/datums/elements/footstep.dm b/code/datums/elements/footstep.dm index 2edad6af977..178f30a981c 100644 --- a/code/datums/elements/footstep.dm +++ b/code/datums/elements/footstep.dm @@ -31,7 +31,7 @@ if(FOOTSTEP_MOB_HUMAN) if(!ishuman(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_humanstep) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_humanstep)) steps_for_living[target] = 0 return if(FOOTSTEP_MOB_CLAW) @@ -46,19 +46,19 @@ footstep_sounds = 'sound/effects/footstep/slime1.ogg' if(FOOTSTEP_OBJ_MACHINE) footstep_sounds = 'sound/effects/bang.ogg' - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_machine)) return if(FOOTSTEP_OBJ_ROBOT) footstep_sounds = 'sound/effects/tank_treads.ogg' - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_machine)) return // MOJAVE SUN EDIT BEGIN if(FOOTSTEP_PA) footstep_sounds = list('mojave/sound/ms13effects/footsteps/pa/PA_01.ogg', 'mojave/sound/ms13effects/footsteps/pa/PA_02.ogg', 'mojave/sound/ms13effects/footsteps/pa/PA_03.ogg', 'mojave/sound/ms13effects/footsteps/pa/PA_04.ogg', 'mojave/sound/ms13effects/footsteps/pa/PA_05.ogg', 'mojave/sound/ms13effects/footsteps/pa/PA_06.ogg') - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_pa) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_pa)) return // MOJAVE SUN EDIT END - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep)) steps_for_living[target] = 0 /datum/element/footstep/Detach(atom/movable/source) diff --git a/code/datums/elements/forced_gravity.dm b/code/datums/elements/forced_gravity.dm index ada16943b86..8f0b3cbd51f 100644 --- a/code/datums/elements/forced_gravity.dm +++ b/code/datums/elements/forced_gravity.dm @@ -12,9 +12,9 @@ src.gravity = gravity src.ignore_space = ignore_space - RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check) + RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check)) if(isturf(target)) - RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check) + RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check)) /datum/element/forced_gravity/Detach(datum/source) . = ..() diff --git a/code/datums/elements/honkspam.dm b/code/datums/elements/honkspam.dm index e13fd7b8292..05f4592e8ac 100644 --- a/code/datums/elements/honkspam.dm +++ b/code/datums/elements/honkspam.dm @@ -6,7 +6,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) /datum/element/honkspam/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_ATTACK_SELF) diff --git a/code/datums/elements/item_fov.dm b/code/datums/elements/item_fov.dm index 57d93f4f537..91c38e02921 100644 --- a/code/datums/elements/item_fov.dm +++ b/code/datums/elements/item_fov.dm @@ -11,8 +11,8 @@ return ELEMENT_INCOMPATIBLE src.fov_angle = fov_angle - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/element/item_fov/Detach(datum/target) UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) diff --git a/code/datums/elements/item_scaling.dm b/code/datums/elements/item_scaling.dm index 4c9fc21e32e..b2130f384c0 100644 --- a/code/datums/elements/item_scaling.dm +++ b/code/datums/elements/item_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/kneecapping.dm b/code/datums/elements/kneecapping.dm index 0bf5822a28b..d8ef9dbcadc 100644 --- a/code/datums/elements/kneecapping.dm +++ b/code/datums/elements/kneecapping.dm @@ -33,7 +33,7 @@ if(. == ELEMENT_INCOMPATIBLE) return - RegisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY , .proc/try_kneecap_target) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY, PROC_REF(try_kneecap_target)) /datum/element/kneecapping/Detach(datum/target) UnregisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY) @@ -67,7 +67,7 @@ . = COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(src, .proc/do_kneecap_target, source, leg, target, attacker) + INVOKE_ASYNC(src, PROC_REF(do_kneecap_target), source, leg, target, attacker) /** * After a short do_mob, attacker applies damage to the given leg with a significant wounding bonus, applying the weapon's force as damage. diff --git a/code/datums/elements/kneejerk.dm b/code/datums/elements/kneejerk.dm index 4b4eff75e3e..ae1e1fb6b4c 100644 --- a/code/datums/elements/kneejerk.dm +++ b/code/datums/elements/kneejerk.dm @@ -8,7 +8,7 @@ if (!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_item_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) /datum/element/kneejerk/Detach(datum/source, ...) . = ..() diff --git a/code/datums/elements/knockback.dm b/code/datums/elements/knockback.dm index ba132e7b235..c167c1dc08d 100644 --- a/code/datums/elements/knockback.dm +++ b/code/datums/elements/knockback.dm @@ -13,11 +13,11 @@ /datum/element/knockback/Attach(datum/target, throw_distance = 1, throw_anchored = FALSE, throw_gentle = FALSE) . = ..() if(ismachinery(target) || isstructure(target) || isgun(target)) // turrets, etc - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/lifesteal.dm b/code/datums/elements/lifesteal.dm index db3d008cd07..9d6a73590fa 100644 --- a/code/datums/elements/lifesteal.dm +++ b/code/datums/elements/lifesteal.dm @@ -12,11 +12,11 @@ /datum/element/lifesteal/Attach(datum/target, flat_heal) . = ..() if(isgun(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/light_blocking.dm b/code/datums/elements/light_blocking.dm index 1080d2c3b4f..2d710d30bf8 100644 --- a/code/datums/elements/light_blocking.dm +++ b/code/datums/elements/light_blocking.dm @@ -9,7 +9,7 @@ . = ..() if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_target_move) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_target_move)) var/atom/movable/movable_target = target if(!isturf(movable_target.loc)) return diff --git a/code/datums/elements/light_eaten.dm b/code/datums/elements/light_eaten.dm index 3183fef1efd..664ff4edaef 100644 --- a/code/datums/elements/light_eaten.dm +++ b/code/datums/elements/light_eaten.dm @@ -10,10 +10,10 @@ . = ..() var/atom/atom_target = target - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_POWER, .proc/block_light_power) - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_RANGE, .proc/block_light_range) - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_ON, .proc/block_light_on) - RegisterSignal(atom_target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_POWER, PROC_REF(block_light_power)) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_RANGE, PROC_REF(block_light_range)) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_ON, PROC_REF(block_light_on)) + RegisterSignal(atom_target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /// Because the lighting system does not like movable lights getting set_light() called. switch(atom_target.light_system) diff --git a/code/datums/elements/light_eater.dm b/code/datums/elements/light_eater.dm index 026258122a7..3b65a5eadb2 100644 --- a/code/datums/elements/light_eater.dm +++ b/code/datums/elements/light_eater.dm @@ -9,14 +9,14 @@ /datum/element/light_eater/Attach(datum/target) if(isatom(target)) if(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/on_throw_impact) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_impact)) if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) - RegisterSignal(target, COMSIG_ITEM_HIT_REACT, .proc/on_hit_reaction) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) + RegisterSignal(target, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_reaction)) else if(isprojectile(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) else if(istype(target, /datum/reagent)) - RegisterSignal(target, COMSIG_REAGENT_EXPOSE_ATOM, .proc/on_expose_atom) + RegisterSignal(target, COMSIG_REAGENT_EXPOSE_ATOM, PROC_REF(on_expose_atom)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/movement_turf_changer.dm b/code/datums/elements/movement_turf_changer.dm index 25dff387b52..5a278cfbbbf 100644 --- a/code/datums/elements/movement_turf_changer.dm +++ b/code/datums/elements/movement_turf_changer.dm @@ -16,7 +16,7 @@ return ELEMENT_INCOMPATIBLE src.turf_type = turf_type - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) /datum/element/movement_turf_changer/Detach(datum/target) UnregisterSignal(target, COMSIG_MOVABLE_MOVED) diff --git a/code/datums/elements/movetype_handler.dm b/code/datums/elements/movetype_handler.dm index f1c6486d7bd..e05235b0e86 100644 --- a/code/datums/elements/movetype_handler.dm +++ b/code/datums/elements/movetype_handler.dm @@ -22,11 +22,11 @@ return var/atom/movable/movable_target = target - RegisterSignal(movable_target, GLOB.movement_type_addtrait_signals, .proc/on_movement_type_trait_gain) - RegisterSignal(movable_target, GLOB.movement_type_removetrait_signals, .proc/on_movement_type_trait_loss) - RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), .proc/on_no_floating_anim_trait_gain) - RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), .proc/on_no_floating_anim_trait_loss) - RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, .proc/pause_floating_anim) + RegisterSignal(movable_target, GLOB.movement_type_addtrait_signals, PROC_REF(on_movement_type_trait_gain)) + RegisterSignal(movable_target, GLOB.movement_type_removetrait_signals, PROC_REF(on_movement_type_trait_loss)) + RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_gain)) + RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_loss)) + RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, PROC_REF(pause_floating_anim)) attached_atoms[movable_target] = TRUE if(movable_target.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(movable_target, TRAIT_NO_FLOATING_ANIM)) diff --git a/code/datums/elements/nerfed_pulling.dm b/code/datums/elements/nerfed_pulling.dm index b01ada506c3..cfa6d1a96b9 100644 --- a/code/datums/elements/nerfed_pulling.dm +++ b/code/datums/elements/nerfed_pulling.dm @@ -14,8 +14,8 @@ src.typecache = typecache - RegisterSignal(target, COMSIG_LIVING_PUSHING_MOVABLE, .proc/on_push_movable) - RegisterSignal(target, COMSIG_LIVING_UPDATING_PULL_MOVESPEED, .proc/on_updating_pull_movespeed) + RegisterSignal(target, COMSIG_LIVING_PUSHING_MOVABLE, PROC_REF(on_push_movable)) + RegisterSignal(target, COMSIG_LIVING_UPDATING_PULL_MOVESPEED, PROC_REF(on_updating_pull_movespeed)) /datum/element/nerfed_pulling/Detach(mob/living/source) source.remove_movespeed_modifier(/datum/movespeed_modifier/nerfed_bump) diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm index ef55457c28c..efb55f4bfa7 100644 --- a/code/datums/elements/obj_regen.dm +++ b/code/datums/elements/obj_regen.dm @@ -21,7 +21,7 @@ return ELEMENT_INCOMPATIBLE rate = _rate - RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, .proc/on_take_damage) + RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage)) if(target.get_integrity() < target.max_integrity) if(!length(processing)) START_PROCESSING(SSobj, src) diff --git a/code/datums/elements/openspace_item_click_handler.dm b/code/datums/elements/openspace_item_click_handler.dm index c70461f8b1e..dd38b0994c2 100644 --- a/code/datums/elements/openspace_item_click_handler.dm +++ b/code/datums/elements/openspace_item_click_handler.dm @@ -9,7 +9,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/element/openspace_item_click_handler/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_AFTERATTACK) @@ -22,4 +22,4 @@ return var/turf/turf_above = get_step_multiz(target, UP) if(turf_above?.z == user.z) - INVOKE_ASYNC(source, /obj/item.proc/handle_openspace_click, turf_above, user, user.CanReach(turf_above, source), click_parameters) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), turf_above, user, user.CanReach(turf_above, source), click_parameters) diff --git a/code/datums/elements/pet_bonus.dm b/code/datums/elements/pet_bonus.dm index f6083feefac..6fa6bebc799 100644 --- a/code/datums/elements/pet_bonus.dm +++ b/code/datums/elements/pet_bonus.dm @@ -20,7 +20,7 @@ src.emote_message = emote_message src.moodlet = moodlet - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) /datum/element/pet_bonus/Detach(datum/target) . = ..() diff --git a/code/datums/elements/plant_backfire.dm b/code/datums/elements/plant_backfire.dm index 512cfd0b613..eba3279979a 100644 --- a/code/datums/elements/plant_backfire.dm +++ b/code/datums/elements/plant_backfire.dm @@ -21,9 +21,9 @@ src.extra_traits = extra_traits src.extra_genes = extra_genes - RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK, .proc/attack_safety_check) - RegisterSignal(target, COMSIG_ITEM_PICKUP, .proc/pickup_safety_check) - RegisterSignal(target, COMSIG_MOVABLE_PRE_THROW, .proc/throw_safety_check) + RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK, PROC_REF(attack_safety_check)) + RegisterSignal(target, COMSIG_ITEM_PICKUP, PROC_REF(pickup_safety_check)) + RegisterSignal(target, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_safety_check)) /datum/element/plant_backfire/Detach(datum/target) . = ..() diff --git a/code/datums/elements/prevent_attacking_of_types.dm b/code/datums/elements/prevent_attacking_of_types.dm index cc7939a7602..8c3b65bdbad 100644 --- a/code/datums/elements/prevent_attacking_of_types.dm +++ b/code/datums/elements/prevent_attacking_of_types.dm @@ -19,7 +19,7 @@ src.alert_message = alert_message src.typecache = typecache - RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_pre_attacking_target) + RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_pre_attacking_target)) /datum/element/prevent_attacking_of_types/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_HOSTILE_PRE_ATTACKINGTARGET) diff --git a/code/datums/elements/projectile_shield.dm b/code/datums/elements/projectile_shield.dm index c8a64e4ac11..2e99ec756e4 100644 --- a/code/datums/elements/projectile_shield.dm +++ b/code/datums/elements/projectile_shield.dm @@ -4,7 +4,7 @@ if(!ismob(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act) + RegisterSignal(target, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) /datum/element/projectile_shield/Detach(datum/target) . = ..() diff --git a/code/datums/elements/radiation_protected_clothing.dm b/code/datums/elements/radiation_protected_clothing.dm index 152ed26e269..a759923a089 100644 --- a/code/datums/elements/radiation_protected_clothing.dm +++ b/code/datums/elements/radiation_protected_clothing.dm @@ -11,7 +11,7 @@ return ELEMENT_INCOMPATIBLE ADD_TRAIT(target, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/radiation_protected_clothing/Detach(datum/source, ...) REMOVE_TRAIT(source, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) diff --git a/code/datums/elements/ranged_attacks.dm b/code/datums/elements/ranged_attacks.dm index 0b09496e24e..d430bb1a0c4 100644 --- a/code/datums/elements/ranged_attacks.dm +++ b/code/datums/elements/ranged_attacks.dm @@ -15,7 +15,7 @@ src.projectilesound = projectilesound src.projectiletype = projectiletype - RegisterSignal(target, COMSIG_MOB_ATTACK_RANGED, .proc/fire_ranged_attack) + RegisterSignal(target, COMSIG_MOB_ATTACK_RANGED, PROC_REF(fire_ranged_attack)) if(casingtype && projectiletype) CRASH("Set both casing type and projectile type in [target]'s ranged attacks element! uhoh! stinky!") @@ -26,7 +26,7 @@ /datum/element/ranged_attacks/proc/fire_ranged_attack(mob/living/basic/firer, atom/target, modifiers) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_fire_ranged_attack, firer, target, modifiers) + INVOKE_ASYNC(src, PROC_REF(async_fire_ranged_attack), firer, target, modifiers) /datum/element/ranged_attacks/proc/async_fire_ranged_attack(mob/living/basic/firer, atom/target, modifiers) diff --git a/code/datums/elements/ridable.dm b/code/datums/elements/ridable.dm index 6b12870474d..5aac3290c0b 100644 --- a/code/datums/elements/ridable.dm +++ b/code/datums/elements/ridable.dm @@ -27,9 +27,9 @@ riding_component_type = component_type potion_boosted = potion_boost - RegisterSignal(target, COMSIG_MOVABLE_PREBUCKLE, .proc/check_mounting) + RegisterSignal(target, COMSIG_MOVABLE_PREBUCKLE, PROC_REF(check_mounting)) if(isvehicle(target)) - RegisterSignal(target, COMSIG_SPEED_POTION_APPLIED, .proc/check_potion) + RegisterSignal(target, COMSIG_SPEED_POTION_APPLIED, PROC_REF(check_potion)) /datum/element/ridable/Detach(datum/target) UnregisterSignal(target, list(COMSIG_MOVABLE_PREBUCKLE, COMSIG_SPEED_POTION_APPLIED)) diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm index dd39ca52a85..cfa61345c6b 100644 --- a/code/datums/elements/rust.dm +++ b/code/datums/elements/rust.dm @@ -15,9 +15,9 @@ if(!rust_overlay) rust_overlay = image(rust_icon, rust_icon_state) ADD_TRAIT(target, TRAIT_RUSTY, ELEMENT_TRAIT(type)) - RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_rust_overlay) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/handle_examine) - RegisterSignal(target, list(COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_RUSTSCRAPER)), .proc/secondary_tool_act) + RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_rust_overlay)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine)) + RegisterSignal(target, list(COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_RUSTSCRAPER)), PROC_REF(secondary_tool_act)) // Unfortunately registering with parent sometimes doesn't cause an overlay update target.update_icon(UPDATE_OVERLAYS) @@ -40,7 +40,7 @@ /// Because do_after sleeps we register the signal here and defer via an async call /datum/element/rust/proc/secondary_tool_act(atom/source, mob/user, obj/item/item) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_tool_use, source, user, item) + INVOKE_ASYNC(src, PROC_REF(handle_tool_use), source, user, item) return COMPONENT_BLOCK_TOOL_ATTACK /// We call this from secondary_tool_act because we sleep with do_after diff --git a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm index f7afaf60dad..f832e173e87 100644 --- a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm +++ b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm @@ -41,7 +41,7 @@ var/atom/atom_target = target atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/contextual_screentip_bare_hands/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM) diff --git a/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm b/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm index 44ff1f3190f..10d5ac6b827 100644 --- a/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm +++ b/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm @@ -17,7 +17,7 @@ var/atom/atom_target = target atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/contextual_screentip_item_typechecks/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM) diff --git a/code/datums/elements/screentips/contextual_screentip_tools.dm b/code/datums/elements/screentips/contextual_screentip_tools.dm index a0850f8742b..a6c358ef2f6 100644 --- a/code/datums/elements/screentips/contextual_screentip_tools.dm +++ b/code/datums/elements/screentips/contextual_screentip_tools.dm @@ -17,7 +17,7 @@ var/atom/atom_target = target atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/contextual_screentip_tools/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM) diff --git a/code/datums/elements/selfknockback.dm b/code/datums/elements/selfknockback.dm index bd59b9d17fe..f12ba1d735d 100644 --- a/code/datums/elements/selfknockback.dm +++ b/code/datums/elements/selfknockback.dm @@ -11,9 +11,9 @@ clamping the Knockback_Force value below. */ /datum/element/selfknockback/Attach(datum/target, throw_amount, speed_amount) . = ..() if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/Item_SelfKnockback) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(Item_SelfKnockback)) else if(isprojectile(target)) - RegisterSignal(target, COMSIG_PROJECTILE_FIRE, .proc/Projectile_SelfKnockback) + RegisterSignal(target, COMSIG_PROJECTILE_FIRE, PROC_REF(Projectile_SelfKnockback)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/series.dm b/code/datums/elements/series.dm index 6f282f6bbed..88cbd8bc184 100644 --- a/code/datums/elements/series.dm +++ b/code/datums/elements/series.dm @@ -20,7 +20,7 @@ subtype_list = subtypesof(subtype) src.series_name = series_name var/atom/attached = target - RegisterSignal(attached, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(attached, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/series/Detach(datum/target) . = ..() diff --git a/code/datums/elements/simple_flying.dm b/code/datums/elements/simple_flying.dm index f88de57f45c..6b991998e38 100644 --- a/code/datums/elements/simple_flying.dm +++ b/code/datums/elements/simple_flying.dm @@ -13,7 +13,7 @@ return ELEMENT_INCOMPATIBLE var/mob/living/valid_target = target on_stat_change(valid_target, new_stat = valid_target.stat) //immediately try adding flight if they're conscious - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) /datum/element/simple_flying/Detach(datum/target) . = ..() diff --git a/code/datums/elements/skittish.dm b/code/datums/elements/skittish.dm index 22a155dc2ad..023c4668aac 100644 --- a/code/datums/elements/skittish.dm +++ b/code/datums/elements/skittish.dm @@ -10,7 +10,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_BUMP, .proc/Bump) + RegisterSignal(target, COMSIG_MOVABLE_BUMP, PROC_REF(Bump)) /datum/element/skittish/Detach(datum/target) UnregisterSignal(target, COMSIG_MOVABLE_BUMP) diff --git a/code/datums/elements/snail_crawl.dm b/code/datums/elements/snail_crawl.dm index 2bca125f4c2..49b3e5ccf0e 100644 --- a/code/datums/elements/snail_crawl.dm +++ b/code/datums/elements/snail_crawl.dm @@ -7,9 +7,9 @@ return ELEMENT_INCOMPATIBLE var/P if(iscarbon(target)) - P = .proc/snail_crawl + P = PROC_REF(snail_crawl) else - P = .proc/lubricate + P = PROC_REF(lubricate) RegisterSignal(target, COMSIG_MOVABLE_MOVED, P) /datum/element/snailcrawl/Detach(mob/living/carbon/target) diff --git a/code/datums/elements/spooky.dm b/code/datums/elements/spooky.dm index 5ff4c07219e..fa52e1b58c2 100644 --- a/code/datums/elements/spooky.dm +++ b/code/datums/elements/spooky.dm @@ -8,7 +8,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE src.too_spooky = too_spooky - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/spectral_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(spectral_attack)) /datum/element/spooky/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_ATTACK) @@ -25,7 +25,7 @@ U.stuttering = 20 if(U.getStaminaLoss() > 95) to_chat(U, "Your ears weren't meant for this spectral sound.") - INVOKE_ASYNC(src, .proc/spectral_change, U) + INVOKE_ASYNC(src, PROC_REF(spectral_change), U) return if(ishuman(C)) @@ -40,7 +40,7 @@ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live to_chat(C, "DOOT") - INVOKE_ASYNC(src, .proc/spectral_change, H) + INVOKE_ASYNC(src, PROC_REF(spectral_change), H) else //the sound will spook monkeys. C.Jitter(15) diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm index b4b58367f6b..73a2c318b36 100644 --- a/code/datums/elements/squish.dm +++ b/code/datums/elements/squish.dm @@ -18,7 +18,7 @@ var/mob/living/carbon/C = target var/was_lying = C.body_position == LYING_DOWN - addtimer(CALLBACK(src, .proc/Detach, C, was_lying, reverse), duration) + addtimer(CALLBACK(src, PROC_REF(Detach), C, was_lying, reverse), duration) if(reverse) C.transform = C.transform.Scale(SHORT, TALL) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 6a51e2f9009..f4859e26299 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -19,7 +19,7 @@ if (!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, .proc/mouse_drop_onto) + RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, PROC_REF(mouse_drop_onto)) src.items = items src.should_strip_proc_path = should_strip_proc_path @@ -57,7 +57,7 @@ strip_menu = new(source, src) LAZYSET(strip_menus, source, strip_menu) - INVOKE_ASYNC(strip_menu, /datum/.proc/ui_interact, user) + INVOKE_ASYNC(strip_menu, TYPE_PROC_REF(/datum, ui_interact), user) /// A representation of an item that can be stripped down /datum/strippable_item diff --git a/code/datums/elements/swabbable.dm b/code/datums/elements/swabbable.dm index 81ad7440eb9..03c328e7cfb 100644 --- a/code/datums/elements/swabbable.dm +++ b/code/datums/elements/swabbable.dm @@ -21,7 +21,7 @@ This element is used in vat growing to allow for the object to be if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_SWAB_FOR_SAMPLES, .proc/GetSwabbed) + RegisterSignal(target, COMSIG_SWAB_FOR_SAMPLES, PROC_REF(GetSwabbed)) src.cell_line_define = cell_line_define src.virus_define = virus_define diff --git a/code/datums/elements/tenacious.dm b/code/datums/elements/tenacious.dm index ed606fa7919..feb74a579d7 100644 --- a/code/datums/elements/tenacious.dm +++ b/code/datums/elements/tenacious.dm @@ -13,7 +13,7 @@ return COMPONENT_INCOMPATIBLE var/mob/living/carbon/human/valid_target = target on_stat_change(valid_target, new_stat = valid_target.stat) //immediately try adding movement bonus if they're in soft crit - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) ADD_TRAIT(target, TRAIT_TENACIOUS, ELEMENT_TRAIT(type)) /datum/element/tenacious/Detach(datum/target) diff --git a/code/datums/elements/tool_flash.dm b/code/datums/elements/tool_flash.dm index 3270dbb4846..c6e35d7d222 100644 --- a/code/datums/elements/tool_flash.dm +++ b/code/datums/elements/tool_flash.dm @@ -16,8 +16,8 @@ src.flash_strength = flash_strength - RegisterSignal(target, COMSIG_TOOL_IN_USE, .proc/prob_flash) - RegisterSignal(target, COMSIG_TOOL_START_USE, .proc/flash) + RegisterSignal(target, COMSIG_TOOL_IN_USE, PROC_REF(prob_flash)) + RegisterSignal(target, COMSIG_TOOL_START_USE, PROC_REF(flash)) /datum/element/tool_flash/Detach(datum/source) . = ..() diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index bfd134f38c2..9599e85c768 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -17,8 +17,8 @@ else our_turf.plane = TRANSPARENT_FLOOR_PLANE - RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, .proc/on_multiz_turf_del) - RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_turf_new) + RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, PROC_REF(on_multiz_turf_del)) + RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_turf_new)) ADD_TRAIT(our_turf, TURF_Z_TRANSPARENT_TRAIT, ELEMENT_TRAIT(type)) diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm index baa17c55ee7..9348ac18d0f 100644 --- a/code/datums/elements/undertile.dm +++ b/code/datums/elements/undertile.dm @@ -22,7 +22,7 @@ if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_OBJ_HIDE, .proc/hide) + RegisterSignal(target, COMSIG_OBJ_HIDE, PROC_REF(hide)) src.invisibility_trait = invisibility_trait src.invisibility_level = invisibility_level diff --git a/code/datums/elements/update_icon_blocker.dm b/code/datums/elements/update_icon_blocker.dm index 5c84ed9886a..674b314ec9c 100644 --- a/code/datums/elements/update_icon_blocker.dm +++ b/code/datums/elements/update_icon_blocker.dm @@ -4,7 +4,7 @@ . = ..() if(!istype(target, /atom)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon) + RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, PROC_REF(block_update_icon)) /datum/element/update_icon_blocker/proc/block_update_icon() SIGNAL_HANDLER diff --git a/code/datums/elements/update_icon_updates_onmob.dm b/code/datums/elements/update_icon_updates_onmob.dm index 7d1cb8d287d..0ec9a472e64 100644 --- a/code/datums/elements/update_icon_updates_onmob.dm +++ b/code/datums/elements/update_icon_updates_onmob.dm @@ -5,7 +5,7 @@ . = ..() if(!istype(target, /obj/item)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/update_onmob) + RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_onmob)) /datum/element/update_icon_updates_onmob/proc/update_onmob(obj/item/target) SIGNAL_HANDLER diff --git a/code/datums/elements/venomous.dm b/code/datums/elements/venomous.dm index f513e03bd6c..a0e92f2feb9 100644 --- a/code/datums/elements/venomous.dm +++ b/code/datums/elements/venomous.dm @@ -15,11 +15,11 @@ . = ..() if(isgun(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target) || isbasicmob(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/volatile_gas_storage.dm b/code/datums/elements/volatile_gas_storage.dm index 9ef28b04a37..14864b08bfd 100644 --- a/code/datums/elements/volatile_gas_storage.dm +++ b/code/datums/elements/volatile_gas_storage.dm @@ -13,9 +13,9 @@ /datum/element/volatile_gas_storage/Attach(datum/target, minimum_explosive_pressure=5000, max_explosive_pressure=100000, max_explosive_force=9) . = ..() if(istype(target, /obj/machinery/atmospherics/components)) - RegisterSignal(target, COMSIG_ATOM_BREAK, .proc/AtmosComponentBreak) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(AtmosComponentBreak)) else if(isobj(target)) - RegisterSignal(target, COMSIG_ATOM_BREAK, .proc/ObjBreak) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(ObjBreak)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm index 673b327848f..eff201455d8 100644 --- a/code/datums/elements/waddling.dm +++ b/code/datums/elements/waddling.dm @@ -5,9 +5,9 @@ if(!ismovable(target)) return ELEMENT_INCOMPATIBLE if(isliving(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(LivingWaddle)) else - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Waddle)) /datum/element/waddling/Detach(datum/source) . = ..() diff --git a/code/datums/elements/wall_engraver.dm b/code/datums/elements/wall_engraver.dm index 307a2272892..75eeca07acf 100644 --- a/code/datums/elements/wall_engraver.dm +++ b/code/datums/elements/wall_engraver.dm @@ -8,8 +8,8 @@ if (!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK_SECONDARY, .proc/on_item_pre_attack_secondary) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK_SECONDARY, PROC_REF(on_item_pre_attack_secondary)) /datum/element/wall_engraver/Detach(datum/source) . = ..() @@ -25,7 +25,7 @@ /datum/element/wall_engraver/proc/on_item_pre_attack_secondary(datum/source, atom/target, mob/living/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_chisel, source, target, user) + INVOKE_ASYNC(src, PROC_REF(try_chisel), source, target, user) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/elements/weapon_description.dm b/code/datums/elements/weapon_description.dm index 1e87236c764..0a905245aaf 100644 --- a/code/datums/elements/weapon_description.dm +++ b/code/datums/elements/weapon_description.dm @@ -24,8 +24,8 @@ . = ..() if(!isitem(target)) // Do not attach this to anything that isn't an item return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/warning_label) - RegisterSignal(target, COMSIG_TOPIC, .proc/topic_handler) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(warning_label)) + RegisterSignal(target, COMSIG_TOPIC, PROC_REF(topic_handler)) // Don't perform the assignment if there is nothing to assign, or if we already have something for this bespoke element if(attached_proc && !src.attached_proc) src.attached_proc = attached_proc diff --git a/code/datums/elements/weather_listener.dm b/code/datums/elements/weather_listener.dm index c5a568a480c..eb8ddd75d88 100644 --- a/code/datums/elements/weather_listener.dm +++ b/code/datums/elements/weather_listener.dm @@ -24,8 +24,8 @@ weather_trait = trait playlist = weather_playlist - RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, .proc/handle_z_level_change, override = TRUE) - RegisterSignal(target, COMSIG_MOB_LOGOUT, .proc/handle_logout, override = TRUE) + RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(handle_z_level_change), override = TRUE) + RegisterSignal(target, COMSIG_MOB_LOGOUT, PROC_REF(handle_logout), override = TRUE) /datum/element/weather_listener/Detach(datum/source) . = ..() diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 0ef45139dce..d9f42c38c71 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -242,7 +242,7 @@ /obj/item/disk/holodisk/Initialize(mapload) . = ..() if(preset_record_text) - INVOKE_ASYNC(src, .proc/build_record) + INVOKE_ASYNC(src, PROC_REF(build_record)) /obj/item/disk/holodisk/Destroy() QDEL_NULL(record) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 003ca63c5bc..269ac1d6cd2 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -69,10 +69,10 @@ GLOBAL_LIST_INIT(huds, list( return if(!hudusers[M]) hudusers[M] = 1 - RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/unregister_mob) + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(unregister_mob)) 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/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 8b37ea4dc8a..25889c4af9b 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -74,7 +74,7 @@ /datum/looping_sound/proc/start_sound_loop() loop_started = TRUE sound_loop() - timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME, SSsound_loops) + timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME, SSsound_loops) /datum/looping_sound/proc/sound_loop(starttime) if(max_loops && world.time >= starttime + mid_length * max_loops) @@ -102,7 +102,7 @@ if(start_sound && !skip_starting_sounds) play(start_sound, start_volume) start_wait = start_length - timerid = addtimer(CALLBACK(src, .proc/start_sound_loop), start_wait, TIMER_CLIENT_TIME | TIMER_DELETE_ME | TIMER_STOPPABLE, SSsound_loops) + timerid = addtimer(CALLBACK(src, PROC_REF(start_sound_loop)), start_wait, TIMER_CLIENT_TIME | TIMER_DELETE_ME | TIMER_STOPPABLE, SSsound_loops) /datum/looping_sound/proc/on_stop() if(loop_started) // MOJAVE MODULE OUTDOOR_EFFECTS - Allow null end_sound to stop sound @@ -113,7 +113,7 @@ UnregisterSignal(parent, COMSIG_PARENT_QDELETING) parent = new_parent if(parent) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/handle_parent_del) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del)) /datum/looping_sound/proc/is_active() return !!timerid diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index cd9acf617b9..4d0e22c6c76 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -37,7 +37,7 @@ streak = copytext(streak, 1 + length(streak[1])) if (display_combos) var/mob/living/holder_living = holder.resolve() - timerid = addtimer(CALLBACK(src, .proc/reset_streak, null, FALSE), combo_timer, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_streak), null, FALSE), combo_timer, TIMER_UNIQUE | TIMER_STOPPABLE) holder_living?.hud_used?.combo_display.update_icon_state(streak, combo_timer - 2 SECONDS) /datum/martial_art/proc/reset_streak(mob/living/new_target, update_icon = TRUE) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index 6f5c2acad39..f0d7e09b389 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -36,7 +36,7 @@ /datum/martial_art/plasma_fist/proc/Tornado(mob/living/A, mob/living/D) A.say("TORNADO SWEEP!", forced="plasma fist") - dance_rotate(A, CALLBACK(GLOBAL_PROC, .proc/playsound, A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)) + dance_rotate(A, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)) var/obj/effect/proc_holder/spell/aoe_turf/repulse/R = new(null) R.cast(RANGE_TURFS(1,A)) log_combat(A, D, "tornado sweeped(Plasma Fist)") @@ -107,7 +107,7 @@ user.apply_damage(rand(50,70), BRUTE) - addtimer(CALLBACK(src,.proc/Apotheosis_end, user), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Apotheosis_end), user), 6 SECONDS) playsound(boomspot, 'sound/weapons/punch1.ogg', 50, TRUE, -1) explosion(user, devastation_range = plasma_power, heavy_impact_range = plasma_power*2, light_impact_range = plasma_power*4, ignorecap = TRUE, explosion_cause = src) plasma_power = 1 //just in case there is any clever way to cause it to happen again diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index dda86b82ccc..16038a6631b 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -171,8 +171,8 @@ /obj/item/staff/bostaff/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/staff/bostaff/ComponentInitialize() . = ..() diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 2ebece40d3b..2a75f6fa7a8 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -199,7 +199,7 @@ If you make a derivative work from this code, you must include this notification if (T && isturf(T)) if (!D.stat) D.emote("scream") - D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living.proc/Paralyze, 20)) + D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, TYPE_PROC_REF(/mob/living, Paralyze), 20)) log_combat(A, D, "has thrown with wrestling") return @@ -336,7 +336,7 @@ If you make a derivative work from this code, you must include this notification A.setDir(turn(A.dir, 90)) A.forceMove(D.loc) - addtimer(CALLBACK(src, .proc/CheckStrikeTurf, A, T), 4) + addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), A, T), 4) D.visible_message(span_danger("[A] headbutts [D]!"), \ span_userdanger("You're headbutted by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) diff --git a/code/datums/mergers/_merger.dm b/code/datums/mergers/_merger.dm index 8e7d656bcc0..1c677e0fbf5 100644 --- a/code/datums/mergers/_merger.dm +++ b/code/datums/mergers/_merger.dm @@ -52,8 +52,8 @@ /datum/merger/proc/AddMember(atom/thing, connected_dir) // note that this fires for the origin of the merger as well SEND_SIGNAL(thing, COMSIG_MERGER_ADDING, src) - RegisterSignal(thing, refresh_signals, .proc/QueueRefresh) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, .proc/HandleMemberDel) + RegisterSignal(thing, refresh_signals, PROC_REF(QueueRefresh)) + RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(HandleMemberDel)) if(!thing.mergers) thing.mergers = list() else if(thing.mergers[id]) @@ -80,7 +80,7 @@ /datum/merger/proc/QueueRefresh() SIGNAL_HANDLER - addtimer(CALLBACK(src, .proc/Refresh), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(Refresh)), 1, TIMER_UNIQUE) /datum/merger/proc/Refresh() // List of turf -> list(interesting dir, found matching atoms) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index b9bc64b1561..8e3139a77c9 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -133,7 +133,7 @@ UnregisterSignal(src, COMSIG_PARENT_QDELETING) current = new_current if(current) - RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/clear_current) + RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(clear_current)) /datum/mind/proc/clear_current(datum/source) SIGNAL_HANDLER @@ -175,7 +175,7 @@ C.last_mind = src transfer_actions(new_character) transfer_martial_arts(new_character) - RegisterSignal(new_character, COMSIG_LIVING_DEATH, .proc/set_death_time) + RegisterSignal(new_character, COMSIG_LIVING_DEATH, PROC_REF(set_death_time)) if(active || force_key_move) new_character.key = key //now transfer the key to link the client to our new body if(new_character.client) @@ -300,7 +300,7 @@ var/datum/team/antag_team = A.get_team() if(antag_team) antag_team.add_member(src) - INVOKE_ASYNC(A, /datum/antagonist.proc/on_gain) + INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain)) log_game("[key_name(src)] has gained antag datum [A.name]([A.type])") return A @@ -836,7 +836,7 @@ continue S.charge_counter = delay S.updateButtonIcon() - INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge) + INVOKE_ASYNC(S, TYPE_PROC_REF(/obj/effect/proc_holder/spell, start_recharge)) /datum/mind/proc/get_ghost(even_if_they_cant_reenter, ghosts_with_clients) for(var/mob/dead/observer/G in (ghosts_with_clients ? GLOB.player_list : GLOB.dead_mob_list)) diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index cf5fa3a3bf6..f1ea135ce75 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -95,7 +95,7 @@ if(isfelinid(owner)) var/mob/living/carbon/human/H = owner H.dna.species.start_wagging_tail(H) - addtimer(CALLBACK(H.dna.species, /datum/species.proc/stop_wagging_tail, H), 3 SECONDS) + addtimer(CALLBACK(H.dna.species, TYPE_PROC_REF(/datum/species, stop_wagging_tail), H), 3 SECONDS) description = "They want to play on the table!\n" mood_change = 2 diff --git a/code/datums/movement_detector.dm b/code/datums/movement_detector.dm index 109290a8a95..be36d62e660 100644 --- a/code/datums/movement_detector.dm +++ b/code/datums/movement_detector.dm @@ -20,7 +20,7 @@ src.listener = listener while(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) target = target.loc /// Stops tracking @@ -49,7 +49,7 @@ if(tracked.loc != newturf) var/atom/target = mover.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 listener.Invoke(tracked, mover, oldloc, direction) diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 460d5b58aac..5e4fdadb86e 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -50,7 +50,7 @@ . = ..() class = class_ if(timer) - addtimer(CALLBACK(src, .proc/remove), timer) + addtimer(CALLBACK(src, PROC_REF(remove)), timer) timeout = timer if(copymut && istype(copymut, /datum/mutation/human)) copy_mutation(copymut) @@ -86,7 +86,7 @@ owner.apply_overlay(layer_used) grant_spell() //we do checks here so nothing about hulk getting magic if(!modified) - addtimer(CALLBACK(src, .proc/modify, 5)) //gonna want children calling ..() to run first + addtimer(CALLBACK(src, PROC_REF(modify), 5)) //gonna want children calling ..() to run first /datum/mutation/human/proc/get_visual_indicator() return diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 27445319e30..e6705cbb0fe 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -311,7 +311,7 @@ /obj/item/hardened_spike/Initialize(mapload, firedby) . = ..() fired_by = firedby - addtimer(CALLBACK(src, .proc/checkembedded), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(checkembedded)), 5 SECONDS) /obj/item/hardened_spike/proc/checkembedded() if(missed) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index dd6753166ef..9b90db82b7d 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -15,7 +15,7 @@ owner.Unconscious(200 * GET_MUTATION_POWER(src)) owner.Jitter(1000 * GET_MUTATION_POWER(src)) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy) - addtimer(CALLBACK(src, .proc/jitter_less), 90) + addtimer(CALLBACK(src, PROC_REF(jitter_less)), 90) /datum/mutation/human/epilepsy/proc/jitter_less() if(owner) @@ -408,7 +408,7 @@ . = ..() if(.) return - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /datum/mutation/human/extrastun/on_losing() . = ..() @@ -439,7 +439,7 @@ . = ..() if(.) return TRUE - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/bloody_shower) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(bloody_shower)) /datum/mutation/human/martyrdom/on_losing() . = ..() @@ -496,7 +496,7 @@ head.drop_organs() qdel(head) owner.regenerate_icons() - RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, .proc/abortattachment) + RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(abortattachment)) /datum/mutation/human/headless/on_losing() . = ..() diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 1b23026d378..5a5ab658119 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -13,8 +13,8 @@ if(..()) return owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) /datum/mutation/human/chameleon/on_life(delta_time, times_fired) owner.alpha = max(owner.alpha - (12.5 * delta_time), 0) diff --git a/code/datums/mutations/holy_mutation/burdened.dm b/code/datums/mutations/holy_mutation/burdened.dm index 955b0a9f8b6..c47aa5af767 100644 --- a/code/datums/mutations/holy_mutation/burdened.dm +++ b/code/datums/mutations/holy_mutation/burdened.dm @@ -15,20 +15,20 @@ /datum/mutation/human/burdened/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/organ_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/organ_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(organ_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(organ_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, .proc/limbs_added_burden) - RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, .proc/limbs_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(limbs_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(limbs_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_ADDICTION, .proc/addict_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ADDICTION, .proc/addict_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ADDICTION, PROC_REF(addict_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ADDICTION, PROC_REF(addict_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_MUTATION, .proc/mutation_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_MUTATION, .proc/mutation_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_MUTATION, PROC_REF(mutation_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_MUTATION, PROC_REF(mutation_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_TRAUMA, .proc/trauma_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_TRAUMA, .proc/trauma_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_TRAUMA, PROC_REF(trauma_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_TRAUMA, PROC_REF(trauma_removed_burden)) /datum/mutation/human/burdened/on_losing(mob/living/carbon/human/owner) . = ..() diff --git a/code/datums/mutations/holy_mutation/honorbound.dm b/code/datums/mutations/holy_mutation/honorbound.dm index 6b7eac5cb4c..6087031ea71 100644 --- a/code/datums/mutations/holy_mutation/honorbound.dm +++ b/code/datums/mutations/holy_mutation/honorbound.dm @@ -19,18 +19,18 @@ //moodlet SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "honorbound", /datum/mood_event/honorbound) //checking spells cast by honorbound - RegisterSignal(owner, COMSIG_MOB_CAST_SPELL, .proc/spell_check) - RegisterSignal(owner, COMSIG_MOB_FIRED_GUN, .proc/staff_check) + RegisterSignal(owner, COMSIG_MOB_CAST_SPELL, PROC_REF(spell_check)) + RegisterSignal(owner, COMSIG_MOB_FIRED_GUN, PROC_REF(staff_check)) //signals that check for guilt - RegisterSignal(owner, COMSIG_PARENT_ATTACKBY, .proc/attackby_guilt) - RegisterSignal(owner, COMSIG_ATOM_HULK_ATTACK, .proc/hulk_guilt) - RegisterSignal(owner, COMSIG_ATOM_ATTACK_HAND, .proc/hand_guilt) - RegisterSignal(owner, COMSIG_ATOM_ATTACK_PAW, .proc/paw_guilt) - RegisterSignal(owner, COMSIG_ATOM_BULLET_ACT, .proc/bullet_guilt) - RegisterSignal(owner, COMSIG_ATOM_HITBY, .proc/thrown_guilt) + RegisterSignal(owner, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_guilt)) + RegisterSignal(owner, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_guilt)) + RegisterSignal(owner, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_guilt)) + RegisterSignal(owner, COMSIG_ATOM_ATTACK_PAW, PROC_REF(paw_guilt)) + RegisterSignal(owner, COMSIG_ATOM_BULLET_ACT, PROC_REF(bullet_guilt)) + RegisterSignal(owner, COMSIG_ATOM_HITBY, PROC_REF(thrown_guilt)) //signal that checks for dishonorable attacks - RegisterSignal(owner, COMSIG_MOB_CLICKON, .proc/attack_honor) + RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(attack_honor)) /datum/mutation/human/honorbound/on_losing(mob/living/carbon/human/owner) SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "honorbound") diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index b3a49861456..e02c4f0b7ec 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -23,9 +23,9 @@ ADD_TRAIT(owner, TRAIT_HULK, GENETIC_MUTATION) owner.update_body_parts() SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk) - RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand) - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) - RegisterSignal(owner, COMSIG_MOB_CLICKON, .proc/check_swing) + RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(check_swing)) /datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers) SIGNAL_HANDLER @@ -37,7 +37,7 @@ if(target.attack_hulk(owner)) if(world.time > (last_scream + scream_delay)) last_scream = world.time - INVOKE_ASYNC(src, .proc/scream_attack, source) + INVOKE_ASYNC(src, PROC_REF(scream_attack), source) log_combat(source, target, "punched", "hulk powers") source.do_attack_animation(target, ATTACK_EFFECT_SMASH) source.changeNext_move(CLICK_CD_MELEE) @@ -119,7 +119,7 @@ return user.face_atom(clicked_atom) - INVOKE_ASYNC(src, .proc/setup_swing, user, possible_throwable) + INVOKE_ASYNC(src, PROC_REF(setup_swing), user, possible_throwable) return(COMSIG_MOB_CANCEL_CLICKON) /// Do a short 2 second do_after before starting the actual swing @@ -225,7 +225,7 @@ the_hulk.visible_message(span_danger("[the_hulk] loses [the_hulk.p_their()] momentum on [yeeted_person]!"), span_warning("You lose your momentum on swinging [yeeted_person]!"), ignored_mobs = yeeted_person) to_chat(yeeted_person, span_userdanger("[the_hulk] loses [the_hulk.p_their()] momentum and lets go of you!")) else - addtimer(CALLBACK(src, .proc/swing_loop, the_hulk, yeeted_person, step, original_dir), delay) + addtimer(CALLBACK(src, PROC_REF(swing_loop), the_hulk, yeeted_person, step, original_dir), delay) /// Time to toss the victim at high speed /datum/mutation/human/hulk/proc/finish_swing(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, original_dir) diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 198edc6d0d9..3e7740fdc51 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -78,7 +78,7 @@ user.update_sight() to_chat(user, text("You focus your eyes intensely, as your vision becomes filled with heat signatures.")) - addtimer(CALLBACK(src, .proc/thermal_vision_deactivate), thermal_duration SECONDS) + addtimer(CALLBACK(src, PROC_REF(thermal_vision_deactivate)), thermal_duration SECONDS) /obj/effect/proc_holder/spell/self/thermal_vision_activate/proc/thermal_vision_deactivate(mob/user = usr) @@ -143,7 +143,7 @@ . = ..() if(.) return - RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack) + RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack)) /datum/mutation/human/laser_eyes/on_losing(mob/living/carbon/human/H) . = ..() @@ -167,7 +167,7 @@ LE.firer = source LE.def_zone = ran_zone(source.zone_selected) LE.preparePixelProjectile(target, source, modifiers) - INVOKE_ASYNC(LE, /obj/projectile.proc/fire) + INVOKE_ASYNC(LE, TYPE_PROC_REF(/obj/projectile, fire)) playsound(source, 'sound/weapons/taser2.ogg', 75, TRUE) ///Projectile type used by laser eyes diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 43653d060f8..11566fcfb39 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -22,7 +22,7 @@ /datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/wacky/on_losing(mob/living/carbon/human/owner) if(..()) @@ -78,7 +78,7 @@ /datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner) if(..()) @@ -109,7 +109,7 @@ /datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner) if(..()) @@ -158,7 +158,7 @@ /datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner) if(..()) @@ -211,7 +211,7 @@ /datum/mutation/human/medieval/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/medieval/on_losing(mob/living/carbon/human/owner) if(..()) @@ -251,7 +251,7 @@ /datum/mutation/human/piglatin/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/piglatin/on_losing(mob/living/carbon/human/owner) if(..()) diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm index 72a8fc33410..b06ac8139ed 100644 --- a/code/datums/mutations/telekinesis.dm +++ b/code/datums/mutations/telekinesis.dm @@ -19,7 +19,7 @@ . = ..() if(.) return - RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack) + RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack)) /datum/mutation/human/telekinesis/on_losing(mob/living/carbon/human/H) . = ..() diff --git a/code/datums/profiling.dm b/code/datums/profiling.dm index 49a80d0eded..1eec8787116 100644 --- a/code/datums/profiling.dm +++ b/code/datums/profiling.dm @@ -6,7 +6,7 @@ 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)) sortTim(PROFILE_STORE, sort, TRUE) var/list/lines = list() diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index 036ebcd20d8..5f296634104 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -66,9 +66,9 @@ else booster = new type(get_turf(target), user, src, bonus_time, focus_sound) //MOJAVE SUN EDIT END - Interactive Progressbar - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/on_user_delete) - RegisterSignal(user, COMSIG_MOB_LOGOUT, .proc/clean_user_client) - RegisterSignal(user, COMSIG_MOB_LOGIN, .proc/on_user_login) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_delete)) + RegisterSignal(user, COMSIG_MOB_LOGOUT, PROC_REF(clean_user_client)) + RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(on_user_login)) /datum/progressbar/Destroy() diff --git a/code/datums/proximity_monitor/fields/timestop.dm b/code/datums/proximity_monitor/fields/timestop.dm index 21357528456..2a296bfce30 100644 --- a/code/datums/proximity_monitor/fields/timestop.dm +++ b/code/datums/proximity_monitor/fields/timestop.dm @@ -36,7 +36,7 @@ if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/timestop) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune. immune[G] = TRUE if(start) - INVOKE_ASYNC(src, .proc/timestop) + INVOKE_ASYNC(src, PROC_REF(timestop)) /obj/effect/timestop/Destroy() QDEL_NULL(chronofield) @@ -95,7 +95,7 @@ return FALSE if(immune[A]) //a little special logic but yes immune things don't freeze if(channelled) - RegisterSignal(A, COMSIG_MOVABLE_MOVED, .proc/atom_broke_channel, override = TRUE) + RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(atom_broke_channel), override = TRUE) return FALSE if(ismob(A)) var/mob/M = A @@ -123,8 +123,8 @@ A.move_resist = INFINITY global_frozen_atoms[A] = src into_the_negative_zone(A) - RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, .proc/unfreeze_atom) - RegisterSignal(A, COMSIG_ITEM_PICKUP, .proc/unfreeze_atom) + RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(unfreeze_atom)) + RegisterSignal(A, COMSIG_ITEM_PICKUP, PROC_REF(unfreeze_atom)) return TRUE diff --git a/code/datums/proximity_monitor/proximity_monitor.dm b/code/datums/proximity_monitor/proximity_monitor.dm index 6bc78a39c83..7ab65204b75 100644 --- a/code/datums/proximity_monitor/proximity_monitor.dm +++ b/code/datums/proximity_monitor/proximity_monitor.dm @@ -9,8 +9,8 @@ var/ignore_if_not_on_turf ///The signals of the connect range component, needed to monitor the turfs in range. var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - COMSIG_ATOM_EXITED =.proc/on_uncrossed, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + COMSIG_ATOM_EXITED = PROC_REF(on_uncrossed), ) /datum/proximity_monitor/New(atom/_host, range, _ignore_if_not_on_turf = TRUE) @@ -28,14 +28,14 @@ if(new_receiver) hasprox_receiver = new_receiver if(new_receiver != new_host) - RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del) + RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del)) else if(hasprox_receiver == host) //Default case hasprox_receiver = new_host host = new_host - RegisterSignal(new_host, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del) - var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = .proc/on_moved) + RegisterSignal(new_host, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del)) + var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = PROC_REF(on_moved)) AddComponent(/datum/component/connect_containers, host, containers_connections) - RegisterSignal(host, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(host, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) set_range(current_range, TRUE) /datum/proximity_monitor/proc/on_host_or_receiver_del(datum/source) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 0e5f0816020..d6a310d5002 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -73,9 +73,9 @@ if(quirk_holder.client) post_add() else - RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, .proc/on_quirk_holder_first_login) + RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(on_quirk_holder_first_login)) - RegisterSignal(quirk_holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdeleting) + RegisterSignal(quirk_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdeleting)) return TRUE diff --git a/code/datums/quirks/negative.dm b/code/datums/quirks/negative.dm index c7a37e86beb..f077dd5c610 100644 --- a/code/datums/quirks/negative.dm +++ b/code/datums/quirks/negative.dm @@ -17,9 +17,9 @@ var/obj/item/storage/backpack/equipped_backpack = human_holder.back if(istype(equipped_backpack)) SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "back_pain", /datum/mood_event/back_pain) - RegisterSignal(human_holder.back, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequipped_backpack) + RegisterSignal(human_holder.back, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequipped_backpack)) else - RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, .proc/on_equipped_item) + RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equipped_item)) /datum/quirk/badback/remove() UnregisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM) @@ -37,7 +37,7 @@ return SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "back_pain", /datum/mood_event/back_pain) - RegisterSignal(equipped_item, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequipped_backpack) + RegisterSignal(equipped_item, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequipped_backpack)) UnregisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM) backpack = WEAKREF(equipped_item) @@ -48,7 +48,7 @@ UnregisterSignal(source, COMSIG_ITEM_POST_UNEQUIP) SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "back_pain") backpack = null - RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, .proc/on_equipped_item) + RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equipped_item)) /datum/quirk/blooddeficiency name = "Blood Deficiency" @@ -317,7 +317,7 @@ hardcore_value = 5 /datum/quirk/nyctophobia/add() - RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) + RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) /datum/quirk/nyctophobia/remove() UnregisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED) @@ -506,9 +506,9 @@ var/dumb_thing = TRUE /datum/quirk/social_anxiety/add() - RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, .proc/eye_contact) - RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, .proc/looks_at_floor) - RegisterSignal(quirk_holder, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, PROC_REF(eye_contact)) + RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, PROC_REF(looks_at_floor)) + RegisterSignal(quirk_holder, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/quirk/social_anxiety/remove() UnregisterSignal(quirk_holder, list(COMSIG_MOB_EYECONTACT, COMSIG_MOB_EXAMINATE, COMSIG_MOB_SAY)) @@ -587,7 +587,7 @@ if(prob(85) || (istype(mind_check) && mind_check.mind)) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, span_smallnotice("You make eye contact with [A].")), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_smallnotice("You make eye contact with [A].")), 3) /datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner) SIGNAL_HANDLER @@ -612,7 +612,7 @@ msg += "causing you to freeze up!" SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "anxiety_eyecontact", /datum/mood_event/anxiety_eyecontact) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, span_userdanger("[msg]")), 3) // so the examine signal has time to fire and this will print after + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_userdanger("[msg]")), 3) // so the examine signal has time to fire and this will print after return COMSIG_BLOCK_EYECONTACT /datum/mood_event/anxiety_eyecontact @@ -836,7 +836,7 @@ hardcore_value = 1 /datum/quirk/bad_touch/add() - RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT, COMSIG_CARBON_TAILPULL), .proc/uncomfortable_touch) + RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT, COMSIG_CARBON_TAILPULL), PROC_REF(uncomfortable_touch)) /datum/quirk/bad_touch/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT, COMSIG_CARBON_TAILPULL)) diff --git a/code/datums/quirks/neutral.dm b/code/datums/quirks/neutral.dm index 6300aa08bb2..f2a406996ef 100644 --- a/code/datums/quirks/neutral.dm +++ b/code/datums/quirks/neutral.dm @@ -66,7 +66,7 @@ var/datum/species/species = human_holder.dna.species species.liked_food &= ~MEAT species.disliked_food |= MEAT - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/vegetarian/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -106,7 +106,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.liked_food |= PINEAPPLE - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/pineapple_liker/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -131,7 +131,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.disliked_food |= PINEAPPLE - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/pineapple_hater/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -158,7 +158,7 @@ var/liked = species.liked_food species.liked_food = species.disliked_food species.disliked_food = liked - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/deviant_tastes/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -260,8 +260,8 @@ old_hair = human_holder.hairstyle human_holder.hairstyle = "Bald" human_holder.update_hair() - RegisterSignal(human_holder, COMSIG_CARBON_EQUIP_HAT, .proc/equip_hat) - RegisterSignal(human_holder, COMSIG_CARBON_UNEQUIP_HAT, .proc/unequip_hat) + RegisterSignal(human_holder, COMSIG_CARBON_EQUIP_HAT, PROC_REF(equip_hat)) + RegisterSignal(human_holder, COMSIG_CARBON_UNEQUIP_HAT, PROC_REF(unequip_hat)) /datum/quirk/item_quirk/bald/add_unique() var/obj/item/clothing/head/wig/natural/baldie_wig = new(get_turf(quirk_holder)) @@ -381,10 +381,10 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.liked_food = JUNKFOOD - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) - RegisterSignal(human_holder, COMSIG_MOB_WON_VIDEOGAME, .proc/won_game) - RegisterSignal(human_holder, COMSIG_MOB_LOST_VIDEOGAME, .proc/lost_game) - RegisterSignal(human_holder, COMSIG_MOB_PLAYED_VIDEOGAME, .proc/gamed) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) + RegisterSignal(human_holder, COMSIG_MOB_WON_VIDEOGAME, PROC_REF(won_game)) + RegisterSignal(human_holder, COMSIG_MOB_LOST_VIDEOGAME, PROC_REF(lost_game)) + RegisterSignal(human_holder, COMSIG_MOB_PLAYED_VIDEOGAME, PROC_REF(gamed)) /datum/quirk/gamer/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -401,7 +401,7 @@ /datum/quirk/gamer/add_unique() // The gamer starts off quelled - gaming_withdrawal_timer = addtimer(CALLBACK(src, .proc/enter_withdrawal), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) + gaming_withdrawal_timer = addtimer(CALLBACK(src, PROC_REF(enter_withdrawal)), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) /** * Gamer won a game @@ -429,7 +429,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder SEND_SIGNAL(human_holder, COMSIG_ADD_MOOD_EVENT, "gamer_lost", /datum/mood_event/gamer_lost) // Executed asynchronously due to say() - INVOKE_ASYNC(src, .proc/gamer_moment) + INVOKE_ASYNC(src, PROC_REF(gamer_moment)) /** * Gamer is playing a game * @@ -445,7 +445,7 @@ // Reset withdrawal timer if (gaming_withdrawal_timer) deltimer(gaming_withdrawal_timer) - gaming_withdrawal_timer = addtimer(CALLBACK(src, .proc/enter_withdrawal), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) + gaming_withdrawal_timer = addtimer(CALLBACK(src, PROC_REF(enter_withdrawal)), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) /datum/quirk/gamer/proc/gamer_moment() diff --git a/code/datums/screentips/atom_context.dm b/code/datums/screentips/atom_context.dm index 7696a3d8e77..557ad52c0f3 100644 --- a/code/datums/screentips/atom_context.dm +++ b/code/datums/screentips/atom_context.dm @@ -4,7 +4,7 @@ /// This is not necessary for Type-B interactions, as you can just apply the flag and register to the signal yourself. /atom/proc/register_context() flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(src, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/add_context) + RegisterSignal(src, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(add_context)) /// Creates a "Type-B" contextual screentip interaction. /// When a user hovers over this, this proc will be called in order diff --git a/code/datums/screentips/item_context.dm b/code/datums/screentips/item_context.dm index 239cd186836..8afa99ddcf2 100644 --- a/code/datums/screentips/item_context.dm +++ b/code/datums/screentips/item_context.dm @@ -7,7 +7,7 @@ RegisterSignal( src, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, - .proc/add_item_context, + PROC_REF(add_item_context), ) /// Creates a "Type-A" contextual screentip interaction. diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index 5fbf8611d57..cb0de6afd4e 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -26,7 +26,7 @@ /datum/station_trait/New() . = ..() - RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, .proc/on_round_start) + RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(on_round_start)) if(trait_processes) START_PROCESSING(SSstation, src) diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index e434b4a7c71..01d56c79701 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -46,7 +46,7 @@ /datum/station_trait/hangover/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_LATEJOIN_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_LATEJOIN_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/hangover/revert() for (var/obj/effect/landmark/start/hangover/hangover_spot in GLOB.start_landmarks_list) @@ -106,7 +106,7 @@ /datum/station_trait/overflow_job_bureaucracy/New() . = ..() - RegisterSignal(SSjob, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/set_overflow_job_override) + RegisterSignal(SSjob, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(set_overflow_job_override)) /datum/station_trait/overflow_job_bureaucracy/get_report() return "[name] - It seems for some reason we put out the wrong job-listing for the overflow role this shift...I hope you like [chosen_job_name]s." @@ -177,7 +177,7 @@ /obj/item/gun/ballistic/automatic/pistol = 1, ) - RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/arm_monke) + RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(arm_monke)) /datum/station_trait/revenge_of_pun_pun/proc/arm_monke() SIGNAL_HANDLER diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm index a7ad09cd8e8..f7674a89f9e 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -40,7 +40,7 @@ // Also gives him a couple extra lives to survive eventual tiders. dog.deadchat_plays(DEMOCRACY_MODE|MUTE_DEMOCRACY_MESSAGES, 3 SECONDS) dog.AddComponent(/datum/component/multiple_lives, 2) - RegisterSignal(dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, .proc/do_corgi_respawn) + RegisterSignal(dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, PROC_REF(do_corgi_respawn)) // The extended safety checks at time of writing are about chasms and lava // if there are any chasms and lava on stations in the future, woah @@ -78,7 +78,7 @@ new_dog.regenerate_icons() new_dog.deadchat_plays(DEMOCRACY_MODE|MUTE_DEMOCRACY_MESSAGES, 3 SECONDS) if(lives_left) - RegisterSignal(new_dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, .proc/do_corgi_respawn) + RegisterSignal(new_dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, PROC_REF(do_corgi_respawn)) if(!gibbed) //The old dog will now disappear so we won't have more than one Ian at a time. qdel(old_dog) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index a7c63520808..fb34364ac04 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -95,7 +95,7 @@ /obj/item/clothing/neck/stripedbluescarf, ) - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/scarves/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -145,7 +145,7 @@ deathrattle_group = new("[department_name] group") blacklist += subtypesof(/datum/station_trait/deathrattle_department) - type //All but ourselves report_message = "All members of [department_name] have received an implant to notify each other if one of them dies. This should help improve job-safety!" - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/deathrattle_department/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -221,7 +221,7 @@ . = ..() deathrattle_group = new("station group") blacklist = subtypesof(/datum/station_trait/deathrattle_department) - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/deathrattle_all/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -241,7 +241,7 @@ /datum/station_trait/wallets/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/wallets/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/living_mob, mob/M, joined_late) SIGNAL_HANDLER diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 59f1806d957..bfcd01f9629 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -155,7 +155,7 @@ owner.add_stun_absorption("bloody bastard sword", duration, 2, "doesn't even flinch as the sword's power courses through them!", "You shrug off the stun!", " glowing with a blazing red aura!") owner.spin(duration,1) animate(owner, color = oldcolor, time = duration, easing = EASE_IN) - addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, update_atom_colour)), duration) playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE) return ..() diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 3eb77e0c5e4..d44f8a1b4ce 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -158,8 +158,8 @@ if(!HAS_TRAIT(owner, TRAIT_SLEEPIMMUNE)) ADD_TRAIT(owner, TRAIT_KNOCKEDOUT, TRAIT_STATUS_EFFECT(id)) tick_interval = -1 - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), .proc/on_owner_insomniac) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE), .proc/on_owner_sleepy) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_insomniac)) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_sleepy)) /datum/status_effect/incapacitating/sleeping/on_remove() UnregisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE))) @@ -408,7 +408,7 @@ /datum/status_effect/eldritch/on_apply() if(owner.mob_size >= MOB_SIZE_HUMAN) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/update_owner_underlay) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(update_owner_underlay)) owner.update_icon(UPDATE_OVERLAYS) return TRUE return FALSE @@ -714,7 +714,7 @@ /datum/status_effect/trance/on_apply() if(!iscarbon(owner)) return FALSE - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(hypnotize)) ADD_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT) owner.add_client_colour(/datum/client_colour/monochrome/trance) owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \ @@ -746,8 +746,8 @@ // The brain trauma itself does its own set of logging, but this is the only place the source of the hypnosis phrase can be found. hearing_speaker.log_message("has hypnotised [key_name(C)] with the phrase '[hearing_args[HEARING_RAW_MESSAGE]]'", LOG_ATTACK) C.log_message("has been hypnotised by the phrase '[hearing_args[HEARING_RAW_MESSAGE]]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, log_globally = FALSE) - addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) - addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, gain_trauma), /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living, Stun), 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) /datum/status_effect/spasms @@ -1036,7 +1036,7 @@ if(new_owner.stat < UNCONSCIOUS) // Unconcious people won't get messages to_chat(new_owner, span_userdanger("You're covered in ants!")) ants_remaining += amount_left - RegisterSignal(new_owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) + RegisterSignal(new_owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(ants_washed)) . = ..() /datum/status_effect/ants/refresh(effect, amount_left) @@ -1053,7 +1053,7 @@ /datum/status_effect/ants/on_remove() ants_remaining = 0 to_chat(owner, span_notice("All of the ants are off of your body!")) - UnregisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) + UnregisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(ants_washed)) . = ..() /datum/status_effect/ants/proc/ants_washed() diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index c4e671cdbfe..96725dd22ae 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -16,7 +16,7 @@ if(!.) return ADD_TRAIT(owner, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id)) - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist)) if(!owner.stat) to_chat(owner, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") @@ -29,7 +29,7 @@ /datum/status_effect/freon/proc/owner_resist() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_resist) + INVOKE_ASYNC(src, PROC_REF(do_resist)) /datum/status_effect/freon/proc/do_resist() to_chat(owner, span_notice("You start breaking out of the ice cube...")) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 01feb573a13..ff90c95b155 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -181,9 +181,9 @@ qdel(src) return - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/check_owner_in_range) - RegisterSignal(offered_item, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/dropped_item) - //RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, .proc/check_fake_out) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(check_owner_in_range)) + RegisterSignal(offered_item, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(dropped_item)) + //RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out)) /datum/status_effect/offering/Destroy() for(var/i in possible_takers) @@ -198,7 +198,7 @@ if(!G) return LAZYADD(possible_takers, possible_candidate) - RegisterSignal(possible_candidate, COMSIG_MOVABLE_MOVED, .proc/check_taker_in_range) + RegisterSignal(possible_candidate, COMSIG_MOVABLE_MOVED, PROC_REF(check_taker_in_range)) G.setup(possible_candidate, owner, offered_item) /// Remove the alert and signals for the specified carbon mob. Automatically removes the status effect when we lost the last taker @@ -381,7 +381,7 @@ alt_clone = new typepath(owner.loc) alt_clone.appearance = owner.appearance alt_clone.real_name = owner.real_name - RegisterSignal(alt_clone, COMSIG_PARENT_QDELETING, .proc/remove_clone_from_var) + RegisterSignal(alt_clone, COMSIG_PARENT_QDELETING, PROC_REF(remove_clone_from_var)) owner.visible_message("[owner] splits into seemingly two versions of themselves!") do_teleport(alt_clone, get_turf(alt_clone), 2, no_effects=TRUE) //teleports clone so it's hard to find the real one! do_sparks(5,FALSE,alt_clone) diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index 216bfe6643d..95ae79c34ee 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -52,8 +52,8 @@ left = C.get_bodypart(BODY_ZONE_L_LEG) right = C.get_bodypart(BODY_ZONE_R_LEG) update_limp() - RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/check_step) - RegisterSignal(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), .proc/update_limp) + RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(check_step)) + RegisterSignal(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), PROC_REF(update_limp)) return TRUE /datum/status_effect/limp/on_remove() @@ -154,7 +154,7 @@ /datum/status_effect/wound/on_apply() if(!iscarbon(owner)) return FALSE - RegisterSignal(owner, COMSIG_CARBON_LOSE_WOUND, .proc/check_remove) + RegisterSignal(owner, COMSIG_CARBON_LOSE_WOUND, PROC_REF(check_remove)) return TRUE /// check if the wound getting removed is the wound we're tied to @@ -170,7 +170,7 @@ /datum/status_effect/wound/blunt/on_apply() . = ..() - RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) on_swap_hands() /datum/status_effect/wound/blunt/on_remove() diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm index 6bf806915a0..6fd3d5b53a0 100644 --- a/code/datums/tgs_event_handler.dm +++ b/code/datums/tgs_event_handler.dm @@ -23,7 +23,7 @@ to_chat(world, span_boldannounce("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, TIMER_STOPPABLE) + reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES, TIMER_STOPPABLE) 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/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index 30e9690d5f6..aedcda7a887 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) else if(findtext(message, right_words)) direction = EAST for(var/mob/living/target as anything in listeners) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, target, direction || pick(GLOB.cardinals)), 1 SECONDS * (iteration - 1)) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(_step), target, direction || pick(GLOB.cardinals)), 1 SECONDS * (iteration - 1)) iteration++ /// This command forces the listeners to switch to walk intent. @@ -386,9 +386,9 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) var/iteration = 1 for(var/mob/living/target as anything in listeners) if(prob(25)) - addtimer(CALLBACK(target, /atom/movable/proc/say, "HOW HIGH?!!"), 0.5 SECONDS * iteration) + addtimer(CALLBACK(target, TYPE_PROC_REF(/atom/movable, say), "HOW HIGH?!!"), 0.5 SECONDS * iteration) else - addtimer(CALLBACK(target, /mob/living/.proc/emote, "jump"), 0.5 SECONDS * iteration) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living, emote), "jump"), 0.5 SECONDS * iteration) iteration++ ///This command plays a bikehorn sound after 2 seconds and a half have passed, and also slips listeners if the user is a clown. @@ -396,7 +396,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) trigger = "ho+nk" /datum/voice_of_god_command/honk/execute(list/listeners, mob/living/user, power_multiplier = 1, message) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 2.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 2.5 SECONDS) if(is_clown_job(user.mind?.assigned_role)) . = COOLDOWN_STUN //it slips. for(var/mob/living/carbon/target in listeners) @@ -418,7 +418,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /datum/voice_of_god_command/emote/execute(list/listeners, mob/living/user, power_multiplier = 1, message) var/iteration = 1 for(var/mob/living/target as anything in listeners) - addtimer(CALLBACK(target, /mob/living/.proc/emote, emote_name), 0.5 SECONDS * iteration) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living, emote), emote_name), 0.5 SECONDS * iteration) iteration++ /datum/voice_of_god_command/emote/flip diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index 3ebd1e682ef..ba4dba673af 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -119,7 +119,7 @@ to_chat(player, telegraph_message) if(telegraph_sound) SEND_SOUND(player, sound(telegraph_sound)) - addtimer(CALLBACK(src, .proc/start), telegraph_duration) + addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration) /** * Starts the actual weather and effects from it @@ -144,7 +144,7 @@ if(weather_sound) SEND_SOUND(player, sound(weather_sound)) if(!perpetual) - addtimer(CALLBACK(src, .proc/wind_down), weather_duration) + addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration) /** * Weather enters the winding down phase, stops effects @@ -168,7 +168,7 @@ to_chat(player, end_message) if(end_sound) SEND_SOUND(player, sound(end_sound)) - addtimer(CALLBACK(src, .proc/end), end_duration) + addtimer(CALLBACK(src, PROC_REF(end)), end_duration) /** * Fully ends the weather diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 3bf5f345dcd..756da226630 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -51,7 +51,7 @@ // If there is a dictionary key set, we'll want to use that. Otherwise, use the holder type. var/key = dictionary_key ? dictionary_key : holder_type - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) if(randomize) randomize() else diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index 2fd182adac8..16895642e55 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -33,13 +33,13 @@ if(!A.shorted) A.shorted = TRUE A.update_appearance() - addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 1200) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200) if(WIRE_IDSCAN) // Toggle lock. A.locked = !A.locked if(WIRE_AI) // Disable AI control for a while. if(!A.aidisabled) A.aidisabled = TRUE - addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 100) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100) if(WIRE_PANIC) // Toggle panic siphon. if(!A.shorted) if(A.mode == 1) // AALARM_MODE_SCRUB diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index ba506987e6c..43175096951 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -98,9 +98,9 @@ return if(!A.requiresID() || A.check_access(null)) if(A.density) - INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open, 1) + INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, open), 1) else - INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close, 1) + INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, close), 1) if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on). if(!A.locked) A.bolt() @@ -119,7 +119,7 @@ A.aiControlDisabled = AI_WIRE_DISABLED else if(A.aiControlDisabled == AI_WIRE_DISABLED_HACKED) A.aiControlDisabled = AI_WIRE_HACKED - addtimer(CALLBACK(A, /obj/machinery/door/airlock.proc/reset_ai_wire), 1 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/door/airlock, reset_ai_wire)), 1 SECONDS) if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks. if(!A.secondsElectrified) A.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, usr) diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index 38020f7bb99..92e3254210f 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -31,14 +31,14 @@ if(WIRE_POWER1, WIRE_POWER2) // Short for a long while. if(!A.shorted) A.shorted = TRUE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 2 MINUTES) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 2 MINUTES) if(WIRE_IDSCAN) // Unlock for a little while. A.locked = FALSE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 30 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 30 SECONDS) if(WIRE_AI) // Disable AI control for a very short time. if(!A.aidisabled) A.aidisabled = TRUE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1 SECONDS) /datum/wires/apc/on_cut(index, mend) var/obj/machinery/power/apc/A = holder diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 8c0516270d2..bf30ba39c08 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -29,13 +29,13 @@ switch(wire) if(WIRE_HACK) A.adjust_hacked(!A.hacked) - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) if(WIRE_SHOCK) A.shocked = !A.shocked - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) if(WIRE_DISABLE) A.disabled = !A.disabled - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) /datum/wires/autolathe/on_cut(wire, mend) var/obj/machinery/autolathe/A = holder diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 63f273c49bc..9f8d895eda2 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -102,7 +102,7 @@ // We can't add the timer without the timer ID, but we can't get the timer ID without the timer! // To solve this, we just use a list that we mutate later. var/list/data = list("input" = input) - var/timer_id = addtimer(CALLBACK(src, .proc/receive_cross_comms_message, data), CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) + var/timer_id = addtimer(CALLBACK(src, PROC_REF(receive_cross_comms_message), data), CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) data["timer_id"] = timer_id LAZYADD(timers, timer_id) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index fec642bfc42..5e859728909 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -173,7 +173,7 @@ remove_wound_from_victim() victim = new_victim if(victim) - RegisterSignal(victim, COMSIG_PARENT_QDELETING, .proc/null_victim) + RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(null_victim)) /datum/wound/proc/source_died() SIGNAL_HANDLER @@ -230,7 +230,7 @@ if(limb) UnregisterSignal(limb, COMSIG_PARENT_QDELETING) limb = new_value - RegisterSignal(new_value, COMSIG_PARENT_QDELETING, .proc/source_died) + RegisterSignal(new_value, COMSIG_PARENT_QDELETING, PROC_REF(source_died)) if(. && disabling) var/obj/item/bodypart/old_limb = . REMOVE_TRAIT(old_limb, TRAIT_PARALYSIS, src) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 1ab422a9a7d..89a2759f283 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -34,14 +34,14 @@ */ /datum/wound/blunt/wound_injury(datum/wound/old_wound = null, attack_direction = null) // hook into gaining/losing gauze so crit bone wounds can re-enable/disable depending if they're slung or not - RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), .proc/update_inefficiencies)// MOJAVE SUN EDIT - ORIGINAL IS RegisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED), .proc/update_inefficiencies) + RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), PROC_REF(update_inefficiencies)) // MOJAVE SUN EDIT - ORIGINAL IS RegisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED), PROC_REF(update_inefficiencies)) if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group) processes = TRUE active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown) - RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/attack_with_hurt_hand) + RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(attack_with_hurt_hand)) if(limb.held_index && victim.get_item_for_held_index(limb.held_index) && (disabling || prob(30 * severity))) var/obj/item/I = victim.get_item_for_held_index(limb.held_index) if(istype(I, /obj/item/offhand)) @@ -110,7 +110,7 @@ else victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!"), \ span_userdanger("You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -230,7 +230,7 @@ /datum/wound/blunt/moderate/wound_injury(datum/wound/old_wound, attack_direction = null) . = ..() - RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, .proc/door_crush) + RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, PROC_REF(door_crush)) /// Getting smushed in an airlock/firelock is a last-ditch attempt to try relocating your limb /datum/wound/blunt/moderate/proc/door_crush() @@ -260,7 +260,7 @@ /datum/wound/blunt/moderate/proc/chiropractice(mob/living/carbon/human/user) var/time = base_treat_time - if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return if(prob(65)) @@ -279,7 +279,7 @@ /datum/wound/blunt/moderate/proc/malpractice(mob/living/carbon/human/user) var/time = base_treat_time - if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return if(prob(65)) @@ -300,7 +300,7 @@ else user.visible_message(span_danger("[user] begins resetting [victim]'s [limb.name] with [I]."), span_notice("You begin resetting [victim]'s [limb.name] with [I]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return if(victim == user) @@ -393,7 +393,7 @@ user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...")) - if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return I.use(1) @@ -434,7 +434,7 @@ user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return I.use(1) @@ -458,7 +458,7 @@ user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return if(victim == user) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 170e09eb047..1da8fc20b6b 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -203,7 +203,7 @@ user.visible_message(span_notice("[user] begins applying [I] to [victim]'s [limb.name]..."), span_notice("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) if (I.amount <= 0) return - if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return limb.heal_damage(I.heal_brute, I.heal_burn) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 523319ad68e..ab352d09a5a 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -120,7 +120,7 @@ /datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = I.stop_bleeding / self_penalty_mult @@ -139,7 +139,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index 514f99cc687..be81ec2bf9b 100644 --- a/code/datums/wounds/scars/_scars.dm +++ b/code/datums/wounds/scars/_scars.dm @@ -48,7 +48,7 @@ */ /datum/scar/proc/generate(obj/item/bodypart/BP, datum/wound/W, add_to_scars=TRUE) limb = BP - RegisterSignal(limb, COMSIG_PARENT_QDELETING, .proc/limb_gone) + RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone)) severity = W.severity if(limb.owner) @@ -92,7 +92,7 @@ return limb = BP - RegisterSignal(limb, COMSIG_PARENT_QDELETING, .proc/limb_gone) + RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone)) if(limb.owner) victim = limb.owner if(victim.get_biological_state() != biology) diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 67cb015e103..fd2d0fadf72 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -62,7 +62,7 @@ if(highest_scar) UnregisterSignal(highest_scar, COMSIG_PARENT_QDELETING) if(new_scar) - RegisterSignal(new_scar, COMSIG_PARENT_QDELETING, .proc/clear_highest_scar) + RegisterSignal(new_scar, COMSIG_PARENT_QDELETING, PROC_REF(clear_highest_scar)) highest_scar = new_scar /datum/wound/slash/proc/clear_highest_scar(datum/source) @@ -202,7 +202,7 @@ user.visible_message(span_notice("[user] begins licking the wounds on [victim]'s [limb.name]."), span_notice("You begin licking the wounds on [victim]'s [limb.name]..."), ignored_mobs=victim) to_chat(victim, span_notice("[user] begins to lick the wounds on your [limb.name].")) - if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_notice("[user] licks the wounds on [victim]'s [limb.name]."), span_notice("You lick some of the wounds on [victim]'s [limb.name]"), ignored_mobs=victim) @@ -226,7 +226,7 @@ /datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) var/self_penalty_mult = (user == victim ? 1.25 : 1) user.visible_message(span_warning("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]..."), span_userdanger("You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return var/damage = lasgun.chambered.loaded_projectile.damage lasgun.chambered.loaded_projectile.wound_bonus -= 30 @@ -243,7 +243,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) @@ -263,7 +263,7 @@ var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a75abe3740f..0fca94aadc5 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (picked && is_station_level(picked.z)) GLOB.teleportlocs[AR.name] = AR - sortTim(GLOB.teleportlocs, /proc/cmp_text_asc) + sortTim(GLOB.teleportlocs, GLOBAL_PROC_REF(cmp_text_asc)) /** * Called when an area loads diff --git a/code/game/atoms.dm b/code/game/atoms.dm index aeae5466ef8..a37934f2d9c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -850,7 +850,7 @@ /atom/proc/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) SEND_SIGNAL(src, COMSIG_ATOM_HITBY, hitting_atom, skipcatch, hitpush, blocked, throwingdatum) if(density && !has_gravity(hitting_atom)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...). - addtimer(CALLBACK(src, .proc/hitby_react, hitting_atom), 2) + addtimer(CALLBACK(src, PROC_REF(hitby_react), hitting_atom), 2) /** * We have have actually hit the passed in atom @@ -1006,7 +1006,7 @@ var/list/things = src_object.contents() var/datum/progressbar/progress = new(user, things.len, src) var/datum/component/storage/STR = GetComponent(/datum/component/storage) - while (do_after(user, 1 SECONDS, src, NONE, FALSE, CALLBACK(STR, /datum/component/storage.proc/handle_mass_item_insertion, things, src_object, user, progress))) + while (do_after(user, 1 SECONDS, src, NONE, FALSE, CALLBACK(STR, TYPE_PROC_REF(/datum/component/storage, handle_mass_item_insertion), things, src_object, user, progress))) stoplag(1) progress.end_progress() to_chat(user, span_notice("You dump as much of [src_object.parent]'s contents [STR.insert_preposition]to [src] as you can.")) @@ -1259,7 +1259,7 @@ if(!valid_id) to_chat(usr, span_warning("A reagent with that ID doesn't exist!")) if("Choose from a list") - chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in sort_list(subtypesof(/datum/reagent), /proc/cmp_typepaths_asc) + chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in sort_list(subtypesof(/datum/reagent), GLOBAL_PROC_REF(cmp_typepaths_asc)) if("I'm feeling lucky") chosen_id = pick(subtypesof(/datum/reagent)) if(chosen_id) @@ -1730,7 +1730,7 @@ /atom/proc/update_filters() filters = null - filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE) + filter_data = sortTim(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_movable.dm b/code/game/atoms_movable.dm index e6b2fe19146..07ce0d3e691 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -194,7 +194,7 @@ if(isobj(hurt_atom) || ismob(hurt_atom)) if(hurt_atom.layer > highest.layer) highest = hurt_atom -// INVOKE_ASYNC(src, .proc/SpinAnimation, 5, 2) This looks dumb and it should feel bad about it. +// INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2) This looks dumb and it should feel bad about it. return TRUE /* @@ -776,7 +776,7 @@ ///allows this movable to hear and adds itself to the important_recursive_contents list of itself and every movable loc its in /atom/movable/proc/become_hearing_sensitive(trait_source = TRAIT_GENERIC) if(!HAS_TRAIT(src, TRAIT_HEARING_SENSITIVE)) - //RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HEARING_SENSITIVE), .proc/on_hearing_sensitive_trait_loss) + //RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HEARING_SENSITIVE), PROC_REF(on_hearing_sensitive_trait_loss)) for(var/atom/movable/location as anything in get_nested_locs(src) + src) LAZYADDASSOCLIST(location.important_recursive_contents, RECURSIVE_CONTENTS_HEARING_SENSITIVE, src) @@ -814,7 +814,7 @@ ///allows this movable to know when it has "entered" another area no matter how many movable atoms its stuffed into, uses important_recursive_contents /atom/movable/proc/become_area_sensitive(trait_source = TRAIT_GENERIC) if(!HAS_TRAIT(src, TRAIT_AREA_SENSITIVE)) - //RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_AREA_SENSITIVE), .proc/on_area_sensitive_trait_loss) + //RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_AREA_SENSITIVE), PROC_REF(on_area_sensitive_trait_loss)) for(var/atom/movable/location as anything in get_nested_locs(src) + src) LAZYADDASSOCLIST(location.important_recursive_contents, RECURSIVE_CONTENTS_AREA_SENSITIVE, src) ADD_TRAIT(src, TRAIT_AREA_SENSITIVE, trait_source) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 1cbdfb028a5..e5b717a8a08 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -414,10 +414,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) /datum/game_mode/dynamic/post_setup(report) for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) rule.candidates.Cut() // The rule should not use candidates at this point as they all are null. - addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/game_mode/dynamic, execute_roundstart_rule), rule), rule.delay) if (!CONFIG_GET(flag/no_intercept_report)) - addtimer(CALLBACK(src, .proc/send_intercept), rand(waittime_l, waittime_h)) + addtimer(CALLBACK(src, PROC_REF(send_intercept)), rand(waittime_l, waittime_h)) ..() @@ -711,7 +711,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if (forced_latejoin_rule.ready(TRUE)) if (!forced_latejoin_rule.repeatable) latejoin_rules = remove_from_list(latejoin_rules, forced_latejoin_rule.type) - addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_midround_latejoin_rule, forced_latejoin_rule), forced_latejoin_rule.delay) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/game_mode/dynamic, execute_midround_latejoin_rule), forced_latejoin_rule), forced_latejoin_rule.delay) forced_latejoin_rule = null else if (latejoin_injection_cooldown < world.time && prob(get_injection_chance())) diff --git a/code/game/gamemodes/dynamic/dynamic_hijacking.dm b/code/game/gamemodes/dynamic/dynamic_hijacking.dm index 04892ad1530..cd13665114c 100644 --- a/code/game/gamemodes/dynamic/dynamic_hijacking.dm +++ b/code/game/gamemodes/dynamic/dynamic_hijacking.dm @@ -1,5 +1,5 @@ /datum/game_mode/dynamic/proc/setup_hijacking() - RegisterSignal(SSdcs, COMSIG_GLOB_PRE_RANDOM_EVENT, .proc/on_pre_random_event) + RegisterSignal(SSdcs, COMSIG_GLOB_PRE_RANDOM_EVENT, PROC_REF(on_pre_random_event)) /datum/game_mode/dynamic/proc/on_pre_random_event(datum/source, datum/round_event_control/round_event_control) SIGNAL_HANDLER diff --git a/code/game/gamemodes/dynamic/ruleset_picking.dm b/code/game/gamemodes/dynamic/ruleset_picking.dm index 2885da67d14..27a5dbefefd 100644 --- a/code/game/gamemodes/dynamic/ruleset_picking.dm +++ b/code/game/gamemodes/dynamic/ruleset_picking.dm @@ -37,7 +37,7 @@ current_midround_rulesets = drafted_rules - rule midround_injection_timer_id = addtimer( - CALLBACK(src, .proc/execute_midround_rule, rule), \ + CALLBACK(src, PROC_REF(execute_midround_rule), rule), \ ADMIN_CANCEL_MIDROUND_TIME, \ TIMER_STOPPABLE, \ ) @@ -53,7 +53,7 @@ midround_injection_timer_id = null if (!rule.repeatable) midround_rules = remove_from_list(midround_rules, rule.type) - addtimer(CALLBACK(src, .proc/execute_midround_latejoin_rule, rule), rule.delay) + addtimer(CALLBACK(src, PROC_REF(execute_midround_latejoin_rule), rule), rule.delay) /// Executes a random latejoin ruleset from the list of drafted rules. /datum/game_mode/dynamic/proc/pick_latejoin_rule(list/drafted_rules) @@ -62,7 +62,7 @@ return if (!rule.repeatable) latejoin_rules = remove_from_list(latejoin_rules, rule.type) - addtimer(CALLBACK(src, .proc/execute_midround_latejoin_rule, rule), rule.delay) + addtimer(CALLBACK(src, PROC_REF(execute_midround_latejoin_rule), rule), rule.delay) return TRUE /// Mainly here to facilitate delayed rulesets. All midround/latejoin rulesets are executed with a timered callback to this proc. diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 4c8c3a32b3d..01277fe0a68 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -22,7 +22,7 @@ /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. if(!report) report = !CONFIG_GET(flag/no_intercept_report) - addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME) if(CONFIG_GET(flag/reopen_roundstart_suicide_roles)) var/delay = CONFIG_GET(number/reopen_roundstart_suicide_roles_delay) @@ -30,7 +30,7 @@ delay = (delay SECONDS) else delay = (4 MINUTES) //default to 4 minutes if the delay isn't defined. - addtimer(CALLBACK(GLOBAL_PROC, .proc/reopen_roundstart_suicide_roles), delay) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reopen_roundstart_suicide_roles)), delay) if(SSdbcore.Connect()) var/list/to_set = list() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5dd8765e726..ee79e9572c0 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -941,7 +941,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/capture, /datum/objective/absorb, /datum/objective/custom - ),/proc/cmp_typepaths_asc) + ), GLOBAL_PROC_REF(cmp_typepaths_asc)) for(var/T in allowed_types) var/datum/objective/X = T diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 7a4ca3e0c1f..4b84d5ac866 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -194,9 +194,9 @@ var/area/our_area = get_area(src) if(our_area) - RegisterSignal(our_area, COMSIG_AREA_POWER_CHANGE, .proc/power_change) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/on_enter_area) - RegisterSignal(src, COMSIG_EXIT_AREA, .proc/on_exit_area) + RegisterSignal(our_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(on_enter_area)) + RegisterSignal(src, COMSIG_EXIT_AREA, PROC_REF(on_exit_area)) /** * proc to call when the machine stops requiring power after a duration of requiring power @@ -216,7 +216,7 @@ SIGNAL_HANDLER update_current_power_usage() power_change() - RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, .proc/power_change) + RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) /obj/machinery/proc/on_exit_area(datum/source, area/area_to_unregister) SIGNAL_HANDLER @@ -819,7 +819,7 @@ wrench.play_tool_sound(src, 50) var/prev_anchored = anchored //as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state - if(!wrench.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user))) + if(!wrench.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user))) return FAILED_UNFASTEN if(!anchored && ground.is_blocked_turf(exclude_mobs = TRUE, source_atom = src)) to_chat(user, span_notice("You fail to secure [src].")) diff --git a/code/game/machinery/accounting.dm b/code/game/machinery/accounting.dm index ac8468723c8..d01bd30b4f0 100644 --- a/code/game/machinery/accounting.dm +++ b/code/game/machinery/accounting.dm @@ -26,7 +26,7 @@ to_chat(user, span_warning("\the [src] blinks red as you try to insert the ID Card!")) return inserted_id = new_id - RegisterSignal(inserted_id, COMSIG_PARENT_QDELETING, .proc/remove_card) + RegisterSignal(inserted_id, COMSIG_PARENT_QDELETING, PROC_REF(remove_card)) var/datum/bank_account/bank_account = new /datum/bank_account(inserted_id.registered_name) inserted_id.registered_account = bank_account if(istype(new_id.trim, /datum/id_trim/job)) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 2a28d35cb95..38963d8cacf 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -42,4 +42,4 @@ to_chat(user, span_notice("You activate [src]. It now has [uses] uses of foam remaining.")) cooldown = world.time + cooldown_time power_change() - addtimer(CALLBACK(src, .proc/power_change), cooldown_time) + addtimer(CALLBACK(src, PROC_REF(power_change)), cooldown_time) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 35072f830c8..c4e7f2b1c09 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -45,7 +45,7 @@ ) /obj/machinery/autolathe/Initialize(mapload) - AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) + AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) . = ..() wires = new /datum/wires/autolathe(src) @@ -206,7 +206,7 @@ if(materials.materials[i] > 0) list_to_show += i - used_material = tgui_input_list(usr, "Choose [used_material]", "Custom Material", sort_list(list_to_show, /proc/cmp_typepaths_asc)) + used_material = tgui_input_list(usr, "Choose [used_material]", "Custom Material", sort_list(list_to_show, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(used_material)) return //Didn't pick any material, so you can't build shit either. custom_materials[used_material] += amount_needed @@ -219,7 +219,7 @@ use_power(power) icon_state = "autolathe_n" var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8 - addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time) + addtimer(CALLBACK(src, PROC_REF(make_item), power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time) . = TRUE else to_chat(usr, span_alert("Not enough materials for this operation.")) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 3e77e6c0123..1288f20c3cf 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -178,7 +178,7 @@ device.pulsed() SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BUTTON_PRESSED,src) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 15) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 15) /obj/machinery/button/door name = "door button" diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 690227aea74..009f5f79a94 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -167,7 +167,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) set_light(0) emped = emped+1 //Increase the number of consecutive EMP's update_appearance() - addtimer(CALLBACK(src, .proc/post_emp_reset, emped, network), 90 SECONDS) + addtimer(CALLBACK(src, PROC_REF(post_emp_reset), emped, network), 90 SECONDS) for(var/i in GLOB.player_list) var/mob/M = i if (M.client?.eye == src) @@ -187,7 +187,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) if(can_use()) GLOB.cameranet.addCamera(src) emped = 0 //Resets the consecutive EMP count - addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) + addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100) /obj/machinery/camera/ex_act(severity, target) if(invuln) @@ -442,7 +442,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) change_msg = "reactivates" triggerCameraAlarm() if(!QDELETED(src)) //We'll be doing it anyway in destroy - addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) + addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100) if(displaymessage) if(user) visible_message(span_danger("[user] [change_msg] [src]!")) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 163489cebb0..646efab885b 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -90,7 +90,7 @@ to_chat(U, span_notice("Now tracking [target.get_visible_name()] on camera.")) - INVOKE_ASYNC(src, .proc/do_track, target, U) + INVOKE_ASYNC(src, PROC_REF(do_track), target, U) /mob/living/silicon/ai/proc/do_track(mob/living/target, mob/living/silicon/ai/U) var/cameraticks = 0 diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index c44d5c56b4b..cbc4257c7ae 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -281,7 +281,7 @@ radio.keyslot = new radio_key radio.set_listening(FALSE) radio.recalculateChannels() - RegisterSignal(radio, COMSIG_ITEM_PRE_EXPORT, .proc/on_export) + RegisterSignal(radio, COMSIG_ITEM_PRE_EXPORT, PROC_REF(on_export)) /obj/item/bounty_cube/Destroy() UnregisterSignal(radio, COMSIG_ITEM_PRE_EXPORT) @@ -376,7 +376,7 @@ /obj/item/civ_bounty_beacon/attack_self() loc.visible_message(span_warning("\The [src] begins to beep loudly!")) - addtimer(CALLBACK(src, .proc/launch_payload), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS) /obj/item/civ_bounty_beacon/proc/launch_payload() playsound(src, "sparks", 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 25b5085cd82..c78638752c6 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -116,7 +116,7 @@ log_game("[key_name(operator)] set the logs of [src] in [AREACOORD(src)] [should_log ? "On" : "Off"]") if("restore-console") restoring = TRUE - addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9) + addtimer(CALLBACK(src, PROC_REF(restore_comp)), rand(3,5) * 9) if("access-apc") var/ref = params["ref"] playsound(src, "terminal_type", 50, FALSE) diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm index 97c5ce27887..baf133890f7 100644 --- a/code/game/machinery/computer/arcade/arcade.dm +++ b/code/game/machinery/computer/arcade/arcade.dm @@ -360,7 +360,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( 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 07295d83147..6f14aa9b790 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?") diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index a3743627755..68495514423 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -77,7 +77,7 @@ var/list/default_arenas = flist(arena_dir) for(var/arena_file in default_arenas) var/simple_name = replacetext(replacetext(arena_file,arena_dir,""),".dmm","") - INVOKE_ASYNC(src, .proc/add_new_arena_template, null, arena_dir + arena_file, simple_name) + INVOKE_ASYNC(src, PROC_REF(add_new_arena_template), null, arena_dir + arena_file, simple_name) /obj/machinery/computer/arena/proc/get_landmark_turf(landmark_tag) for(var/obj/effect/landmark/arena/L in GLOB.landmarks_list) @@ -221,7 +221,7 @@ for(var/mob/M in all_contestants()) to_chat(M,span_userdanger("The gates will open in [timetext]!")) start_time = world.time + start_delay - addtimer(CALLBACK(src,.proc/begin),start_delay) + addtimer(CALLBACK(src, PROC_REF(begin),start_delay)) for(var/team in teams) var/obj/machinery/arena_spawn/team_spawn = get_spawn(team) var/obj/effect/countdown/arena/A = new(team_spawn) @@ -248,9 +248,9 @@ if(D.id != arena_id) continue if(closed) - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) else - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) /obj/machinery/computer/arena/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 6e42cf93b7b..37fa96a9eaf 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -289,13 +289,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai /obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_CLICK, .proc/BigClick) + RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick)) // Bypass clickchain to allow humans to use the telescreen from a distance /obj/machinery/computer/security/telescreen/entertainment/proc/BigClick() SIGNAL_HANDLER - INVOKE_ASYNC(src, /atom.proc/interact, usr) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), usr) /obj/machinery/computer/security/telescreen/entertainment/proc/notify(on) if(on && icon_state == icon_state_off) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 7f929d41fa5..2d64fa12799 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -126,7 +126,7 @@ return battlecruiser_called = TRUE caller_card.use_charge(user) - addtimer(CALLBACK(GLOBAL_PROC, /proc/summon_battlecruiser, caller_card.team), rand(20 SECONDS, 1 MINUTES)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(summon_battlecruiser), caller_card.team), rand(20 SECONDS, 1 MINUTES)) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) return @@ -340,7 +340,7 @@ ) ) - send_cross_comms_message_timer = addtimer(CALLBACK(src, .proc/send_cross_comms_message, usr, destination, message), CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) + send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), usr, destination, message), CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("setState") @@ -434,7 +434,7 @@ SSjob.safe_code_request_loc = pod_location SSjob.safe_code_requested = TRUE - SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, /datum/controller/subsystem/job.proc/send_spare_id_safe_code, pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) + SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, TYPE_PROC_REF(/datum/controller/subsystem/job, send_spare_id_safe_code), pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) minor_announce("Due to staff shortages, your station has been approved for delivery of access codes to secure the Captain's Spare ID. Delivery via drop pod at [get_area(pod_location)]. ETA 120 seconds.") /obj/machinery/computer/communications/proc/emergency_access_cooldown(mob/user) @@ -816,7 +816,7 @@ var/datum/round_event_control/pirates/pirate_event = locate() in SSevents.control if(!pirate_event) CRASH("hack_console() attempted to run pirates, but could not find an event controller!") - addtimer(CALLBACK(pirate_event, /datum/round_event_control.proc/runEvent), rand(20 SECONDS, 1 MINUTES)) + addtimer(CALLBACK(pirate_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) if(HACK_FUGITIVES) // Triggers fugitives, which can cause confusion / chaos as the crew decides which side help priority_announce( @@ -827,7 +827,7 @@ var/datum/round_event_control/fugitives/fugitive_event = locate() in SSevents.control if(!fugitive_event) CRASH("hack_console() attempted to run fugitives, but could not find an event controller!") - addtimer(CALLBACK(fugitive_event, /datum/round_event_control.proc/runEvent), rand(20 SECONDS, 1 MINUTES)) + addtimer(CALLBACK(fugitive_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) if(HACK_THREAT) // Adds a flat amount of threat to buy a (probably) more dangerous antag later priority_announce( diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 34d4a434653..0de23451eab 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -2227,7 +2227,7 @@ connected_scanner.set_linked_console(null) connected_scanner = new_scanner if(connected_scanner) - RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, .proc/react_to_scanner_del) + RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, PROC_REF(react_to_scanner_del)) connected_scanner.set_linked_console(src) /obj/machinery/computer/scan_consolenew/proc/react_to_scanner_del(datum/source) diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 796a24a7f51..b07a632d952 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -100,11 +100,11 @@ return if(COMPONENT_TRIGGERED_BY(send_trigger, port)) - INVOKE_ASYNC(the_pad, /obj/machinery/launchpad.proc/doteleport, null, TRUE, parent.get_creator()) + INVOKE_ASYNC(the_pad, TYPE_PROC_REF(/obj/machinery/launchpad, doteleport), null, TRUE, parent.get_creator()) sent.set_output(COMPONENT_SIGNAL) if(COMPONENT_TRIGGERED_BY(retrieve_trigger, port)) - INVOKE_ASYNC(the_pad, /obj/machinery/launchpad.proc/doteleport, null, FALSE, parent.get_creator()) + INVOKE_ASYNC(the_pad, TYPE_PROC_REF(/obj/machinery/launchpad, doteleport), null, FALSE, parent.get_creator()) retrieved.set_output(COMPONENT_SIGNAL) /obj/machinery/computer/launchpad/attack_paw(mob/user, list/modifiers) diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 21a7b9cff83..ab9b80c07a0 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -114,7 +114,7 @@ if("teleport") if(!teleporter || !beacon) return - addtimer(CALLBACK(src, .proc/teleport, usr), 5) + addtimer(CALLBACK(src, PROC_REF(teleport), usr), 5) return TRUE /obj/machinery/computer/prisoner/gulag_teleporter_computer/proc/scan_machinery() diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index aca7eb25e47..eb21de258a8 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/station_alert/Initialize(mapload) alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z), title = name) - RegisterSignal(alert_control.listener, list(COMSIG_ALARM_TRIGGERED, COMSIG_ALARM_CLEARED), .proc/update_alarm_display) + RegisterSignal(alert_control.listener, list(COMSIG_ALARM_TRIGGERED, COMSIG_ALARM_CLEARED), PROC_REF(update_alarm_display)) return ..() /obj/machinery/computer/station_alert/Destroy() diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 2473bcdbfe6..6745abe9920 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -100,7 +100,7 @@ say("Processing hub calibration to target...") calibrating = TRUE power_station.update_appearance() - addtimer(CALLBACK(src, .proc/finish_calibration), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration + addtimer(CALLBACK(src, PROC_REF(finish_calibration)), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration return TRUE /obj/machinery/computer/teleporter/proc/set_teleport_target(new_target) @@ -247,7 +247,7 @@ if (istype(shell, /obj/machinery/computer/teleporter)) attached_console = shell - RegisterSignal(attached_console, COMSIG_TELEPORTER_NEW_TARGET, .proc/on_teleporter_new_target) + RegisterSignal(attached_console, COMSIG_TELEPORTER_NEW_TARGET, PROC_REF(on_teleporter_new_target)) update_targets() /obj/item/circuit_component/teleporter_control_console/unregister_usb_parent(atom/movable/shell) diff --git a/code/game/machinery/computer/tram_controls.dm b/code/game/machinery/computer/tram_controls.dm index 38939c19227..9b06c3617ed 100644 --- a/code/game/machinery/computer/tram_controls.dm +++ b/code/game/machinery/computer/tram_controls.dm @@ -139,8 +139,8 @@ if (istype(shell, /obj/machinery/computer/tram_controls)) computer = shell var/obj/structure/industrial_lift/tram/central/tram_part = computer.tram_ref?.resolve() - RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, .proc/on_tram_set_travelling) - RegisterSignal(tram_part, COMSIG_TRAM_TRAVEL, .proc/on_tram_travel) + RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, PROC_REF(on_tram_set_travelling)) + RegisterSignal(tram_part, COMSIG_TRAM_TRAVEL, PROC_REF(on_tram_travel)) /obj/item/circuit_component/tram_controls/unregister_usb_parent(atom/movable/shell) var/obj/structure/industrial_lift/tram/central/tram_part = computer.tram_ref?.resolve() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 2cc94deed58..b3005d264d6 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -229,7 +229,7 @@ for(var/obj/item/co in replacer) part_list += co //Sort the parts. This ensures that higher tier items are applied first. - part_list = sortTim(part_list, /proc/cmp_rped_sort) + part_list = sortTim(part_list, GLOBAL_PROC_REF(cmp_rped_sort)) for(var/path in req_components) while(req_components[path] > 0 && (locate(path) in part_list)) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index eecb80df4ff..54f3a57eab8 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -310,7 +310,7 @@ glow.set_light_color(COLOR_SOFT_RED) glow.even_cycle = !glow.even_cycle if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up - INVOKE_ASYNC(src, .proc/hierofunk) + INVOKE_ASYNC(src, PROC_REF(hierofunk)) sleep(selection.song_beat) if(QDELETED(src)) return @@ -331,7 +331,7 @@ /obj/machinery/jukebox/disco/proc/dance2(mob/living/M) for(var/i in 0 to 9) - dance_rotate(M, CALLBACK(M, /mob.proc/dance_flip)) + dance_rotate(M, CALLBACK(M, TYPE_PROC_REF(/mob, dance_flip))) sleep(20) /mob/proc/dance_flip() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index fa4808082ee..c4ec872b031 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -118,7 +118,7 @@ /obj/structure/barricade/security/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/deploy), deploy_time) + addtimer(CALLBACK(src, PROC_REF(deploy)), deploy_time) /obj/structure/barricade/security/proc/deploy() icon_state = "barrier1" diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 921631cea54..73955e7f253 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -153,7 +153,7 @@ UnregisterSignal(linked_console, COMSIG_PARENT_QDELETING) linked_console = new_console if(linked_console) - RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, .proc/react_to_console_del) + RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, PROC_REF(react_to_console_del)) /obj/machinery/dna_scannernew/proc/react_to_console_del(datum/source) SIGNAL_HANDLER diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index bc8bb91bae3..71412573b3b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -164,12 +164,12 @@ diag_hud.add_to_hud(src) diag_hud_set_electrified() - RegisterSignal(src, COMSIG_MACHINERY_BROKEN, .proc/on_break) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_MACHINERY_BROKEN, PROC_REF(on_break)) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) // Click on the floor to close airlocks var/static/list/connections = list( - COMSIG_ATOM_ATTACK_HAND = .proc/on_attack_hand + COMSIG_ATOM_ATTACK_HAND = PROC_REF(on_attack_hand) ) AddElement(/datum/element/connect_loc, connections) @@ -269,9 +269,9 @@ return if(density) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) else - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) if("bolt") if(command_value == "on" && locked) @@ -437,7 +437,7 @@ secondsBackupPowerLost = 10 if(!spawnPowerRestoreRunning) spawnPowerRestoreRunning = TRUE - INVOKE_ASYNC(src, .proc/handlePowerRestore) + INVOKE_ASYNC(src, PROC_REF(handlePowerRestore)) update_appearance() /obj/machinery/door/airlock/proc/loseBackupPower() @@ -445,7 +445,7 @@ secondsBackupPowerLost = 60 if(!spawnPowerRestoreRunning) spawnPowerRestoreRunning = TRUE - INVOKE_ASYNC(src, .proc/handlePowerRestore) + INVOKE_ASYNC(src, PROC_REF(handlePowerRestore)) update_appearance() /obj/machinery/door/airlock/proc/regainBackupPower() @@ -581,7 +581,7 @@ if(!machine_stat) update_icon(ALL, AIRLOCK_DENY) playsound(src,doorDeni,50,FALSE,3) - addtimer(CALLBACK(src, /atom/proc/update_icon, ALL, AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), ALL, AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME) /obj/machinery/door/airlock/examine(mob/user) . = ..() @@ -752,7 +752,7 @@ /obj/machinery/door/airlock/proc/on_attack_hand(atom/source, mob/user, list/modifiers) SIGNAL_HANDLER - INVOKE_ASYNC(src, /atom/proc/attack_hand, user, modifiers) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, attack_hand), user, modifiers) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/door/airlock/attack_hand(mob/user, list/modifiers) @@ -1023,7 +1023,7 @@ user.visible_message(span_notice("[user] begins welding the airlock."), \ span_notice("You begin repairing the airlock..."), \ span_hear("You hear welding.")) - if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) + if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message(span_notice("[user] finishes welding [src]."), \ @@ -1038,7 +1038,7 @@ user.visible_message(span_notice("[user] begins [welded ? "unwelding":"welding"] the airlock."), \ span_notice("You begin [welded ? "unwelding":"welding"] the airlock..."), \ span_hear("You hear welding.")) - if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, tool, user))) + if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), tool, user))) return welded = !welded user.visible_message(span_notice("[user] [welded? "welds shut":"unwelds"] [src]."), \ @@ -1151,7 +1151,7 @@ if(axe && !axe.wielded) to_chat(user, span_warning("You need to be wielding \the [axe] to do that!")) return - INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) + INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2) /obj/machinery/door/airlock/open(forced=0) @@ -1175,7 +1175,7 @@ return TRUE if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock)) - addtimer(CALLBACK(closeOther, .proc/close), 2) + addtimer(CALLBACK(closeOther, PROC_REF(close)), 2) if(close_others) for(var/obj/machinery/door/airlock/otherlock as anything in close_others) @@ -1183,14 +1183,14 @@ if(otherlock.operating) otherlock.delayed_close_requested = TRUE else - addtimer(CALLBACK(otherlock, .proc/close), 2) + addtimer(CALLBACK(otherlock, PROC_REF(close)), 2) if(cyclelinkedairlock) if(!shuttledocked && !emergency && !cyclelinkedairlock.shuttledocked && !cyclelinkedairlock.emergency) if(cyclelinkedairlock.operating) cyclelinkedairlock.delayed_close_requested = TRUE else - addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2) + addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2) SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced) operating = TRUE @@ -1212,7 +1212,7 @@ operating = FALSE if(delayed_close_requested) delayed_close_requested = FALSE - addtimer(CALLBACK(src, .proc/close), 1) + addtimer(CALLBACK(src, PROC_REF(close)), 1) /obj/machinery/door/airlock/close(forced = FALSE, force_crush = FALSE) if(operating || welded || locked || seal) @@ -1383,7 +1383,7 @@ secondsElectrified = seconds diag_hud_set_electrified() if(secondsElectrified > MACHINE_NOT_ELECTRIFIED) - INVOKE_ASYNC(src, .proc/electrified_loop) + INVOKE_ASYNC(src, PROC_REF(electrified_loop)) if(user) var/message diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index c1d32ebdbdc..796c51c3ca8 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -23,7 +23,7 @@ . = ..() SSradio.remove_object(src, air_frequency) air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(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 a2f2c810301..3afd7075dc9 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -98,7 +98,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() @@ -135,7 +135,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/door.dm b/code/game/machinery/doors/door.dm index 2832e53c214..6b651435f05 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -95,7 +95,7 @@ //doors only block while dense though so we have to use the proc real_explosion_block = explosion_block explosion_block = EXPLOSION_BLOCK_PROC - RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_security_level) + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) /obj/machinery/door/proc/set_init_door_layer() if(density) @@ -320,12 +320,12 @@ if (. & EMP_PROTECT_SELF) return if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) if(prob(severity*10 - 20)) if(secondsElectrified == MACHINE_NOT_ELECTRIFIED) secondsElectrified = MACHINE_ELECTRIFIED_PERMANENT LAZYADD(shockedby, "\[[time_stamp()]\]EM Pulse") - addtimer(CALLBACK(src, .proc/unelectrify), 300) + addtimer(CALLBACK(src, PROC_REF(unelectrify)), 300) /obj/machinery/door/proc/unelectrify() secondsElectrified = MACHINE_NOT_ELECTRIFIED @@ -440,7 +440,7 @@ close() /obj/machinery/door/proc/autoclose_in(wait) - addtimer(CALLBACK(src, .proc/autoclose), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(autoclose)), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE) /obj/machinery/door/proc/requiresID() return 1 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 8e5f7a1a80c..269406ac089 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -65,7 +65,7 @@ CalculateAffectingAreas() my_area = get_area(src) var/static/list/loc_connections = list( - COMSIG_TURF_EXPOSE = .proc/check_atmos, + COMSIG_TURF_EXPOSE = PROC_REF(check_atmos), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -288,7 +288,7 @@ return digital_crowbar.use_charge(user) obj_flags |= EMAGGED - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/firedoor/Bumped(atom/movable/AM) if(panel_open || operating) @@ -384,9 +384,9 @@ if(QDELETED(user)) being_held_open = FALSE return - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/handle_held_open_adjacency) - RegisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION, .proc/handle_held_open_adjacency) - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/handle_held_open_adjacency) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(handle_held_open_adjacency)) + RegisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(handle_held_open_adjacency)) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(handle_held_open_adjacency)) handle_held_open_adjacency(user) else close() @@ -399,7 +399,7 @@ if(density) open() if(alarm_type) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() @@ -424,7 +424,7 @@ if(density) open() if(alarm_type) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() return TRUE @@ -439,7 +439,7 @@ return open() if(alarm_type) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) /obj/machinery/door/firedoor/do_animate(animation) switch(animation) @@ -479,10 +479,10 @@ if(obj_flags & EMAGGED || being_held_open) return //Unmotivated, indifferent, we have no real care what state we're in anymore. if(alarm_type && !density) //We should be closed but we're not - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) return if(!alarm_type && density) //We should be open but we're not - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) return /obj/machinery/door/firedoor/open() @@ -536,7 +536,7 @@ . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 07943a772f8..eef6fa21c5c 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -128,9 +128,9 @@ /obj/machinery/door/poddoor/shuttledock/proc/check() var/turf/turf = get_step(src, checkdir) if(!istype(turf, turftype)) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) else - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) /obj/machinery/door/poddoor/incinerator_ordmix name = "combustion chamber vent" diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5d2ab107bb7..3c5aad32729 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -40,10 +40,10 @@ if(cable) debris += new /obj/item/stack/cable_coil(src, cable) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -345,11 +345,11 @@ return if(density) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) else - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) if("touch") - INVOKE_ASYNC(src, .proc/open_and_close) + INVOKE_ASYNC(src, PROC_REF(open_and_close)) /obj/machinery/door/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 9167c93220e..f530a5fc577 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -20,12 +20,12 @@ /obj/machinery/doppler_array/Initialize(mapload) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, .proc/sense_explosion) - RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, .proc/power_change) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) + RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(power_change)) printer_ready = world.time + PRINTER_TIMEOUT // Alt clicking when unwrenched does not rotate. (likely from UI not returning the mouse click) // Also there is no sprite change for rotation dir, this shouldn't even have a rotate component tbh - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/RotationMessage)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(RotationMessage))) /datum/data/tachyon_record name = "Log Recording" diff --git a/code/game/machinery/ecto_sniffer.dm b/code/game/machinery/ecto_sniffer.dm index b40fab15caa..e04c410c899 100644 --- a/code/game/machinery/ecto_sniffer.dm +++ b/code/game/machinery/ecto_sniffer.dm @@ -34,7 +34,7 @@ use_power(10) if(activator?.ckey) ectoplasmic_residues += activator.ckey - addtimer(CALLBACK(src, .proc/clear_residue, activator.ckey), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clear_residue), activator.ckey), 15 SECONDS) /obj/machinery/ecto_sniffer/attack_hand(mob/living/user, list/modifiers) . = ..() diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index cc40b370ca5..ca7baa00ccd 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -79,7 +79,7 @@ controller.cycleClose(door) else controller.onlyClose(door) - addtimer(CALLBACK(src, .proc/not_busy), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(not_busy)), 2 SECONDS) /obj/machinery/door_buttons/access_button/proc/not_busy() busy = FALSE @@ -207,7 +207,7 @@ goIdle(TRUE) return A.unbolt() - INVOKE_ASYNC(src, .proc/do_openDoor, A) + INVOKE_ASYNC(src, PROC_REF(do_openDoor), A) /obj/machinery/door_buttons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A) if(A?.open()) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 5de0920f902..1ee14ebcf25 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -57,10 +57,10 @@ if(program) program.receive_user_command(href_list["command"]) - addtimer(CALLBACK(program, /datum/computer/file/embedded_program.proc/process), 5) + addtimer(CALLBACK(program, TYPE_PROC_REF(/datum/computer/file/embedded_program, process)), 5) usr.set_machine(src) - addtimer(CALLBACK(src, .proc/updateDialog), 5) + addtimer(CALLBACK(src, PROC_REF(updateDialog)), 5) /obj/machinery/embedded_controller/process(delta_time) if(program) diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 9bbeb928e71..cfec9c8dd69 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -62,7 +62,7 @@ set_occupant(null) return to_chat(occupant, span_notice("You enter [src].")) - addtimer(CALLBACK(src, .proc/start_extracting), 20, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(start_extracting)), 20, TIMER_OVERRIDE|TIMER_UNIQUE) update_appearance() /obj/machinery/fat_sucker/open_machine(mob/user) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c352a097d68..c5f00c24536 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -49,7 +49,7 @@ LAZYADD(my_area.firealarms, src) AddElement(/datum/element/atmos_sensitive, mapload) - RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_security_level) + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) soundloop = new(src, FALSE) AddElement( \ diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 30fde7ea0eb..1616892d559 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -107,7 +107,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26) playsound(src.loc, 'sound/weapons/flash.ogg', 100, TRUE) flick("[base_icon_state]_flash", src) set_light_on(TRUE) - addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) last_flash = world.time use_power(1000) diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index 3e4bd98dd6d..8b160bb4ab7 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -98,7 +98,7 @@ visible_message(span_notice("The [name] begins warming up!")) say("Initializing harvest protocol.") update_appearance() - addtimer(CALLBACK(src, .proc/harvest), interval) + addtimer(CALLBACK(src, PROC_REF(harvest)), interval) /obj/machinery/harvester/proc/harvest() warming_up = FALSE @@ -133,7 +133,7 @@ operation_order.Remove(BP) break use_power(5000) - addtimer(CALLBACK(src, .proc/harvest), interval) + addtimer(CALLBACK(src, PROC_REF(harvest)), interval) /obj/machinery/harvester/proc/end_harvesting() warming_up = FALSE diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 2b6c797a87e..ea7f24a71fe 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -765,7 +765,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(HOLORECORD_SOUND) playsound(src,entry[2],50,TRUE) if(HOLORECORD_DELAY) - addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2]) + addtimer(CALLBACK(src, PROC_REF(replay_entry), entry_number+1), entry[2]) return if(HOLORECORD_LANGUAGE) var/datum/language_holder/holder = replay_holo.get_language_holder() diff --git a/code/game/machinery/hypnochair.dm b/code/game/machinery/hypnochair.dm index 93faf6f0620..b62a2fff0dc 100644 --- a/code/game/machinery/hypnochair.dm +++ b/code/game/machinery/hypnochair.dm @@ -99,7 +99,7 @@ START_PROCESSING(SSobj, src) start_time = world.time update_appearance() - timerid = addtimer(CALLBACK(src, .proc/finish_interrogation), 450, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(finish_interrogation)), 450, TIMER_STOPPABLE) /obj/machinery/hypnochair/process(delta_time) var/mob/living/carbon/C = occupant diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 019b38abfa9..c7d73ba93ab 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -100,7 +100,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) . = ..() if(istype(parent, /obj/machinery/light_switch)) attached_switch = parent - RegisterSignal(parent, COMSIG_LIGHT_SWITCH_SET, .proc/on_light_switch_set) + RegisterSignal(parent, COMSIG_LIGHT_SWITCH_SET, PROC_REF(on_light_switch_set)) /obj/item/circuit_component/light_switch/unregister_usb_parent(atom/movable/parent) attached_switch = null diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 06863d274b7..1f5d8b2eb9b 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -170,7 +170,7 @@ flick("limbgrower_fill",src) icon_state = "limbgrower_idleon" selected_category = params["active_tab"] - addtimer(CALLBACK(src, .proc/build_item, consumed_reagents_list), production_speed * production_coefficient) + addtimer(CALLBACK(src, PROC_REF(build_item), consumed_reagents_list), production_speed * production_coefficient) . = TRUE return diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm index c1fc9f1ebf9..883d6c2cb98 100644 --- a/code/game/machinery/medipen_refiller.dm +++ b/code/game/machinery/medipen_refiller.dm @@ -58,7 +58,7 @@ if(reagents.has_reagent(allowed[P.type], 10)) busy = TRUE add_overlay("active") - addtimer(CALLBACK(src, .proc/refill, P, user), 20) + addtimer(CALLBACK(src, PROC_REF(refill), P, user), 20) qdel(P) return to_chat(user, span_danger("There aren't enough reagents to finish this operation.")) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index dcc4c9def42..f7a83a32417 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -864,7 +864,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30) playsound(loc, 'sound/machines/twobeep_high.ogg', 75, TRUE) alert = TRUE update_appearance() - addtimer(CALLBACK(src,.proc/remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)) else if(!channel && update_alert) say("Attention! Wanted issue distributed!") diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 67ab1031ae8..e870970fe4f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -123,7 +123,7 @@ DEFINE_BITFIELD(turret_flags, list( base.layer = NOT_HIGH_OBJ_LAYER underlays += base if(!has_cover) - INVOKE_ASYNC(src, .proc/popUp) + INVOKE_ASYNC(src, PROC_REF(popUp)) /obj/machinery/porta_turret/proc/toggle_on(set_to) var/current = on @@ -175,7 +175,7 @@ DEFINE_BITFIELD(turret_flags, list( turret_gun.forceMove(src) stored_gun = turret_gun - RegisterSignal(stored_gun, COMSIG_PARENT_PREQDELETED, .proc/null_gun) + RegisterSignal(stored_gun, COMSIG_PARENT_PREQDELETED, PROC_REF(null_gun)) if(!stored_gun) //sanity check return @@ -361,7 +361,7 @@ DEFINE_BITFIELD(turret_flags, list( toggle_on(FALSE) //turns off the turret temporarily update_appearance() //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 6 SECONDS) //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here /obj/machinery/porta_turret/emp_act(severity) @@ -381,7 +381,7 @@ DEFINE_BITFIELD(turret_flags, list( toggle_on(FALSE) remove_control() - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), rand(60,600)) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), rand(60,600)) /obj/machinery/porta_turret/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) . = ..() @@ -390,7 +390,7 @@ DEFINE_BITFIELD(turret_flags, list( spark_system.start() if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED)) turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT - addtimer(CALLBACK(src, .proc/reset_attacked), 60) + addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 60) /obj/machinery/porta_turret/proc/reset_attacked() turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT @@ -779,9 +779,9 @@ DEFINE_BITFIELD(turret_flags, list( if(target) setDir(get_dir(base, target))//even if you can't shoot, follow the target shootAt(target) - addtimer(CALLBACK(src, .proc/shootAt, target), 5) - addtimer(CALLBACK(src, .proc/shootAt, target), 10) - addtimer(CALLBACK(src, .proc/shootAt, target), 15) + addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5) + addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10) + addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15) return TRUE /obj/machinery/porta_turret/syndicate/pod/toolbox @@ -1146,8 +1146,8 @@ DEFINE_BITFIELD(turret_flags, list( if(team_color == "blue") if(istype(P, /obj/projectile/beam/lasertag/redtag)) toggle_on(FALSE) - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS) else if(team_color == "red") if(istype(P, /obj/projectile/beam/lasertag/bluetag)) toggle_on(FALSE) - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 69f80340d99..9fe19bc9a73 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -142,7 +142,7 @@ playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, TRUE) teleporting = TRUE - addtimer(CALLBACK(src, .proc/teleport_contents, user, target_pad), teleport_speed) + addtimer(CALLBACK(src, PROC_REF(teleport_contents), user, target_pad), teleport_speed) /obj/machinery/quantumpad/proc/teleport_contents(mob/user, obj/machinery/quantumpad/target_pad) teleporting = FALSE diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index e7c9ba8d002..1ac84ec957a 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -42,7 +42,7 @@ update_appearance(UPDATE_ICON) req_one_access = SSid_access.get_region_access_list(list(REGION_ALL_STATION, REGION_CENTCOM)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -109,7 +109,7 @@ /obj/machinery/recycler/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/eat, AM) + INVOKE_ASYNC(src, PROC_REF(eat), AM) /obj/machinery/recycler/proc/eat(atom/movable/AM0, sound=TRUE) if(machine_stat & (BROKEN|NOPOWER)) @@ -183,7 +183,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) safety_mode = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(reboot)), SAFETY_COOLDOWN) /obj/machinery/recycler/proc/reboot() playsound(src, 'sound/machines/ping.ogg', 50, FALSE) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 8bf26da9124..07a245f8187 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -304,7 +304,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console, 30) Radio.set_frequency(radio_freq) Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq) update_appearance() - addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES) + addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES) if(href_list["send"] && message && to_department && priority) diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 55c11d5b476..00e3f5b99a7 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -166,7 +166,7 @@ playsound(src, 'sound/machines/piston_raise.ogg', 70) playsound(src, 'sound/machines/chime.ogg', 50) - addtimer(CALLBACK(src, .proc/play, user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first + addtimer(CALLBACK(src, PROC_REF(play), user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first return TRUE else var/obj/item/card/id/new_card = W @@ -177,7 +177,7 @@ name = msg desc = "Owned by [new_card.registered_account.account_holder], draws directly from [user.p_their()] account." my_card = new_card - RegisterSignal(my_card, COMSIG_PARENT_QDELETING, .proc/on_my_card_deleted) + RegisterSignal(my_card, COMSIG_PARENT_QDELETING, PROC_REF(on_my_card_deleted)) to_chat(user, span_notice("You link the wheel to your account.")) power_change() return @@ -207,8 +207,8 @@ var/rolled_number = rand(0, 36) playsound(src, 'sound/machines/roulettewheel.ogg', 50) - addtimer(CALLBACK(src, .proc/finish_play, player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play - addtimer(CALLBACK(src, .proc/finish_play_animation), 30) + addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play + addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 30) /obj/machinery/roulette/proc/finish_play_animation() icon_state = "idle" @@ -287,7 +287,7 @@ var/obj/item/cash = new coin_to_drop(drop_loc) playsound(cash, pick(list('sound/machines/coindrop.ogg', 'sound/machines/coindrop2.ogg')), 40, TRUE) - addtimer(CALLBACK(src, .proc/drop_coin), 3) //Recursion time + addtimer(CALLBACK(src, PROC_REF(drop_coin)), 3) //Recursion time ///Fills a list of coins that should be dropped. @@ -430,7 +430,7 @@ return loc.visible_message(span_warning("\The [src] begins to beep loudly!")) used = TRUE - addtimer(CALLBACK(src, .proc/launch_payload), 40) + addtimer(CALLBACK(src, PROC_REF(launch_payload)), 40) /obj/item/roulette_wheel_beacon/proc/launch_payload() var/obj/structure/closet/supplypod/centcompod/toLaunch = new() diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index 0e23bb05399..4af47dd30da 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -54,7 +54,7 @@ wires = new /datum/wires/scanner_gate(src) set_scanline("passive") var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -72,7 +72,7 @@ /obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/auto_scan, AM) + INVOKE_ASYNC(src, PROC_REF(auto_scan), AM) /obj/machinery/scanner_gate/proc/auto_scan(atom/movable/AM) if(!(machine_stat & (BROKEN|NOPOWER)) && isliving(AM) & (!panel_open)) @@ -83,7 +83,7 @@ deltimer(scanline_timer) add_overlay(type) if(duration) - scanline_timer = addtimer(CALLBACK(src, .proc/set_scanline, "passive"), duration, TIMER_STOPPABLE) + scanline_timer = addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_STOPPABLE) /obj/machinery/scanner_gate/attackby(obj/item/W, mob/user, params) var/obj/item/card/id/card = W.GetID() diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 3057643983d..c9d946d5b82 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -14,7 +14,7 @@ /obj/machinery/sheetifier/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) + AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) /obj/machinery/sheetifier/update_overlays() . = ..() @@ -37,7 +37,7 @@ var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing") processing_overlay.color = last_inserted_material.color flick_overlay_static(processing_overlay, src, 64) - addtimer(CALLBACK(src, .proc/finish_processing), 64) + addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64) /obj/machinery/sheetifier/proc/finish_processing() busy_processing = FALSE diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 748314f0a63..4eb5eaf13be 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -292,7 +292,7 @@ . = ..() if(anchored) connect_to_network() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity_if_active) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) /obj/machinery/power/shieldwallgen/Destroy() for(var/d in GLOB.cardinals) @@ -476,7 +476,7 @@ for(var/mob/living/L in get_turf(src)) visible_message(span_danger("\The [src] is suddenly occupying the same space as \the [L]!")) L.gib() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) /obj/machinery/shieldwall/Destroy() gen_primary = null diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index ad1aef979ef..51d749a92cf 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -43,13 +43,13 @@ jackpots = rand(1, 4) //false hope plays = rand(75, 200) - INVOKE_ASYNC(src, .proc/toggle_reel_spin, TRUE)//The reels won't spin unless we activate them + INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), TRUE)//The reels won't spin unless we activate them var/list/reel = reels[1] for(var/i in 1 to reel.len) //Populate the reels. randomize_reels() - INVOKE_ASYNC(src, .proc/toggle_reel_spin, FALSE) + INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), FALSE) for(cointype in typesof(/obj/item/coin)) var/obj/item/coin/C = new cointype @@ -212,9 +212,9 @@ update_appearance() updateDialog() - var/spin_loop = addtimer(CALLBACK(src, .proc/do_spin), 2, TIMER_LOOP|TIMER_STOPPABLE) + var/spin_loop = addtimer(CALLBACK(src, PROC_REF(do_spin)), 2, TIMER_LOOP|TIMER_STOPPABLE) - addtimer(CALLBACK(src, .proc/finish_spinning, spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) + addtimer(CALLBACK(src, PROC_REF(finish_spinning), spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) //WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code. /obj/machinery/computer/slot_machine/proc/do_spin() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 0dbb5fc9761..e2cdfa4bad5 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -262,7 +262,7 @@ user, src, choices, - custom_check = CALLBACK(src, .proc/check_interactable, user), + custom_check = CALLBACK(src, PROC_REF(check_interactable), user), require_near = !issilicon(user), ) @@ -382,7 +382,7 @@ if(iscarbon(mob_occupant) && mob_occupant.stat < UNCONSCIOUS) //Awake, organic and screaming mob_occupant.emote("scream") - addtimer(CALLBACK(src, .proc/cook), 50) + addtimer(CALLBACK(src, PROC_REF(cook)), 50) else uv_cycles = initial(uv_cycles) uv = FALSE @@ -483,7 +483,7 @@ if(locked) visible_message(span_notice("You see [user] kicking against the doors of [src]!"), \ span_notice("You start kicking against the doors...")) - addtimer(CALLBACK(src, .proc/resist_open, user), 300) + addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300) else open_machine() dump_inventory_contents() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 377ef390ee1..17b4b1b0874 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -436,7 +436,7 @@ chem_splash(get_turf(src), reagents, spread_range, list(reactants), temp_boost) // Detonate it again in one second, until it's out of juice. - addtimer(CALLBACK(src, .proc/detonate), 10) + addtimer(CALLBACK(src, PROC_REF(detonate)), 10) // If it's not a time release bomb, do normal explosion diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm index eee3dba2d54..8759623ade9 100644 --- a/code/game/machinery/teambuilder.dm +++ b/code/game/machinery/teambuilder.dm @@ -20,7 +20,7 @@ . = ..() add_filter("teambuilder", 2, list("type" = "outline", "color" = team_color, "size" = 2)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 96ce880a8ae..40ef584c98d 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -58,7 +58,7 @@ // Will help make emagging the console not so easy to get away with. MK.info += "

£%@%(*$%&(£&?*(%&£/{}" var/time = 100 * length(linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) + addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), time) message = rebootmsg else to_chat(user, span_notice("A no server error appears on the screen.")) @@ -342,7 +342,7 @@ hacking = TRUE screen = MSG_MON_SCREEN_HACKED //Time it takes to bruteforce is dependant on the password length. - addtimer(CALLBACK(src, .proc/finish_bruteforce, usr), 100*length(linkedServer.decryptkey)) + addtimer(CALLBACK(src, PROC_REF(finish_bruteforce), usr), 100*length(linkedServer.decryptkey)) //Delete the log. if (href_list["delete_logs"]) diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 6f0a2fcf7c1..bbf987ed008 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -49,7 +49,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages if(!GLOB.message_delay) GLOB.message_delay = TRUE - addtimer(CALLBACK(GLOBAL_PROC, .proc/end_message_delay), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_message_delay)), 1 SECONDS) /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 845b7392c62..59e6a23eebd 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(prob(100/severity) && !(machine_stat & EMPED)) set_machine_stat(machine_stat | EMPED) var/duration = (300 * 10)/severity - addtimer(CALLBACK(src, .proc/de_emp), rand(duration - 20, duration + 20)) + addtimer(CALLBACK(src, PROC_REF(de_emp)), rand(duration - 20, duration + 20)) /obj/machinery/telecomms/proc/de_emp() set_machine_stat(machine_stat & ~EMPED) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 516cffa7361..f407067612c 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -102,7 +102,7 @@ R.set_connected_ai(masterAI) R.lawsync() R.lawupdate = TRUE - addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50) + addtimer(CALLBACK(src, PROC_REF(unlock_new_robot), R), 50) /obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R) playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index aa7a86941d1..36f8498b524 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -392,7 +392,7 @@ GLOBAL_LIST_INIT(dye_registry, list( if(HAS_TRAIT(user, TRAIT_BRAINWASHING)) ADD_TRAIT(src, TRAIT_BRAINWASHING, SKILLCHIP_TRAIT) update_appearance() - addtimer(CALLBACK(src, .proc/wash_cycle), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 20 SECONDS) START_PROCESSING(SSfastprocess, src) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index e7103514483..385cfd7fd24 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -117,7 +117,7 @@ if(anchored) ADD_TRAIT(M, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) if(!length(buckled_mobs)) - RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, .proc/on_set_anchored) + RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) M.set_buckled(src) buckled_mobs |= M M.throw_alert(ALERT_BUCKLED, /atom/movable/screen/alert/buckled) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 5a813c89084..faaafbeddc9 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -118,7 +118,7 @@ /obj/effect/anomaly/grav/Initialize(mapload, new_lifespan, drops_core) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -177,7 +177,7 @@ /obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan) . = ..() - INVOKE_ASYNC(src, .proc/setup_grav_field) + INVOKE_ASYNC(src, PROC_REF(setup_grav_field)) /obj/effect/anomaly/grav/high/proc/setup_grav_field() grav_field = new(src, 7, TRUE, rand(0, 3)) @@ -201,7 +201,7 @@ . = ..() explosive = _explosive var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -305,7 +305,7 @@ /obj/effect/anomaly/bluespace/proc/blue_effect(mob/make_sparkle) make_sparkle.overlay_fullscreen("bluespace_flash", /atom/movable/screen/fullscreen/bluespace_sparkle, 1) - addtimer(CALLBACK(make_sparkle, /mob/.proc/clear_fullscreen, "bluespace_flash"), 2 SECONDS) + addtimer(CALLBACK(make_sparkle, TYPE_PROC_REF(/mob, clear_fullscreen), "bluespace_flash"), 2 SECONDS) ///////////////////// @@ -329,7 +329,7 @@ T.atmos_spawn_air("o2=5;plasma=5;TEMP=1000") /obj/effect/anomaly/pyro/detonate() - INVOKE_ASYNC(src, .proc/makepyroslime) + INVOKE_ASYNC(src, PROC_REF(makepyroslime)) /obj/effect/anomaly/pyro/proc/makepyroslime() var/turf/open/T = get_turf(src) diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index f7cb9c6723e..89eca6f8b75 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -16,7 +16,7 @@ I.alpha = 64 I.appearance_flags = RESET_ALPHA add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I) - RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport) + RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(block_cult_teleport)) /obj/effect/blessing/Destroy() UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 2e0243ca370..57419359764 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -30,7 +30,7 @@ name = "[name] - [poster_structure.original_name]" //If the poster structure is being deleted something has gone wrong, kill yourself off too - RegisterSignal(poster_structure, COMSIG_PARENT_QDELETING, .proc/react_to_deletion) + RegisterSignal(poster_structure, COMSIG_PARENT_QDELETING, PROC_REF(react_to_deletion)) /obj/item/poster/Destroy() poster_structure = null diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index d3438718af4..d13132904c4 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -34,7 +34,7 @@ if(T && is_station_level(T.z)) SSblackbox.record_feedback("tally", "station_mess_created", 1, name) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index aaf7b382e3d..5084f9f75c3 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -29,7 +29,7 @@ /obj/effect/decal/cleanable/xenoblood/xgibs/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions, mapload=FALSE) SEND_SIGNAL(src, COMSIG_GIBS_STREAK, directions) @@ -46,7 +46,7 @@ return var/datum/move_loop/loop = SSmove_manager.move_to_dir(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/xenoblood/xgibs/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 95835ae4401..b23d6d1380a 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -121,7 +121,7 @@ /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases) . = ..() reagents.add_reagent(/datum/reagent/liquidgibs, 5) - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/blood/gibs/replace_decal(obj/effect/decal/cleanable/C) return FALSE //Never fail to place us @@ -169,7 +169,7 @@ MOJAVE SUN EDIT END */ return var/datum/move_loop/loop = SSmove_manager.move_to(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/blood/gibs/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER @@ -366,9 +366,9 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) /obj/effect/decal/cleanable/blood/hitsplatter/proc/fly_towards(turf/target_turf, range) var/delay = 2 var/datum/move_loop/loop = SSmove_manager.move_towards(src, target_turf, delay, timeout = delay * range, priority = MOVEMENT_ABOVE_SPACE_PRIORITY, flags = MOVEMENT_LOOP_START_FAST) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_done) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_done)) /obj/effect/decal/cleanable/blood/hitsplatter/proc/pre_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 42d39ded0b9..a76464cfc5b 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -15,7 +15,7 @@ /obj/effect/decal/cleanable/robot_debris/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions, mapload=FALSE) var/direction = pick(directions) @@ -32,7 +32,7 @@ return var/datum/move_loop/loop = SSmove_manager.move_to_dir(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/robot_debris/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 44c69ee37eb..9a36be2e502 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -67,7 +67,7 @@ would spawn and follow the beaker, even if it is carried or thrown. var/step_delay = 5 var/datum/move_loop/loop = SSmove_manager.move(effect, direction, step_delay, timeout = step_delay * step_amt, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/decrement_total_effect) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(decrement_total_effect)) /datum/effect_system/proc/decrement_total_effect(datum/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index 60ed4f31dcb..f59bd972f45 100644 --- a/code/game/objects/effects/effect_system/effects_explosion.dm +++ b/code/game/objects/effects/effect_system/effects_explosion.dm @@ -12,7 +12,7 @@ var/step_amt = pick(25;1,50;2,100;3,200;4) var/datum/move_loop/loop = SSmove_manager.move(src, pick(GLOB.alldirs), 1, timeout = step_amt, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/end_particle) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(end_particle)) /obj/effect/particle_effect/expl_particles/proc/end_particle(datum/source) SIGNAL_HANDLER @@ -63,4 +63,4 @@ /datum/effect_system/explosion/smoke/start() ..() - addtimer(CALLBACK(src, .proc/create_smoke), 5) + addtimer(CALLBACK(src, PROC_REF(create_smoke)), 5) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 91d38fb30fc..92150ace6fc 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -43,7 +43,7 @@ /obj/effect/particle_effect/smoke/proc/kill_smoke() STOP_PROCESSING(SSobj, src) - INVOKE_ASYNC(src, .proc/fade_out) + INVOKE_ASYNC(src, PROC_REF(fade_out)) QDEL_IN(src, 10) /obj/effect/particle_effect/smoke/process() @@ -65,7 +65,7 @@ if(C.smoke_delay) return FALSE C.smoke_delay++ - addtimer(CALLBACK(src, .proc/remove_smoke_delay, C), 10) + addtimer(CALLBACK(src, PROC_REF(remove_smoke_delay), C), 10) return TRUE /obj/effect/particle_effect/smoke/proc/remove_smoke_delay(mob/living/carbon/C) @@ -96,7 +96,7 @@ //the smoke spreads rapidly but not instantly for(var/obj/effect/particle_effect/smoke/SM in newsmokes) - addtimer(CALLBACK(SM, /obj/effect/particle_effect/smoke.proc/spread_smoke), 1) + addtimer(CALLBACK(SM, TYPE_PROC_REF(/obj/effect/particle_effect/smoke, spread_smoke)), 1) /datum/effect_system/smoke_spread @@ -129,7 +129,7 @@ /obj/effect/particle_effect/smoke/bad/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 4141788552f..03cc6bad39c 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -40,8 +40,8 @@ /// Returns the created loop /obj/effect/particle_effect/water/extinguisher/proc/move_at(atom/target, delay, lifetime) var/datum/move_loop/loop = SSmove_manager.move_towards_legacy(src, target, delay, timeout = delay * lifetime, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_forcemove) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/movement_stopped) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_forcemove)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stopped)) return loop /obj/effect/particle_effect/water/extinguisher/proc/post_forcemove(datum/move_loop/source, success) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 0faa180d74f..e2b51273bb6 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -17,9 +17,9 @@ if(arm_delay) armed = FALSE icon_state = "uglymine-inactive" - addtimer(CALLBACK(src, .proc/now_armed), arm_delay) + addtimer(CALLBACK(src, PROC_REF(now_armed)), arm_delay) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -197,7 +197,7 @@ playsound(src, 'sound/weapons/armbomb.ogg', 70, TRUE) to_chat(user, span_warning("You arm \the [src], causing it to shake! It will deploy in 3 seconds.")) active = TRUE - addtimer(CALLBACK(src, .proc/deploy_mine), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(deploy_mine)), 3 SECONDS) /// Deploys the mine and deletes itself /obj/item/minespawner/proc/deploy_mine() diff --git a/code/game/objects/effects/phased_mob.dm b/code/game/objects/effects/phased_mob.dm index 5ddd317b092..c3129635143 100644 --- a/code/game/objects/effects/phased_mob.dm +++ b/code/game/objects/effects/phased_mob.dm @@ -27,7 +27,7 @@ to_chat(living_cheaterson, span_userdanger("This area has a heavy universal force occupying it, and you are scattered to the cosmos!")) if(ishuman(living_cheaterson)) shake_camera(living_cheaterson, 20, 1) - addtimer(CALLBACK(living_cheaterson, /mob/living/carbon.proc/vomit), 2 SECONDS) + addtimer(CALLBACK(living_cheaterson, TYPE_PROC_REF(/mob/living/carbon, vomit)), 2 SECONDS) phasing_in.forceMove(find_safe_turf(z)) return ..() diff --git a/code/game/objects/effects/powerup.dm b/code/game/objects/effects/powerup.dm index 624ceee12bf..7b70d7daf50 100644 --- a/code/game/objects/effects/powerup.dm +++ b/code/game/objects/effects/powerup.dm @@ -20,7 +20,7 @@ if(lifetime) QDEL_IN(src, lifetime) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index d0e99d0f903..7ab8e0910a3 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -15,5 +15,5 @@ message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].") log_game("An alien egg has been delivered to [AREACOORD(T)]") var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen." - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(print_command_report), message), announcement_time)) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm index 8ec5ec113c5..73b77effaba 100644 --- a/code/game/objects/effects/spiderwebs.dm +++ b/code/game/objects/effects/spiderwebs.dm @@ -157,7 +157,7 @@ forceMove(exit_vent) var/travel_time = round(get_dist(loc, exit_vent.loc) / 2) - addtimer(CALLBACK(src, .proc/do_vent_move, exit_vent, travel_time), travel_time) + addtimer(CALLBACK(src, PROC_REF(do_vent_move), exit_vent, travel_time), travel_time) /obj/structure/spider/spiderling/proc/do_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent, travel_time) if(QDELETED(exit_vent) || exit_vent.welded) @@ -167,7 +167,7 @@ if(prob(50)) audible_message(span_hear("You hear something scampering through the ventilation ducts.")) - addtimer(CALLBACK(src, .proc/finish_vent_move, exit_vent), travel_time) + addtimer(CALLBACK(src, PROC_REF(finish_vent_move), exit_vent), travel_time) /obj/structure/spider/spiderling/proc/finish_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent) if(QDELETED(exit_vent) || exit_vent.welded) @@ -195,7 +195,7 @@ visible_message("[src] scrambles into the ventilation ducts!", \ span_hear("You hear something scampering through the ventilation ducts.")) - addtimer(CALLBACK(src, .proc/vent_move, exit_vent), rand(20,60)) + addtimer(CALLBACK(src, PROC_REF(vent_move), exit_vent), rand(20,60)) //================= diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index e1f83b002b9..efe4ee8571e 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -10,7 +10,7 @@ /obj/effect/step_trigger/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -25,7 +25,7 @@ return if(!ismob(H) && mobs_only) return - INVOKE_ASYNC(src, .proc/Trigger, H) + INVOKE_ASYNC(src, PROC_REF(Trigger), H) /obj/effect/step_trigger/singularity_act() @@ -71,9 +71,9 @@ affecting[AM] = AM.dir var/datum/move_loop/loop = SSmove_manager.move(AM, direction, speed, tiles ? tiles * speed : INFINITY) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/set_to_normal) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(set_to_normal)) /obj/effect/step_trigger/thrower/proc/pre_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index ef1b014c46c..f1e03c2071a 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -499,7 +499,7 @@ status = rcd_status delay = rcd_delay if (status == RCD_DECONSTRUCT) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1.1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 1.1 SECONDS) delay -= 11 icon_state = "rcd_end_reverse" else @@ -525,7 +525,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.dm b/code/game/objects/items.dm index 399afa7c4f4..a81e47b8dbf 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -766,7 +766,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(HAS_TRAIT(src, TRAIT_NODROP)) return thrownby = WEAKREF(thrower) - callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own + callback = CALLBACK(src, PROC_REF(after_throw), callback) //replace their callback with our own . = ..(target, range, speed, thrower, spin, diagonals_first, callback, force, gentle, quickstart = quickstart) /obj/item/proc/after_throw(datum/callback/callback) @@ -937,7 +937,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e var/mob/living/L = usr if(usr.client.prefs.read_preference(/datum/preference/toggle/enable_tooltips)) var/timedelay = usr.client.prefs.read_preference(/datum/preference/numeric/tooltip_delay) / 100 - tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. + tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. if(usr.client.prefs.read_preference(/datum/preference/toggle/item_outlines)) if(istype(L) && L.incapacitated()) apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now @@ -1004,7 +1004,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(delay) // Create a callback with checks that would be called every tick by do_after. - var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks) + var/datum/callback/tool_check = CALLBACK(src, PROC_REF(tool_check_callback), user, amount, extra_checks) if(ismob(target)) if(!do_mob(user, target, delay, extra_checks=tool_check)) @@ -1182,7 +1182,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e */ /obj/item/proc/on_accidental_consumption(mob/living/carbon/victim, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE) if(get_sharpness() && force >= 5) //if we've got something sharp with a decent force (ie, not plastic) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.visible_message(span_warning("[victim] looks like [victim.p_theyve()] just bit something they shouldn't have!"), \ span_boldwarning("OH GOD! Was that a crunch? That didn't feel good at all!!")) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 70de22a709e..1b847ba46b2 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -444,7 +444,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) "SOUTH" = image(icon = 'icons/hud/radial.dmi', icon_state = "csouth"), "WEST" = image(icon = 'icons/hud/radial.dmi', icon_state = "cwest") ) - var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(computerdirs) @@ -510,11 +510,11 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) "External Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/external/glass) ) - var/airlockcat = show_radial_menu(user, remote_anchor || src, solid_or_glass_choices, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockcat = show_radial_menu(user, remote_anchor || src, solid_or_glass_choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockcat) if("Solid") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, remote_anchor || src, solid_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockpaint = show_radial_menu(user, remote_anchor || src, solid_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockpaint) if("Standard") airlock_type = /obj/machinery/door/airlock @@ -555,7 +555,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) if("Glass") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, remote_anchor || src, glass_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockpaint = show_radial_menu(user, remote_anchor || src, glass_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockpaint) if("Standard") airlock_type = /obj/machinery/door/airlock/glass @@ -607,7 +607,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) "Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "table"), "Glass Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "glass_table") ) - 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) @@ -705,7 +705,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) choices += list( "Change Furnishing Type" = image(icon = 'icons/hud/radial.dmi', icon_state = "chair") ) - 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) @@ -770,7 +770,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) buzz loudly!","[src] begins \ vibrating violently!") // 5 seconds to get rid of it - addtimer(CALLBACK(src, .proc/detonate_pulse_explode), 50) + addtimer(CALLBACK(src, PROC_REF(detonate_pulse_explode)), 50) /obj/item/construction/rcd/proc/detonate_pulse_explode() explosion(src, light_impact_range = 3, flame_range = 1, flash_range = 1) @@ -1119,7 +1119,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) name_to_type[initial(M.name)] = M machinery_data["cost"][A] = plumbing_design_types[A] - 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 diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index 53aec1775d2..dcc418f1986 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -25,8 +25,8 @@ /obj/item/rcl/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/rcl/ComponentInitialize() . = ..() @@ -174,7 +174,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, .proc/trigger) + RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, PROC_REF(trigger)) listeningTo = to_hook /obj/item/rcl/proc/trigger(mob/user) @@ -259,7 +259,7 @@ /obj/item/rcl/proc/showWiringGui(mob/user) var/list/choices = wiringGuiGenerateChoices(user) - wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42) + wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, PROC_REF(wiringGuiReact), user), radius = 42) /obj/item/rcl/proc/wiringGuiUpdate(mob/user) if(!wiring_gui_menu) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index f376c9d6358..d563c4be4c8 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( /obj/item/pipe_dispenser/equipped(mob/user, slot, initial) . = ..() if(slot == ITEM_SLOT_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/RSF.dm b/code/game/objects/items/RSF.dm index ff9d4db773b..8f0d17aa4d9 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -86,7 +86,7 @@ RSF var/cost = 0 //Warning, prepare for bodgecode while(islist(target))//While target is a list we continue the loop - var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user) || picked == null) return for(var/emem in target)//Back through target agian diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm index b4e8a478004..7c714e2ae1f 100644 --- a/code/game/objects/items/binoculars.dm +++ b/code/game/objects/items/binoculars.dm @@ -14,8 +14,8 @@ /obj/item/binoculars/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/binoculars/ComponentInitialize() . = ..() @@ -28,8 +28,8 @@ /obj/item/binoculars/proc/on_wield(obj/item/source, mob/user) SIGNAL_HANDLER - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_walk) - RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, .proc/rotate) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_walk)) + RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate)) listeningTo = user user.visible_message(span_notice("[user] holds [src] up to [user.p_their()] eyes."), span_notice("You hold [src] up to your eyes.")) inhand_icon_state = "binoculars_wielded" diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 296aebc40a7..5b4f3870771 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -20,14 +20,14 @@ ADD_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT) ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) owner.med_hud_set_status() - INVOKE_ASYNC(src, .proc/AddInfectionImages, owner) + INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), owner) /obj/item/organ/body_egg/Remove(mob/living/carbon/M, special = FALSE) if(owner) REMOVE_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT) REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) owner.med_hud_set_status() - INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner) + INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), owner) ..() /obj/item/organ/body_egg/on_death(delta_time, times_fired) diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm index 59f0bdd605d..d867f7b2dfb 100644 --- a/code/game/objects/items/broom.dm +++ b/code/game/objects/items/broom.dm @@ -20,8 +20,8 @@ /obj/item/pushbroom/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/pushbroom/ComponentInitialize() . = ..() @@ -42,7 +42,7 @@ SIGNAL_HANDLER to_chat(user, span_notice("You brace the [src] against the ground in a firm sweeping stance.")) - RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep) + RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(sweep)) /** * Handles unregistering the sweep proc when the broom is unwielded diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index d6a0a6bba86..9b619d8e422 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -100,7 +100,7 @@ * * user The mob choosing a skin of the cardboard cutout */ /obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user) - var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, .proc/check_menu, user, crayon), radius = 36, require_near = TRUE) + var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, PROC_REF(check_menu), user, crayon), radius = 36, require_near = TRUE) if(!new_appearance) return FALSE if(!do_after(user, 1 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM)) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 0fcd125e8f6..da6a9ff5f3d 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -113,7 +113,7 @@ update_label() update_icon() - RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, .proc/update_in_wallet) + RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet)) /obj/item/card/id/Destroy() if (registered_account) @@ -837,8 +837,8 @@ /obj/item/card/id/advanced/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(src, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/Destroy() UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) @@ -886,8 +886,8 @@ UnregisterSignal(old_loc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) if(istype(source.loc, /obj/item/modular_computer/tablet)) - RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(source.loc, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(source.loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/Moved(atom/OldLoc, Dir) . = ..() @@ -905,18 +905,18 @@ UnregisterSignal(slot_holder, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) if(istype(loc, /obj/item/pda) || istype(loc, /obj/item/storage/wallet)) - RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(loc, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) if(istype(loc, /obj/item/computer_hardware/card_slot)) var/obj/item/computer_hardware/card_slot/slot = loc - RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/on_holding_card_slot_moved) + RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_holding_card_slot_moved)) if(istype(slot.holder, /obj/item/modular_computer/tablet)) var/obj/item/modular_computer/tablet/slot_holder = slot.holder - RegisterSignal(slot_holder, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(slot_holder, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(slot_holder, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(slot_holder, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/update_overlays() . = ..() @@ -1449,7 +1449,7 @@ var/fake_trim_name = "[trim.assignment] ([trim.trim_state])" trim_list[fake_trim_name] = trim_path - var/selected_trim_path = tgui_input_list(user, "Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", sort_list(trim_list, /proc/cmp_typepaths_asc)) + var/selected_trim_path = tgui_input_list(user, "Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", sort_list(trim_list, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(selected_trim_path) SSid_access.apply_trim_to_chameleon_card(src, trim_list[selected_trim_path]) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 1870e2566da..05aa4818130 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -26,8 +26,8 @@ /obj/item/chainsaw/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/chainsaw/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index eafa2ace8b2..7682e0c4e19 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -58,7 +58,7 @@ to_chat(user, span_notice("Your name has been sent to your employers for approval.")) // Autoapproves after a certain time - response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) + response_timer_id = addtimer(CALLBACK(src, PROC_REF(rename_station), new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) to_chat(GLOB.admins, span_adminnotice("CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]")) for(var/client/admin_client in GLOB.admins) if(admin_client.prefs.toggles & SOUND_ADMINHELP) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 88add4a928c..b7c22174788 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -19,7 +19,7 @@ /obj/item/door_remote/Initialize(mapload) . = ..() access_list = SSid_access.get_region_access_list(list(region_access)) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_NAK, .proc/bad_signal) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_NAK, PROC_REF(bad_signal)) /obj/item/door_remote/proc/bad_signal(datum/source, datum/netdata/data, error_code) SIGNAL_HANDLER diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 086e4e728fc..74e581a6407 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -96,7 +96,7 @@ add_overlay("flaps") add_overlay("hatch") add_overlay("legs_retracted") - addtimer(CALLBACK(src, .proc/startUp), 50) + addtimer(CALLBACK(src, PROC_REF(startUp)), 50) QDEL_IN(src, 8 MINUTES) //Self-destruct after 8 min ADD_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, REF(src)) @@ -192,7 +192,7 @@ if (account) // get_bank_account() may return FALSE account.transfer_money(B, amount) B.bank_card_talk("You have lost [percentage_lost * 100]% of your funds! A spacecoin credit deposit machine is located at: [get_area(src)].") - addtimer(CALLBACK(src, .proc/dump), 150) //Drain every 15 seconds + addtimer(CALLBACK(src, PROC_REF(dump)), 150) //Drain every 15 seconds /obj/structure/checkoutmachine/process() var/anydir = pick(GLOB.cardinals) @@ -228,7 +228,7 @@ /obj/effect/dumpeet_target/Initialize(mapload, user) . = ..() bogdanoff = user - addtimer(CALLBACK(src, .proc/startLaunch), 100) + addtimer(CALLBACK(src, PROC_REF(startLaunch)), 100) sound_to_playing_players('sound/items/dump_it.ogg', 20) deadchat_broadcast("Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!", turf_target = get_turf(src), message_type=DEADCHAT_ANNOUNCEMENT) @@ -238,7 +238,7 @@ priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol") animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING) playsound(src, 'sound/weapons/mortar_whistle.ogg', 70, TRUE, 6) - addtimer(CALLBACK(src, .proc/endLaunch), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation + addtimer(CALLBACK(src, PROC_REF(endLaunch)), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index 86cbfb48700..0772573141a 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -69,7 +69,7 @@ "Rolling Pin" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "rolling_pin"), "Wire Brush" = image(icon = 'icons/obj/tools.dmi', icon_state = "wirebrush"), ) - var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(tool_result) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index aece9ae9ba6..836944ebf83 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -103,7 +103,7 @@ update_power() /obj/item/defibrillator/ui_action_click() - INVOKE_ASYNC(src, .proc/toggle_paddles) + INVOKE_ASYNC(src, PROC_REF(toggle_paddles)) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/defibrillator/attack_hand(mob/user, list/modifiers) @@ -245,7 +245,7 @@ return FALSE /obj/item/defibrillator/proc/cooldowncheck() - addtimer(CALLBACK(src, .proc/finish_charging), cooldown_duration) + addtimer(CALLBACK(src, PROC_REF(finish_charging)), cooldown_duration) /obj/item/defibrillator/proc/finish_charging() if(cell) @@ -366,7 +366,7 @@ . = ..() if(!req_defib) return - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/check_range) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_range)) /obj/item/shockpaddles/Moved() . = ..() @@ -405,8 +405,8 @@ /obj/item/shockpaddles/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, TRAIT_GENERIC) //stops shockpaddles from being inserted in BoH - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) if(!req_defib) return //If it doesn't need a defib, just say it exists if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7d3c0180fcd..4b86d10266e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(PDAs) cartridge.host_pda = src if(insert_type) inserted_item = SSwardrobe.provide_type(insert_type, src) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) update_appearance() @@ -541,7 +541,7 @@ GLOBAL_LIST_EMPTY(PDAs) update_label() if(!silent) playsound(src, 'sound/machines/terminal_processing.ogg', 15, TRUE) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/machines/terminal_success.ogg', 15, TRUE), 1.3 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/machines/terminal_success.ogg', 15, TRUE), 1.3 SECONDS) if("Eject")//Ejects the cart, only done from hub. eject_cart(U) if(!silent) @@ -1292,7 +1292,7 @@ GLOBAL_LIST_EMPTY(PDAs) A.emp_act(severity) if (!(. & EMP_PROTECT_SELF)) emped++ - addtimer(CALLBACK(src, .proc/emp_end), 200 * severity) + addtimer(CALLBACK(src, PROC_REF(emp_end)), 200 * severity) /obj/item/pda/proc/emp_end() emped-- @@ -1302,9 +1302,9 @@ GLOBAL_LIST_EMPTY(PDAs) // Returns a list of PDAs which can be viewed from another PDA/message monitor., var/sortmode if(sort_by_job) - sortmode = /proc/cmp_pdajob_asc + sortmode = GLOBAL_PROC_REF(cmp_pdajob_asc) else - sortmode = /proc/cmp_pdaname_asc + sortmode = GLOBAL_PROC_REF(cmp_pdaname_asc) for(var/obj/item/pda/P in sort_list(GLOB.PDAs, sortmode)) if(!P.owner || P.toff || P.hidden) diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 0242f9a1fad..e0ad48214d6 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -11,8 +11,8 @@ /obj/item/pda/clown/ComponentInitialize() . = ..() - AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip), slot_whitelist = list(ITEM_SLOT_ID, ITEM_SLOT_BELT)) - AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, .proc/after_sitcom_laugh)) + AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip)), slot_whitelist = list(ITEM_SLOT_ID, ITEM_SLOT_BELT)) + AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, PROC_REF(after_sitcom_laugh))) /obj/item/pda/clown/proc/AfterSlip(mob/living/carbon/human/M) if (istype(M) && (M.real_name != owner)) @@ -67,7 +67,7 @@ /obj/item/pda/ai/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, .proc/pda_no_detonate) + RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, PROC_REF(pda_no_detonate)) /obj/item/pda/medical name = "medical PDA" @@ -160,7 +160,7 @@ /obj/item/pda/captain/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, .proc/pda_no_detonate) + RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, PROC_REF(pda_no_detonate)) /obj/item/pda/cargo name = "cargo technician PDA" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 9f0a007f3ca..84a46617468 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -619,7 +619,7 @@ active1 = null if("Send Signal") - INVOKE_ASYNC(radio, /obj/item/integrated_signaler.proc/send_activation) + INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/integrated_signaler, send_activation)) if("Signal Frequency") var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"])) @@ -760,7 +760,7 @@ menu += "Keep an ID inserted to upload access codes upon summoning." menu += "
[PDAIMG(back)]Return to bot list" - + return menu //If the cartridge adds a special line to the top of the messaging app diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index 7ed4f95ccec..45ed9a44672 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -15,7 +15,7 @@ /obj/item/cartridge/virus/special(mob/living/user, list/params) var/obj/item/pda/P = locate(params["target"]) in GLOB.PDAs //Leaving it alone in case it may do something useful, I guess. - INVOKE_ASYNC(src, .proc/send_virus, P, user) + INVOKE_ASYNC(src, PROC_REF(send_virus), P, user) /obj/item/cartridge/virus/clown name = "\improper Honkworks 5.0 cartridge" diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm index 39ceac83045..8cf780ad47e 100644 --- a/code/game/objects/items/devices/anomaly_neutralizer.dm +++ b/code/game/objects/items/devices/anomaly_neutralizer.dm @@ -17,13 +17,13 @@ // Primarily used to delete and neutralize anomalies. AddComponent(/datum/component/effect_remover, \ success_feedback = "You neutralize %THEEFFECT with %THEWEAPON, frying its circuitry in the process.", \ - on_clear_callback = CALLBACK(src, .proc/on_anomaly_neutralized), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_anomaly_neutralized)), \ effects_we_clear = list(/obj/effect/anomaly)) // Can also be used to delete drained heretic influences, to stop fools from losing arms. AddComponent(/datum/component/effect_remover, \ success_feedback = "You close %THEEFFECT with %THEWEAPON, frying its circuitry in the process.", \ - on_clear_callback = CALLBACK(src, .proc/on_use), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_use)), \ effects_we_clear = list(/obj/effect/visible_heretic_influence)) /** diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 51d536cbc2e..f0423b1857c 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -259,7 +259,7 @@ to_chat(usr, span_warning("Something's wrong with that camera! You can't get a feed.")) return current = camera - addtimer(CALLBACK(src, .proc/view_camera, usr, camera), 0.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(view_camera), usr, camera), 0.6 SECONDS) return else usr.unset_machine() diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 719d502e85f..5a0161014eb 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -54,7 +54,7 @@ SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION) last_use = world.time icon_state = "desynchronizer-on" - resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE) + resync_timer = addtimer(CALLBACK(src, PROC_REF(resync)), duration , TIMER_STOPPABLE) /obj/item/desynchronizer/proc/resync() new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location()) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index a080fa4e08a..94d1d783c9b 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -47,7 +47,7 @@ maptext = MAPTEXT(circuits) icon_state = "[initial(icon_state)]_recharging" var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming - addtimer(CALLBACK(src, .proc/recharge), recharge_time) + addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time) return TRUE //The actual circuit magic itself is done on a per-object basis /obj/item/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 8d1d05f4dd6..d29163481c5 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -19,7 +19,7 @@ /obj/item/geiger_counter/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(src, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/examine(mob/user) . = ..() @@ -77,23 +77,23 @@ return 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 /obj/item/geiger_counter/equipped(mob/user, slot, initial) . = ..() - RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/dropped(mob/user, silent = FALSE) . = ..() - UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/proc/on_pre_potential_irradiation(datum/source, datum/radiation_pulse_information/pulse_information, insulation_to_target) SIGNAL_HANDLER last_perceived_radiation_danger = get_perceived_radiation_danger(pulse_information, insulation_to_target) - addtimer(CALLBACK(src, .proc/reset_perceived_danger), TIME_WITHOUT_RADIATION_BEFORE_RESET, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(reset_perceived_danger)), TIME_WITHOUT_RADIATION_BEFORE_RESET, TIMER_UNIQUE | TIMER_OVERRIDE) if (scanning) update_appearance(UPDATE_ICON) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 84f77cd8b51..f8352f5a6e6 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -20,7 +20,7 @@ /obj/item/megaphone/equipped(mob/M, slot) . = ..() if (slot == ITEM_SLOT_HANDS && !HAS_TRAIT(M, TRAIT_SIGN_LANG)) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index 146dedb0d15..7d78e7f55c2 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -33,9 +33,9 @@ if(undertile_pressureplate) AddElement(/datum/element/undertile, tile_overlay = tile_overlay, use_anchor = TRUE) - RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/ToggleActive) + RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(ToggleActive)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -51,7 +51,7 @@ else if(!trigger_item) return can_trigger = FALSE - addtimer(CALLBACK(src, .proc/trigger), trigger_delay) + addtimer(CALLBACK(src, PROC_REF(trigger)), trigger_delay) /obj/item/pressure_plate/proc/trigger() can_trigger = TRUE diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 24093aa8717..b0bdabe4880 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -21,7 +21,7 @@ var/area/current_area = get_area(src) if(!current_area) return - RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/AreaPowerCheck) + RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck)) GLOB.intercoms_list += src /obj/item/radio/intercom/Destroy() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 6380fe822e8..65bbd448350 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -245,7 +245,7 @@ spans = list(talking_movable.speech_span) if(!language) language = talking_movable.get_selected_language() - INVOKE_ASYNC(src, .proc/talk_into_impl, talking_movable, message, channel, spans.Copy(), language, message_mods) + INVOKE_ASYNC(src, PROC_REF(talk_into_impl), talking_movable, message, channel, spans.Copy(), language, message_mods) return ITALICS | REDUCE_RANGE /obj/item/radio/proc/talk_into_impl(atom/movable/talking_movable, message, channel, list/spans, datum/language/language, list/message_mods) @@ -314,7 +314,7 @@ // Non-subspace radios will check in a couple of seconds, and if the signal // was never received, send a mundane broadcast (no headsets). - addtimer(CALLBACK(src, .proc/backup_transmission, signal), 20) + addtimer(CALLBACK(src, PROC_REF(backup_transmission), signal), 20) /obj/item/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal) var/turf/T = get_turf(src) @@ -481,7 +481,7 @@ for (var/ch_name in channels) channels[ch_name] = 0 set_on(FALSE) - addtimer(CALLBACK(src, .proc/end_emp_effect, curremp), 200) + addtimer(CALLBACK(src, PROC_REF(end_emp_effect), curremp), 200) /obj/item/radio/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 8f334104b59..70c0a92711e 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -50,7 +50,7 @@ soundloop.stop() soundloop2.stop() to_chat(loc, span_userdanger("*ding*")) - addtimer(CALLBACK(src, .proc/snap), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(snap)), 0.2 SECONDS) COOLDOWN_RESET(src, kill_countdown) // reset the countdown in case it wasn't finished /obj/item/reverse_bear_trap/attack_hand(mob/user, list/modifiers) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 572d30a8e4f..f7d782b9a34 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -868,7 +868,7 @@ GENE SCANNER ready = FALSE icon_state = "[icon_state]_recharging" - addtimer(CALLBACK(src, .proc/recharge), cooldown, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(recharge)), cooldown, TIMER_UNIQUE) /obj/item/sequence_scanner/proc/recharge() icon_state = initial(icon_state) diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm index 6577a2de966..1c39a6ec212 100644 --- a/code/game/objects/items/devices/spyglasses.dm +++ b/code/game/objects/items/devices/spyglasses.dm @@ -55,7 +55,7 @@ /obj/item/clothing/accessory/spy_bug/Initialize(mapload) . = ..() - tracker = new /datum/movement_detector(src, CALLBACK(src, .proc/update_view)) + tracker = new /datum/movement_detector(src, CALLBACK(src, PROC_REF(update_view))) cam_screen = new cam_screen.name = "screen" diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm index d0721866bc6..4916a1ac529 100644 --- a/code/game/objects/items/devices/swapper.dm +++ b/code/game/objects/items/devices/swapper.dm @@ -55,7 +55,7 @@ var/mob/holder = linked_swapper.loc to_chat(holder, span_notice("[linked_swapper] starts buzzing.")) next_use = world.time + cooldown //only the one used goes on cooldown - addtimer(CALLBACK(src, .proc/swap, user), 25) + addtimer(CALLBACK(src, PROC_REF(swap), user), 25) /obj/item/swapper/examine(mob/user) . = ..() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 1ae8fd1f01a..857df1699a3 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -92,7 +92,7 @@ effective or pretty fucking useless. addtimer(VARSET_CALLBACK(src, used, FALSE), cooldown) addtimer(VARSET_CALLBACK(src, icon_state, "health"), cooldown) to_chat(user, span_warning("Successfully irradiated [M].")) - addtimer(CALLBACK(src, .proc/radiation_aftereffect, M, intensity), (wavelength+(intensity*4))*5) + addtimer(CALLBACK(src, PROC_REF(radiation_aftereffect), M, intensity), (wavelength+(intensity*4))*5) return to_chat(user, span_warning("The radioactive microlaser is still recharging.")) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index c2363794c90..4ecd02ff718 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -99,7 +99,7 @@ if(toggle) toggle = FALSE toggle_valve() - addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever + addtimer(CALLBACK(src, PROC_REF(toggle_off)), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever /obj/item/transfer_valve/proc/toggle_off() toggle = TRUE @@ -203,7 +203,7 @@ merge_gases() for(var/i in 1 to 6) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 20 + (i - 1) * 10) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 20 + (i - 1) * 10) else if(valve_open && tank_one && tank_two) split_gases() diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index f136cdaa052..87b37a34b53 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -100,8 +100,8 @@ /obj/item/dualsaber/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) if(LAZYLEN(possible_colors)) saber_color = pick(possible_colors) switch(saber_color) @@ -130,10 +130,10 @@ impale(user) return if(wielded && prob(50)) - INVOKE_ASYNC(src, .proc/jedi_spin, user) + INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) /obj/item/dualsaber/proc/jedi_spin(mob/living/user) - dance_rotate(user, CALLBACK(user, /mob.proc/dance_flip)) + dance_rotate(user, CALLBACK(user, TYPE_PROC_REF(/mob, dance_flip))) /obj/item/dualsaber/proc/impale(mob/living/user) to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src].")) @@ -172,7 +172,7 @@ playsound(loc, hitsound, get_clamped_volume(), TRUE, -1) add_fingerprint(user) // Light your candles while spinning around the room - INVOKE_ASYNC(src, .proc/jedi_spin, user) + INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) /obj/item/dualsaber/green possible_colors = list("green") diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 3cd44bfd8e6..07b1d46fa58 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -64,7 +64,7 @@ say(answer) on_cooldown = TRUE - addtimer(CALLBACK(src, .proc/clear_cooldown), cooldown_time) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), cooldown_time) shaking = FALSE diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index eafcb4d4e08..9940d17d145 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -100,7 +100,7 @@ /obj/item/card/emag/doorjack/proc/use_charge(mob/user) charges -- to_chat(user, span_notice("You use [src]. It now has [charges] charges remaining.")) - charge_timers.Add(addtimer(CALLBACK(src, .proc/recharge), charge_time, TIMER_STOPPABLE)) + charge_timers.Add(addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time, TIMER_STOPPABLE)) /obj/item/card/emag/doorjack/proc/recharge(mob/user) charges = min(charges+1, max_charges) diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm index 1c38c16db40..4f1f0b0277f 100644 --- a/code/game/objects/items/etherealdiscoball.dm +++ b/code/game/objects/items/etherealdiscoball.dm @@ -59,7 +59,7 @@ set_light(range, power, current_color) add_atom_colour("#[current_color]", FIXED_COLOUR_PRIORITY) update_appearance() - TimerID = addtimer(CALLBACK(src, .proc/DiscoFever), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors + TimerID = addtimer(CALLBACK(src, PROC_REF(DiscoFever)), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors /obj/structure/etherealball/update_icon_state() icon_state = "ethdisco_head_[TurnedOn]" diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index bec6f9f12a3..c6bec619e8f 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -225,15 +225,15 @@ var/datum/move_loop/loop = SSmove_manager.move(buckled_object, movementdirection, 1, timeout = 9, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) //This means the chair slowing down is dependant on the extinguisher existing, which is weird //Couldn't figure out a better way though - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/manage_chair_speed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(manage_chair_speed)) /obj/item/extinguisher/proc/manage_chair_speed(datum/move_loop/move/source) SIGNAL_HANDLER switch(source.lifetime) - if(5 to 4) - source.delay = 2 - if(3 to 1) + if(1 to 3) source.delay = 3 + if(4 to 5) + source.delay = 2 /obj/item/extinguisher/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE)) diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index c2d45fc00ba..87b6bd10732 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -25,8 +25,8 @@ /obj/item/fireaxe/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/fireaxe/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 730df0413be..dd736085a44 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -243,7 +243,7 @@ if(create_with_tank) ptank = new /obj/item/tank/internals/plasma/full(src) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_refill) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_refill)) /obj/item/flamethrower/full create_full = TRUE diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index 8827e32d546..9e973c54695 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -287,7 +287,7 @@ tastes = tastes,\ eatverbs = eatverbs,\ bite_consumption = bite_consumption,\ - on_consume = CALLBACK(src, .proc/On_Consume)) + on_consume = CALLBACK(src, PROC_REF(On_Consume))) /obj/item/food/deepfryholder/Initialize(mapload, obj/item/fried) diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index e6f2c3e3219..210e79e7e3a 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -250,7 +250,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - after_eat = CALLBACK(src, .proc/after_bite)) + after_eat = CALLBACK(src, PROC_REF(after_bite))) /obj/item/food/popsicle/update_overlays() diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index a57426ec818..3808e75a9ac 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -410,7 +410,7 @@ return SHAME playsound(user, 'sound/items/eatfood.ogg', rand(10, 50), TRUE) user.temporarilyRemoveItemFromInventory(src) //removes from hands, keeps in M - addtimer(CALLBACK(src, .proc/finish_suicide, user), 15) //you've eaten it, you can run now + addtimer(CALLBACK(src, PROC_REF(finish_suicide), user), 15) //you've eaten it, you can run now return MANUAL_SUICIDE /obj/item/food/monkeycube/proc/finish_suicide(mob/living/user) ///internal proc called by a monkeycube's suicide_act using a timer and callback. takes as argument the mob/living who activated the suicide @@ -982,7 +982,7 @@ /obj/item/food/meat/steak/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/OnMicrowaveCooked) + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(OnMicrowaveCooked)) /obj/item/food/meat/steak/proc/OnMicrowaveCooked(datum/source, obj/item/source_item, cooking_efficiency = 1) @@ -1187,7 +1187,7 @@ /obj/item/food/meat/cutlet/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/OnMicrowaveCooked) + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(OnMicrowaveCooked)) ///This proc handles setting up the correct meat name for the cutlet, this should definitely be changed with the food rework. /obj/item/food/meat/cutlet/proc/OnMicrowaveCooked(datum/source, atom/source_item, cooking_efficiency) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 825fe6796f3..ee89d461895 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -41,7 +41,7 @@ /obj/item/food/cheese/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_eat)) /obj/item/food/cheese/proc/on_rat_eat(datum/source, mob/living/simple_animal/hostile/regalrat/king) SIGNAL_HANDLER @@ -205,7 +205,7 @@ . = ..() icon_state = "rot_[rand(1,4)]" AddElement(/datum/element/item_scaling, 0.65, 1) - RegisterSignal(src, COMSIG_ITEM_GRILLED, .proc/OnGrill) + RegisterSignal(src, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill)) /obj/item/food/badrecipe/moldy name = "moldy mess" @@ -510,7 +510,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - on_consume = CALLBACK(src, .proc/OnConsume)) + on_consume = CALLBACK(src, PROC_REF(OnConsume))) /obj/item/food/bubblegum/bubblegum/proc/OnConsume(mob/living/eater, mob/living/feeder) if(iscarbon(eater)) @@ -733,7 +733,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - check_liked = CALLBACK(src, .proc/check_liked)) + check_liked = CALLBACK(src, PROC_REF(check_liked))) /obj/item/food/rationpack/proc/check_liked(fraction, mob/mob) //Nobody likes rationpacks. Nobody. return FOOD_DISLIKED diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 78d857835e0..f22d5b0a9e0 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -38,7 +38,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - check_liked = CALLBACK(src, .proc/check_liked)) + check_liked = CALLBACK(src, PROC_REF(check_liked))) /obj/item/food/donut/proc/decorate_donut() if(is_decorated || !decorated_icon) diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index b97bbbcbf17..4bc06b83570 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -41,7 +41,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - after_eat = CALLBACK(src, .proc/after_eat)) + after_eat = CALLBACK(src, PROC_REF(after_eat))) /obj/item/food/candy/bronx/proc/after_eat(mob/living/eater) if(ishuman(eater)) diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm index 0577143531a..bd5e3bf8d30 100644 --- a/code/game/objects/items/grenades/_grenade.dm +++ b/code/game/objects/items/grenades/_grenade.dm @@ -133,7 +133,7 @@ active = TRUE icon_state = initial(icon_state) + "_active" SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /** * detonate (formerly prime) refers to when the grenade actually delivers its payload (whether or not a boom/bang/detonation is involved) diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm index 11100390c80..a80e66b874b 100644 --- a/code/game/objects/items/grenades/antigravity.dm +++ b/code/game/objects/items/grenades/antigravity.dm @@ -16,6 +16,6 @@ for(var/turf/lanced_turf in view(range, src)) lanced_turf.AddElement(/datum/element/forced_gravity, forced_value) - addtimer(CALLBACK(lanced_turf, /datum/.proc/_RemoveElement, list(/datum/element/forced_gravity, forced_value)), duration) + addtimer(CALLBACK(lanced_turf, TYPE_PROC_REF(/datum, _RemoveElement), list(/datum/element/forced_gravity, forced_value)), duration) qdel(src) diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm index 27223969a34..6acbbb2d177 100644 --- a/code/game/objects/items/grenades/atmos_grenades.dm +++ b/code/game/objects/items/grenades/atmos_grenades.dm @@ -21,7 +21,7 @@ SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) if(user) SEND_SIGNAL(src, COMSIG_MOB_GRENADE_ARMED, user, src, det_time, delayoverride) - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/gas_crystal/healium_crystal name = "Healium crystal" diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 1e9dd6652dc..7222cef4af6 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -224,7 +224,7 @@ if(landminemode) landminemode.activate() return - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/chem_grenade/detonate(mob/living/lanced_by) if(stage != GRENADE_READY) @@ -379,7 +379,7 @@ chem_splash(get_turf(src), reagents, affected_area, list(reactants), ignition_temp, threatscale) var/turf/detonated_turf = get_turf(src) - addtimer(CALLBACK(src, .proc/detonate), det_time) + addtimer(CALLBACK(src, PROC_REF(detonate)), det_time) log_game("A grenade detonated at [AREACOORD(detonated_turf)]") diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 17d4a577eaa..997e9e5c1bc 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -68,7 +68,7 @@ var/steps = rand(1, 4) for(var/step in 1 to steps) step_away(src, loc) - addtimer(CALLBACK(src, .proc/detonate), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME)) + addtimer(CALLBACK(src, PROC_REF(detonate)), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME)) /obj/item/grenade/clusterbuster/segment/detonate(mob/living/lanced_by) new payload_spawner(drop_location(), payload, rand(min_spawned, max_spawned)) diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index 622f7803150..c26fa46b45e 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -107,7 +107,7 @@ playsound(src, 'sound/effects/fuse.ogg', volume, TRUE) active = TRUE icon_state = initial(icon_state) + "_active" - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/firecracker/detonate(mob/living/lanced_by) . = ..() diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index ba6be18a1ee..ad85b858681 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -121,7 +121,7 @@ target.add_overlay(plastic_overlay) to_chat(user, span_notice("You plant the bomb. Timer counting down from [det_time].")) - addtimer(CALLBACK(src, .proc/detonate), det_time*10) + addtimer(CALLBACK(src, PROC_REF(detonate)), det_time*10) /obj/item/grenade/c4/proc/shout_syndicate_crap(mob/player) if(!player) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index 81132946e2a..3ba25ce69b0 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -15,7 +15,7 @@ var/mob/living/owner = loc if(!istype(owner)) return - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, .proc/ownerExamined) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(ownerExamined)) /obj/item/circlegame/Destroy() var/mob/owner = loc @@ -34,7 +34,7 @@ if(!istype(sucker) || !in_range(owner, sucker)) return - addtimer(CALLBACK(src, .proc/waitASecond, owner, sucker), 4) + addtimer(CALLBACK(src, PROC_REF(waitASecond), owner, sucker), 4) /// Stage 2: Fear sets in /obj/item/circlegame/proc/waitASecond(mob/living/owner, mob/living/sucker) @@ -43,10 +43,10 @@ if(owner == sucker) // big mood to_chat(owner, span_danger("Wait a second... you just looked at your own [src.name]!")) - addtimer(CALLBACK(src, .proc/selfGottem, owner), 10) + addtimer(CALLBACK(src, PROC_REF(selfGottem), owner), 10) else to_chat(sucker, span_danger("Wait a second... was that a-")) - addtimer(CALLBACK(src, .proc/GOTTEM, owner, sucker), 6) + addtimer(CALLBACK(src, PROC_REF(GOTTEM), owner, sucker), 6) /// Stage 3A: We face our own failures /obj/item/circlegame/proc/selfGottem(mob/living/owner) @@ -541,7 +541,7 @@ if(2) other_msg = "stammers softly for a moment before choking on something!" self_msg = "You feel your tongue disappear down your throat as you fight to remember how to make words!" - addtimer(CALLBACK(living_target, /atom/movable.proc/say, pick("Uhhh...", "O-oh, uhm...", "I- uhhhhh??", "You too!!", "What?")), rand(0.5 SECONDS, 1.5 SECONDS)) + addtimer(CALLBACK(living_target, TYPE_PROC_REF(/atom/movable, say), pick("Uhhh...", "O-oh, uhm...", "I- uhhhhh??", "You too!!", "What?")), rand(0.5 SECONDS, 1.5 SECONDS)) living_target.stuttering += rand(5, 15) if(3) other_msg = "locks up with a stunned look on [living_target.p_their()] face, staring at [firer ? firer : "the ceiling"]!" diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 605c5d769ca..19b6489d718 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -344,7 +344,7 @@ . = ..() update_appearance() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/spring_trap, + COMSIG_ATOM_ENTERED = PROC_REF(spring_trap), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -397,7 +397,7 @@ if(C.body_position == STANDING_UP) def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) if(!C.legcuffed && C.num_legs >= 2) //beartrap can't cuff your leg if there's already a beartrap or legcuffs, or you don't have two legs. - INVOKE_ASYNC(C, /mob/living/carbon.proc/equip_to_slot, src, ITEM_SLOT_LEGCUFFED) + INVOKE_ASYNC(C, TYPE_PROC_REF(/mob/living/carbon, equip_to_slot), src, ITEM_SLOT_LEGCUFFED) SSblackbox.record_feedback("tally", "handcuffs", 1, type) else if(snap && isanimal(L)) var/mob/living/simple_animal/SA = L @@ -431,7 +431,7 @@ /obj/item/restraints/legcuffs/beartrap/energy/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/dissipate), 100) + addtimer(CALLBACK(src, PROC_REF(dissipate)), 100) /** * Handles energy snares disappearing diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index e3a040cc9a1..79578d429d9 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -31,7 +31,7 @@ . = ..() START_PROCESSING(SSprocessing, src) SSpoints_of_interest.make_point_of_interest(src) - RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, .proc/move_gracefully) + RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, PROC_REF(move_gracefully)) update_appearance() /obj/item/his_grace/Destroy() @@ -56,7 +56,7 @@ /obj/item/his_grace/attack_self(mob/living/user) if(!awakened) - INVOKE_ASYNC(src, .proc/awaken, user) + INVOKE_ASYNC(src, PROC_REF(awaken), user) /obj/item/his_grace/attack(mob/living/M, mob/user) if(awakened && M.stat) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index de36f2aa6ff..0cd14bc3ef5 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -154,7 +154,7 @@ AddComponent(/datum/component/effect_remover, \ success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \ success_forcesay = "BEGONE FOUL MAGIKS!!", \ - on_clear_callback = CALLBACK(src, .proc/on_cult_rune_removed), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \ effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune)) AddElement(/datum/element/bane, /mob/living/simple_animal/revenant, 0, 25, FALSE) @@ -164,7 +164,7 @@ if(!initial(nullrod_type.chaplain_spawnable)) continue rods[nullrod_type] = initial(nullrod_type.menu_description) - AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, .proc/on_holy_weapon_picked)) + AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, PROC_REF(on_holy_weapon_picked))) /obj/item/nullrod/proc/on_holy_weapon_picked(obj/item/nullrod/holy_weapon_type) GLOB.holy_weapon_type = holy_weapon_type diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index 4a58ba2a3e9..86058a823be 100644 --- a/code/game/objects/items/hot_potato.dm +++ b/code/game/objects/items/hot_potato.dm @@ -142,7 +142,7 @@ ADD_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT) name = "primed [name]" activation_time = timer + world.time - detonation_timerid = addtimer(CALLBACK(src, .proc/detonate), delay, TIMER_STOPPABLE) + detonation_timerid = addtimer(CALLBACK(src, PROC_REF(detonate)), delay, TIMER_STOPPABLE) START_PROCESSING(SSfastprocess, src) if(user) log_bomber(user, "has primed a", src, "for detonation (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range])") diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index 7860ddb6d4a..a5ec94bc7e0 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -35,7 +35,7 @@ /obj/item/hourglass/proc/start() finish_time = world.time + time - timing_id = addtimer(CALLBACK(src, .proc/finish), time, TIMER_STOPPABLE) + timing_id = addtimer(CALLBACK(src, PROC_REF(finish)), time, TIMER_STOPPABLE) countdown.start() timing_animation() diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index 1c50132b1eb..3b9f4908db4 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -22,7 +22,7 @@ SEND_SIGNAL(src, COMSIG_IMPLANT_ACTIVATED) /obj/item/implant/ui_action_click() - INVOKE_ASYNC(src, .proc/activate, "action_button") + INVOKE_ASYNC(src, PROC_REF(activate), "action_button") /obj/item/implant/proc/can_be_implanted_in(mob/living/target) if(issilicon(target)) diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index bbb1e72027f..042155a9542 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -32,7 +32,7 @@ /obj/item/implant/chem/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) . = ..() if(.) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /obj/item/implant/chem/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_clown.dm b/code/game/objects/items/implants/implant_clown.dm index 001e6a35075..06359129ec6 100644 --- a/code/game/objects/items/implants/implant_clown.dm +++ b/code/game/objects/items/implants/implant_clown.dm @@ -13,7 +13,7 @@ /obj/item/implant/sad_trombone/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) . = ..() if(.) - RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), .proc/on_deathgasp) + RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), PROC_REF(on_deathgasp)) /obj/item/implant/sad_trombone/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm index a7afe701c2a..e73bb944b73 100644 --- a/code/game/objects/items/implants/implant_deathrattle.dm +++ b/code/game/objects/items/implants/implant_deathrattle.dm @@ -20,9 +20,9 @@ /datum/deathrattle_group/proc/register(obj/item/implant/deathrattle/implant) if(implant in implants) return - RegisterSignal(implant, COMSIG_IMPLANT_IMPLANTED, .proc/on_implant_implantation) - RegisterSignal(implant, COMSIG_IMPLANT_REMOVED, .proc/on_implant_removal) - RegisterSignal(implant, COMSIG_PARENT_QDELETING, .proc/on_implant_destruction) + RegisterSignal(implant, COMSIG_IMPLANT_IMPLANTED, PROC_REF(on_implant_implantation)) + RegisterSignal(implant, COMSIG_IMPLANT_REMOVED, PROC_REF(on_implant_removal)) + RegisterSignal(implant, COMSIG_PARENT_QDELETING, PROC_REF(on_implant_destruction)) implants += implant @@ -32,7 +32,7 @@ /datum/deathrattle_group/proc/on_implant_implantation(obj/item/implant/implant, mob/living/target, mob/user, silent = FALSE, force = FALSE) SIGNAL_HANDLER - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_user_statchange) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_user_statchange)) /datum/deathrattle_group/proc/on_implant_removal(obj/item/implant/implant, mob/living/source, silent = FALSE, special = 0) SIGNAL_HANDLER diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm index 96165b3fd3a..3b7d37fc6ee 100644 --- a/code/game/objects/items/implants/implant_explosive.dm +++ b/code/game/objects/items/implants/implant_explosive.dm @@ -18,7 +18,7 @@ // and the process of activating destroys the body, so let the other // signal handlers at least finish. Also, the "delayed explosion" // uses sleeps, which is bad for signal handlers to do. - INVOKE_ASYNC(src, .proc/activate, "death") + INVOKE_ASYNC(src, PROC_REF(activate), "death") /obj/item/implant/explosive/get_data() var/dat = {"Implant Specifications:
@@ -73,7 +73,7 @@ . = ..() if(.) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /obj/item/implant/explosive/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm index 7ef672e63c7..4b963b7e490 100644 --- a/code/game/objects/items/implants/implant_stealth.dm +++ b/code/game/objects/items/implants/implant_stealth.dm @@ -33,7 +33,7 @@ /obj/structure/closet/cardboard/agent/proc/reveal() alpha = 255 - addtimer(CALLBACK(src, .proc/go_invisible), 10, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(go_invisible)), 10, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/structure/closet/cardboard/agent/Bump(atom/A) . = ..() diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 61282d9246c..15f5dec4519 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -78,10 +78,10 @@ ready_implants-- if(!replenishing && auto_replenish) replenishing = TRUE - addtimer(CALLBACK(src,.proc/replenish),replenish_cooldown) + addtimer(CALLBACK(src, PROC_REF(replenish),replenish_cooldown)) if(injection_cooldown > 0) ready = FALSE - addtimer(CALLBACK(src,.proc/set_ready),injection_cooldown) + addtimer(CALLBACK(src, PROC_REF(set_ready),injection_cooldown)) else playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, TRUE) update_appearance() diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index e495a1216ab..47ab555bdc5 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -16,7 +16,7 @@ if(!uplink_flag) uplink_flag = src.uplink_flag src.uplink_handler = uplink_handler - RegisterSignal(src, COMSIG_COMPONENT_REMOVING, .proc/_component_removal) + RegisterSignal(src, COMSIG_COMPONENT_REMOVING, PROC_REF(_component_removal)) /obj/item/implant/uplink/implant(mob/living/carbon/target, mob/user, silent, force) . = ..() diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index a8c1abbd332..0ea0cdc1ae5 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -52,7 +52,7 @@ /obj/item/mail/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) AddElement(/datum/element/item_scaling, 0.75, 1) if(isnull(department_colors)) department_colors = list( diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index cf979f7459f..69c2e991c5d 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -308,7 +308,7 @@ clumsy_check = FALSE, \ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \ attack_verb_simple_on = list("smack", "strike", "crack", "beat")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/baton/telescopic/suicide_act(mob/user) var/mob/living/carbon/human/human_user = user @@ -413,7 +413,7 @@ log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].") else cell = new preload_cell_type(src) - RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/convert) + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(convert)) update_appearance() /obj/item/melee/baton/security/get_cell() @@ -567,7 +567,7 @@ target.stuttering = max(8, target.stuttering) SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK) - addtimer(CALLBACK(src, .proc/apply_stun_effect_end, target), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS) /// After the initial stun period, we check to see if the target needs to have the stun applied. /obj/item/melee/baton/security/proc/apply_stun_effect_end(mob/living/target) @@ -606,7 +606,7 @@ scramble_mode() for(var/loops in 1 to rand(6, 12)) scramble_time = rand(5, 15) / (1 SECONDS) - addtimer(CALLBACK(src, .proc/scramble_mode), scramble_time*loops * (1 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(scramble_mode)), scramble_time*loops * (1 SECONDS)) /obj/item/melee/baton/security/proc/scramble_mode() active = !active diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 3876f62e4d3..ca141c1dcb2 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -52,7 +52,7 @@ w_class_on = active_w_class, \ attack_verb_continuous_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts"), \ attack_verb_simple_on = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/suicide_act(mob/user) if(!blade_active) @@ -143,7 +143,7 @@ throw_speed_on = throw_speed, \ sharpness_on = sharpness, \ w_class_on = active_w_class) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/axe/suicide_act(mob/user) user.visible_message(span_suicide("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 371a2eeb34f..c8cc323f911 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -121,8 +121,8 @@ var/speedbase = abs((4 SECONDS) / limbs_to_dismember.len) for(bodypart in limbs_to_dismember) i++ - addtimer(CALLBACK(src, .proc/suicide_dismember, user, bodypart), speedbase * i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), (5 SECONDS) * i) + addtimer(CALLBACK(src, PROC_REF(suicide_dismember), user, bodypart), speedbase * i) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), (5 SECONDS) * i) return MANUAL_SUICIDE /obj/item/melee/sabre/proc/suicide_dismember(mob/living/user, obj/item/bodypart/affecting) @@ -323,8 +323,8 @@ AddComponent(/datum/component/transforming, \ hitsound_on = hitsound, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, .proc/attempt_transform) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, PROC_REF(attempt_transform)) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_PRE_TRANSFORM]. diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 8f3b55010bf..1a5fb2b18aa 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -66,7 +66,7 @@ "white" = image(icon = src.icon, icon_state = "paint_white"), "yellow" = image(icon = src.icon, icon_state = "paint_yellow") ) - var/picked_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE) + var/picked_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 38, require_near = TRUE) switch(picked_color) if("black") paint_color = COLOR_ALMOST_BLACK diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index a03b8a8601d..086c40b69a9 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -606,7 +606,7 @@ /obj/item/toy/plush/goatplushie/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = .proc/splat, + COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = PROC_REF(splat), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 598a45817a9..d27de78484c 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -368,7 +368,7 @@ /obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks. if(!charging && candy < candymax) - addtimer(CALLBACK(src, .proc/charge_lollipops), charge_delay) + addtimer(CALLBACK(src, PROC_REF(charge_lollipops)), charge_delay) charging = TRUE /obj/item/borg/lollipop/proc/charge_lollipops() @@ -609,7 +609,7 @@ icon_state = "shield0" START_PROCESSING(SSfastprocess, src) host = loc - RegisterSignal(host, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(host, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /obj/item/borg/projectile_dampen/proc/on_death(datum/source, gibbed) SIGNAL_HANDLER @@ -788,7 +788,7 @@ /obj/item/borg/apparatus/Initialize(mapload) . = ..() - RegisterSignal(loc.loc, COMSIG_BORG_SAFE_DECONSTRUCT, .proc/safedecon) + RegisterSignal(loc.loc, COMSIG_BORG_SAFE_DECONSTRUCT, PROC_REF(safedecon)) /obj/item/borg/apparatus/Destroy() QDEL_NULL(stored) @@ -844,7 +844,7 @@ var/obj/item/O = A O.forceMove(src) stored = O - RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon) + RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon)) update_appearance() return else @@ -883,7 +883,7 @@ /obj/item/borg/apparatus/beaker/Initialize(mapload) . = ..() stored = new /obj/item/reagent_containers/glass/beaker/large(src) - RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon) + RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon)) update_appearance() /obj/item/borg/apparatus/beaker/Destroy() @@ -945,7 +945,7 @@ /obj/item/borg/apparatus/beaker/service/Initialize(mapload) . = ..() stored = new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon) + RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon)) update_appearance() ///////////////////// diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 9fe29d87639..5c6b1e36895 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -480,7 +480,7 @@ defib_instance = D name = defib_instance.name defib_instance.moveToNullspace() - RegisterSignal(defib_instance, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), .proc/on_defib_instance_qdel_or_moved) + RegisterSignal(defib_instance, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(on_defib_instance_qdel_or_moved)) /obj/item/borg/upgrade/defib/backpack/proc/on_defib_instance_qdel_or_moved(obj/item/defibrillator/D) SIGNAL_HANDLER diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index de0718fe643..3423a5b03c1 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -220,7 +220,7 @@ throw_speed_on = active_throw_speed, \ hitsound_on = hitsound, \ clumsy_check = !can_clumsy_use) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return FALSE @@ -267,7 +267,7 @@ w_class_on = WEIGHT_CLASS_BULKY, \ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \ attack_verb_simple_on = list("smack", "strike", "crack", "beat")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(extended) diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 3bf15d05eaa..0a0d85cce82 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -22,8 +22,8 @@ /obj/item/singularityhammer/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) AddElement(/datum/element/kneejerk) /obj/item/singularityhammer/ComponentInitialize() @@ -79,7 +79,7 @@ playsound(user, 'sound/weapons/marauder.ogg', 50, TRUE) var/turf/target = get_turf(A) vortex(target,user) - addtimer(CALLBACK(src, .proc/recharge), 100) + addtimer(CALLBACK(src, PROC_REF(recharge)), 100) /obj/item/mjollnir name = "Mjolnir" @@ -99,8 +99,8 @@ /obj/item/mjollnir/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/mjollnir/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 227673ea5d6..50adbe37ce6 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -61,8 +61,8 @@ /obj/item/spear/explosive/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) set_explosive(new /obj/item/grenade/iedcasing/spawned()) //For admin-spawned explosive lances /obj/item/spear/explosive/ComponentInitialize() diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d8dd5a03f6e..4634e66097f 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(T && is_station_level(T.z)) SSblackbox.record_feedback("tally", "station_mess_created", 1, name) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index de00fd63ffa..a4800ab8d43 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -72,7 +72,7 @@ if(item_stack == src) continue if(can_merge(item_stack)) - INVOKE_ASYNC(src, .proc/merge_without_del, item_stack) + INVOKE_ASYNC(src, PROC_REF(merge_without_del), item_stack) if(is_zero_amount(delete_if_zero = FALSE)) return INITIALIZE_HINT_QDEL var/list/temp_recipes = get_main_recipes() @@ -90,7 +90,7 @@ update_weight() update_appearance() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_movable_entered_occupied_turf, + COMSIG_ATOM_ENTERED = PROC_REF(on_movable_entered_occupied_turf), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -496,7 +496,7 @@ return if(!arrived.throwing && can_merge(arrived)) - INVOKE_ASYNC(src, .proc/merge, arrived) + INVOKE_ASYNC(src, PROC_REF(merge), arrived) /obj/item/stack/hitby(atom/movable/hitting, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(can_merge(hitting)) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 13cdd8eb265..ba44e052cce 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -96,7 +96,7 @@ return (OXYLOSS) /obj/item/storage/backpack/santabag/proc/regenerate_presents() - addtimer(CALLBACK(src, .proc/regenerate_presents), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS) var/mob/M = get(loc, /mob) if(!istype(M)) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 2267fd8ac48..ef7fece0f0e 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -134,7 +134,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/Pickup_ores) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(Pickup_ores)) listeningTo = user /obj/item/storage/bag/ore/dropped() @@ -379,7 +379,7 @@ var/delay = rand(2,4) var/datum/move_loop/loop = SSmove_manager.move_rand(tray_item, list(NORTH,SOUTH,EAST,WEST), delay, timeout = rand(1, 2) * delay, flags = MOVEMENT_LOOP_START_FAST) //This does mean scattering is tied to the tray. Not sure how better to handle it - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/change_speed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(change_speed)) /obj/item/storage/bag/tray/proc/change_speed(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 64fec2c45a5..b7d46f3b72a 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -70,7 +70,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", var/image/bible_image = image(icon = 'icons/obj/storage.dmi', icon_state = GLOB.biblestates[i]) skins += list("[GLOB.biblenames[i]]" = bible_image) - var/choice = show_radial_menu(user, src, skins, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE) + var/choice = show_radial_menu(user, src, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE) if(!choice) return FALSE var/bible_index = GLOB.biblenames.Find(choice) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e5b42a034b9..417a4336e25 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -970,7 +970,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/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 78529726620..35a99fc1807 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -557,8 +557,8 @@ /obj/item/storage/organbox/Initialize(mapload) . = ..() create_reagents(100, TRANSPARENT) - RegisterSignal(src, COMSIG_ATOM_ENTERED, .proc/freeze) - RegisterSignal(src, COMSIG_TRY_STORAGE_TAKE, .proc/unfreeze) + RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(freeze)) + RegisterSignal(src, COMSIG_TRY_STORAGE_TAKE, PROC_REF(unfreeze)) START_PROCESSING(SSobj, src) /obj/item/storage/organbox/process(delta_time) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 2fc29e3bfa1..47cf5281797 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -77,9 +77,9 @@ on = TRUE icon_state = "[initial(icon_state)]-on" ion_trail.start() - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move_react) - RegisterSignal(user, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) + RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react)) + RegisterSignal(user, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(spacemove_react)) if(full_speed) user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) return TRUE @@ -273,9 +273,9 @@ air_contents = null return active_hardsuit = loc - RegisterSignal(active_hardsuit, COMSIG_MOVABLE_MOVED, .proc/on_hardsuit_moved) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(active_user, COMSIG_PARENT_QDELETING, .proc/on_user_del) + RegisterSignal(active_hardsuit, COMSIG_MOVABLE_MOVED, PROC_REF(on_hardsuit_moved)) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(active_user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_del)) START_PROCESSING(SSobj, src) @@ -308,7 +308,7 @@ if(istype(loc, /obj/item/clothing/suit/space/hardsuit) && ishuman(loc.loc) && loc.loc == active_user) UnregisterSignal(active_hardsuit, COMSIG_MOVABLE_MOVED) active_hardsuit = loc - RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/on_hardsuit_moved) + RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_hardsuit_moved)) return turn_off(active_user) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 4810eb24a33..fa0c44ad857 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -22,7 +22,7 @@ . = ..() create_reagents(volume, OPENCONTAINER) noz = make_noz() - RegisterSignal(noz, COMSIG_MOVABLE_MOVED, .proc/noz_move) + RegisterSignal(noz, COMSIG_MOVABLE_MOVED, PROC_REF(noz_move)) /obj/item/watertank/Destroy() QDEL_NULL(noz) @@ -47,7 +47,7 @@ if(QDELETED(noz)) noz = make_noz() - RegisterSignal(noz, COMSIG_MOVABLE_MOVED, .proc/noz_move) + RegisterSignal(noz, COMSIG_MOVABLE_MOVED, PROC_REF(noz_move)) if(noz in src) //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) @@ -315,8 +315,8 @@ playsound(src,'sound/items/syringeproj.ogg',40,TRUE) var/delay = 2 var/datum/move_loop/loop = SSmove_manager.move_towards(resin, target, delay, timeout = delay * 5, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/resin_stop_check) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/resin_landed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(resin_stop_check)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(resin_landed)) return if(nozzle_mode == RESIN_FOAM) @@ -331,7 +331,7 @@ var/obj/effect/particle_effect/foam/metal/resin/F = new (get_turf(target)) F.amount = 0 metal_synthesis_cooldown++ - addtimer(CALLBACK(src, .proc/reduce_metal_synth_cooldown), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reduce_metal_synth_cooldown)), 10 SECONDS) else balloon_alert(user, "still being synthesized!") return diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index 94806a81368..035131ac20f 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) "Tap" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_tap"), "Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"), ) - 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) @@ -221,7 +221,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) "Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"), "Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"), ) - 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) @@ -564,7 +564,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) totalCards++ cardsByCount[id] += 1 var/toSend = "Out of [totalCards] cards" - for(var/id in sort_list(cardsByCount, /proc/cmp_num_string_asc)) + for(var/id in sort_list(cardsByCount, GLOBAL_PROC_REF(cmp_num_string_asc))) if(id) var/datum/card/template = GLOB.cached_cards[pack.series]["ALL"][id] toSend += "\nID:[id] [template.name] [(cardsByCount[id] * 100) / totalCards]% Total:[cardsByCount[id]]" diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index f8842db9013..6931a69d4e2 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -200,7 +200,7 @@ if (about_to_replace_location) UnregisterSignal(about_to_replace_location, COMSIG_TELEPORTER_NEW_TARGET) - RegisterSignal(teleport_location, COMSIG_TELEPORTER_NEW_TARGET, .proc/on_teleporter_new_target) + RegisterSignal(teleport_location, COMSIG_TELEPORTER_NEW_TARGET, PROC_REF(on_teleporter_new_target)) last_portal_location = WEAKREF(teleport_location) @@ -251,8 +251,8 @@ var/obj/effect/portal/portal1 = created[1] var/obj/effect/portal/portal2 = created[2] - RegisterSignal(portal1, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) - RegisterSignal(portal2, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) + RegisterSignal(portal1, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) + RegisterSignal(portal2, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) try_move_adjacent(portal1, user.dir) active_portal_pairs[portal1] = portal2 diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 7e5c31d1bdc..da3f6060e69 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -61,7 +61,7 @@ core = ncore icon_state = "core_container_loaded" to_chat(user, span_warning("Container is sealing...")) - addtimer(CALLBACK(src, .proc/seal), 50) + addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE /obj/item/nuke_core_container/proc/seal() @@ -241,7 +241,7 @@ T.icon_state = "supermatter_tongs" icon_state = "core_container_loaded" to_chat(user, span_warning("Container is sealing...")) - addtimer(CALLBACK(src, .proc/seal), 50) + addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE /obj/item/nuke_core_container/supermatter/seal() diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 143eb8b3161..924666531db 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -93,7 +93,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index c05807b975f..cccf453b209 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -104,7 +104,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index a801bf5f49e..6d9e1b51034 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -97,7 +97,7 @@ hitsound_on = hitsound, \ w_class_on = WEIGHT_CLASS_NORMAL, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm index 4edf8ec00bd..7acd4b403a8 100644 --- a/code/game/objects/items/toy_mechs.dm +++ b/code/game/objects/items/toy_mechs.dm @@ -179,7 +179,7 @@ to_chat(user, span_notice("You offer battle to [target.name]!")) to_chat(target, span_notice("[user.name] wants to battle with [user.p_their()] [name]! Attack them with a toy mech to initiate combat.")) wants_to_battle = TRUE - addtimer(CALLBACK(src, .proc/withdraw_offer, user), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(withdraw_offer), user), 6 SECONDS) return ..() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index fb363ceb950..05646704174 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -268,7 +268,7 @@ user.visible_message(span_suicide("[user] consumes [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(user, 'sound/items/eatfood.ogg', 50, TRUE) user.adjust_nutrition(50) // mmmm delicious - addtimer(CALLBACK(src, .proc/manual_suicide, user), (3SECONDS)) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), (3SECONDS)) return MANUAL_SUICIDE /** @@ -410,7 +410,7 @@ throw_speed_on = throw_speed, \ hitsound_on = hitsound, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* @@ -507,7 +507,7 @@ update_appearance() playsound(src, 'sound/effects/pope_entry.ogg', 100) Rumble() - addtimer(CALLBACK(src, .proc/stopRumble), 600) + addtimer(CALLBACK(src, PROC_REF(stopRumble)), 600) else to_chat(user, span_warning("[src] is already active!")) @@ -609,7 +609,7 @@ /obj/item/toy/snappop/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -631,7 +631,7 @@ /obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/respawn), respawn_time) + addtimer(CALLBACK(src, PROC_REF(respawn)), respawn_time) /obj/effect/decal/cleanable/ash/snappop_phoenix/proc/respawn() new /obj/item/toy/snappop/phoenix(get_turf(src)) @@ -660,7 +660,7 @@ activation_message(user) playsound(loc, 'sound/machines/click.ogg', 20, TRUE) - INVOKE_ASYNC(src, .proc/do_toy_talk, user) + INVOKE_ASYNC(src, PROC_REF(do_toy_talk), user) cooldown = TRUE addtimer(VARSET_CALLBACK(src, cooldown, FALSE), recharge_time) @@ -976,7 +976,7 @@ for(var/obj/item/toy/cards/singlecard/card in cards) handradial[card] = image(icon = src.icon, icon_state = "sc_[card.name]_[deckstyle]") - var/obj/item/toy/cards/singlecard/choice = show_radial_menu(usr, src, handradial, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/obj/item/toy/cards/singlecard/choice = show_radial_menu(usr, src, handradial, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE draw_card(user, cards, choice) @@ -1278,7 +1278,7 @@ if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI // Short delay to match up with the explosion sound // Shakes player camera 2 squares for 1 second. - addtimer(CALLBACK(GLOBAL_PROC, .proc/shake_camera, M, 2, 1), 0.8 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(shake_camera), M, 2, 1), 0.8 SECONDS) else to_chat(user, span_alert("Nothing happens.")) @@ -1680,7 +1680,7 @@ if(cooldown <= world.time) cooldown = (world.time + 300) user.visible_message(span_notice("[user] adjusts the dial on [src].")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/items/radiostatic.ogg', 50, FALSE), 0.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/items/radiostatic.ogg', 50, FALSE), 0.5 SECONDS) else to_chat(user, span_warning("The dial on [src] jams up")) return @@ -1695,7 +1695,7 @@ /obj/item/toy/braintoy/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 10) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/blobattack.ogg', 50, FALSE), 0.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/effects/blobattack.ogg', 50, FALSE), 0.5 SECONDS) /* diff --git a/code/game/objects/items/virgin_mary.dm b/code/game/objects/items/virgin_mary.dm index 71ee71ccfd8..acdc942e1ad 100644 --- a/code/game/objects/items/virgin_mary.dm +++ b/code/game/objects/items/virgin_mary.dm @@ -48,7 +48,7 @@ /obj/item/virgin_mary/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] starts saying their Hail Mary's at a terrifying pace! It looks like [user.p_theyre()] trying to enter the afterlife!")) user.say("Hail Mary, full of grace, the Lord is with thee. Blessed are thou amongst women, and blessed is the fruit of thy womb, Jesus. Holy Mary, mother of God, pray for us sinners, now and at the hour of our death. Amen. ", forced = /obj/item/virgin_mary) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 75) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 75) addtimer(CALLBACK(user, /atom/movable/proc/say, "O my Mother, preserve me this day from mortal sin..."), 50) return MANUAL_SUICIDE diff --git a/code/game/objects/items/wayfinding.dm b/code/game/objects/items/wayfinding.dm index 5e7e4e51133..1c42f884f6f 100644 --- a/code/game/objects/items/wayfinding.dm +++ b/code/game/objects/items/wayfinding.dm @@ -228,7 +228,7 @@ deltimer(expression_timer) add_overlay(type) if(duration) - expression_timer = addtimer(CALLBACK(src, .proc/set_expression, "happy"), duration, TIMER_STOPPABLE) + expression_timer = addtimer(CALLBACK(src, PROC_REF(set_expression), "happy"), duration, TIMER_STOPPABLE) /obj/machinery/pinpointer_dispenser/point_at(A) . = ..() diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index bef092b5f6b..e07fa32d754 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -859,8 +859,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/highfrequencyblade/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) AddElement(/datum/element/update_icon_updates_onmob) /obj/item/highfrequencyblade/ComponentInitialize() diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 00e360003e0..4b4b058c4ad 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -158,7 +158,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(QDELETED(src)) return 0 obj_flags |= BEING_SHOCKED - addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 1 SECONDS) return power / 2 //The surgeon general warns that being buckled to certain objects receiving powerful shocks is greatly hazardous to your health diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f5cbdf46402..4d51702a064 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -192,7 +192,7 @@ if(machine) unset_machine() machine = O - RegisterSignal(O, COMSIG_PARENT_QDELETING, .proc/unset_machine) + RegisterSignal(O, COMSIG_PARENT_QDELETING, PROC_REF(unset_machine)) if(istype(O)) O.obj_flags |= IN_USE @@ -337,7 +337,7 @@ items += list("[reskin_option]" = item_image) sort_list(items) - var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, .proc/check_reskin_menu, M), radius = 38, require_near = TRUE) + var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), M), radius = 38, require_near = TRUE) if(!pick) return if(!unique_reskin[pick]) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index a59bfebb0be..cfd1b500aa0 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -214,7 +214,7 @@ check_weed = new(check_turf) //set the new one's parent node to our parent node check_weed.parent_node = parent_node - check_weed.RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, .proc/after_parent_destroyed) + check_weed.RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, PROC_REF(after_parent_destroyed)) /** * Called when the parent node is destroyed @@ -222,7 +222,7 @@ /obj/structure/alien/weeds/proc/after_parent_destroyed() if(!find_new_parent()) var/random_time = rand(2 SECONDS, 8 SECONDS) - addtimer(CALLBACK(src, .proc/do_qdel), random_time) + addtimer(CALLBACK(src, PROC_REF(do_qdel)), random_time) /** * Called when trying to find a new parent after our previous parent died @@ -236,7 +236,7 @@ if(new_parent == previous_node) continue parent_node = new_parent - RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, .proc/after_parent_destroyed) + RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, PROC_REF(after_parent_destroyed)) return parent_node return FALSE @@ -348,7 +348,7 @@ if(status == GROWING || status == GROWN) child = new(src) if(status == GROWING) - addtimer(CALLBACK(src, .proc/Grow), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) proximity_monitor = new(src, status == GROWN ? 1 : 0) if(status == BURST) atom_integrity = integrity_failure * max_integrity @@ -408,7 +408,7 @@ status = BURSTING proximity_monitor.set_range(0) flick("egg_opening", src) - addtimer(CALLBACK(src, .proc/finish_bursting, kill), 15) + addtimer(CALLBACK(src, PROC_REF(finish_bursting), kill), 15) /obj/structure/alien/egg/proc/finish_bursting(kill = TRUE) status = BURST diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index bbc2863b831..be05aa9e8a4 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -25,7 +25,7 @@ /obj/structure/chair/Initialize(mapload) . = ..() if(!anchored) //why would you put these on the shuttle? - addtimer(CALLBACK(src, .proc/RemoveFromLatejoin), 0) + addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0) if(prob(0.2)) name = "tactical [name]" MakeRotate() @@ -506,7 +506,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) Mob.pixel_y += 2 .=..() if(iscarbon(Mob)) - INVOKE_ASYNC(src, .proc/snap_check, Mob) + INVOKE_ASYNC(src, PROC_REF(snap_check), Mob) /obj/structure/chair/plastic/post_unbuckle_mob(mob/living/Mob) Mob.pixel_y -= 2 diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 6bfb760817f..384d368e8fb 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -34,7 +34,7 @@ /obj/structure/bonfire/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm index 19a82ced61d..95652ead7ff 100644 --- a/code/game/objects/structures/cannons/cannon.dm +++ b/code/game/objects/structures/cannons/cannon.dm @@ -69,7 +69,7 @@ return visible_message(ignition_message) log_game("Cannon fired by [key_name(user)] in [AREACOORD(src)]") - addtimer(CALLBACK(src, .proc/fire), fire_delay) + addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay) charge_ignited = TRUE return diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 55f584032ec..ad313a0cc2f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -71,14 +71,14 @@ /obj/structure/closet/Initialize(mapload) if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents - addtimer(CALLBACK(src, .proc/take_contents, TRUE), 0) + addtimer(CALLBACK(src, PROC_REF(take_contents), TRUE), 0) . = ..() update_appearance() PopulateContents() if(QDELETED(src)) //It turns out populate contents has a 1 in 100 chance of qdeling src on /obj/structure/closet/emcloset return //Why /*var/static/list/loc_connections = list( // MOJAVE SUN EDIT BEGIN - Commented out! - COMSIG_CARBON_DISARM_COLLIDE = .proc/locker_carbon, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(locker_carbon), ) AddElement(/datum/element/connect_loc, loc_connections)*/ // MOJAVE SUN EDIT END @@ -165,7 +165,7 @@ animate(door_obj, transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW) else animate(transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag) - addtimer(CALLBACK(src, .proc/end_door_animation), door_anim_time, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(end_door_animation)), door_anim_time, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_CLIENT_TIME) /// Ends the door animation and removes the animated overlay /obj/structure/closet/proc/end_door_animation() diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 058665c4437..6f6e6ccdc2d 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -30,7 +30,7 @@ var/oldloc = loc step(src, direction) if(oldloc != loc) - addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) + addtimer(CALLBACK(src, PROC_REF(ResetMoveDelay)), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) else move_delay = FALSE diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm index c029ec941a3..45f1390772a 100644 --- a/code/game/objects/structures/crates_lockers/closets/infinite.dm +++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm @@ -26,7 +26,7 @@ /obj/structure/closet/infinite/open(mob/living/user, force = FALSE) . = ..() if(. && auto_close_time) - addtimer(CALLBACK(src, .proc/close_on_my_own), auto_close_time, TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_OVERRIDE) /obj/structure/closet/infinite/proc/close_on_my_own() if(close()) diff --git a/code/game/objects/structures/crates_lockers/crates/bins.dm b/code/game/objects/structures/crates_lockers/crates/bins.dm index 5f7faf406fb..efb7dc4a10d 100644 --- a/code/game/objects/structures/crates_lockers/crates/bins.dm +++ b/code/game/objects/structures/crates_lockers/crates/bins.dm @@ -38,7 +38,7 @@ /obj/structure/closet/crate/bin/proc/do_animate() playsound(loc, open_sound, 15, TRUE, -3) flick("animate_largebins", src) - addtimer(CALLBACK(src, .proc/do_close), 13) + addtimer(CALLBACK(src, PROC_REF(do_close)), 13) /obj/structure/closet/crate/bin/proc/do_close() playsound(loc, close_sound, 15, TRUE, -3) diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm index 92fdc82f23d..6ec4ff6f464 100644 --- a/code/game/objects/structures/deployable_turret.dm +++ b/code/game/objects/structures/deployable_turret.dm @@ -184,7 +184,7 @@ /obj/machinery/deployable_turret/proc/volley(mob/user) target_turf = get_turf(target) for(var/i in 1 to number_of_shots) - addtimer(CALLBACK(src, /obj/machinery/deployable_turret/.proc/fire_helper, user), i*rate_of_fire) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret, fire_helper), user), i*rate_of_fire) /obj/machinery/deployable_turret/proc/fire_helper(mob/user) if(user.incapacitated() || !(user in buckled_mobs)) diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index c2b66cfdea8..a550f7db135 100644 --- a/code/game/objects/structures/divine.dm +++ b/code/game/objects/structures/divine.dm @@ -41,7 +41,7 @@ to_chat(user, span_notice("The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")) user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20) update_appearance() - addtimer(CALLBACK(src, /atom/.proc/update_appearance), time_between_uses) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_between_uses) /obj/structure/healingfountain/update_icon_state() diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 8b799fc4d22..f9944646d12 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -80,7 +80,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)) @@ -93,7 +93,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 @@ -106,7 +106,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 @@ -149,7 +149,7 @@ for(var/mob/M in viewers(src, 7)) 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/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index 0d57ebca77e..a8eda7c9889 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -82,7 +82,7 @@ item_image.copy_overlays(thing) items += list("[thing.name] ([i])" = item_image) - var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!pick) return diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index 493c7eabca0..53e6cb48742 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -15,7 +15,7 @@ smoke.start() visible_message(span_boldannounce("[src] warps in!")) playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE) - addtimer(CALLBACK(src, .proc/warpbots), rand(10, 600)) + addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(10, 600)) /obj/structure/hivebot_beacon/proc/warpbots() icon_state = "def_radar" diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 0e8c5023747..fbc78b1e3e4 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -201,7 +201,7 @@ var/mob/living/M = user M.electrocute_act(15,"Energy Barrier") shockcd = TRUE - addtimer(CALLBACK(src, .proc/cooldown), 5) + addtimer(CALLBACK(src, PROC_REF(cooldown)), 5) /obj/structure/holosign/barrier/cyborg/hacked/Bumped(atom/movable/AM) if(shockcd) @@ -213,4 +213,4 @@ var/mob/living/M = AM M.electrocute_act(15,"Energy Barrier") shockcd = TRUE - addtimer(CALLBACK(src, .proc/cooldown), 5) + addtimer(CALLBACK(src, PROC_REF(cooldown)), 5) diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 4a4767f13a4..71c25f29b04 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(ore_probability, list( playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) visible_message(span_boldannounce("[src] begins to collapse, cutting it off from this world!")) animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS) - addtimer(CALLBACK(src, .proc/collapse), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) /** * Handles portal deletion diff --git a/code/game/objects/structures/industrial_lift.dm b/code/game/objects/structures/industrial_lift.dm index f99cc4e4efa..9aa62342f8c 100644 --- a/code/game/objects/structures/industrial_lift.dm +++ b/code/game/objects/structures/industrial_lift.dm @@ -29,7 +29,7 @@ return new_lift_platform.lift_master_datum = src LAZYADD(lift_platforms, new_lift_platform) - RegisterSignal(new_lift_platform, COMSIG_PARENT_QDELETING, .proc/remove_lift_platforms) + RegisterSignal(new_lift_platform, COMSIG_PARENT_QDELETING, PROC_REF(remove_lift_platforms)) /datum/lift_master/proc/remove_lift_platforms(obj/structure/industrial_lift/old_lift_platform) SIGNAL_HANDLER @@ -170,12 +170,12 @@ GLOBAL_LIST_EMPTY(lifts) . = ..() GLOB.lifts.Add(src) var/static/list/loc_connections = list( - COMSIG_ATOM_EXITED =.proc/UncrossedRemoveItemFromLift, - COMSIG_ATOM_ENTERED = .proc/AddItemOnLift, - COMSIG_ATOM_CREATED = .proc/AddItemOnLift, + COMSIG_ATOM_EXITED = PROC_REF(UncrossedRemoveItemFromLift), + COMSIG_ATOM_ENTERED = PROC_REF(AddItemOnLift), + COMSIG_ATOM_CREATED = PROC_REF(AddItemOnLift), ) AddElement(/datum/element/connect_loc, loc_connections) - RegisterSignal(src, COMSIG_MOVABLE_BUMP, .proc/GracefullyBreak) + RegisterSignal(src, COMSIG_MOVABLE_BUMP, PROC_REF(GracefullyBreak)) if(!lift_master_datum) lift_master_datum = new(src) @@ -190,7 +190,7 @@ GLOBAL_LIST_EMPTY(lifts) if(!(potential_rider in lift_load)) return if(isliving(potential_rider) && HAS_TRAIT(potential_rider, TRAIT_CANNOT_BE_UNBUCKLED)) - REMOVE_TRAIT(potential_rider, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) + REMOVE_TRAIT(potential_rider, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) LAZYREMOVE(lift_load, potential_rider) UnregisterSignal(potential_rider, COMSIG_PARENT_QDELETING) @@ -201,9 +201,9 @@ GLOBAL_LIST_EMPTY(lifts) if(AM in lift_load) return if(isliving(AM) && !HAS_TRAIT(AM, TRAIT_CANNOT_BE_UNBUCKLED)) - ADD_TRAIT(AM, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) + ADD_TRAIT(AM, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) LAZYADD(lift_load, AM) - RegisterSignal(AM, COMSIG_PARENT_QDELETING, .proc/RemoveItemFromLift) + RegisterSignal(AM, COMSIG_PARENT_QDELETING, PROC_REF(RemoveItemFromLift)) /** * Signal for when the tram runs into a field of which it cannot go through. @@ -240,7 +240,7 @@ GLOBAL_LIST_EMPTY(lifts) destination = get_step_multiz(src, going) else destination = going - ///handles any special interactions objects could have with the lift/tram, handled on the item itself + ///handles any special interactions objects could have with the lift/tram, handled on the item itself SEND_SIGNAL(destination, COMSIG_TURF_INDUSTRIAL_LIFT_ENTER, things_to_move) if(istype(destination, /turf/closed/wall)) @@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(lifts) collided.throw_at() //if going EAST, will turn to the NORTHEAST or SOUTHEAST and throw the ran over guy away - var/datum/callback/land_slam = new(collided, /mob/living/.proc/tram_slam_land) + var/datum/callback/land_slam = new(collided, TYPE_PROC_REF(/mob/living, tram_slam_land)) collided.throw_at(throw_target, 200, 4, callback = land_slam) set_glide_size(gliding_amount) @@ -328,7 +328,7 @@ GLOBAL_LIST_EMPTY(lifts) to_chat(user, span_warning("[src] has its controls locked! It must already be trying to do something!")) add_fingerprint(user) return - var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user, src.loc), require_near = TRUE, tooltips = TRUE) + var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user, src.loc), require_near = TRUE, tooltips = TRUE) if(!isliving(user) || !in_range(src, user) || user.combat_mode) return //nice try switch(result) @@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(lifts) "NORTHWEST" = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow", dir = WEST) ) - var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = FALSE) + var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = FALSE) if (!in_range(src, user)) return // nice try @@ -538,7 +538,7 @@ GLOBAL_DATUM(central_tram, /obj/structure/industrial_lift/tram/central) /obj/structure/industrial_lift/tram/process(delta_time) if(!travel_distance) - addtimer(CALLBACK(src, .proc/unlock_controls), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(unlock_controls)), 3 SECONDS) return PROCESS_KILL else travel_distance-- diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 6ecf4875908..8881f4ea19c 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -116,7 +116,7 @@ if(!length(items)) return items = sort_list(items) - var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE) + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 38, require_near = TRUE) if(!pick) return switch(pick) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 054e93e762d..2439a455b16 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -96,7 +96,7 @@ to_chat(user, span_warning("[src] doesn't seem to lead anywhere!")) return - var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user, is_ghost), require_near = !is_ghost, tooltips = TRUE) + var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user, is_ghost), require_near = !is_ghost, tooltips = TRUE) if (!is_ghost && !in_range(src, user)) return // nice try switch(result) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 43d84b93ac4..547481bd1ed 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(tendrils, list()) visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) visible_message(span_warning("Something falls free of the tendril!")) playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) - addtimer(CALLBACK(src, .proc/collapse), 50) + addtimer(CALLBACK(src, PROC_REF(collapse)), 50) /obj/effect/collapse/Destroy() QDEL_NULL(emitted_light) diff --git a/code/game/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index 988203a7eeb..9b7e1045ad2 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -72,7 +72,7 @@ for(var/m in linked_minds) var/datum/mind/mind = m if(!mind.current || (mind.current && mind.current.stat == DEAD)) - addtimer(CALLBACK(src, .proc/respawn, mind), respawn_time, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(respawn), mind), respawn_time, TIMER_UNIQUE) /obj/structure/life_candle/proc/respawn(datum/mind/mind) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index ddfcd176b3f..9d38ebb065a 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -109,7 +109,7 @@ isSwitchingStates = FALSE if(close_delay != -1) - addtimer(CALLBACK(src, .proc/Close), close_delay) + addtimer(CALLBACK(src, PROC_REF(Close)), close_delay) /obj/structure/mineral_door/proc/Close() if(isSwitchingStates || !door_opened) diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index e4534962aad..16265961d9e 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -141,12 +141,12 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( /obj/structure/mystery_box/proc/present_weapon() visible_message(span_notice("[src] presents [presented_item]!"), vision_distance = COMBAT_MESSAGE_RANGE) box_state = MYSTERY_BOX_PRESENTING - box_expire_timer = addtimer(CALLBACK(src, .proc/start_expire_offer), MBOX_DURATION_PRESENTING, TIMER_STOPPABLE) + box_expire_timer = addtimer(CALLBACK(src, PROC_REF(start_expire_offer)), MBOX_DURATION_PRESENTING, TIMER_STOPPABLE) /// The prize is still claimable, but the animation will show it start to recede back into the box /obj/structure/mystery_box/proc/start_expire_offer() presented_item.expire_animation() - box_close_timer = addtimer(CALLBACK(src, .proc/close_box), MBOX_DURATION_EXPIRING, TIMER_STOPPABLE) + box_close_timer = addtimer(CALLBACK(src, PROC_REF(close_box)), MBOX_DURATION_EXPIRING, TIMER_STOPPABLE) /// The box is closed, whether because the prize fully expired, or it was claimed. Start resetting all of the state stuff /obj/structure/mystery_box/proc/close_box() @@ -158,7 +158,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( playsound(src, crate_close_sound, 100) box_close_timer = null box_expire_timer = null - addtimer(CALLBACK(src, .proc/ready_again), MBOX_DURATION_STANDBY) + addtimer(CALLBACK(src, PROC_REF(ready_again)), MBOX_DURATION_STANDBY) /// The cooldown between activations has finished, shake to show that /obj/structure/mystery_box/proc/ready_again() @@ -249,9 +249,9 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( change_delay += change_delay_delta change_counter += change_delay selected_path = pick(parent_box.valid_types) - addtimer(CALLBACK(src, .proc/update_random_icon, selected_path), change_counter) + addtimer(CALLBACK(src, PROC_REF(update_random_icon), selected_path), change_counter) - addtimer(CALLBACK(src, .proc/present_item), MBOX_DURATION_CHOOSING) + addtimer(CALLBACK(src, PROC_REF(present_item)), MBOX_DURATION_CHOOSING) /// animate() isn't up to the task for queueing up icon changes, so this is the proc we call with timers to update our icon /obj/mystery_box_item/proc/update_random_icon(new_item_type) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 8604fd64825..c4da297bd60 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -31,7 +31,7 @@ var/action = anchored ? "unscrews [src] from" : "screws [src] to" var/uraction = anchored ? "unscrew [src] from" : "screw [src] to" user.visible_message(span_warning("[user] [action] the floor."), span_notice("You start to [uraction] the floor..."), span_hear("You hear rustling noises.")) - if(!W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, .proc/check_anchored_state, anchored))) + if(!W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, PROC_REF(check_anchored_state), anchored))) return TRUE set_anchored(!anchored) update_atmos_behaviour() diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 2a6ac08dee6..0c693d19ab8 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -28,7 +28,7 @@ if(density && flags_1 & ON_BORDER_1) // blocks normal movement from and to the direction it's facing. var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -74,7 +74,7 @@ if(flags_1&NODECONSTRUCT_1) return to_chat(user, span_notice("You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...")) - if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) + if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) set_anchored(!anchored) to_chat(user, span_notice("You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.")) return TRUE diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 651e5862696..2af10266a2a 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -41,7 +41,7 @@ soundloop = new(src, FALSE) AddComponent(/datum/component/plumbing/simple_demand) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -121,10 +121,10 @@ // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec var/obj/effect/mist/mist = locate() in loc if(!mist && on && current_temperature != SHOWER_FREEZING) - addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS) if(mist && (!on || current_temperature == SHOWER_FREEZING)) - addtimer(CALLBACK(src, .proc/clear_mist), 25 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clear_mist)), 25 SECONDS) /obj/machinery/shower/proc/make_mist() var/obj/effect/mist/mist = locate() in loc diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index bb0f021bc0d..ee28bd1ae1e 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -35,7 +35,7 @@ update_surrounding() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -78,7 +78,7 @@ if(!isobserver(leaving) && isTerminator() && direction == dir) leaving.set_currently_z_moving(CURRENTLY_Z_ASCENDING) - INVOKE_ASYNC(src, .proc/stair_ascend, leaving) + INVOKE_ASYNC(src, PROC_REF(stair_ascend), leaving) leaving.Bump(src) return COMPONENT_ATOM_BLOCK_EXIT @@ -124,7 +124,7 @@ if(listeningTo) UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW) var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP) - RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_new) + RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_new)) listeningTo = T /obj/structure/stairs/proc/force_open_above() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index d7bfa1bd261..1b64695fe04 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -43,7 +43,7 @@ AddElement(/datum/element/climbable) var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_COLLIDE = .proc/table_carbon, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(table_carbon), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -314,7 +314,7 @@ /obj/structure/table/rolling/AfterPutItemOnTable(obj/item/I, mob/living/user) . = ..() attached_items += I - RegisterSignal(I, COMSIG_MOVABLE_MOVED, .proc/RemoveItemFromTable) //Listen for the pickup event, unregister on pick-up so we aren't moved + RegisterSignal(I, COMSIG_MOVABLE_MOVED, PROC_REF(RemoveItemFromTable)) //Listen for the pickup event, unregister on pick-up so we aren't moved /obj/structure/table/rolling/proc/RemoveItemFromTable(datum/source, newloc, dir) SIGNAL_HANDLER @@ -361,7 +361,7 @@ else debris += new /obj/item/shard var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -377,7 +377,7 @@ return // Don't break if they're just flying past if(AM.throwing) - addtimer(CALLBACK(src, .proc/throw_check, AM), 5) + addtimer(CALLBACK(src, PROC_REF(throw_check), AM), 5) else check_break(AM) @@ -685,7 +685,7 @@ UnregisterSignal(patient, COMSIG_PARENT_QDELETING) patient = new_patient if(patient) - RegisterSignal(patient, COMSIG_PARENT_QDELETING, .proc/patient_deleted) + RegisterSignal(patient, COMSIG_PARENT_QDELETING, PROC_REF(patient_deleted)) /obj/structure/table/optable/proc/patient_deleted(datum/source) SIGNAL_HANDLER diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index 8a9422f4cff..5c21701955b 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -133,7 +133,7 @@ attached_item.forceMove(src) attached_item.vis_flags |= VIS_INHERIT_ID vis_contents += attached_item - RegisterSignal(attached_item, COMSIG_PARENT_QDELETING, .proc/on_attached_delete) + RegisterSignal(attached_item, COMSIG_PARENT_QDELETING, PROC_REF(on_attached_delete)) handle_density() /** diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 951e1acbee2..87b821d1104 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -108,7 +108,7 @@ if(open_status == STATION_TUBE_CLOSED) icon_state = "opening_[base_icon]" open_status = STATION_TUBE_OPENING - addtimer(CALLBACK(src, .proc/finish_animation), OPEN_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION) /obj/structure/transit_tube/station/proc/finish_animation() switch(open_status) @@ -131,7 +131,7 @@ if(open_status == STATION_TUBE_OPEN) icon_state = "closing_[base_icon]" open_status = STATION_TUBE_CLOSING - addtimer(CALLBACK(src, .proc/finish_animation), CLOSE_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION) /obj/structure/transit_tube/station/proc/launch_pod() if(launch_cooldown >= world.time) @@ -153,7 +153,7 @@ /obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir) pod_moving = TRUE - addtimer(CALLBACK(src, .proc/start_stopped, pod), 5) + addtimer(CALLBACK(src, PROC_REF(start_stopped), pod), 5) /obj/structure/transit_tube/station/proc/start_stopped(obj/structure/transit_tube_pod/pod) if(QDELETED(pod)) @@ -162,7 +162,7 @@ pod.setDir(tube_dirs[1]) //turning the pod around for next launch. launch_cooldown = world.time + cooldown_delay open_animation() - addtimer(CALLBACK(src, .proc/finish_stopped, pod), OPEN_DURATION + 2) + addtimer(CALLBACK(src, PROC_REF(finish_stopped), pod), OPEN_DURATION + 2) /obj/structure/transit_tube/station/proc/finish_stopped(obj/structure/transit_tube_pod/pod) pod_moving = FALSE diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index 8f73c76d48a..d99d3aecc40 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -16,7 +16,7 @@ /obj/structure/c_transit_tube/Initialize(mapload) . = ..() - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) /obj/structure/c_transit_tube/proc/can_wrench_in_loc(mob/user) var/turf/source_turf = get_turf(loc) @@ -45,7 +45,7 @@ return to_chat(user, span_notice("You start attaching the [name]...")) add_fingerprint(user) - if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user))) + if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, PROC_REF(can_wrench_in_loc), user))) to_chat(user, span_notice("You attach the [name].")) var/obj/structure/transit_tube/R = new build_type(loc, dir) transfer_fingerprints_to(R) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 1d1d5028d00..ffa855ac1c2 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -98,9 +98,9 @@ current_tube = tube var/datum/move_loop/engine = SSmove_manager.force_move_dir(src, dir, 0, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(engine, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/before_pipe_transfer) - RegisterSignal(engine, COMSIG_MOVELOOP_POSTPROCESS, .proc/after_pipe_transfer) - RegisterSignal(engine, COMSIG_PARENT_QDELETING, .proc/engine_finish) + RegisterSignal(engine, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(before_pipe_transfer)) + RegisterSignal(engine, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_pipe_transfer)) + RegisterSignal(engine, COMSIG_PARENT_QDELETING, PROC_REF(engine_finish)) calibrate_engine(engine) /obj/structure/transit_tube_pod/proc/before_pipe_transfer(datum/move_loop/move/source) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index b11a4ebae38..81db9bc0d04 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -26,7 +26,7 @@ spark_system.attach(src) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered + COMSIG_ATOM_ENTERED = PROC_REF(on_entered) ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/votingbox.dm b/code/game/objects/structures/votingbox.dm index 18b07dfcf8e..71e4c954dca 100644 --- a/code/game/objects/structures/votingbox.dm +++ b/code/game/objects/structures/votingbox.dm @@ -173,7 +173,7 @@ results[text] = 1 else results[text] += 1 - sortTim(results, cmp=/proc/cmp_numeric_dsc, associative = TRUE) + sortTim(results, cmp = GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE) if(!COOLDOWN_FINISHED(src, vote_print_cooldown)) return COOLDOWN_START(src, vote_print_cooldown, 60 SECONDS) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 3852bc3267f..a5a75d7b7df 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -36,7 +36,7 @@ air_update_turf(TRUE, TRUE) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a836f5ea6d6..2c5cf37210a 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -68,12 +68,12 @@ explosion_block = EXPLOSION_BLOCK_PROC flags_1 |= ALLOW_DARK_PAINTS_1 - RegisterSignal(src, COMSIG_OBJ_PAINTED, .proc/on_painted) + RegisterSignal(src, COMSIG_OBJ_PAINTED, PROC_REF(on_painted)) AddElement(/datum/element/atmos_sensitive, mapload) - AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM, AfterRotation = CALLBACK(src,.proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -203,13 +203,13 @@ if(!(flags_1&NODECONSTRUCT_1) && !(reinf && state >= RWINDOW_FRAME_BOLTED)) if(I.tool_behaviour == TOOL_SCREWDRIVER) to_chat(user, span_notice("You begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...")) - if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) + if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) set_anchored(!anchored) to_chat(user, span_notice("You [anchored ? "fasten the window to":"unfasten the window from"] the floor.")) return else if(I.tool_behaviour == TOOL_WRENCH && !anchored) to_chat(user, span_notice("You begin to disassemble [src]...")) - if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount) if (!QDELETED(G)) G.add_fingerprint(user) @@ -219,7 +219,7 @@ return else if(I.tool_behaviour == TOOL_CROWBAR && reinf && (state == WINDOW_OUT_OF_FRAME) && anchored) to_chat(user, span_notice("You begin to lever the window into the frame...")) - if(I.use_tool(src, user, 100, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(I.use_tool(src, user, 100, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = RWINDOW_SECURE to_chat(user, span_notice("You pry the window into the frame.")) return @@ -405,7 +405,7 @@ if(tool.use_tool(src, user, 150, volume = 100)) to_chat(user, span_notice("The security screws are glowing white hot and look ready to be removed.")) state = RWINDOW_BOLTS_HEATED - addtimer(CALLBACK(src, .proc/cool_bolts), 300) + addtimer(CALLBACK(src, PROC_REF(cool_bolts)), 300) else if (tool.tool_behaviour) to_chat(user, span_warning("The security screws need to be heated first!")) diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 6829f9e8b79..919efac6385 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -120,7 +120,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction mined.update_visuals() @@ -620,7 +620,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) mined.update_visuals() /turf/closed/mineral/gibtonite/volcanic @@ -681,7 +681,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction mined.update_visuals() H.mind?.adjust_experience(/datum/skill/mining, 100) //yay! diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm index d1378c32707..57fbd9aab89 100644 --- a/code/game/turfs/open/floor/light_floor.dm +++ b/code/game/turfs/open/floor/light_floor.dm @@ -123,7 +123,7 @@ return if(!can_modify_colour) return FALSE - var/choice = show_radial_menu(user,src, lighttile_designs, custom_check = CALLBACK(src, .proc/check_menu, user, I), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user,src, lighttile_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, I), radius = 36, require_near = TRUE) if(!choice) return FALSE currentcolor = choice diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index b3759aae4b8..153283a657a 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr /turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker . = ..() overlays += GLOB.openspace_backdrop_one_for_all //Special grey square for projecting backdrop darkness filter on it. - RegisterSignal(src, COMSIG_ATOM_CREATED, .proc/on_atom_created) + RegisterSignal(src, COMSIG_ATOM_CREATED, PROC_REF(on_atom_created)) return INITIALIZE_HINT_LATELOAD /turf/open/openspace/LateInitialize() @@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr SIGNAL_HANDLER if(ismovable(created_atom)) //Drop it only when it's finished initializing, not before. - addtimer(CALLBACK(src, .proc/zfall_if_on_turf, created_atom), 0 SECONDS) + addtimer(CALLBACK(src, PROC_REF(zfall_if_on_turf), created_atom), 0 SECONDS) /turf/open/openspace/proc/zfall_if_on_turf(atom/movable/movable) if(QDELETED(movable) || movable.loc != src) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index da8810fc8be..dc413e77579 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -467,7 +467,7 @@ GLOBAL_LIST_EMPTY(station_turfs) var/list/things = src_object.contents() var/datum/progressbar/progress = new(user, things.len, src) - while (do_after(usr, 1 SECONDS, src, NONE, FALSE, CALLBACK(src_object, /datum/component/storage.proc/mass_remove_from_storage, src, things, progress))) + while (do_after(usr, 1 SECONDS, src, NONE, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress))) stoplag(1) progress.end_progress() diff --git a/code/game/world.dm b/code/game/world.dm index 48bc87a35ca..2b65356d9ac 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -100,11 +100,11 @@ GLOBAL_VAR(restart_counter) CONFIG_SET(number/round_end_countdown, 0) var/datum/callback/cb #ifdef UNIT_TESTS - cb = CALLBACK(GLOBAL_PROC, /proc/RunUnitTests) + cb = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(RunUnitTests)) #else cb = VARSET_CALLBACK(SSticker, force_ending, TRUE) #endif - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, cb, 10 SECONDS)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), cb, 10 SECONDS)) /world/proc/SetupLogs() diff --git a/code/modules/NTNet/netdata.dm b/code/modules/NTNet/netdata.dm index 3ba782ff96e..04224033356 100644 --- a/code/modules/NTNet/netdata.dm +++ b/code/modules/NTNet/netdata.dm @@ -14,7 +14,7 @@ server_id = conn.hardware_id server_network = conn.network.network_id src.port = port - RegisterSignal(conn, COMSIG_COMPONENT_NTNET_PORT_DESTROYED, .proc/_server_disconnected) + RegisterSignal(conn, COMSIG_COMPONENT_NTNET_PORT_DESTROYED, PROC_REF(_server_disconnected)) ..() /datum/netlink/proc/_server_disconnected(datum/component/com) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 938c47e27f6..116dedf6c70 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -109,7 +109,7 @@ return GLOB.stickybanadminexemptions[ckey] = world.time stoplag() // sleep a byond tick - GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, /proc/restore_stickybans), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE) + GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(restore_stickybans)), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE) return var/list/ban = ..() //default pager ban stuff diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7d1ebcaaa61..fbeb9898463 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -198,7 +198,7 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/cmd_admin_debug_traitor_objectives, /client/proc/spawn_debug_full_crew, ) -GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) +GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, GLOBAL_PROC_REF(release))) GLOBAL_PROTECT(admin_verbs_possess) GLOBAL_LIST_INIT(admin_verbs_permissions, list(/client/proc/edit_admin_permissions)) GLOBAL_PROTECT(admin_verbs_permissions) @@ -709,7 +709,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(!istype(T)) to_chat(src, span_notice("You can only give a disease to a mob of type /mob/living."), confidential = TRUE) return - var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in sort_list(SSdisease.diseases, /proc/cmp_typepaths_asc) + var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in sort_list(SSdisease.diseases, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!D) return T.ForceContractDisease(new D, FALSE, TRUE) diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 87b05cb320f..efe1db537fc 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -108,7 +108,7 @@ GLOBAL_VAR(antag_prototypes) GLOB.antag_prototypes[cat_id] = list(A) else GLOB.antag_prototypes[cat_id] += A - sortTim(GLOB.antag_prototypes,/proc/cmp_text_asc,associative=TRUE) + sortTim(GLOB.antag_prototypes, GLOBAL_PROC_REF(cmp_text_asc), associative = TRUE) var/list/sections = list() var/list/priority_sections = list() diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm index 1c0581c0282..fb5d4c427f9 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -96,7 +96,7 @@ all_antagonists -= X sections += T.antag_listing_entry() - sortTim(all_antagonists, /proc/cmp_antag_category) + sortTim(all_antagonists, GLOBAL_PROC_REF(cmp_antag_category)) var/current_category var/list/current_section = list() diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 79640e37d41..7a7fb3130b7 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -19,7 +19,7 @@ /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item, /obj/item/reagent_containers, /obj/item/gun) - var/path = input("Select the path of the object you wish to create.", "Path", /obj) in sort_list(create_object_forms, /proc/cmp_typepaths_asc) + var/path = input("Select the path of the object you wish to create.", "Path", /obj) in sort_list(create_object_forms, GLOBAL_PROC_REF(cmp_typepaths_asc)) var/html_form = create_object_forms[path] if (!html_form) diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 54442c2a1ae..0d90ddb63ab 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -38,7 +38,7 @@ /datum/greyscale_modify_menu/New(atom/target, client/user, list/allowed_configs, datum/callback/apply_callback, starting_icon_state="", starting_config, starting_colors) src.target = target src.user = user - src.apply_callback = apply_callback || CALLBACK(src, .proc/DefaultApply) + src.apply_callback = apply_callback || CALLBACK(src, PROC_REF(DefaultApply)) icon_state = starting_icon_state SetupConfigOwner() @@ -58,7 +58,7 @@ ReadColorsFromString(starting_colors || target?.greyscale_colors) if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/ui_close) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(ui_close)) refresh_preview() @@ -237,12 +237,12 @@ This is highly likely to cause massive amounts of lag as every object in the gam if(config) UnregisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED) config = new_config - RegisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED, .proc/queue_refresh) + RegisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED, PROC_REF(queue_refresh)) /datum/greyscale_modify_menu/proc/queue_refresh() SIGNAL_HANDLER refreshing = TRUE - addtimer(CALLBACK(src, .proc/refresh_preview), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(refresh_preview)), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/greyscale_modify_menu/proc/refresh_preview() for(var/i in length(split_colors) + 1 to config.expected_colors) diff --git a/code/modules/admin/smites/berforate.dm b/code/modules/admin/smites/berforate.dm index a2bcd8747fc..3d05afd519d 100644 --- a/code/modules/admin/smites/berforate.dm +++ b/code/modules/admin/smites/berforate.dm @@ -46,7 +46,7 @@ var/shots_this_limb = 0 for (var/_iter_turf in shuffle(open_adj_turfs)) var/turf/iter_turf = _iter_turf - addtimer(CALLBACK(GLOBAL_PROC, .proc/firing_squad, dude, iter_turf, limb.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(firing_squad), dude, iter_turf, limb.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter) delay_counter += delay_per_shot shots_this_limb += 1 if (shots_this_limb > shots_per_limb_per_rep) diff --git a/code/modules/admin/smites/bread.dm b/code/modules/admin/smites/bread.dm index 2bdd34155e1..3e75b31614b 100644 --- a/code/modules/admin/smites/bread.dm +++ b/code/modules/admin/smites/bread.dm @@ -9,6 +9,6 @@ var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread") var/mutable_appearance/transform_scanline = mutable_appearance('icons/effects/effects.dmi', "transform_effect") target.transformation_animation(bread_appearance,time = BREADIFY_TIME, transform_overlay=transform_scanline, reset_after=TRUE) - addtimer(CALLBACK(GLOBAL_PROC, .proc/breadify, target), BREADIFY_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(breadify), target), BREADIFY_TIME) #undef BREADIFY_TIME diff --git a/code/modules/admin/smites/nugget.dm b/code/modules/admin/smites/nugget.dm index 4d3ed826a7b..1851e2e461a 100644 --- a/code/modules/admin/smites/nugget.dm +++ b/code/modules/admin/smites/nugget.dm @@ -15,7 +15,7 @@ var/obj/item/bodypart/limb = _limb if (limb.body_part == HEAD || limb.body_part == CHEST) continue - addtimer(CALLBACK(limb, /obj/item/bodypart/.proc/dismember), timer) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, carbon_target, 'sound/effects/cartoon_pop.ogg', 70), timer) - addtimer(CALLBACK(carbon_target, /mob/living/.proc/spin, 4, 1), timer - 0.4 SECONDS) + addtimer(CALLBACK(limb, TYPE_PROC_REF(/obj/item/bodypart, dismember)), timer) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), carbon_target, 'sound/effects/cartoon_pop.ogg', 70), timer) + addtimer(CALLBACK(carbon_target, TYPE_PROC_REF(/mob/living, spin), 4, 1), timer - 0.4 SECONDS) timer += 2 SECONDS diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm index 459c6d7ecb3..85af1765539 100644 --- a/code/modules/admin/tag.dm +++ b/code/modules/admin/tag.dm @@ -10,7 +10,7 @@ return LAZYADD(tagged_datums, target_datum) - RegisterSignal(target_datum, COMSIG_PARENT_QDELETING, .proc/handle_tagged_del, override = TRUE) + RegisterSignal(target_datum, COMSIG_PARENT_QDELETING, PROC_REF(handle_tagged_del), override = TRUE) to_chat(owner, span_notice("[target_datum] has been tagged.")) /// Get ahead of the curve with deleting diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ec28ee787aa..96bf6857598 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -589,7 +589,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdome1)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 1)") @@ -615,7 +615,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdome2)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 2)") @@ -638,7 +638,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdomeadmin)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Admin.)") @@ -668,7 +668,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdomeobserve)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Observer.)") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 88eff5d9406..a3044bb37e4 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -493,7 +493,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null options |= SDQL2_OPTION_SEQUENTIAL /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/SDQL2/SDQL_spells/spells.dm b/code/modules/admin/verbs/SDQL2/SDQL_spells/spells.dm index 093e4e8dd16..ee167d712a4 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_spells/spells.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_spells/spells.dm @@ -6,7 +6,7 @@ /obj/effect/proc_holder/spell/aimed/sdql/Initialize(mapload, new_owner, giver) . = ..() AddComponent(/datum/component/sdql_executor, giver) - RegisterSignal(src, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) + RegisterSignal(src, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) /obj/effect/proc_holder/spell/aimed/sdql/proc/on_projectile_hit(source, firer, target) SIGNAL_HANDLER @@ -137,7 +137,7 @@ for(var/V in hand_var_overrides) if(attached_hand.vars[V]) attached_hand.vv_edit_var(V, hand_var_overrides[V]) - RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK, .proc/on_touch_attack) + RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_touch_attack)) user.update_inv_hands() /obj/effect/proc_holder/spell/targeted/touch/sdql/proc/on_touch_attack(source, target, user) diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index a2cc2b106f1..e3bff55dc7a 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -491,7 +491,7 @@ if(!holder) return - var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/weather), /proc/cmp_typepaths_asc) + var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/weather), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!weather_type) return @@ -519,7 +519,7 @@ var/mob/living/marked_mob = holder.marked_datum - var/ability_type = input("Choose an ability", "Ability") as null|anything in sort_list(subtypesof(/datum/action/cooldown/mob_cooldown), /proc/cmp_typepaths_asc) + var/ability_type = input("Choose an ability", "Ability") as null|anything in sort_list(subtypesof(/datum/action/cooldown/mob_cooldown), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!ability_type) return diff --git a/code/modules/admin/verbs/ai_triumvirate.dm b/code/modules/admin/verbs/ai_triumvirate.dm index 1cc7c01a8a0..ca7ebfe7cc4 100644 --- a/code/modules/admin/verbs/ai_triumvirate.dm +++ b/code/modules/admin/verbs/ai_triumvirate.dm @@ -11,7 +11,7 @@ GLOBAL_DATUM(triple_ai_controller, /datum/triple_ai_controller) /datum/triple_ai_controller/New() . = ..() - RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, .proc/on_occupations_divided) + RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, PROC_REF(on_occupations_divided)) /datum/triple_ai_controller/proc/on_occupations_divided(datum/source) SIGNAL_HANDLER diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 2cb8d1a0f04..7d8144875f7 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -6,6 +6,6 @@ if(!SSticker) return - var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as null|anything in sort_list(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc) + var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as null|anything in sort_list(subtypesof(/datum/cinematic), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(choice) Cinematic(initial(choice.id),world,null) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2fbcb87e1bf..f0a0cc4669d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -45,7 +45,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that tgui_alert(usr,"Wait until the game starts") return log_admin("[key_name(src)] has robotized [M.key].") - INVOKE_ASYNC(M, /mob.proc/Robotize) + INVOKE_ASYNC(M, TYPE_PROC_REF(/mob, Robotize)) /client/proc/makepAI(turf/T in GLOB.mob_list) set category = "Admin.Fun" @@ -559,7 +559,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set desc = "Display del's log of everything that's passed through it." var/list/dellog = list("List of things that have gone through qdel this round

    ") - sortTim(SSgarbage.items, cmp=/proc/cmp_qdel_item_time, associative = TRUE) + sortTim(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]
      " @@ -699,7 +699,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/queries = list() for(var/i in 1 to val) var/datum/db_query/query = SSdbcore.NewQuery("NULL") - INVOKE_ASYNC(query, /datum/db_query.proc/Execute) + INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/db_query, Execute)) queries += query for(var/datum/db_query/query as anything in queries) @@ -788,9 +788,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set desc = "Shows tracked profiling info from code lines that support it" var/sortlist = list( - "Avg time" = /proc/cmp_profile_avg_time_dsc, - "Total Time" = /proc/cmp_profile_time_dsc, - "Call Count" = /proc/cmp_profile_count_dsc + "Avg time" = GLOBAL_PROC_REF(cmp_profile_avg_time_dsc), + "Total Time" = GLOBAL_PROC_REF(cmp_profile_time_dsc), + "Call Count" = GLOBAL_PROC_REF(cmp_profile_count_dsc) ) var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist if (!sort) @@ -848,7 +848,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/sorted = list() for (var/source in per_source) sorted += list(list("source" = source, "count" = per_source[source])) - sorted = sortTim(sorted, .proc/cmp_timer_data) + sorted = sortTim(sorted, GLOBAL_PROC_REF(cmp_timer_data)) // Now that everything is sorted, compile them into an HTML output var/output = "" diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm index 66386b831f1..ac97514a67d 100644 --- a/code/modules/admin/verbs/ert.dm +++ b/code/modules/admin/verbs/ert.dm @@ -78,9 +78,9 @@ ertemplate = new /datum/ert/centcom_official var/list/settings = list( - "preview_callback" = CALLBACK(src, .proc/makeERTPreviewIcon), + "preview_callback" = CALLBACK(src, PROC_REF(makeERTPreviewIcon)), "mainsettings" = list( - "template" = list("desc" = "Template", "callback" = CALLBACK(src, .proc/makeERTTemplateModified), "type" = "datum", "path" = "/datum/ert", "subtypesonly" = TRUE, "value" = ertemplate.type), + "template" = list("desc" = "Template", "callback" = CALLBACK(src, PROC_REF(makeERTTemplateModified)), "type" = "datum", "path" = "/datum/ert", "subtypesonly" = TRUE, "value" = ertemplate.type), "teamsize" = list("desc" = "Team Size", "type" = "number", "value" = ertemplate.teamsize), "mission" = list("desc" = "Mission", "type" = "string", "value" = ertemplate.mission), "polldesc" = list("desc" = "Ghost poll description", "type" = "string", "value" = ertemplate.polldesc), @@ -160,7 +160,7 @@ var/mob/dead/observer/potential_leader = i candidate_living_exps[potential_leader] = potential_leader.client?.get_exp_living(TRUE) - candidate_living_exps = sort_list(candidate_living_exps, cmp=/proc/cmp_numeric_dsc) + candidate_living_exps = sort_list(candidate_living_exps, cmp = GLOBAL_PROC_REF(cmp_numeric_dsc)) if(candidate_living_exps.len > ERT_EXPERIENCED_LEADER_CHOOSE_TOP) candidate_living_exps = candidate_living_exps.Cut(ERT_EXPERIENCED_LEADER_CHOOSE_TOP+1) // pick from the top ERT_EXPERIENCED_LEADER_CHOOSE_TOP contenders in playtime earmarked_leader = pick(candidate_living_exps) diff --git a/code/modules/admin/verbs/hiddenprints.dm b/code/modules/admin/verbs/hiddenprints.dm index 2d87e404498..7b42601ffd2 100644 --- a/code/modules/admin/verbs/hiddenprints.dm +++ b/code/modules/admin/verbs/hiddenprints.dm @@ -14,7 +14,7 @@ if(!length(hiddenprints)) hiddenprints = list("Nobody has touched this yet!") - hiddenprints = sort_list(hiddenprints, /proc/cmp_hiddenprint_lasttime_dsc) + hiddenprints = sort_list(hiddenprints, GLOBAL_PROC_REF(cmp_hiddenprint_lasttime_dsc)) for(var/record in hiddenprints) interface += "
    • [record]

      • " diff --git a/code/modules/admin/verbs/highlander_datum.dm b/code/modules/admin/verbs/highlander_datum.dm index e7e19746e01..bd0a60a848d 100644 --- a/code/modules/admin/verbs/highlander_datum.dm +++ b/code/modules/admin/verbs/highlander_datum.dm @@ -9,7 +9,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) /datum/highlander_controller/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/new_highlander) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_highlander)) sound_to_playing_players('sound/misc/highlander.ogg') send_to_playing_players(span_boldannounce("THERE CAN BE ONLY ONE")) for(var/obj/item/disk/nuclear/nuke_disk as anything in SSpoints_of_interest.real_nuclear_disks) @@ -36,7 +36,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) robot.gib() continue robot.make_scottish() - addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 1), 50) + addtimer(CALLBACK(SSshuttle.emergency, TYPE_PROC_REF(/obj/docking_port/mobile/emergency, request), null, 1), 50) /datum/highlander_controller/Destroy(force, ...) . = ..() @@ -88,7 +88,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) send_to_playing_players(span_userdanger("Bagpipes begin to blare. You feel Scottish pride coming over you.")) message_admins(span_adminnotice("[key_name_admin(usr)] used (delayed) THERE CAN BE ONLY ONE!")) log_admin("[key_name(usr)] used delayed THERE CAN BE ONLY ONE.") - addtimer(CALLBACK(src, .proc/only_one, TRUE), 42 SECONDS) + addtimer(CALLBACK(src, PROC_REF(only_one), TRUE), 42 SECONDS) /mob/living/proc/make_scottish() return diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm index 2b0942c95be..f22c5fe4b42 100644 --- a/code/modules/admin/verbs/individual_logging.dm +++ b/code/modules/admin/verbs/individual_logging.dm @@ -56,7 +56,7 @@ for(var/entry in all_the_entrys) concatenated_logs += "[entry]
      [all_the_entrys[entry]]" if(length(concatenated_logs)) - sortTim(concatenated_logs, cmp = /proc/cmp_text_dsc) //Sort by timestamp. + sortTim(concatenated_logs, cmp = GLOBAL_PROC_REF(cmp_text_dsc)) //Sort by timestamp. dat += "" dat += concatenated_logs.Join("
      ") dat += "      " diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index d10ec67d139..c2112c224d1 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -51,6 +51,6 @@ set desc = "Give this guy possess/release verbs" set category = "Debug" set name = "Give Possessing Verbs" - add_verb(M, /proc/possess) - add_verb(M, /proc/release) + add_verb(M, GLOBAL_PROC_REF(possess)) + add_verb(M, GLOBAL_PROC_REF(release)) SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Possessing Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index bbe3e590202..f7ce65abfd7 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -225,7 +225,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control E = DC.runEvent() if("Choose") - var/virus = input("Choose the virus to spread", "BIOHAZARD") as null|anything in sort_list(typesof(/datum/disease), /proc/cmp_typepaths_asc) + var/virus = input("Choose the virus to spread", "BIOHAZARD") as null|anything in sort_list(typesof(/datum/disease), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control var/datum/round_event/disease_outbreak/DO = DC.runEvent() DO.virus_type = virus @@ -428,9 +428,9 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) var/ghostcandidates = list() for (var/j in 1 to min(prefs["amount"]["value"], length(candidates))) ghostcandidates += pick_n_take(candidates) - addtimer(CALLBACK(GLOBAL_PROC, .proc/doPortalSpawn, get_random_station_turf(), pathToSpawn, length(ghostcandidates), storm, ghostcandidates, outfit), i*prefs["delay"]["value"]) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(doPortalSpawn), get_random_station_turf(), pathToSpawn, length(ghostcandidates), storm, ghostcandidates, outfit), i*prefs["delay"]["value"]) else if (prefs["playersonly"]["value"] != "Yes") - addtimer(CALLBACK(GLOBAL_PROC, .proc/doPortalSpawn, get_random_station_turf(), pathToSpawn, prefs["amount"]["value"], storm, null, outfit), i*prefs["delay"]["value"]) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(doPortalSpawn), get_random_station_turf(), pathToSpawn, prefs["amount"]["value"], storm, null, outfit), i*prefs["delay"]["value"]) if("changebombcap") if(!is_funmin) return @@ -451,7 +451,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) log_admin("[key_name_admin(holder)] made everyone into monkeys.") for(var/i in GLOB.human_list) var/mob/living/carbon/human/H = i - INVOKE_ASYNC(H, /mob/living/carbon.proc/monkeyize) + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon, monkeyize)) if("traitor_all") if(!is_funmin) return @@ -621,7 +621,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) /datum/everyone_is_a_traitor_controller/New(objective) src.objective = objective - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/make_traitor) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(make_traitor)) /datum/everyone_is_a_traitor_controller/Destroy() UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm index 9f0aee07d32..09759c72c6f 100644 --- a/code/modules/admin/view_variables/topic_basic.dm +++ b/code/modules/admin/view_variables/topic_basic.dm @@ -56,11 +56,11 @@ if(!check_rights(NONE)) return var/list/names = list() - var/list/componentsubtypes = sort_list(subtypesof(/datum/component), /proc/cmp_typepaths_asc) + var/list/componentsubtypes = sort_list(subtypesof(/datum/component), GLOBAL_PROC_REF(cmp_typepaths_asc)) names += "---Components---" names += componentsubtypes names += "---Elements---" - names += sort_list(subtypesof(/datum/element), /proc/cmp_typepaths_asc) + names += sort_list(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/result = tgui_input_list(usr, "Choose a component/element to add", "Add Component", names) if(isnull(result)) return @@ -97,10 +97,10 @@ var/list/names = list() names += "---Components---" if(length(components)) - names += sort_list(components, /proc/cmp_typepaths_asc) + names += sort_list(components, GLOBAL_PROC_REF(cmp_typepaths_asc)) names += "---Elements---" // We have to list every element here because there is no way to know what element is on this object without doing some sort of hack. - names += sort_list(subtypesof(/datum/element), /proc/cmp_typepaths_asc) + names += sort_list(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/path = tgui_input_list(usr, "Choose a component/element to remove. All elements listed here may not be on the datum.", "Remove element", names) if(isnull(path)) return diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 8a04dda49f8..bda89556d6f 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -156,8 +156,8 @@ GLOBAL_LIST_EMPTY(antagonists) info_button.Trigger() apply_innate_effects() give_antag_moodies() - RegisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT, .proc/pre_mindshield) - RegisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED, .proc/on_mindshield) + RegisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT, PROC_REF(pre_mindshield)) + RegisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED, PROC_REF(on_mindshield)) if(is_banned(owner.current) && replace_banned) replace_banned_player() else if(owner.current.client?.holder && (CONFIG_GET(flag/auto_deadmin_antagonists) || owner.current.client.prefs?.toggles & DEADMIN_ANTAGONIST)) diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm index 1087369f2f7..516631e8f50 100644 --- a/code/modules/antagonists/_common/antag_hud.dm +++ b/code/modules/antagonists/_common/antag_hud.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc RegisterSignal( mind, list(COMSIG_ANTAGONIST_GAINED, COMSIG_ANTAGONIST_REMOVED), - .proc/update_antag_hud_images + PROC_REF(update_antag_hud_images) ) check_processing() diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index eedc2314789..fa9270478e8 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -49,7 +49,7 @@ . = ..() if(used || polling || !ishuman(usr)) return - INVOKE_ASYNC(src, .proc/poll_for_student, usr, params["school"]) + INVOKE_ASYNC(src, PROC_REF(poll_for_student), usr, params["school"]) SStgui.close_uis(src) /obj/item/antag_spawner/contract/proc/poll_for_student(mob/living/carbon/human/teacher, apprentice_school) diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 041c471c169..7d646f6299f 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(possible_abductor_names, list("Alpha","Beta","Gamma","Delta","E /datum/antagonist/abductor/get_admin_commands() . = ..() - .["Equip"] = CALLBACK(src,.proc/admin_equip) + .["Equip"] = CALLBACK(src, PROC_REF(admin_equip)) /datum/antagonist/abductor/proc/admin_equip(mob/admin) if(!ishuman(owner.current)) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 2be0af405e8..94a1428dea3 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -670,7 +670,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} user.visible_message(span_notice("[user] places down [src] and activates it."), span_notice("You place down [src] and activate it.")) user.dropItemToGround(src) playsound(src, 'sound/machines/terminal_alert.ogg', 50) - addtimer(CALLBACK(src, .proc/try_spawn_machine), 30) + addtimer(CALLBACK(src, PROC_REF(try_spawn_machine)), 30) /obj/item/abductor_machine_beacon/proc/try_spawn_machine() var/viable = FALSE @@ -819,7 +819,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/structure/table/optable/abductor/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index a9bc69343f6..7a71134ca38 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -69,7 +69,7 @@ update_gland_hud() var/atom/movable/screen/alert/mind_control/mind_alert = owner.throw_alert(ALERT_MIND_CONTROL, /atom/movable/screen/alert/mind_control) mind_alert.command = command - addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + addtimer(CALLBACK(src, PROC_REF(clear_mind_control)), mind_control_duration) return TRUE /obj/item/organ/heart/gland/proc/clear_mind_control() diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index 6c15d82e336..3f9d3bff4be 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -19,7 +19,7 @@ owner.visible_message(span_danger("[owner]'s skin starts emitting electric arcs!"),\ span_warning("You feel electric energy building up inside you!")) playsound(get_turf(owner), "sparks", 100, TRUE, -1, SHORT_RANGE_SOUND_EXTRARANGE) - addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) + addtimer(CALLBACK(src, PROC_REF(zap)), rand(30, 100)) /obj/item/organ/heart/gland/electric/proc/zap() tesla_zap(owner, 4, 8000, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN) diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 3845462d736..74d340a9165 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -157,7 +157,7 @@ else to_chat(owner, span_warning("You feel a weird rumble behind your eye sockets...")) - addtimer(CALLBACK(src, .proc/finish_replace_eyes), rand(100, 200)) + addtimer(CALLBACK(src, PROC_REF(finish_replace_eyes)), rand(100, 200)) /obj/item/organ/heart/gland/heal/proc/finish_replace_eyes() var/eye_type = /obj/item/organ/eyes @@ -175,7 +175,7 @@ else to_chat(owner, span_warning("You feel a weird tingle in your [parse_zone(body_zone)]... even if you don't have one.")) - addtimer(CALLBACK(src, .proc/finish_replace_limb, body_zone), rand(150, 300)) + addtimer(CALLBACK(src, PROC_REF(finish_replace_limb), body_zone), rand(150, 300)) /obj/item/organ/heart/gland/heal/proc/finish_replace_limb(body_zone) owner.visible_message(span_warning("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!"), @@ -205,7 +205,7 @@ if(owner.reagents.has_reagent(R.type)) keep_going = TRUE if(keep_going) - addtimer(CALLBACK(src, .proc/keep_replacing_blood), 30) + addtimer(CALLBACK(src, PROC_REF(keep_replacing_blood)), 30) /obj/item/organ/heart/gland/heal/proc/replace_chest(obj/item/bodypart/chest/chest) if(chest.status == BODYPART_ROBOTIC) diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm index d4777cd606e..0d9524f2214 100644 --- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm +++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm @@ -49,7 +49,7 @@ if(LAZYLEN(broadcasted_mobs)) active_mind_control = TRUE - addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + addtimer(CALLBACK(src, PROC_REF(clear_mind_control)), mind_control_duration) update_gland_hud() return TRUE diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm index 9dc1cc0f9c7..af12b42b1e6 100644 --- a/code/modules/antagonists/abductor/equipment/glands/plasma.dm +++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm @@ -9,8 +9,8 @@ /obj/item/organ/heart/gland/plasma/activate() to_chat(owner, span_warning("You feel bloated.")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, span_userdanger("A massive stomachache overcomes you.")), 150) - addtimer(CALLBACK(src, .proc/vomit_plasma), 200) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), owner, span_userdanger("A massive stomachache overcomes you.")), 150) + addtimer(CALLBACK(src, PROC_REF(vomit_plasma)), 200) /obj/item/organ/heart/gland/plasma/proc/vomit_plasma() if(!owner) diff --git a/code/modules/antagonists/abductor/equipment/glands/quantum.dm b/code/modules/antagonists/abductor/equipment/glands/quantum.dm index b43552085de..2342fead936 100644 --- a/code/modules/antagonists/abductor/equipment/glands/quantum.dm +++ b/code/modules/antagonists/abductor/equipment/glands/quantum.dm @@ -15,7 +15,7 @@ if(!iscarbon(M)) continue entangled_mob = M - addtimer(CALLBACK(src, .proc/quantum_swap), rand(600, 2400)) + addtimer(CALLBACK(src, PROC_REF(quantum_swap)), rand(600, 2400)) return /obj/item/organ/heart/gland/quantum/proc/quantum_swap() diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index b484056591f..515f181fc3c 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -38,7 +38,7 @@ /obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) new /obj/effect/temp_visual/teleport_abductor(place) - addtimer(CALLBACK(src, .proc/doMobToLoc, place, target), 80) + addtimer(CALLBACK(src, PROC_REF(doMobToLoc), place, target), 80) /obj/machinery/abductor/pad/proc/doPadToLoc(place) flick("alien-pad", src) @@ -48,7 +48,7 @@ /obj/machinery/abductor/pad/proc/PadToLoc(place) new /obj/effect/temp_visual/teleport_abductor(place) - addtimer(CALLBACK(src, .proc/doPadToLoc, place), 80) + addtimer(CALLBACK(src, PROC_REF(doPadToLoc), place), 80) /obj/effect/temp_visual/teleport_abductor name = "Huh" diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm index 88b436e22c8..609ebc3cc24 100644 --- a/code/modules/antagonists/ashwalker/ashwalker.dm +++ b/code/modules/antagonists/ashwalker/ashwalker.dm @@ -26,11 +26,11 @@ /datum/antagonist/ashwalker/on_body_transfer(mob/living/old_body, mob/living/new_body) . = ..() UnregisterSignal(old_body, COMSIG_MOB_EXAMINATE) - RegisterSignal(new_body, COMSIG_MOB_EXAMINATE, .proc/on_examinate) + RegisterSignal(new_body, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) /datum/antagonist/ashwalker/on_gain() . = ..() - RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, .proc/on_examinate) + RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) /datum/antagonist/ashwalker/on_removal() diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index 311451bd0c1..ffc969054a9 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -71,7 +71,7 @@ /datum/action/innate/blobpop/Grant(Target) . = ..() if(owner) - addtimer(CALLBACK(src, .proc/Activate, TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(Activate), TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE) to_chat(owner, "You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)].") /datum/action/innate/blobpop/Activate(timer_activated = FALSE) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index c0c92f1d986..b4455d1bd91 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) set_security_level("delta") max_blob_points = INFINITY blob_points = INFINITY - addtimer(CALLBACK(src, .proc/victory), 450) + addtimer(CALLBACK(src, PROC_REF(victory)), 450) else if(!free_strain_rerolls && (last_reroll_time + BLOB_POWER_REROLL_FREE_TIME[span_big("You have gained another free strain re-roll.")]") free_strain_rerolls = 1 diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 8f9560c80c0..4ce493bf708 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -123,8 +123,8 @@ var/mob/living/living_mob = mob_to_tweak handle_clown_mutation(living_mob, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - RegisterSignal(living_mob, COMSIG_MOB_LOGIN, .proc/on_login) - RegisterSignal(living_mob, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(living_mob, COMSIG_MOB_LOGIN, PROC_REF(on_login)) + RegisterSignal(living_mob, COMSIG_LIVING_LIFE, PROC_REF(on_life)) living_mob.hud_used?.lingchemdisplay.invisibility = 0 living_mob.hud_used?.lingchemdisplay.maptext = FORMAT_CHEM_CHARGES_TEXT(chem_charges) @@ -132,7 +132,7 @@ return var/mob/living/carbon/carbon_mob = mob_to_tweak - RegisterSignal(carbon_mob, list(COMSIG_MOB_MIDDLECLICKON, COMSIG_MOB_ALTCLICKON), .proc/on_click_sting) + RegisterSignal(carbon_mob, list(COMSIG_MOB_MIDDLECLICKON, COMSIG_MOB_ALTCLICKON), PROC_REF(on_click_sting)) // Brains are optional for lings. var/obj/item/organ/brain/our_ling_brain = carbon_mob.getorganslot(ORGAN_SLOT_BRAIN) @@ -224,7 +224,7 @@ if(!chosen_sting || clicked == ling || !istype(ling) || ling.stat != CONSCIOUS) return - INVOKE_ASYNC(chosen_sting, /datum/action/changeling/sting.proc/try_to_sting, ling, clicked) + INVOKE_ASYNC(chosen_sting, TYPE_PROC_REF(/datum/action/changeling/sting, try_to_sting), ling, clicked) return COMSIG_MOB_CANCEL_CLICKON @@ -608,7 +608,7 @@ /datum/antagonist/changeling/get_admin_commands() . = ..() if(stored_profiles.len && (owner.current.real_name != first_profile.name)) - .["Transform to initial appearance."] = CALLBACK(src,.proc/admin_restore_appearance) + .["Transform to initial appearance."] = CALLBACK(src, PROC_REF(admin_restore_appearance)) /* * Restores the appearance of the changeling to the original DNA. diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index a01fb9a7649..b2fb47ff358 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -20,7 +20,7 @@ user.visible_message(span_warning("[user] vomits a glob of acid on [user.p_their()] [O]!"), \ span_warning("We vomit acidic ooze onto our restraints!")) - addtimer(CALLBACK(src, .proc/dissolve_handcuffs, user, O), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_handcuffs), user, O), 30) used = TRUE if(user.legcuffed) @@ -30,7 +30,7 @@ user.visible_message(span_warning("[user] vomits a glob of acid on [user.p_their()] [O]!"), \ span_warning("We vomit acidic ooze onto our restraints!")) - addtimer(CALLBACK(src, .proc/dissolve_legcuffs, user, O), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_legcuffs), user, O), 30) used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) @@ -39,7 +39,7 @@ return FALSE user.visible_message(span_warning("[user] vomits a glob of acid across the front of [user.p_their()] [S]!"), \ span_warning("We vomit acidic ooze onto our straight jacket!")) - addtimer(CALLBACK(src, .proc/dissolve_straightjacket, user, S), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_straightjacket), user, S), 30) used = TRUE @@ -49,7 +49,7 @@ return FALSE C.visible_message(span_warning("[C]'s hinges suddenly begin to melt and run!")) to_chat(user, span_warning("We vomit acidic goop onto the interior of [C]!")) - addtimer(CALLBACK(src, .proc/open_closet, user, C), 70) + addtimer(CALLBACK(src, PROC_REF(open_closet), user, C), 70) used = TRUE if(istype(user.loc, /obj/structure/spider/cocoon) && !used) @@ -58,7 +58,7 @@ return FALSE C.visible_message(span_warning("[src] shifts and starts to fall apart!")) to_chat(user, span_warning("We secrete acidic enzymes from our skin and begin melting our cocoon...")) - addtimer(CALLBACK(src, .proc/dissolve_cocoon, user, C), 25) //Very short because it's just webs + addtimer(CALLBACK(src, PROC_REF(dissolve_cocoon), user, C), 25) //Very short because it's just webs used = TRUE ..() return used diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index 32c29c05105..e322aec6327 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -13,7 +13,7 @@ /datum/action/changeling/fakedeath/sting_action(mob/living/user) ..() if(revive_ready) - INVOKE_ASYNC(src, .proc/revive, user) + INVOKE_ASYNC(src, PROC_REF(revive), user) revive_ready = FALSE name = "Reviving Stasis" desc = "We fall into a stasis, allowing us to regenerate and trick our enemies." @@ -24,7 +24,7 @@ else to_chat(user, span_notice("We begin our stasis, preparing energy to arise once more.")) user.fakedeath("changeling") //play dead - addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(ready_to_regenerate), user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) return TRUE /datum/action/changeling/fakedeath/proc/revive(mob/living/user) diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index f0d08c2f31f..879686186a8 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -35,7 +35,7 @@ user.transfer_observers_to(user_turf) // user is about to be deleted, store orbiters on the turf user.gib() . = TRUE - addtimer(CALLBACK(src, .proc/spawn_headcrab, stored_mind, user_turf, organs), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawn_headcrab), stored_mind, user_turf, organs), 3 SECONDS) /datum/action/changeling/headcrab/proc/spawn_headcrab(datum/mind/stored_mind, turf/spawn_location, list/organs) var/mob/living/simple_animal/hostile/headcrab/crab = new(spawn_location) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 1d8719ee4ae..a991a1cb3c6 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -378,11 +378,11 @@ return BULLET_ACT_HIT if(firer_combat_mode) C.visible_message(span_danger("[L] is thrown towards [H] by a tentacle!"),span_userdanger("A tentacle grabs you and throws you towards [H]!")) - C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, .proc/tentacle_stab, H, C)) + C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, PROC_REF(tentacle_stab), H, C)) return BULLET_ACT_HIT else C.visible_message(span_danger("[L] is grabbed by [H]'s tentacle!"),span_userdanger("A tentacle grabs you and pulls you towards [H]!")) - C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, .proc/tentacle_grab, H, C)) + C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, PROC_REF(tentacle_grab), H, C)) return BULLET_ACT_HIT else diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm index aacac7a6b66..9e9db974d8c 100644 --- a/code/modules/antagonists/changeling/powers/strained_muscles.dm +++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm @@ -25,7 +25,7 @@ user.Paralyze(60) user.emote("gasp") - INVOKE_ASYNC(src, .proc/muscle_loop, user) + INVOKE_ASYNC(src, PROC_REF(muscle_loop), user) return TRUE diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 3841e2ae6d9..919d72969f3 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -146,7 +146,7 @@ target.visible_message(span_warning("A grotesque blade forms around [target.name]\'s arm!"), span_userdanger("Your arm twists and mutates, transforming into a horrific monstrosity!"), span_hear("You hear organic matter ripping and tearing!")) playsound(target, 'sound/effects/blobattack.ogg', 30, TRUE) - addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600) + addtimer(CALLBACK(src, PROC_REF(remove_fake), target, blade), 600) return TRUE /datum/action/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/melee/arm_blade/false/blade) @@ -218,7 +218,7 @@ /datum/action/changeling/sting/lsd/sting_action(mob/user, mob/living/carbon/target) log_combat(user, target, "stung", "LSD sting") - addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(300,600)) + addtimer(CALLBACK(src, PROC_REF(hallucination_time), target), rand(300,600)) return TRUE /datum/action/changeling/sting/lsd/proc/hallucination_time(mob/living/carbon/target) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index f846097a403..935a22f8f97 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -160,7 +160,7 @@ disguise_image.overlays = snap.overlays disguises[current_profile.name] = disguise_image - var/chosen_name = show_radial_menu(user, user, disguises, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE, tooltips = TRUE) + var/chosen_name = show_radial_menu(user, user, disguises, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE, tooltips = TRUE) if(!chosen_name) return diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index 8cca7534d0a..9c9bd8d5b8a 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -80,7 +80,7 @@ attack_verb_continuous_on = list("slips"), \ attack_verb_simple_on = list("slip"), \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/sword/bananium/on_transform(obj/item/source, mob/user, active) . = ..() @@ -232,7 +232,7 @@ /obj/item/clothing/mask/fakemoustache/sticky/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) - addtimer(CALLBACK(src, .proc/unstick), unstick_time) + addtimer(CALLBACK(src, PROC_REF(unstick)), unstick_time) /obj/item/clothing/mask/fakemoustache/sticky/proc/unstick() REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index df9db661adb..46bad7053b4 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -270,7 +270,7 @@ SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50)) var/image/C = image('icons/effects/cult/effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) - addtimer(CALLBACK(H,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_alt_appearance), "cult_apoc", TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) to_chat(ranged_ability_user,span_cult("[H] has been cursed with living nightmares!")) attached_action.charges-- attached_action.desc = attached_action.base_desc @@ -436,7 +436,7 @@ L.mob_light(_range = 2, _color = LIGHT_COLOR_HOLY_MAGIC, _duration = 10 SECONDS) var/mutable_appearance/forbearance = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER) L.add_overlay(forbearance) - addtimer(CALLBACK(L, /atom/proc/cut_overlay, forbearance), 100) + addtimer(CALLBACK(L, TYPE_PROC_REF(/atom, cut_overlay), forbearance), 100) if(istype(anti_magic_source, /obj/item)) var/obj/item/ams_object = anti_magic_source @@ -614,7 +614,7 @@ if(do_after(user, 90, target = candidate)) candidate.undeploy() candidate.emp_act(EMP_HEAVY) - var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return if(QDELETED(candidate)) @@ -814,7 +814,7 @@ "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/guns/ballistic.dmi', icon_state = "arcane_barrage"), "Blood Beam (500)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "disintegrate") ) - var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) to_chat(user, span_cultitalic("You decide against conducting a greater blood rite.")) return diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 73f75f770b2..453cb689f8a 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -184,9 +184,9 @@ /datum/antagonist/cult/get_admin_commands() . = ..() - .["Dagger"] = CALLBACK(src,.proc/admin_give_dagger) - .["Dagger and Metal"] = CALLBACK(src,.proc/admin_give_metal) - .["Remove Dagger and Metal"] = CALLBACK(src, .proc/admin_take_all) + .["Dagger"] = CALLBACK(src, PROC_REF(admin_give_dagger)) + .["Dagger and Metal"] = CALLBACK(src, PROC_REF(admin_give_metal)) + .["Remove Dagger and Metal"] = CALLBACK(src, PROC_REF(admin_take_all)) /datum/antagonist/cult/proc/admin_give_dagger(mob/admin) if(!equip_cultist(metal=FALSE)) @@ -356,9 +356,9 @@ update_explanation_text() // Register a bunch of signals to both the target mind and its body // to stop cult from softlocking everytime the target is deleted before being actually sacrificed. - RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/on_mind_transfer) - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transfer)) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) else message_admins("Cult Sacrifice: Could not find unconvertible or convertible target. WELP!") sacced = TRUE // Prevents another hypothetical softlock. This basically means every PC is a cultist. @@ -371,30 +371,30 @@ /datum/objective/sacrifice/proc/on_target_body_del() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/find_target) + INVOKE_ASYNC(src, PROC_REF(find_target)) /datum/objective/sacrifice/proc/on_mind_transfer(datum/source, mob/previous_body) SIGNAL_HANDLER //If, for some reason, the mind was transferred to a ghost (better safe than sorry), find a new target. if(!isliving(target.current)) - INVOKE_ASYNC(src, .proc/find_target) + INVOKE_ASYNC(src, PROC_REF(find_target)) return UnregisterSignal(previous_body, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) /datum/objective/sacrifice/proc/on_possible_mindswap(mob/source) SIGNAL_HANDLER UnregisterSignal(target.current, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) //we check if the mind is bodyless only after mindswap shenanigeans to avoid issues. - addtimer(CALLBACK(src, .proc/do_we_have_a_body), 0 SECONDS) + addtimer(CALLBACK(src, PROC_REF(do_we_have_a_body)), 0 SECONDS) /datum/objective/sacrifice/proc/do_we_have_a_body() if(!target.current) //The player was ghosted and the mind isn't probably going to be transferred to another mob at this point. find_target() return - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) /datum/objective/sacrifice/check_completion() return sacced || completed diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 25d38de519b..6a2b1498b94 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -202,7 +202,7 @@ S.release_shades(owner) B.current.setDir(SOUTH) new /obj/effect/temp_visual/cult/blood(final) - addtimer(CALLBACK(B.current, /mob/.proc/reckon, final), 10) + addtimer(CALLBACK(B.current, TYPE_PROC_REF(/mob, reckon), final), 10) else return antag.cult_team.reckoning_complete = TRUE @@ -288,7 +288,7 @@ C.cult_team.blood_target = target var/area/A = get_area(target) attached_action.cooldown = world.time + attached_action.base_cooldown - addtimer(CALLBACK(attached_action.owner, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown) + addtimer(CALLBACK(attached_action.owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown) C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER) C.cult_team.blood_target_image.appearance_flags = RESET_COLOR C.cult_team.blood_target_image.pixel_x = -target.pixel_x @@ -300,7 +300,7 @@ B.current.client.images += C.cult_team.blood_target_image attached_action.owner.update_action_buttons_icon() remove_ranged_ability(span_cult("The marking rite is complete! It will last for 90 seconds.")) - C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target,C.cult_team), 900, TIMER_STOPPABLE) + C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target), C.cult_team), 900, TIMER_STOPPABLE) return TRUE return FALSE @@ -368,7 +368,7 @@ var/atom/atom_target = target var/area/A = get_area(atom_target) cooldown = world.time + base_cooldown - addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown) C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', atom_target, "glow", ABOVE_MOB_LAYER) C.cult_team.blood_target_image.appearance_flags = RESET_COLOR C.cult_team.blood_target_image.pixel_x = -atom_target.pixel_x @@ -385,8 +385,8 @@ desc = "Remove the Blood Mark you previously set." button_icon_state = "emp" owner.update_action_buttons_icon() - C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target,C.cult_team), base_cooldown, TIMER_STOPPABLE) - addtimer(CALLBACK(src, .proc/reset_button), base_cooldown) + C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target), C.cult_team), base_cooldown, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(reset_button)), base_cooldown) //////// ELDRITCH PULSE ///////// @@ -478,4 +478,4 @@ attached_action.cooldown = world.time + attached_action.base_cooldown remove_ranged_ability(span_cult("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")) caller.update_action_buttons_icon() - addtimer(CALLBACK(caller, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown) + addtimer(CALLBACK(caller, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index ead6fb8d4c6..0155239175f 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -282,7 +282,7 @@ Striking a noncultist, however, will tear their flesh."} sword.spinning = TRUE sword.block_chance = 100 sword.slowdown += 1.5 - addtimer(CALLBACK(src, .proc/stop_spinning), 50) + addtimer(CALLBACK(src, PROC_REF(stop_spinning)), 50) holder.update_action_buttons_icon() /datum/action/innate/cult/spin2win/proc/stop_spinning() @@ -444,7 +444,7 @@ Striking a noncultist, however, will tear their flesh."} hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield /obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding() - AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged)) + AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged))) /// A proc for callback when the shield breaks, since cult robes are stupid and have different effects /obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges) @@ -585,7 +585,7 @@ Striking a noncultist, however, will tear their flesh."} if(totalcurses >= MAX_SHUTTLE_CURSES && (world.time < first_curse_time + SHUTTLE_CURSE_OMFG_TIMESPAN)) var/omfg_message = pick_list(CULT_SHUTTLE_CURSE, "omfg_announce") || "LEAVE US ALONE!" - addtimer(CALLBACK(GLOBAL_PROC, .proc/priority_announce, omfg_message, "Priority Alert", 'sound/misc/notice1.ogg', null, "Nanotrasen Department of Transportation: Central Command"), rand(2 SECONDS, 6 SECONDS)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(priority_announce), omfg_message, "Priority Alert", 'sound/misc/notice1.ogg', null, "Nanotrasen Department of Transportation: Central Command"), rand(2 SECONDS, 6 SECONDS)) for(var/mob/iter_player as anything in GLOB.player_list) if(IS_CULTIST(iter_player)) iter_player.client?.give_award(/datum/award/achievement/misc/cult_shuttle_omfg, iter_player) @@ -724,8 +724,8 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/melee/cultblade/halberd/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/melee/cultblade/halberd/ComponentInitialize() . = ..() @@ -916,11 +916,11 @@ Striking a noncultist, however, will tear their flesh."} qdel(src) return charging = TRUE - INVOKE_ASYNC(src, .proc/charge, user) + INVOKE_ASYNC(src, PROC_REF(charge), user) if(do_after(user, 9 SECONDS, target = user)) firing = TRUE ADD_TRAIT(user, TRAIT_IMMOBILIZED, CULT_TRAIT) - INVOKE_ASYNC(src, .proc/pewpew, user, clickparams) + INVOKE_ASYNC(src, PROC_REF(pewpew), user, clickparams) var/obj/structure/emergency_shield/cult/weak/N = new(user.loc) if(do_after(user, 9 SECONDS, target = user)) user.Paralyze(40) @@ -1035,7 +1035,7 @@ Striking a noncultist, however, will tear their flesh."} playsound(src, 'sound/weapons/parry.ogg', 100, TRUE) if(illusions > 0) illusions-- - addtimer(CALLBACK(src, /obj/item/shield/mirror.proc/readd), 450) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/shield/mirror, readd)), 450) if(prob(60)) var/mob/living/simple_animal/hostile/illusion/M = new(owner.loc) M.faction = list("cult") diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index bfe1514dc7e..dc1af41afd7 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -150,7 +150,7 @@ user, src, choices, - custom_check = CALLBACK(src, .proc/check_menu, user), + custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE, ) diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm index fe10b3a8193..ef8f2179e0b 100644 --- a/code/modules/antagonists/cult/rune_spawn_action.dm +++ b/code/modules/antagonists/cult/rune_spawn_action.dm @@ -57,7 +57,7 @@ cooldown = base_cooldown + world.time owner.update_action_buttons_icon() - addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown) var/list/health if(damage_interrupt && isliving(owner)) var/mob/living/L = owner @@ -66,7 +66,7 @@ if(istype(T, /turf/open/floor/engine/cult)) scribe_mod *= 0.5 playsound(T, 'sound/magic/enter_blood.ogg', 100, FALSE) - if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt))) + if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, TYPE_PROC_REF(/mob, break_do_after_checks), health, action_interrupt))) new rune_type(owner.loc, chosen_keyword) else qdel(R1) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 65dea559cdc..45afdbc07dc 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -180,7 +180,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/oldcolor = color color = rgb(255, 0, 0) animate(src, color = oldcolor, time = 5) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5) //Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user. /obj/effect/rune/malformed @@ -245,7 +245,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() do_sacrifice(L, invokers) animate(src, color = oldcolor, time = 5) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5) Cult_team.check_size() // Triggers the eye glow or aura effects if the cult has grown large enough relative to the crew rune_in_use = FALSE @@ -483,7 +483,7 @@ structure_check() searches for nearby cultist structures required for the invoca outer_portal = new(T, 600, color) set_light_range(4) update_light() - addtimer(CALLBACK(src, .proc/close_portal), 600, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(close_portal)), 600, TIMER_UNIQUE) /obj/effect/rune/teleport/proc/close_portal() qdel(inner_portal) @@ -963,11 +963,11 @@ structure_check() searches for nearby cultist structures required for the invoca if(ishuman(M)) if(!IS_CULTIST(M)) AH.remove_hud_from(M) - addtimer(CALLBACK(GLOBAL_PROC, .proc/hudFix, M), duration) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(hudFix), M), duration) var/image/A = image('icons/mob/cult.dmi',M,"cultist", ABOVE_MOB_LAYER) A.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"human_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "human_apoc", TRUE), duration) images += A SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/voice/ghost_whisper.ogg'),sound('sound/misc/ghosty_wind.ogg'))) else @@ -975,13 +975,13 @@ structure_check() searches for nearby cultist structures required for the invoca var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER) B.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"mob_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "mob_apoc", TRUE), duration) images += B if(!IS_CULTIST(M)) if(M.client) var/image/C = image('icons/effects/cult/effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "cult_apoc", TRUE), duration) images += C else to_chat(M, span_cultlarge("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 5b2513dd6b1..d9341cec740 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -71,7 +71,7 @@ the new instance inside the host to be updated to the template's stats. browser = new /datum/browser(src, "disease_menu", "Adaptation Menu", 1000, 770, src) freemove_end = world.time + FREEMOVE_TIME - freemove_end_timerid = addtimer(CALLBACK(src, .proc/infect_random_patient_zero), FREEMOVE_TIME, TIMER_STOPPABLE) + freemove_end_timerid = addtimer(CALLBACK(src, PROC_REF(infect_random_patient_zero)), FREEMOVE_TIME, TIMER_STOPPABLE) /mob/camera/disease/Destroy() . = ..() @@ -288,7 +288,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/proc/set_following(mob/living/L) if(following_host) UnregisterSignal(following_host, COMSIG_MOVABLE_MOVED) - RegisterSignal(L, COMSIG_MOVABLE_MOVED, .proc/follow_mob) + RegisterSignal(L, COMSIG_MOVABLE_MOVED, PROC_REF(follow_mob)) following_host = L follow_mob() @@ -329,7 +329,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/proc/adapt_cooldown() to_chat(src, span_notice("You have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].")) next_adaptation_time = world.time + adaptation_cooldown - addtimer(CALLBACK(src, .proc/notify_adapt_ready), adaptation_cooldown) + addtimer(CALLBACK(src, PROC_REF(notify_adapt_ready)), adaptation_cooldown) /mob/camera/disease/proc/notify_adapt_ready() to_chat(src, span_notice("You are now ready to adapt again.")) diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index 11d11b115b7..ff7af744e49 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -40,9 +40,9 @@ /datum/antagonist/gang/get_admin_commands() . = ..() - .["Give extra equipment"] = CALLBACK(src, .proc/equip_gangster_in_inventory) + .["Give extra equipment"] = CALLBACK(src, PROC_REF(equip_gangster_in_inventory)) if(!starter_gangster) - .["Make Leader"] = CALLBACK(src, .proc/make_gangster_leader) + .["Make Leader"] = CALLBACK(src, PROC_REF(make_gangster_leader)) /datum/antagonist/gang/proc/make_gangster_leader() if(starter_gangster) diff --git a/code/modules/antagonists/gang/handler.dm b/code/modules/antagonists/gang/handler.dm index 8b99124eeaa..d2258260906 100644 --- a/code/modules/antagonists/gang/handler.dm +++ b/code/modules/antagonists/gang/handler.dm @@ -172,7 +172,7 @@ GLOBAL_VAR(families_override_theme) // see /datum/antagonist/gang/create_team() for how the gang team datum gets instantiated and added to our gangs list - addtimer(CALLBACK(src, .proc/announce_gang_locations), 5 MINUTES) + addtimer(CALLBACK(src, PROC_REF(announce_gang_locations)), 5 MINUTES) return TRUE /** diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index 9746aa033ff..1c531e1fdc8 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -174,7 +174,7 @@ gain_knowledge(starting_knowledge) GLOB.reality_smash_track.add_tracked_mind(owner) - addtimer(CALLBACK(src, .proc/passive_influence_gain), passive_gain_timer) // Gain +1 knowledge every 20 minutes. + addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer) // Gain +1 knowledge every 20 minutes. return ..() /datum/antagonist/heretic/on_removal() @@ -191,9 +191,9 @@ var/mob/living/our_mob = mob_override || owner.current handle_clown_mutation(our_mob, "Ancient knowledge described to you has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") our_mob.faction |= FACTION_HERETIC - RegisterSignal(our_mob, COMSIG_MOB_PRE_CAST_SPELL, .proc/on_spell_cast) - RegisterSignal(our_mob, COMSIG_MOB_ITEM_AFTERATTACK, .proc/on_item_afterattack) - RegisterSignal(our_mob, COMSIG_MOB_LOGIN, .proc/fix_influence_network) + RegisterSignal(our_mob, COMSIG_MOB_PRE_CAST_SPELL, PROC_REF(on_spell_cast)) + RegisterSignal(our_mob, COMSIG_MOB_ITEM_AFTERATTACK, PROC_REF(on_item_afterattack)) + RegisterSignal(our_mob, COMSIG_MOB_LOGIN, PROC_REF(fix_influence_network)) /datum/antagonist/heretic/remove_innate_effects(mob/living/mob_override) var/mob/living/our_mob = mob_override || owner.current @@ -252,7 +252,7 @@ if(QDELETED(offhand) || !istype(offhand, /obj/item/melee/touch_attack/mansus_fist)) return - try_draw_rune(source, target, additional_checks = CALLBACK(src, .proc/check_mansus_grasp_offhand, source)) + try_draw_rune(source, target, additional_checks = CALLBACK(src, PROC_REF(check_mansus_grasp_offhand), source)) return COMPONENT_CANCEL_ATTACK_CHAIN /** @@ -278,7 +278,7 @@ target_turf.balloon_alert(user, "already drawing a rune!") return - INVOKE_ASYNC(src, .proc/draw_rune, user, target_turf, drawing_time, additional_checks) + INVOKE_ASYNC(src, PROC_REF(draw_rune), user, target_turf, drawing_time, additional_checks) /** * The actual process of drawing a rune. @@ -368,7 +368,7 @@ knowledge_points++ if(owner.current.stat <= SOFT_CRIT) to_chat(owner.current, "[span_hear("You hear a whisper...")] [span_hypnophrase(pick(strings(HERETIC_INFLUENCE_FILE, "drain_message")))]") - addtimer(CALLBACK(src, .proc/passive_influence_gain), passive_gain_timer) + addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer) /datum/antagonist/heretic/roundend_report() var/list/parts = list() @@ -415,12 +415,12 @@ var/obj/item/organ/our_living_heart = owner.current?.getorganslot(living_heart_organ_slot) if(our_living_heart) if(HAS_TRAIT(our_living_heart, TRAIT_LIVING_HEART)) - .["Add Heart Target (Marked Mob)"] = CALLBACK(src, .proc/add_marked_as_target) - .["Remove Heart Target"] = CALLBACK(src, .proc/remove_target) + .["Add Heart Target (Marked Mob)"] = CALLBACK(src, PROC_REF(add_marked_as_target)) + .["Remove Heart Target"] = CALLBACK(src, PROC_REF(remove_target)) else - .["Give Living Heart"] = CALLBACK(src, .proc/give_living_heart) + .["Give Living Heart"] = CALLBACK(src, PROC_REF(give_living_heart)) - .["Adjust Knowledge Points"] = CALLBACK(src, .proc/admin_change_points) + .["Adjust Knowledge Points"] = CALLBACK(src, PROC_REF(admin_change_points)) /* * Admin proc for giving a heretic a Living Heart easily. diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index 28fb4b1a13d..4ff399a4781 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -219,7 +219,7 @@ loc.balloon_alert(user, "ritual failed, no fingerprints!") return FALSE - var/chosen_mob = tgui_input_list(user, "Select the person you wish to curse", "Eldritch Curse", sort_list(compiled_list, /proc/cmp_mob_realname_dsc)) + var/chosen_mob = tgui_input_list(user, "Select the person you wish to curse", "Eldritch Curse", sort_list(compiled_list, GLOBAL_PROC_REF(cmp_mob_realname_dsc))) if(isnull(chosen_mob)) return FALSE @@ -230,7 +230,7 @@ log_combat(user, to_curse, "cursed via heretic ritual", addition = "([name])") curse(to_curse) - addtimer(CALLBACK(src, .proc/uncurse, to_curse), duration) + addtimer(CALLBACK(src, PROC_REF(uncurse), to_curse), duration) return TRUE /** diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm index e9e61e99128..42a5d2b04e3 100644 --- a/code/modules/antagonists/heretic/heretic_living_heart.dm +++ b/code/modules/antagonists/heretic/heretic_living_heart.dm @@ -32,7 +32,7 @@ action.Grant(organ_parent.owner) ADD_TRAIT(parent, TRAIT_LIVING_HEART, REF(src)) - RegisterSignal(parent, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) // It's not technically visible, // but the organ sprite shows up in the action @@ -134,7 +134,7 @@ owner, owner, targets_to_choose, - custom_check = CALLBACK(src, .proc/check_menu), + custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 40, require_near = TRUE, tooltips = TRUE, diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index b75d9b501d9..e70f6d51b4d 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -125,7 +125,7 @@ /obj/effect/visible_heretic_influence/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/show_presence), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(show_presence)), 15 SECONDS) var/image/silicon_image = image('icons/effects/eldritch.dmi', src, null, OBJ_LAYER) silicon_image.override = TRUE @@ -231,7 +231,7 @@ if(being_drained) balloon_alert(user, "already being drained!") else - INVOKE_ASYNC(src, .proc/drain_influence, user, 1) + INVOKE_ASYNC(src, PROC_REF(drain_influence), user, 1) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN @@ -244,7 +244,7 @@ if(!being_drained && istype(weapon, /obj/item/codex_cicatrix)) var/obj/item/codex_cicatrix/codex = weapon codex.open_animation() - INVOKE_ASYNC(src, .proc/drain_influence, user, 2) + INVOKE_ASYNC(src, PROC_REF(drain_influence), user, 2) return TRUE @@ -258,7 +258,7 @@ being_drained = TRUE balloon_alert(user, "draining influence...") - RegisterSignal(user, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(user, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) if(!do_after(user, 10 SECONDS, src)) being_drained = FALSE diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm index 91d415cdea6..415ad3d9162 100644 --- a/code/modules/antagonists/heretic/items/forbidden_book.dm +++ b/code/modules/antagonists/heretic/items/forbidden_book.dm @@ -49,7 +49,7 @@ icon_state = "[base_icon_state]_open" flick("[base_icon_state]_opening", src) - addtimer(CALLBACK(src, .proc/close_animation), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(close_animation)), 5 SECONDS) /* * Plays a closing animation and resets the icon state. diff --git a/code/modules/antagonists/heretic/items/hunter_rifle.dm b/code/modules/antagonists/heretic/items/hunter_rifle.dm index d12ff4236ea..111ff5cf3e3 100644 --- a/code/modules/antagonists/heretic/items/hunter_rifle.dm +++ b/code/modules/antagonists/heretic/items/hunter_rifle.dm @@ -78,7 +78,7 @@ animate(reticle, fire_time * 0.5, transform = turn(reticle.transform, 180)) currently_aiming = TRUE - . = do_after(user, fire_time, target, IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, .proc/check_fire_callback, target, user)) + . = do_after(user, fire_time, target, IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_fire_callback), target, user)) currently_aiming = FALSE animate(reticle, 0.5 SECONDS, alpha = 0) diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index 5c66a0e7d32..cc34bd7e380 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -63,7 +63,7 @@ route = PATH_ASH /datum/heretic_knowledge/ashen_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/ashen_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -113,8 +113,8 @@ route = PATH_ASH /datum/heretic_knowledge/ash_mark/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/ash_mark/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_BLADE_ATTACK)) @@ -184,7 +184,7 @@ /datum/heretic_knowledge/ash_blade_upgrade/on_gain(mob/user) . = ..() - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/ash_blade_upgrade/on_lose(mob/user) . = ..() diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index e5af4b4630a..8506dc4e4bb 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -76,7 +76,7 @@ route = PATH_FLESH /datum/heretic_knowledge/limited_amount/flesh_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/limited_amount/flesh_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -108,7 +108,7 @@ log_game("[key_name(source)] created a ghoul, controlled by [key_name(human_target)].") message_admins("[ADMIN_LOOKUPFLW(source)] created a ghoul, [ADMIN_LOOKUPFLW(human_target)].") - RegisterSignal(human_target, COMSIG_LIVING_DEATH, .proc/remove_ghoul) + RegisterSignal(human_target, COMSIG_LIVING_DEATH, PROC_REF(remove_ghoul)) human_target.revive(full_heal = TRUE, admin_revive = TRUE) human_target.setMaxHealth(GHOUL_MAX_HEALTH) human_target.health = GHOUL_MAX_HEALTH @@ -197,7 +197,7 @@ selected_atoms -= soon_to_be_ghoul LAZYADD(created_items, WEAKREF(soon_to_be_ghoul)) - RegisterSignal(soon_to_be_ghoul, COMSIG_LIVING_DEATH, .proc/remove_ghoul) + RegisterSignal(soon_to_be_ghoul, COMSIG_LIVING_DEATH, PROC_REF(remove_ghoul)) return TRUE /datum/heretic_knowledge/limited_amount/flesh_ghoul/proc/remove_ghoul(mob/living/carbon/human/source) @@ -225,8 +225,8 @@ route = PATH_FLESH /datum/heretic_knowledge/flesh_mark/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/flesh_mark/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_BLADE_ATTACK)) @@ -291,7 +291,7 @@ route = PATH_FLESH /datum/heretic_knowledge/flesh_blade_upgrade/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/flesh_blade_upgrade/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 86fa5a82e87..a835098c0ae 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -63,8 +63,8 @@ route = PATH_RUST /datum/heretic_knowledge/rust_fist/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, .proc/on_secondary_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, PROC_REF(on_secondary_mansus_grasp)) /datum/heretic_knowledge/rust_fist/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY)) @@ -97,8 +97,8 @@ route = PATH_RUST /datum/heretic_knowledge/rust_regen/on_gain(mob/user) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/heretic_knowledge/rust_regen/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_LIFE)) @@ -153,8 +153,8 @@ route = PATH_RUST /datum/heretic_knowledge/rust_mark/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/rust_mark/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_BLADE_ATTACK)) @@ -212,7 +212,7 @@ route = PATH_RUST /datum/heretic_knowledge/rust_blade_upgrade/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/rust_blade_upgrade/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK) @@ -281,8 +281,8 @@ . = ..() priority_announce("[generate_heretic_text()] Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) new /datum/rust_spread(loc) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) user.client?.give_award(/datum/award/achievement/misc/rust_ascension, user) /** diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index f5414b7e0e6..725b7d377a2 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -38,7 +38,7 @@ if(!heretic_level_generated) heretic_level_generated = TRUE message_admins("Generating z-level for heretic sacrifices...") - INVOKE_ASYNC(src, .proc/generate_heretic_z_level) + INVOKE_ASYNC(src, PROC_REF(generate_heretic_z_level)) /// Generate the sacrifice z-level. /datum/heretic_knowledge/hunt_and_sacrifice/proc/generate_heretic_z_level() @@ -225,8 +225,8 @@ sac_target.do_jitter_animation(100) log_combat(heretic_mind.current, sac_target, "sacrificed") - addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation, 100), SACRIFICE_SLEEP_DURATION * (1/3)) - addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation, 100), SACRIFICE_SLEEP_DURATION * (2/3)) + addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 100), SACRIFICE_SLEEP_DURATION * (1/3)) + addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 100), SACRIFICE_SLEEP_DURATION * (2/3)) // If our target is dead, try to revive them // and if we fail to revive them, don't proceede the chain @@ -241,7 +241,7 @@ sac_target.AdjustParalyzed(SACRIFICE_SLEEP_DURATION * 1.2) sac_target.AdjustImmobilized(SACRIFICE_SLEEP_DURATION * 1.2) - addtimer(CALLBACK(src, .proc/after_target_sleeps, sac_target, destination), SACRIFICE_SLEEP_DURATION * 0.5) // Teleport to the minigame + addtimer(CALLBACK(src, PROC_REF(after_target_sleeps), sac_target, destination), SACRIFICE_SLEEP_DURATION * 0.5) // Teleport to the minigame return TRUE @@ -279,10 +279,10 @@ to_chat(sac_target, span_big(span_hypnophrase("Unnatural forces begin to claw at your every being from beyond the veil."))) sac_target.apply_status_effect(/datum/status_effect/unholy_determination, SACRIFICE_REALM_DURATION) - addtimer(CALLBACK(src, .proc/after_target_wakes, sac_target), SACRIFICE_SLEEP_DURATION * 0.5) // Begin the minigame + addtimer(CALLBACK(src, PROC_REF(after_target_wakes), sac_target), SACRIFICE_SLEEP_DURATION * 0.5) // Begin the minigame - RegisterSignal(sac_target, COMSIG_MOVABLE_Z_CHANGED, .proc/on_target_escape) // Cheese condition - RegisterSignal(sac_target, COMSIG_LIVING_DEATH, .proc/on_target_death) // Loss condition + RegisterSignal(sac_target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_target_escape)) // Cheese condition + RegisterSignal(sac_target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death)) // Loss condition /** * This proc is called from [proc/after_target_sleeps] when the [sac_target] should be waking up. @@ -315,9 +315,9 @@ to_chat(sac_target, span_reallybig(span_hypnophrase("The grasp of the Mansus reveal themselves to you!"))) to_chat(sac_target, span_hypnophrase("You feel invigorated! Fight to survive!")) // When it runs out, let them know they're almost home free - addtimer(CALLBACK(src, .proc/after_helgrasp_ends, sac_target), helgrasp_time) + addtimer(CALLBACK(src, PROC_REF(after_helgrasp_ends), sac_target), helgrasp_time) // Win condition - var/win_timer = addtimer(CALLBACK(src, .proc/return_target, sac_target), SACRIFICE_REALM_DURATION, TIMER_STOPPABLE) + var/win_timer = addtimer(CALLBACK(src, PROC_REF(return_target), sac_target), SACRIFICE_REALM_DURATION, TIMER_STOPPABLE) LAZYSET(return_timers, REF(sac_target), win_timer) /** diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index bafe83bdfa6..7379010eb5e 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -71,7 +71,7 @@ route = PATH_VOID /datum/heretic_knowledge/void_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/void_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -127,8 +127,8 @@ route = PATH_VOID /datum/heretic_knowledge/void_mark/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/void_mark/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_BLADE_ATTACK)) @@ -187,7 +187,7 @@ /datum/heretic_knowledge/void_blade_upgrade/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK, .proc/on_ranged_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK, PROC_REF(on_ranged_eldritch_blade)) /datum/heretic_knowledge/void_blade_upgrade/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK) @@ -201,7 +201,7 @@ var/dir = angle2dir(dir2angle(get_dir(user, target)) + 180) user.forceMove(get_step(target, dir)) - INVOKE_ASYNC(src, .proc/follow_up_attack, user, target) + INVOKE_ASYNC(src, PROC_REF(follow_up_attack), user, target) /datum/heretic_knowledge/void_blade_upgrade/proc/follow_up_attack(mob/living/user, mob/living/target) var/obj/item/melee/sickly_blade/blade = user.get_active_held_item() @@ -255,8 +255,8 @@ // Let's get this show on the road! sound_loop = new(user, TRUE, TRUE) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) - RegisterSignal(user, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) + RegisterSignal(user, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /datum/heretic_knowledge/final/void_final/on_lose(mob/user) on_death() // Losing is pretty much dying. I think diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm index 3b19438a0e7..9f1748c68bb 100644 --- a/code/modules/antagonists/heretic/magic/ash_ascension.dm +++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm @@ -22,7 +22,7 @@ . = ..() current_user = user has_fire_ring = TRUE - addtimer(CALLBACK(src, .proc/remove, user), duration, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(remove), user), duration, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/effect/proc_holder/spell/targeted/fire_sworn/proc/remove() has_fire_ring = FALSE @@ -58,7 +58,7 @@ action_background_icon_state = "bg_ecult" /obj/effect/proc_holder/spell/aoe_turf/fire_cascade/cast(list/targets, mob/user = usr) - INVOKE_ASYNC(src, .proc/fire_cascade, user, range) + INVOKE_ASYNC(src, PROC_REF(fire_cascade), user, range) /obj/effect/proc_holder/spell/aoe_turf/fire_cascade/proc/fire_cascade(atom/centre, max_range) playsound(get_turf(centre), 'sound/items/welder.ogg', 75, TRUE) @@ -94,15 +94,15 @@ for(var/X in targets) var/T T = line_target(-25, range, X, user) - INVOKE_ASYNC(src, .proc/fire_line, user, T) + INVOKE_ASYNC(src, PROC_REF(fire_line), user, T) T = line_target(10, range, X, user) - INVOKE_ASYNC(src, .proc/fire_line, user, T) + INVOKE_ASYNC(src, PROC_REF(fire_line), user, T) T = line_target(0, range, X, user) - INVOKE_ASYNC(src, .proc/fire_line, user, T) + INVOKE_ASYNC(src, PROC_REF(fire_line), user, T) T = line_target(-10, range, X, user) - INVOKE_ASYNC(src, .proc/fire_line, user, T) + INVOKE_ASYNC(src, PROC_REF(fire_line), user, T) T = line_target(25, range, X, user) - INVOKE_ASYNC(src, .proc/fire_line, user, T) + INVOKE_ASYNC(src, PROC_REF(fire_line), user, T) return ..() /obj/effect/proc_holder/spell/pointed/ash_final/proc/line_target(offset, range, atom/at , atom/user) diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm index c936805383a..09cb9dffea1 100644 --- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm +++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm @@ -21,7 +21,7 @@ . = ..() AddComponent(/datum/component/effect_remover, \ success_feedback = "You remove %THEEFFECT.", \ - on_clear_callback = CALLBACK(src, .proc/after_clear_rune), \ + on_clear_callback = CALLBACK(src, PROC_REF(after_clear_rune)), \ effects_we_clear = list(/obj/effect/heretic_rune)) /* diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm index c092cb3b070..dd65c1e4da3 100644 --- a/code/modules/antagonists/heretic/structures/carving_knife.dm +++ b/code/modules/antagonists/heretic/structures/carving_knife.dm @@ -59,7 +59,7 @@ if(is_type_in_typecache(target, blacklisted_turfs)) return - INVOKE_ASYNC(src, .proc/try_carve_rune, target, user) + INVOKE_ASYNC(src, PROC_REF(try_carve_rune), target, user) /* * Begin trying to carve a rune. Go through a few checks, then call do_carve_rune if successful. diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm index bb500b3b7e8..b5163cb2ba8 100644 --- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm +++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm @@ -117,7 +117,7 @@ balloon_alert(user, "not full enough!") return TRUE - INVOKE_ASYNC(src, .proc/show_radial, user) + INVOKE_ASYNC(src, PROC_REF(show_radial), user) return TRUE /* diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm index 4029296ffb7..78713e475b4 100644 --- a/code/modules/antagonists/heretic/transmutation_rune.dm +++ b/code/modules/antagonists/heretic/transmutation_rune.dm @@ -36,7 +36,7 @@ /obj/effect/heretic_rune/interact(mob/living/user) . = ..() - INVOKE_ASYNC(src, .proc/try_rituals, user) + INVOKE_ASYNC(src, PROC_REF(try_rituals), user) return TRUE /** diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index 360d664f6bd..f45c6b816dc 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -96,7 +96,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, signalCache) - RegisterSignal(user, signalCache, .proc/disrupt) + RegisterSignal(user, signalCache, PROC_REF(disrupt)) listeningTo = user /obj/item/borg_chameleon/proc/deactivate(mob/living/silicon/robot/user) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 870017faa7f..8abc6d0f151 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -473,7 +473,7 @@ GLOBAL_VAR(station_nuke_source) sound_to_playing_players('sound/machines/alarm.ogg') if(SSticker?.mode) SSticker.roundend_check_paused = TRUE - addtimer(CALLBACK(src, .proc/actually_explode), 100) + addtimer(CALLBACK(src, PROC_REF(actually_explode)), 100) /obj/machinery/nuclearbomb/proc/actually_explode() if(!core) @@ -512,10 +512,10 @@ GLOBAL_VAR(station_nuke_source) var/turf/bomb_location = get_turf(src) Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src)) if(off_station == STATION_DESTROYED_NUKE) - INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnStation) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(KillEveryoneOnStation)) return if(off_station != NUKE_NEAR_MISS) // Don't kill people in the station if the nuke missed, even if we are technically on the same z-level - INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, bomb_location.z) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(KillEveryoneOnZLevel), bomb_location.z) /obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station) if(off_station < NUKE_NEAR_MISS) @@ -558,10 +558,10 @@ GLOBAL_VAR(station_nuke_source) disarm() return if(is_station_level(bomb_location.z)) - addtimer(CALLBACK(src, .proc/really_actually_explode), 110) + addtimer(CALLBACK(src, PROC_REF(really_actually_explode)), 110) else visible_message(span_notice("[src] fizzes ominously.")) - addtimer(CALLBACK(src, .proc/local_foam), 110) + addtimer(CALLBACK(src, PROC_REF(local_foam)), 110) /obj/machinery/nuclearbomb/beer/proc/disarm() detonation_timer = null @@ -754,8 +754,8 @@ This is here to make the tiles around the station mininuke change when it's arme user.visible_message(span_suicide("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/machines/alarm.ogg', 50, -1, TRUE) for(var/i in 1 to 100) - addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 101) + addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101) return MANUAL_SUICIDE /obj/item/disk/nuclear/proc/manual_suicide(mob/living/user) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 927db80dd0c..02dff9f8eeb 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -150,8 +150,8 @@ /datum/antagonist/nukeop/get_admin_commands() . = ..() - .["Send to base"] = CALLBACK(src,.proc/admin_send_to_base) - .["Tell code"] = CALLBACK(src,.proc/admin_tell_code) + .["Send to base"] = CALLBACK(src, PROC_REF(admin_send_to_base)) + .["Tell code"] = CALLBACK(src, PROC_REF(admin_tell_code)) /datum/antagonist/nukeop/proc/admin_send_to_base(mob/admin) owner.current.forceMove(pick(GLOB.nukeop_start)) @@ -262,7 +262,7 @@ H.put_in_hands(dukinuki, TRUE) nuke_team.war_button_ref = WEAKREF(dukinuki) - addtimer(CALLBACK(src, .proc/nuketeam_name_assign), 1) + addtimer(CALLBACK(src, PROC_REF(nuketeam_name_assign)), 1) /datum/antagonist/nukeop/leader/proc/nuketeam_name_assign() if(!nuke_team) diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index da06bb31546..422fb8dc115 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -84,7 +84,7 @@ //Lists notable loot. if(!cargo_hold || !cargo_hold.total_report) return "Nothing" - cargo_hold.total_report.total_value = sortTim(cargo_hold.total_report.total_value, cmp = /proc/cmp_numeric_dsc, associative = TRUE) + cargo_hold.total_report.total_value = sortTim(cargo_hold.total_report.total_value, cmp = GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE) var/count = 0 var/list/loot_texts = list() for(var/datum/export/E in cargo_hold.total_report.total_value) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index f72a5716eb0..9b77bca762e 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -80,7 +80,7 @@ AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/overload(null)) AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/blight(null)) AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction(null)) - RegisterSignal(src, COMSIG_LIVING_BANED, .proc/on_baned) + RegisterSignal(src, COMSIG_LIVING_BANED, PROC_REF(on_baned)) random_revenant_name() /mob/living/simple_animal/revenant/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE, no_hands = FALSE, floor_okay=FALSE) @@ -199,7 +199,7 @@ span_revendanger("As [weapon] passes through you, you feel your essence draining away!")) inhibited = TRUE update_action_buttons_icon() - addtimer(CALLBACK(src, .proc/reset_inhibit), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_inhibit)), 3 SECONDS) /mob/living/simple_animal/revenant/proc/reset_inhibit() inhibited = FALSE @@ -400,7 +400,7 @@ /obj/item/ectoplasm/revenant/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/try_reform), 600) + addtimer(CALLBACK(src, PROC_REF(try_reform)), 600) /obj/item/ectoplasm/revenant/proc/scatter() qdel(src) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 8250450a4d4..0daf0ba91fe 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -208,7 +208,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - INVOKE_ASYNC(src, .proc/overload, T, user) + INVOKE_ASYNC(src, PROC_REF(overload), T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload(turf/T, mob/user) for(var/obj/machinery/light/L in T) @@ -219,7 +219,7 @@ s.set_up(4, 0, L) s.start() new /obj/effect/temp_visual/revenant(get_turf(L)) - addtimer(CALLBACK(src, .proc/overload_shock, L, user), 20) + addtimer(CALLBACK(src, PROC_REF(overload_shock), L, user), 20) /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload_shock(obj/machinery/light/L, mob/user) if(!L.on) //wait, wait, don't shock me @@ -249,7 +249,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - INVOKE_ASYNC(src, .proc/defile, T) + INVOKE_ASYNC(src, PROC_REF(defile), T) /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T) for(var/obj/effect/blessing/B in T) @@ -300,7 +300,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - INVOKE_ASYNC(src, .proc/malfunction, T, user) + INVOKE_ASYNC(src, PROC_REF(malfunction), T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/proc/malfunction(turf/T, mob/user) for(var/mob/living/simple_animal/bot/bot in T) @@ -343,7 +343,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - INVOKE_ASYNC(src, .proc/blight, T, user) + INVOKE_ASYNC(src, PROC_REF(blight), T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/proc/blight(turf/T, mob/user) for(var/mob/living/mob in T) diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index defe4a6c851..d6289ca5577 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -67,4 +67,4 @@ affected_mob.dna.species.handle_hair(affected_mob,"#1d2953") affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) - addtimer(CALLBACK(src, .proc/cure), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(cure)), 10 SECONDS) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 9822e213ae6..d8b84215091 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -99,7 +99,7 @@ /datum/antagonist/rev/get_admin_commands() . = ..() - .["Promote"] = CALLBACK(src,.proc/admin_promote) + .["Promote"] = CALLBACK(src, PROC_REF(admin_promote)) /datum/antagonist/rev/proc/admin_promote(mob/admin) var/datum/mind/O = owner @@ -119,10 +119,10 @@ /datum/antagonist/rev/head/get_admin_commands() . = ..() . -= "Promote" - .["Take flash"] = CALLBACK(src,.proc/admin_take_flash) - .["Give flash"] = CALLBACK(src,.proc/admin_give_flash) - .["Repair flash"] = CALLBACK(src,.proc/admin_repair_flash) - .["Demote"] = CALLBACK(src,.proc/admin_demote) + .["Take flash"] = CALLBACK(src, PROC_REF(admin_take_flash)) + .["Give flash"] = CALLBACK(src, PROC_REF(admin_give_flash)) + .["Repair flash"] = CALLBACK(src, PROC_REF(admin_repair_flash)) + .["Demote"] = CALLBACK(src, PROC_REF(admin_demote)) /datum/antagonist/rev/head/proc/admin_take_flash(mob/admin) var/list/L = owner.current.get_contents() @@ -349,7 +349,7 @@ var/datum/antagonist/rev/R = M.has_antag_datum(/datum/antagonist/rev) R.objectives |= objectives - addtimer(CALLBACK(src,.proc/update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)) /datum/team/revolution/proc/head_revolutionaries() . = list() @@ -381,7 +381,7 @@ var/datum/antagonist/rev/rev = new_leader.has_antag_datum(/datum/antagonist/rev) rev.promote() - addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)) /datum/team/revolution/proc/save_members() ex_headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE) diff --git a/code/modules/antagonists/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm index 7b64a38c1f5..747ac290e3c 100644 --- a/code/modules/antagonists/separatist/separatist.dm +++ b/code/modules/antagonists/separatist/separatist.dm @@ -10,7 +10,7 @@ /datum/team/nation/New(starting_members, potential_recruits, department) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/new_possible_separatist) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_possible_separatist)) src.potential_recruits = potential_recruits src.department = department diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index d9dabfe9e85..75518e266e3 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -84,7 +84,7 @@ if(istype(loc, /obj/effect/dummy/phased_mob)) bloodspell.phased = TRUE if(bloodpool) - bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), /obj/effect/dummy/phased_mob/.proc/deleteself) + bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), TYPE_PROC_REF(/obj/effect/dummy/phased_mob, deleteself)) /// Performs the classic slaughter demon bodyslam on the attack_target. Yeets them a screen away. /mob/living/simple_animal/hostile/imp/slaughter/proc/bodyslam(atom/attack_target) @@ -137,7 +137,7 @@ /mob/living/simple_animal/hostile/imp/slaughter/phasein() . = ..() add_movespeed_modifier(/datum/movespeed_modifier/slaughter) - addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_movespeed_modifier), /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) //The loot from killing a slaughter demon - can be consumed to allow the user to blood crawl /obj/item/organ/heart/demon @@ -246,7 +246,7 @@ /mob/living/simple_animal/hostile/imp/slaughter/laughter/bloodcrawl_swallow(mob/living/victim) // Keep their corpse so rescue is possible consumed_mobs += victim - RegisterSignal(victim, COMSIG_MOB_STATCHANGE, .proc/on_victim_statchange) + RegisterSignal(victim, COMSIG_MOB_STATCHANGE, PROC_REF(on_victim_statchange)) /* Handle signal from a consumed mob changing stat. * diff --git a/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm index 65bc57b8902..e5dc5e4cf58 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm @@ -23,10 +23,10 @@ /datum/component/traitor_objective_register/RegisterWithParent() if(succeed_signals) - RegisterSignal(target, succeed_signals, .proc/on_success) + RegisterSignal(target, succeed_signals, PROC_REF(on_success)) if(fail_signals) - RegisterSignal(target, fail_signals, .proc/on_fail) - RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self) + RegisterSignal(target, fail_signals, PROC_REF(on_fail)) + RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), PROC_REF(delete_self)) /datum/component/traitor_objective_register/UnregisterFromParent() if(target) diff --git a/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm index e0abde5fe3c..ce72e1227de 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm @@ -20,7 +20,7 @@ src.typepath = parent.type /datum/component/traitor_objective_limit_per_time/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, .proc/handle_generate) + RegisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, PROC_REF(handle_generate)) /datum/component/traitor_objective_limit_per_time/UnregisterFromParent() UnregisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE) diff --git a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm index eb7933c2a9c..1bd27c5ac32 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm @@ -17,9 +17,9 @@ src.signals = signals /datum/component/traitor_objective_mind_tracker/RegisterWithParent() - RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/handle_mind_transferred) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/delete_self) - RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self) + RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(handle_mind_transferred)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(delete_self)) + RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), PROC_REF(delete_self)) handle_mind_transferred(target) /datum/component/traitor_objective_mind_tracker/UnregisterFromParent() diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 01fc052c9ba..e27d2041c7a 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -398,8 +398,8 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) for(var/obj/machinery/door/D in GLOB.airlocks) if(!is_station_level(D.z)) continue - INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, owner) - addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door, hostile_lockdown), owner) + addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/door, disable_lockdown)), 900) var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) @@ -407,7 +407,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) minor_announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert:", TRUE) to_chat(owner, span_danger("Lockdown initiated. Network reset in 90 seconds.")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/minor_announce, + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(minor_announce), "Automatic system reboot complete. Have a secure day.", "Network reset:"), 900) @@ -460,7 +460,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." attached_action.UpdateButtonIcon() target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!")) - addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/override_machine.proc/animate_machine, target), 50) //kabeep! + addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/override_machine, animate_machine), target), 50) //kabeep! remove_ranged_ability(span_danger("Sending override signal...")) return TRUE @@ -543,7 +543,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." attached_action.UpdateButtonIcon() target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!")) - addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/overload_machine.proc/detonate_machine, target), 50) //kaboom! + addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/overload_machine, detonate_machine), target), 50) //kaboom! remove_ranged_ability(span_danger("Overcharging machine...")) return TRUE @@ -680,7 +680,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) I.loc = T client.images += I I.icon_state = "[success ? "green" : "red"]Overlay" //greenOverlay and redOverlay for success and failure respectively - addtimer(CALLBACK(src, .proc/remove_transformer_image, client, I, T), 30) + addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, T), 30) if(!success) to_chat(src, span_warning("[alert_msg]")) return success @@ -759,7 +759,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) for(var/obj/machinery/light/L in GLOB.machines) if(is_station_level(L.z)) L.no_emergency = TRUE - INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE) + INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) CHECK_TICK to_chat(owner, span_notice("Emergency light connections severed.")) owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE) diff --git a/code/modules/antagonists/traitor/equipment/module_picker.dm b/code/modules/antagonists/traitor/equipment/module_picker.dm index c11ace042d3..76e9f8296f0 100644 --- a/code/modules/antagonists/traitor/equipment/module_picker.dm +++ b/code/modules/antagonists/traitor/equipment/module_picker.dm @@ -24,7 +24,7 @@ filtered_modules[AM.category][AM] = AM for(var/category in filtered_modules) - filtered_modules[category] = sortTim(filtered_modules[category], /proc/cmp_malfmodules_priority) + filtered_modules[category] = sortTim(filtered_modules[category], GLOBAL_PROC_REF(cmp_malfmodules_priority)) return filtered_modules diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index cc7df5d2cac..acd26a49613 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -87,7 +87,7 @@ card = new(user.drop_location()) user.put_in_hands(card) card.balloon_alert(user, "the card materializes in your hand") - RegisterSignal(card, COMSIG_ITEM_EQUIPPED, .proc/on_card_planted) + RegisterSignal(card, COMSIG_ITEM_EQUIPPED, PROC_REF(on_card_planted)) AddComponent(/datum/component/traitor_objective_register, card, \ succeed_signals = null, \ fail_signals = COMSIG_PARENT_QDELETING, \ @@ -107,7 +107,7 @@ . = ..() if(!.) //didn't generate return FALSE - RegisterSignal(kill_target, COMSIG_PARENT_QDELETING, .proc/on_target_qdeleted) + RegisterSignal(kill_target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdeleted)) /datum/traitor_objective/assassinate/calling_card/ungenerate_objective() UnregisterSignal(kill_target, COMSIG_PARENT_QDELETING) @@ -132,7 +132,7 @@ if(!.) //didn't generate return FALSE AddComponent(/datum/component/traitor_objective_register, behead_goal, fail_signals = COMSIG_PARENT_QDELETING) - RegisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB, .proc/on_target_dismembered) + RegisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(on_target_dismembered)) /datum/traitor_objective/assassinate/behead/ungenerate_objective() UnregisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB) @@ -159,7 +159,7 @@ fail_objective() else behead_goal = lost_head - RegisterSignal(behead_goal, COMSIG_ITEM_PICKUP, .proc/on_head_pickup) + RegisterSignal(behead_goal, COMSIG_ITEM_PICKUP, PROC_REF(on_head_pickup)) /datum/traitor_objective/assassinate/New(datum/uplink_handler/handler) . = ..() @@ -219,7 +219,7 @@ kill_target = kill_target_mind.current replace_in_name("%TARGET%", kill_target.real_name) replace_in_name("%JOB TITLE%", kill_target_mind.assigned_role.title) - RegisterSignal(kill_target, COMSIG_LIVING_DEATH, .proc/on_target_death) + RegisterSignal(kill_target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death)) return TRUE /datum/traitor_objective/assassinate/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/bug_room.dm b/code/modules/antagonists/traitor/objectives/bug_room.dm index 6ac99c3244c..8d8fdb22462 100644 --- a/code/modules/antagonists/traitor/objectives/bug_room.dm +++ b/code/modules/antagonists/traitor/objectives/bug_room.dm @@ -169,7 +169,7 @@ forceMove(target) target.vis_contents += src planted_on = target - RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, .proc/handle_planted_on_deletion) + RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, PROC_REF(handle_planted_on_deletion)) SEND_SIGNAL(src, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, target) /obj/item/traitor_bug/proc/handle_planted_on_deletion() @@ -199,7 +199,7 @@ /obj/structure/traitor_bug/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/fade_out, 10 SECONDS), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(fade_out), 10 SECONDS), 3 MINUTES) /obj/structure/traitor_bug/proc/fade_out(seconds) animate(src, alpha = 30, time = seconds) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index dfcc8a4606f..243ee56819f 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -67,7 +67,7 @@ special_equipment = target_item.special_equipment replace_in_name("%ITEM%", target_item.name) AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_MOB_EQUIPPED_ITEM = .proc/on_item_pickup)) + signals = list(COMSIG_MOB_EQUIPPED_ITEM = PROC_REF(on_item_pickup))) return TRUE /datum/traitor_objective/destroy_item/is_duplicate(datum/traitor_objective/destroy_item/objective_to_compare) diff --git a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm index 78d22e592ee..dd5e5765d6d 100644 --- a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm +++ b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm @@ -20,8 +20,8 @@ if(handler.get_completion_progression(/datum/traitor_objective) < progression_objectives_minimum) return FALSE AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_HUMAN_EARLY_UNARMED_ATTACK = .proc/on_unarmed_attack)) - RegisterSignal(generating_for, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, .proc/on_global_obj_completed) + signals = list(COMSIG_HUMAN_EARLY_UNARMED_ATTACK = PROC_REF(on_unarmed_attack))) + RegisterSignal(generating_for, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, PROC_REF(on_global_obj_completed)) return TRUE /datum/traitor_objective/hack_comm_console/proc/on_global_obj_completed(datum/source, datum/traitor_objective/objective) @@ -37,7 +37,7 @@ return if(!istype(target)) return - INVOKE_ASYNC(src, .proc/begin_hack, user, target) + INVOKE_ASYNC(src, PROC_REF(begin_hack), user, target) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/traitor_objective/hack_comm_console/proc/begin_hack(mob/user, obj/machinery/computer/communications/target) diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm index 92f30bdaa3a..4b0854d717e 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm @@ -49,7 +49,7 @@ if(!(job.title in limited_to)) return FALSE AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = .proc/on_surgery_success)) + signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = PROC_REF(on_surgery_success))) return TRUE /datum/traitor_objective/sleeper_protocol/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/smuggling.dm b/code/modules/antagonists/traitor/objectives/smuggling.dm index dff20d80d46..829eb40f1cb 100644 --- a/code/modules/antagonists/traitor/objectives/smuggling.dm +++ b/code/modules/antagonists/traitor/objectives/smuggling.dm @@ -54,7 +54,7 @@ contraband = new contraband_type(user.drop_location()) user.put_in_hands(contraband) user.balloon_alert(user, "[contraband] materializes in your hand") - RegisterSignal(contraband, COMSIG_ITEM_PICKUP, .proc/on_contraband_pickup) + RegisterSignal(contraband, COMSIG_ITEM_PICKUP, PROC_REF(on_contraband_pickup)) AddComponent(/datum/component/traitor_objective_register, contraband, \ succeed_signals = COMSIG_ITEM_EXPORTED, \ fail_signals = list(COMSIG_PARENT_QDELETING), \ diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index 37de558a352..38681544616 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -28,7 +28,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) objectives_by_path = list() for(var/datum/objective_item/item as anything in subtypesof(/datum/objective_item)) objectives_by_path[initial(item.targetitem)] = list() - RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/save_items) + RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(save_items)) // Very inefficient proc, only gets called when the map finishes loading. /datum/objective_item_handler/proc/save_items() @@ -38,7 +38,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) if(!place || !is_station_level(place.z)) objectives_by_path[typepath] -= object continue - RegisterSignal(object, COMSIG_PARENT_QDELETING, .proc/remove_item) + RegisterSignal(object, COMSIG_PARENT_QDELETING, PROC_REF(remove_item)) /datum/objective_item_handler/proc/remove_item(atom/source) SIGNAL_HANDLER @@ -209,8 +209,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) AddComponent(/datum/component/traitor_objective_register, bug, \ fail_signals = COMSIG_PARENT_QDELETING, \ penalty = telecrystal_penalty) - RegisterSignal(bug, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, .proc/on_bug_planted) - RegisterSignal(bug, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, .proc/handle_special_case) + RegisterSignal(bug, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, PROC_REF(on_bug_planted)) + RegisterSignal(bug, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, PROC_REF(handle_special_case)) if("summon_gear") if(!special_equipment) return diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 06c9933710c..bbf82d07487 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -146,7 +146,7 @@ insaneinthemembrane.sanity = 0 for(var/lore in typesof(/datum/brain_trauma/severe)) jedi.gain_trauma(lore) - addtimer(CALLBACK(src, .proc/deranged, jedi), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(deranged), jedi), 10 SECONDS) /obj/tear_in_reality/proc/deranged(mob/living/carbon/C) if(!C || C.stat == DEAD) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 2ad77520de0..c1a7be92a1d 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -20,12 +20,12 @@ /obj/item/soulstone/Initialize(mapload) . = ..() if(theme != THEME_HOLY) - RegisterSignal(src, COMSIG_BIBLE_SMACKED, .proc/on_bible_smacked) + RegisterSignal(src, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked)) ///signal called whenever a soulstone is smacked by a bible /obj/item/soulstone/proc/on_bible_smacked(datum/source, mob/living/user, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_exorcism, user) + INVOKE_ASYNC(src, PROC_REF(attempt_exorcism), user) /** * attempt_exorcism: called from on_bible_smacked, takes time and if successful @@ -295,7 +295,7 @@ return TRUE else to_chat(user, "[span_userdanger("Capture failed!")]: The soul has already fled its mortal frame. You attempt to bring it back...") - INVOKE_ASYNC(src, .proc/getCultGhost, victim, user) + INVOKE_ASYNC(src, PROC_REF(getCultGhost), victim, user) return TRUE //it'll probably get someone ;) ///captures a shade that was previously released from a soulstone. @@ -323,7 +323,7 @@ if(!shade) to_chat(user, "[span_userdanger("Creation failed!")]: [src] is empty! Go kill someone!") return FALSE - var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user, shell), require_near = TRUE, tooltips = TRUE) + var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, PROC_REF(check_menu), user, shell), require_near = TRUE, tooltips = TRUE) if(!shell || !construct_class) return FALSE make_new_construct_from_class(construct_class, theme, shade, user, FALSE, shell.loc) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 15a903f0897..f302ffa56b9 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -194,7 +194,7 @@ /datum/antagonist/wizard/get_admin_commands() . = ..() - .["Send to Lair"] = CALLBACK(src,.proc/admin_send_to_lair) + .["Send to Lair"] = CALLBACK(src, PROC_REF(admin_send_to_lair)) /datum/antagonist/wizard/proc/admin_send_to_lair(mob/admin) owner.current.forceMove(pick(GLOB.wizardstart)) diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm index 457c181790d..48225b5a2e4 100644 --- a/code/modules/aquarium/aquarium.dm +++ b/code/modules/aquarium/aquarium.dm @@ -43,7 +43,7 @@ /obj/structure/aquarium/Initialize(mapload) . = ..() update_appearance() - RegisterSignal(src,COMSIG_PARENT_ATTACKBY, .proc/feed_feedback) + RegisterSignal(src,COMSIG_PARENT_ATTACKBY, PROC_REF(feed_feedback)) /obj/structure/aquarium/proc/request_layer(layer_type) diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 421234337f9..f59964a65d9 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -343,7 +343,7 @@ Moving interrupts /obj/item/chisel/proc/set_block(obj/structure/carving_block/B,mob/living/user) prepared_block = B tracked_user = user - RegisterSignal(tracked_user,COMSIG_MOVABLE_MOVED,.proc/break_sculpting) + RegisterSignal(tracked_user,COMSIG_MOVABLE_MOVED, PROC_REF(break_sculpting)) to_chat(user,span_notice("You prepare to work on [B]."),type=MESSAGE_TYPE_INFO) /obj/item/chisel/dropped(mob/user, silent) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 54fe2d6943a..402d10b4705 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -65,9 +65,9 @@ ///Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs /obj/item/assembly/proc/pulsed(radio = FALSE) if(wire_type & WIRE_RECEIVE) - INVOKE_ASYNC(src, .proc/activate) + INVOKE_ASYNC(src, PROC_REF(activate)) if(radio && (wire_type & WIRE_RADIO_RECEIVE)) - INVOKE_ASYNC(src, .proc/activate) + INVOKE_ASYNC(src, PROC_REF(activate)) SEND_SIGNAL(src, COMSIG_ASSEMBLY_PULSED) return TRUE diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index e9e37e95d2f..ad720abad7c 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -29,7 +29,7 @@ if(M.id == src.id) if(openclose == null || !sync_doors) openclose = M.density - INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/machinery/door/poddoor, open) : TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) /obj/item/assembly/control/curtain @@ -50,7 +50,7 @@ if(M.id == src.id) if(openclose == null || !sync_doors) openclose = M.density - INVOKE_ASYNC(M, openclose ? /obj/structure/curtain/cloth/fancy/mechanical.proc/open : /obj/structure/curtain/cloth/fancy/mechanical.proc/close) + INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, open) : TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5) @@ -94,7 +94,7 @@ D.safe = !D.safe for(var/D in open_or_close) - INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open) + INVOKE_ASYNC(D, doors_need_closing ? TYPE_PROC_REF(/obj/machinery/door/airlock, close) : TYPE_PROC_REF(/obj/machinery/door/airlock, open)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) @@ -109,7 +109,7 @@ cooldown = TRUE for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) sleep(10) @@ -121,7 +121,7 @@ for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) @@ -136,7 +136,7 @@ cooldown = TRUE for(var/obj/machinery/sparker/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/sparker, ignite)) for(var/obj/machinery/igniter/M in GLOB.machines) if(M.id == src.id) @@ -156,7 +156,7 @@ cooldown = TRUE for(var/obj/machinery/flasher/M in GLOB.machines) if(M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/flasher, flash)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 2278da60010..1fe710b6650 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -49,7 +49,7 @@ flashing = flash . = ..() if(flash) - addtimer(CALLBACK(src, /atom/.proc/update_icon), 5) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5) holder?.update_icon(updates) /obj/item/assembly/flash/update_overlays() @@ -117,7 +117,7 @@ last_trigger = world.time playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) set_light_on(TRUE) - addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) times_used++ if(!flash_recharge()) return FALSE @@ -345,7 +345,7 @@ to_chat(real_arm.owner, span_warning("Your photon projector implant overheats and deactivates!")) real_arm.Retract() overheat = TRUE - addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2) + addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd * 2) /obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null) if(overheat) @@ -354,7 +354,7 @@ to_chat(real_arm.owner, span_warning("Your photon projector is running too hot to be used again so quickly!")) return FALSE overheat = TRUE - addtimer(CALLBACK(src, .proc/cooldown), flashcd) + addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd) playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) update_icon(ALL, TRUE) return TRUE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index ca35ced6c6b..b281c8edef0 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -18,7 +18,7 @@ . = ..() beams = list() START_PROCESSING(SSobj, src) - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) /obj/item/assembly/infra/proc/AfterRotation(mob/user, degrees) refreshBeam() @@ -161,7 +161,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, COMSIG_ATOM_EXITED) - RegisterSignal(newloc, COMSIG_ATOM_EXITED, .proc/check_exit) + RegisterSignal(newloc, COMSIG_ATOM_EXITED, PROC_REF(check_exit)) listeningTo = newloc /obj/item/assembly/infra/proc/check_exit(datum/source, atom/movable/gone, direction) @@ -175,7 +175,7 @@ var/obj/item/I = gone if (I.item_flags & ABSTRACT) return - INVOKE_ASYNC(src, .proc/refreshBeam) + INVOKE_ASYNC(src, PROC_REF(refreshBeam)) /obj/item/assembly/infra/setDir() . = ..() @@ -229,7 +229,7 @@ /obj/effect/beam/i_beam/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -241,4 +241,4 @@ var/obj/item/I = AM if (I.item_flags & ABSTRACT) return - INVOKE_ASYNC(master, /obj/item/assembly/infra.proc/trigger_beam, AM, get_turf(src)) + INVOKE_ASYNC(master, TYPE_PROC_REF(/obj/item/assembly/infra, trigger_beam), AM, get_turf(src)) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 580b17ab374..7d8ff550273 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -11,13 +11,13 @@ ///if we are attached to an assembly holder, we attach a connect_loc element to ourselves that listens to this from the holder var/static/list/holder_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) /obj/item/assembly/mousetrap/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -135,13 +135,13 @@ if(ishuman(AM)) var/mob/living/carbon/H = AM if(H.m_intent == MOVE_INTENT_RUN) - INVOKE_ASYNC(src, .proc/triggered, H) + INVOKE_ASYNC(src, PROC_REF(triggered), H) H.visible_message(span_warning("[H] accidentally steps on [src]."), \ span_warning("You accidentally step on [src]")) else if(ismouse(MM) || israt(MM) || isregalrat(MM)) - INVOKE_ASYNC(src, .proc/triggered, MM) + INVOKE_ASYNC(src, PROC_REF(triggered), MM) else if(AM.density) // For mousetrap grenades, set off by anything heavy - INVOKE_ASYNC(src, .proc/triggered, AM) + INVOKE_ASYNC(src, PROC_REF(triggered), AM) /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 21886c1eb74..40d1d1a15d1 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -95,7 +95,7 @@ to_chat(usr, span_warning("[src] is still recharging...")) return TIMER_COOLDOWN_START(src, COOLDOWN_SIGNALLER_SEND, 1 SECONDS) - INVOKE_ASYNC(src, .proc/signal) + INVOKE_ASYNC(src, PROC_REF(signal)) . = TRUE if("freq") var/new_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index d2312056c2e..e2ee9990c0e 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -16,7 +16,7 @@ /obj/item/assembly/timer/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!")) activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...) - addtimer(CALLBACK(src, .proc/manual_suicide, user), time SECONDS)//kill yourself once the time runs out + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), time SECONDS)//kill yourself once the time runs out return MANUAL_SUICIDE /obj/item/assembly/timer/proc/manual_suicide(mob/living/user) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 62df5b79ca0..330b90cf9c7 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -90,7 +90,7 @@ /obj/item/assembly/voice/proc/send_pulse() visible_message("clicks", visible_message_flags = EMOTE_MESSAGE) playsound(src, 'sound/effects/whirthunk.ogg', 30) - addtimer(CALLBACK(src, .proc/pulse), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(pulse)), 2 SECONDS) /obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) ..() diff --git a/code/modules/asset_cache/assets/uplink.dm b/code/modules/asset_cache/assets/uplink.dm index 20ade18da3f..b3bf5362cc8 100644 --- a/code/modules/asset_cache/assets/uplink.dm +++ b/code/modules/asset_cache/assets/uplink.dm @@ -8,7 +8,7 @@ var/list/items = list() for(var/datum/uplink_category/category as anything in subtypesof(/datum/uplink_category)) categories += category - categories = sortTim(categories, .proc/cmp_uplink_category_desc) + categories = sortTim(categories, GLOBAL_PROC_REF(cmp_uplink_category_desc)) var/list/new_categories = list() for(var/datum/uplink_category/category as anything in categories) diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index c0714e70d9c..83c50976bd7 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -14,7 +14,7 @@ /datum/asset_transport/proc/Load() if (CONFIG_GET(flag/asset_simple_preload)) for(var/client/C in GLOB.clients) - addtimer(CALLBACK(src, .proc/send_assets_slow, C, preload), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS) /// Initialize - Called when SSassets initializes. /datum/asset_transport/proc/Initialize(list/assets) @@ -22,7 +22,7 @@ if (!CONFIG_GET(flag/asset_simple_preload)) return for(var/client/C in GLOB.clients) - addtimer(CALLBACK(src, .proc/send_assets_slow, C, preload), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS) /// Register a browser asset with the asset cache system diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 6d0ea3fa379..a7afa40f8b5 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -90,7 +90,7 @@ setDir(pick(GLOB.cardinals)) air_update_turf(FALSE, FALSE) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index dd5ee701327..d60abc35bc3 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -92,7 +92,7 @@ ///Represents a signel source of atmos alarms, complains to all the listeners if one of our thresholds is violated var/datum/alarm_handler/alarm_manager - var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = .proc/check_air_dangerlevel) + var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = PROC_REF(check_air_dangerlevel)) var/list/TLV = list( // Breathable air. "pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are hazard_min, warning_min, warning_max, hazard_max @@ -636,10 +636,10 @@ danger_level = max(pressure_dangerlevel, temperature_dangerlevel, gas_dangerlevel) if(old_danger_level != danger_level) - INVOKE_ASYNC(src, .proc/apply_danger_level) + INVOKE_ASYNC(src, PROC_REF(apply_danger_level)) if(mode == AALARM_MODE_REPLACEMENT && environment_pressure < ONE_ATMOSPHERE * 0.05) mode = AALARM_MODE_SCRUBBING - INVOKE_ASYNC(src, .proc/apply_mode, src) + INVOKE_ASYNC(src, PROC_REF(apply_mode), src) /obj/machinery/airalarm/proc/post_alert(alert_level) diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm index 89f54413d53..6243ac93260 100644 --- a/code/modules/atmospherics/machinery/bluespace_vendor.dm +++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm @@ -164,7 +164,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30) /obj/machinery/bluespace_vendor/proc/register_machine(machine) connected_machine = machine LAZYADD(connected_machine.vendors, src) - RegisterSignal(connected_machine, COMSIG_PARENT_QDELETING, .proc/unregister_machine) + RegisterSignal(connected_machine, COMSIG_PARENT_QDELETING, PROC_REF(unregister_machine)) mode = BS_MODE_IDLE update_appearance() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 45efa9e16e1..b74b5935c2f 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -182,7 +182,7 @@ if("set_external_pressure" in signal.data) external_pressure_bound = clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50) - addtimer(CALLBACK(src, .proc/broadcast_status), 2) + addtimer(CALLBACK(src, PROC_REF(broadcast_status)), 2) if(!("status" in signal.data)) //do not update_appearance update_appearance() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index ab62e039aea..c77316a9582 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -223,10 +223,10 @@ var/obj/machinery/atmospherics/components/binary/pump/connected_pump /obj/item/circuit_component/atmos_pump/populate_ports() - pressure_value = add_input_port("New Pressure", PORT_TYPE_NUMBER, trigger = .proc/set_pump_pressure) - on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_on) - off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_off) - request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = .proc/request_pump_data) + pressure_value = add_input_port("New Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_pump_pressure)) + on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_on)) + off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_off)) + request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_pump_data)) input_pressure = add_output_port("Input Pressure", PORT_TYPE_NUMBER) output_pressure = add_output_port("Output Pressure", PORT_TYPE_NUMBER) @@ -241,7 +241,7 @@ . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/pump)) connected_pump = shell - RegisterSignal(connected_pump, COMSIG_PUMP_SET_ON, .proc/handle_pump_activation) + RegisterSignal(connected_pump, COMSIG_PUMP_SET_ON, PROC_REF(handle_pump_activation)) /obj/item/circuit_component/atmos_pump/unregister_usb_parent(atom/movable/shell) UnregisterSignal(connected_pump, COMSIG_PUMP_SET_ON) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index e9c92cae73c..4359618480c 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -63,7 +63,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return update_icon_nopipes(TRUE) switching = TRUE - addtimer(CALLBACK(src, .proc/finish_interact), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_interact)), 1 SECONDS) /** * Called by iteract() after a 1 second timer, calls toggle(), allows another interaction with the component. @@ -116,7 +116,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/valve/digital)) attached_valve = shell - RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, .proc/handle_valve_toggled) + RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, PROC_REF(handle_valve_toggled)) /obj/item/circuit_component/digital_valve/unregister_usb_parent(atom/movable/shell) UnregisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index b3a83332dd4..6e82682863c 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -36,7 +36,7 @@ . = ..() if(hide) - RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/hide_pipe) + RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(hide_pipe)) // Iconnery diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm index cde55b10a35..50a1a68b3b8 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm @@ -172,7 +172,7 @@ radio.recalculateChannels() investigate_log("has been created.", INVESTIGATE_HYPERTORUS) - RegisterSignal(src.loc, COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(src.loc, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) for(var/atom/movable/movable_object in src.loc) SEND_SIGNAL(movable_object, COMSIG_MOVABLE_SECLUDED_LOCATION) diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm index a7bf9129811..82b6501fda4 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm @@ -92,20 +92,20 @@ update_appearance() linked_interface.active = TRUE linked_interface.update_appearance() - RegisterSignal(linked_interface, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_interface, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_input.active = TRUE linked_input.update_appearance() - RegisterSignal(linked_input, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_input, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_output.active = TRUE linked_output.update_appearance() - RegisterSignal(linked_output, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_output, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_moderator.active = TRUE linked_moderator.update_appearance() - RegisterSignal(linked_moderator, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_moderator, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) for(var/obj/machinery/hypertorus/corner/corner in corners) corner.active = TRUE corner.update_appearance() - RegisterSignal(corner, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(corner, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) soundloop = new(src, TRUE) soundloop.volume = 5 diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm index 0f99a977625..f99dff4d05c 100644 --- a/code/modules/atmospherics/machinery/components/tank.dm +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -81,9 +81,9 @@ AddElement(/datum/element/volatile_gas_storage) AddElement(/datum/element/crackable, 'icons/obj/atmospherics/stationary_canisters.dmi', crack_states) - RegisterSignal(src, COMSIG_MERGER_ADDING, .proc/merger_adding) - RegisterSignal(src, COMSIG_MERGER_REMOVING, .proc/merger_removing) - RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, .proc/smoothed) + RegisterSignal(src, COMSIG_MERGER_ADDING, PROC_REF(merger_adding)) + RegisterSignal(src, COMSIG_MERGER_REMOVING, PROC_REF(merger_removing)) + RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smoothed)) air_contents = new air_contents.temperature = T20C @@ -203,7 +203,7 @@ SIGNAL_HANDLER if(new_merger.id != merger_id) return - RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, .proc/merger_refresh_complete) + RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, PROC_REF(merger_refresh_complete)) /obj/machinery/atmospherics/components/tank/proc/merger_removing(obj/machinery/atmospherics/components/tank/us, datum/merger/old_merger) SIGNAL_HANDLER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 5fd68f74c9b..2b7837278ff 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -30,8 +30,8 @@ // It will follow this as the animation goes, but that's no problem as the "mask" icon state // already accounts for this. add_filter("alpha_mask", 1, list("type" = "alpha", "icon" = icon('icons/obj/cryogenics.dmi', "mask"), "y" = -22)) - RegisterSignal(parent, COMSIG_MACHINERY_SET_OCCUPANT, .proc/on_set_occupant) - RegisterSignal(parent, COMSIG_CRYO_SET_ON, .proc/on_set_on) + RegisterSignal(parent, COMSIG_MACHINERY_SET_OCCUPANT, PROC_REF(on_set_occupant)) + RegisterSignal(parent, COMSIG_CRYO_SET_ON, PROC_REF(on_set_on)) /// COMSIG_MACHINERY_SET_OCCUPANT callback /atom/movable/visual/cryo_occupant/proc/on_set_occupant(datum/source, mob/living/new_occupant) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 068de9ac27d..4c5290c0f8b 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -138,7 +138,7 @@ on = !on if("inject" in signal.data) - INVOKE_ASYNC(src, .proc/inject) + INVOKE_ASYNC(src, PROC_REF(inject)) return if("set_volume_rate" in signal.data) @@ -146,7 +146,7 @@ var/datum/gas_mixture/air_contents = airs[1] volume_rate = clamp(number, 0, air_contents.volume) - addtimer(CALLBACK(src, .proc/broadcast_status), 2) + addtimer(CALLBACK(src, PROC_REF(broadcast_status)), 2) if(!("status" in signal.data)) //do not update_icon update_appearance() diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index c7f922c92f5..2baca59f1f6 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -137,7 +137,7 @@ holding = null if(new_tank) holding = new_tank - RegisterSignal(holding, COMSIG_PARENT_QDELETING, .proc/unregister_holding) + RegisterSignal(holding, COMSIG_PARENT_QDELETING, PROC_REF(unregister_holding)) SSair.start_processing_machine(src) update_appearance() diff --git a/code/modules/autowiki/autowiki.dm b/code/modules/autowiki/autowiki.dm index 99e4755871f..f7a7d957c3e 100644 --- a/code/modules/autowiki/autowiki.dm +++ b/code/modules/autowiki/autowiki.dm @@ -4,7 +4,7 @@ #if defined(AUTOWIKI) || defined(UNIT_TESTS) /proc/setup_autowiki() Master.sleep_offline_after_initializations = FALSE - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/generate_autowiki)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(generate_autowiki))) SSticker.start_immediately = TRUE CONFIG_SET(number/round_end_countdown, 0) diff --git a/code/modules/autowiki/pages/techweb.dm b/code/modules/autowiki/pages/techweb.dm index 83525621b54..6198e4645eb 100644 --- a/code/modules/autowiki/pages/techweb.dm +++ b/code/modules/autowiki/pages/techweb.dm @@ -4,7 +4,7 @@ /datum/autowiki/techweb/generate() var/output = "" - for (var/node_id in sort_list(SSresearch.techweb_nodes, /proc/sort_research_nodes)) + for (var/node_id in sort_list(SSresearch.techweb_nodes, GLOBAL_PROC_REF(sort_research_nodes))) var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id] if (!node.show_on_wiki) continue diff --git a/code/modules/autowiki/pages/vending.dm b/code/modules/autowiki/pages/vending.dm index 798bf743410..0a8dd3db0a9 100644 --- a/code/modules/autowiki/pages/vending.dm +++ b/code/modules/autowiki/pages/vending.dm @@ -10,7 +10,7 @@ // So we put it inside, something var/obj/parent = new - for (var/vending_type in sort_list(subtypesof(/obj/machinery/vending), /proc/cmp_typepaths_asc)) + for (var/vending_type in sort_list(subtypesof(/obj/machinery/vending), GLOBAL_PROC_REF(cmp_typepaths_asc))) var/obj/machinery/vending/vending_machine = new vending_type(parent) vending_machine.use_power = FALSE vending_machine.update_icon(UPDATE_ICON_STATE) diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index 71d04598086..838c1adc4f4 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -65,7 +65,7 @@ /obj/structure/pitgrate/Initialize(mapload) . = ..() - RegisterSignal(SSdcs,COMSIG_GLOB_BUTTON_PRESSED, .proc/OnButtonPressed) + RegisterSignal(SSdcs,COMSIG_GLOB_BUTTON_PRESSED, PROC_REF(OnButtonPressed)) if(hidden) update_openspace() @@ -93,7 +93,7 @@ obj_flags |= BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP plane = ABOVE_LIGHTING_PLANE //What matters it's one above openspace, so our animation is not dependant on what's there. Up to revision with 513 animate(src,alpha = talpha,time = 10) - addtimer(CALLBACK(src,.proc/reset_plane),10) + addtimer(CALLBACK(src, PROC_REF(reset_plane),10)) if(hidden) update_openspace() var/turf/T = get_turf(src) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index d5b8c5fc5a6..39fac0e8fd1 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -89,7 +89,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations) /datum/gateway_destination/gateway/post_transfer(atom/movable/AM) . = ..() - addtimer(CALLBACK(AM,/atom/movable.proc/setDir,SOUTH),0) + addtimer(CALLBACK(AM, TYPE_PROC_REF(/atom/movable, setDir), SOUTH), 0) /* Special home destination, so we can check exile implants */ /datum/gateway_destination/gateway/home diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index cd32ccec532..6c530ef1a39 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -219,7 +219,7 @@ var/turf/T = get_turf(src) T.visible_message(span_userdanger("[src] flares briefly.")) - addtimer(CALLBACK(src, .proc/effect, user, .), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) COOLDOWN_START(src, roll_cd, 2.5 SECONDS) /obj/item/dice/d20/fate/equipped(mob/user, slot) diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index 1b1ad132bb6..c29b58b670d 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -29,7 +29,7 @@ /obj/effect/murderdome/dead_barricade/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/respawn), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(respawn)), 3 MINUTES) /obj/effect/murderdome/dead_barricade/proc/respawn() if(!QDELETED(src)) diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index fb56096cf77..a87255d33d9 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -129,7 +129,7 @@ /obj/effect/meatgrinder/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index af9ee82a6ca..b5a0e77d583 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -130,7 +130,7 @@ var/newcolor = pick(10;COLOR_GREEN, 5;COLOR_BLUE, 3;COLOR_RED, 1;COLOR_PURPLE) add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -138,7 +138,7 @@ SIGNAL_HANDLER if(!ismob(AM)) return - INVOKE_ASYNC(src, .proc/put_in_crossers_hands, AM) + INVOKE_ASYNC(src, PROC_REF(put_in_crossers_hands), AM) /obj/item/rupee/proc/put_in_crossers_hands(mob/crosser) if(crosser.put_in_hands(src)) diff --git a/code/modules/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm index c2737226078..19916b30f4f 100644 --- a/code/modules/balloon_alert/balloon_alert.dm +++ b/code/modules/balloon_alert/balloon_alert.dm @@ -12,7 +12,7 @@ /atom/proc/balloon_alert(mob/viewer, text) SHOULD_NOT_SLEEP(TRUE) - INVOKE_ASYNC(src, .proc/balloon_alert_perform, viewer, text) + INVOKE_ASYNC(src, PROC_REF(balloon_alert_perform), viewer, text) /// Create balloon alerts (text that floats up) to everything within range. /// Will only display to people who can see. @@ -79,7 +79,7 @@ easing = CUBIC_EASING | EASE_IN, ) - addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_client, balloon_alert, viewer_client), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_image_from_client), balloon_alert, viewer_client), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) #undef BALLOON_TEXT_CHAR_LIFETIME_INCREASE_MIN #undef BALLOON_TEXT_CHAR_LIFETIME_INCREASE_MULT diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index f256fae89b6..836748ac743 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -27,7 +27,7 @@ mode = new /datum/buildmode_mode/basic(src) holder = c buttons = list() - li_cb = CALLBACK(src, .proc/post_login) + li_cb = CALLBACK(src, PROC_REF(post_login)) holder.player_details.post_login_callbacks += li_cb holder.show_popup_menus = FALSE create_buttons() diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index 1c3272c11b4..70bf42c2da9 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -40,7 +40,7 @@ if(!reset) reset = new reset_path(get_turf(src)) reset.flag = src - RegisterSignal(src, COMSIG_PARENT_PREQDELETED, .proc/reset_flag) //just in case CTF has some map hazards (read: chasms). + RegisterSignal(src, COMSIG_PARENT_PREQDELETED, PROC_REF(reset_flag)) //just in case CTF has some map hazards (read: chasms). /obj/item/ctf/process() if(is_ctf_target(loc)) //pickup code calls temporary drops to test things out, we need to make sure the flag doesn't reset from @@ -358,7 +358,7 @@ recently_dead_ckeys += body.ckey spawned_mobs -= body - addtimer(CALLBACK(src, .proc/clear_cooldown, body.ckey), respawn_cooldown, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown), body.ckey), respawn_cooldown, TIMER_UNIQUE) /obj/machinery/capture_the_flag/proc/clear_cooldown(ckey) recently_dead_ckeys -= ckey @@ -393,7 +393,7 @@ M.key = new_team_member.key M.faction += team M.equipOutfit(chosen_class) - RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/ctf_qdelled_player) //just in case CTF has some map hazards (read: chasms). bit shorter than dust + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(ctf_qdelled_player)) //just in case CTF has some map hazards (read: chasms). bit shorter than dust for(var/trait in player_traits) ADD_TRAIT(M, trait, CAPTURE_THE_FLAG_TRAIT) spawned_mobs[M] = chosen_class diff --git a/code/modules/capture_the_flag/ctf_map_loading.dm b/code/modules/capture_the_flag/ctf_map_loading.dm index 60212cd8b44..5e0bf7b6cea 100644 --- a/code/modules/capture_the_flag/ctf_map_loading.dm +++ b/code/modules/capture_the_flag/ctf_map_loading.dm @@ -9,7 +9,7 @@ GLOBAL_DATUM(ctf_spawner, /obj/effect/landmark/ctf) if(GLOB.ctf_spawner) qdel(GLOB.ctf_spawner) GLOB.ctf_spawner = src - INVOKE_ASYNC(src, .proc/load_map) + INVOKE_ASYNC(src, PROC_REF(load_map)) /obj/effect/landmark/ctf/Destroy() if(map_bounds) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 52eb1611bae..1efe4d11457 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -346,7 +346,7 @@ if (temp_pod.effectShrapnel == TRUE) //If already doing custom damage, set back to default (no shrapnel) temp_pod.effectShrapnel = FALSE return - var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath", 0) in sort_list(subtypesof(/obj/projectile), /proc/cmp_typepaths_asc) + var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath", 0) in sort_list(subtypesof(/obj/projectile), GLOBAL_PROC_REF(cmp_typepaths_asc)) if (isnull(shrapnelInput)) return var/shrapnelMagnitude = input("Enter the magnitude of the pellet cloud. This is usually a value around 1-5. Please note that Ryll-Ryll has asked me to tell you that if you go too crazy with the projectiles you might crash the server. So uh, be gentle!", "Shrapnel Magnitude", 0) as null|num diff --git a/code/modules/cargo/department_order.dm b/code/modules/cargo/department_order.dm index a5b65ca7583..c1fb2b4c571 100644 --- a/code/modules/cargo/department_order.dm +++ b/code/modules/cargo/department_order.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list( department_order = new(pack, name, rank, ckey, "", null, chosen_delivery_area, null) SSshuttle.shopping_list += department_order if(!already_signalled) - RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, .proc/finalize_department_order) + RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, PROC_REF(finalize_department_order)) say("Order processed. Cargo will deliver the crate when it comes in on their shuttle. NOTICE: Heads of staff may override the order.") calculate_cooldown(pack.cost) diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm index e06c9615875..17fa49193d8 100644 --- a/code/modules/cargo/gondolapod.dm +++ b/code/modules/cargo/gondolapod.dm @@ -69,7 +69,7 @@ /mob/living/simple_animal/pet/gondola/gondolapod/setOpened() opened = TRUE update_appearance() - addtimer(CALLBACK(src, /atom/.proc/setClosed), 50) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, setClosed)), 50) /mob/living/simple_animal/pet/gondola/gondolapod/setClosed() opened = FALSE diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8580ecd15a0..4dce81ff161 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1914,7 +1914,7 @@ anomalous_box_provided = TRUE log_game("An anomalous pizza box was provided in a pizza crate at during cargo delivery") if(prob(50)) - addtimer(CALLBACK(src, .proc/anomalous_pizza_report), rand(300, 1800)) + addtimer(CALLBACK(src, PROC_REF(anomalous_pizza_report)), rand(300, 1800)) else message_admins("An anomalous pizza box was silently created with no command report in a pizza crate delivery.") continue diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 089081d43ac..fe2a7f69b76 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -281,11 +281,11 @@ var/mob/living/simple_animal/pet/gondola/gondolapod/benis = new(turf_underneath, src) benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob. moveToNullspace() - addtimer(CALLBACK(src, .proc/open_pod, benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob + addtimer(CALLBACK(src, PROC_REF(open_pod), benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob else if (style == STYLE_SEETHROUGH) open_pod(src) else - addtimer(CALLBACK(src, .proc/open_pod, src), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplypod, while referencing this supplypod's contents + addtimer(CALLBACK(src, PROC_REF(open_pod), src), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplypod, while referencing this supplypod's contents /obj/structure/closet/supplypod/proc/open_pod(atom/movable/holder, broken = FALSE, forced = FALSE) //The holder var represents an atom whose contents we will be working with if (!holder) @@ -313,9 +313,9 @@ startExitSequence(src) else if (reversing) - addtimer(CALLBACK(src, .proc/SetReverseIcon), delays[POD_LEAVING]/2) //Finish up the pod's duties after a certain amount of time + addtimer(CALLBACK(src, PROC_REF(SetReverseIcon)), delays[POD_LEAVING]/2) //Finish up the pod's duties after a certain amount of time if(!stay_after_drop) // Departing should be handled manually - addtimer(CALLBACK(src, .proc/startExitSequence, holder), delays[POD_LEAVING]*(4/5)) //Finish up the pod's duties after a certain amount of time + addtimer(CALLBACK(src, PROC_REF(startExitSequence), holder), delays[POD_LEAVING]*(4/5)) //Finish up the pod's duties after a certain amount of time /obj/structure/closet/supplypod/proc/startExitSequence(atom/movable/holder) if (leavingSound) @@ -336,7 +336,7 @@ take_contents(holder) playsound(holder, close_sound, soundVolume*0.75, TRUE, -3) holder.setClosed() - addtimer(CALLBACK(src, .proc/preReturn, holder), delays[POD_LEAVING] * 0.2) //Start to leave a bit after closing for cinematic effect + addtimer(CALLBACK(src, PROC_REF(preReturn), holder), delays[POD_LEAVING] * 0.2) //Start to leave a bit after closing for cinematic effect /obj/structure/closet/supplypod/take_contents(atom/movable/holder) var/turf/turf_underneath = holder.drop_location() @@ -413,7 +413,7 @@ deleteRubble() animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) animate(holder, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod - addtimer(CALLBACK(src, .proc/handleReturnAfterDeparting, holder), 15) //Finish up the pod's duties after a certain amount of time + addtimer(CALLBACK(src, PROC_REF(handleReturnAfterDeparting), holder), 15) //Finish up the pod's duties after a certain amount of time /obj/structure/closet/supplypod/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open_pod() proc for more details opened = TRUE @@ -460,7 +460,7 @@ vis_contents += glow_effect glow_effect.layer = GASFIRE_LAYER glow_effect.plane = ABOVE_GAME_PLANE - RegisterSignal(glow_effect, COMSIG_PARENT_QDELETING, .proc/remove_glow) + RegisterSignal(glow_effect, COMSIG_PARENT_QDELETING, PROC_REF(remove_glow)) /obj/structure/closet/supplypod/proc/endGlow() if(!glow_effect) @@ -605,8 +605,8 @@ if (soundStartTime < 0) soundStartTime = 1 if (!pod.effectQuiet && !(pod.pod_flags & FIRST_SOUNDS)) - addtimer(CALLBACK(src, .proc/playFallingSound), soundStartTime) - addtimer(CALLBACK(src, .proc/beginLaunch, pod.effectCircle), pod.delays[POD_TRANSIT]) + addtimer(CALLBACK(src, PROC_REF(playFallingSound)), soundStartTime) + addtimer(CALLBACK(src, PROC_REF(beginLaunch), pod.effectCircle), pod.delays[POD_TRANSIT]) /obj/effect/pod_landingzone/proc/playFallingSound() playsound(src, pod.fallingSound, pod.soundVolume, TRUE, 6) @@ -627,7 +627,7 @@ pod.plane = ABOVE_GAME_PLANE if (pod.style != STYLE_INVISIBLE) animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING) //Make the pod fall! At an angle! - addtimer(CALLBACK(src, .proc/endLaunch), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation + addtimer(CALLBACK(src, PROC_REF(endLaunch)), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation /obj/effect/pod_landingzone/proc/setupSmoke(rotation) if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH) @@ -644,7 +644,7 @@ smoke_part.pixel_y = abs(cos(rotation))*32 * i smoke_part.add_filter("smoke_blur", 1, gauss_blur_filter(size = 4)) var/time = (pod.delays[POD_FALLING] / length(smoke_effects))*(length(smoke_effects)-i) - addtimer(CALLBACK(smoke_part, /obj/effect/supplypod_smoke/.proc/drawSelf, i), time, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation + addtimer(CALLBACK(smoke_part, TYPE_PROC_REF(/obj/effect/supplypod_smoke, drawSelf), i), time, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation QDEL_IN(smoke_part, pod.delays[POD_FALLING] + 35) /obj/effect/pod_landingzone/proc/drawSmoke() diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 746cf8946f0..107b2fc3492 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -23,7 +23,7 @@ launched = TRUE playsound(src,'sound/machines/triple_beep.ogg',50,FALSE) playsound(src,'sound/machines/warning-buzzer.ogg',50,FALSE) - addtimer(CALLBACK(src, .proc/endLaunch), 33)//wait 3.3 seconds (time it takes for supplypod to land), then update icon + addtimer(CALLBACK(src, PROC_REF(endLaunch)), 33)//wait 3.3 seconds (time it takes for supplypod to land), then update icon if (SP_UNLINK) linked = FALSE playsound(src,'sound/machines/synth_no.ogg',50,FALSE) diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm index c6be322429f..986086c2c67 100644 --- a/code/modules/chatter/chatter.dm +++ b/code/modules/chatter/chatter.dm @@ -44,7 +44,7 @@ delay += 0.1 SECONDS if(delay) - addtimer(CALLBACK(GLOBAL_PROC, /proc/chatter_speak_word, speaker, letter_count, phomeme, length), delay, flags = TIMER_CLIENT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(chatter_speak_word), speaker, letter_count, phomeme, length), delay, flags = TIMER_CLIENT_TIME) else chatter_speak_word(speaker, current_context, phomeme, length) break //We use the loop as a handy way of dealing with punctuation, the actual looping operation here happens in timers that call timers diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm index 325b5d88955..780bed3689b 100644 --- a/code/modules/client/client_colour.dm +++ b/code/modules/client/client_colour.dm @@ -205,7 +205,7 @@ /datum/client_colour/bloodlust/New(mob/_owner) ..() - addtimer(CALLBACK(src, .proc/update_colour, list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0), 10, SINE_EASING|EASE_OUT), 1) + addtimer(CALLBACK(src, PROC_REF(update_colour), list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0), 10, SINE_EASING|EASE_OUT), 1) /datum/client_colour/rave priority = PRIORITY_LOW diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index a2ceb7d80ea..db394650468 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( var/datum/asset/A = get_asset_datum(/datum/asset/simple/mouse) A.send(src) src << browse(file('html/statbrowser.html'), "window=statbrowser") - addtimer(CALLBACK(src, .proc/check_panel_loaded), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 30 SECONDS) tgui_panel.initialize() tgui_say.initialize() @@ -968,7 +968,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( //Precache the client with all other assets slowly, so as to not block other browse() calls if (CONFIG_GET(flag/asset_simple_preload)) - addtimer(CALLBACK(SSassets.transport, /datum/asset_transport.proc/send_assets_slow, src, SSassets.transport.preload), 5 SECONDS) + addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS) #if (PRELOAD_RSC == 0) for (var/name in GLOB.vox_sounds) diff --git a/code/modules/client/preferences/README.md b/code/modules/client/preferences/README.md index 4ef49a74602..96fb5e754e6 100644 --- a/code/modules/client/preferences/README.md +++ b/code/modules/client/preferences/README.md @@ -350,7 +350,7 @@ Middleware can hijack actions by specifying `action_delegations`: ```dm /datum/preference_middleware/congratulations action_delegations = list( - "congratulate_me" = .proc/congratulate_me, + "congratulate_me" = PROC_REF(congratulate_me), ) /datum/preference_middleware/congratulations/proc/congratulate_me(list/params, mob/user) diff --git a/code/modules/client/preferences/middleware/antags.dm b/code/modules/client/preferences/middleware/antags.dm index b782397fd5b..5cc0e5164a4 100644 --- a/code/modules/client/preferences/middleware/antags.dm +++ b/code/modules/client/preferences/middleware/antags.dm @@ -1,6 +1,6 @@ /datum/preference_middleware/antags action_delegations = list( - "set_antags" = .proc/set_antags, + "set_antags" = PROC_REF(set_antags), ) /datum/preference_middleware/antags/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm index 877f5a7fbe2..bf7194561c1 100644 --- a/code/modules/client/preferences/middleware/jobs.dm +++ b/code/modules/client/preferences/middleware/jobs.dm @@ -1,7 +1,7 @@ /datum/preference_middleware/jobs action_delegations = list( - "set_job_preference" = .proc/set_job_preference, - "stats" = .proc/open_stats, + "set_job_preference" = PROC_REF(set_job_preference), + "stats" = PROC_REF(open_stats), ) /datum/preference_middleware/jobs/proc/set_job_preference(list/params, mob/user) diff --git a/code/modules/client/preferences/middleware/keybindings.dm b/code/modules/client/preferences/middleware/keybindings.dm index 67102f1e17f..f4a1c06784e 100644 --- a/code/modules/client/preferences/middleware/keybindings.dm +++ b/code/modules/client/preferences/middleware/keybindings.dm @@ -3,9 +3,9 @@ /// Middleware to handle keybindings /datum/preference_middleware/keybindings action_delegations = list( - "reset_all_keybinds" = .proc/reset_all_keybinds, - "reset_keybinds_to_defaults" = .proc/reset_keybinds_to_defaults, - "set_keybindings" = .proc/set_keybindings, + "reset_all_keybinds" = PROC_REF(reset_all_keybinds), + "reset_keybinds_to_defaults" = PROC_REF(reset_keybinds_to_defaults), + "set_keybindings" = PROC_REF(set_keybindings), ) /datum/preference_middleware/keybindings/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/names.dm b/code/modules/client/preferences/middleware/names.dm index 34e97f0f727..0bad6b947b5 100644 --- a/code/modules/client/preferences/middleware/names.dm +++ b/code/modules/client/preferences/middleware/names.dm @@ -2,7 +2,7 @@ /// they have. /datum/preference_middleware/names action_delegations = list( - "randomize_name" = .proc/randomize_name, + "randomize_name" = PROC_REF(randomize_name), ) /datum/preference_middleware/names/get_constant_data() diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index babbad37d2b..75e0e1433ec 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -3,8 +3,8 @@ var/tainted = FALSE action_delegations = list( - "give_quirk" = .proc/give_quirk, - "remove_quirk" = .proc/remove_quirk, + "give_quirk" = PROC_REF(give_quirk), + "remove_quirk" = PROC_REF(remove_quirk), ) /datum/preference_middleware/quirks/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/random.dm b/code/modules/client/preferences/middleware/random.dm index c98ed0476a3..587d1184c27 100644 --- a/code/modules/client/preferences/middleware/random.dm +++ b/code/modules/client/preferences/middleware/random.dm @@ -1,8 +1,8 @@ /// Middleware for handling randomization preferences /datum/preference_middleware/random action_delegations = list( - "randomize_character" = .proc/randomize_character, - "set_random_preference" = .proc/set_random_preference, + "randomize_character" = PROC_REF(randomize_character), + "set_random_preference" = PROC_REF(set_random_preference), ) /datum/preference_middleware/random/get_character_preferences(mob/user) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 7a55b5c42b6..1d3cfb9ecd1 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -132,7 +132,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car notadded += kb save_preferences() //Save the players pref so that new keys that were set to Unbound as default are permanently stored if(length(notadded)) - addtimer(CALLBACK(src, .proc/announce_conflict, notadded), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(announce_conflict), notadded), 5 SECONDS) /datum/preferences/proc/announce_conflict(list/notadded) to_chat(parent, "Keybinding Conflict\n\ diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 838a5304d11..23830859af5 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -84,7 +84,7 @@ for(var/path in subtypesof(/datum/outfit/job)) var/datum/outfit/O = path standard_outfit_options[initial(O.name)] = path - sortTim(standard_outfit_options, /proc/cmp_text_asc) + sortTim(standard_outfit_options, GLOBAL_PROC_REF(cmp_text_asc)) outfit_options = standard_outfit_options /datum/action/chameleon_outfit/Trigger(trigger_flags) @@ -179,7 +179,7 @@ /datum/action/item_action/chameleon/change/proc/select_look(mob/user) var/obj/item/picked_item - var/picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon Settings", sort_list(chameleon_list, /proc/cmp_typepaths_asc)) + var/picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon Settings", sort_list(chameleon_list, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(picked_name)) return if(isnull(chameleon_list[picked_name])) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0c1f81fa2ee..88b0ac59765 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -108,7 +108,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - after_eat = CALLBACK(src, .proc/after_eat)) + after_eat = CALLBACK(src, PROC_REF(after_eat))) /obj/item/food/clothing/proc/after_eat(mob/eater) var/obj/item/clothing/resolved_clothing = clothing.resolve() @@ -212,7 +212,7 @@ if(iscarbon(loc)) var/mob/living/carbon/C = loc C.visible_message(span_danger("The [zone_name] on [C]'s [src.name] is [break_verb] away!"), span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), vision_distance = COMBAT_MESSAGE_RANGE) - RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) + RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE) zones_disabled++ for(var/i in zone2body_parts_covered(def_zone)) @@ -260,7 +260,7 @@ return if(slot_flags & slot) //Was equipped to a valid slot for this item? if(iscarbon(user) && LAZYLEN(zones_disabled)) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE) for(var/trait in clothing_traits) ADD_TRAIT(user, trait, "[CLOTHING_TRAIT] [REF(src)]") if (LAZYLEN(user_vars_to_edit)) @@ -485,7 +485,7 @@ BLIND // can't see anything /obj/item/clothing/atom_destruction(damage_flag) if(damage_flag == BOMB) //so the shred survives potential turf change from the explosion. - addtimer(CALLBACK(src, .proc/_spawn_shreds), 1) + addtimer(CALLBACK(src, PROC_REF(_spawn_shreds)), 1) deconstruct(FALSE) if(damage_flag == CONSUME) //This allows for moths to fully consume clothing, rather than damaging it like other sources like brute var/turf/current_position = get_turf(src) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 9cafb97563e..c41e1cdcc6e 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -219,7 +219,7 @@ . = ..() AddComponent(/datum/component/knockoff,25,list(BODY_ZONE_PRECISE_EYES),list(ITEM_SLOT_EYES)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -593,7 +593,7 @@ if(slot != ITEM_SLOT_EYES) return bigshot = user - RegisterSignal(bigshot, COMSIG_CARBON_SANITY_UPDATE, .proc/moodshift) + RegisterSignal(bigshot, COMSIG_CARBON_SANITY_UPDATE, PROC_REF(moodshift)) /obj/item/clothing/glasses/salesman/dropped(mob/living/carbon/human/user) ..() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 54908e216a4..f3c170a6ff1 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -49,8 +49,8 @@ /obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot) . = ..() - RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, .proc/use_charge) - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, .proc/use_charge) + RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, PROC_REF(use_charge)) + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(use_charge)) /obj/item/clothing/gloves/color/yellow/sprayon/proc/use_charge() SIGNAL_HANDLER diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index 196d692aad8..2ba07f44662 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -13,8 +13,8 @@ /obj/item/clothing/gloves/cargo_gauntlet/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, .proc/on_glove_equip) - RegisterSignal(src, COMSIG_ITEM_POST_UNEQUIP, .proc/on_glove_unequip) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(on_glove_equip)) + RegisterSignal(src, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_glove_unequip)) /// Called when the glove is equipped. Adds a component to the equipper and stores a weak reference to it. /obj/item/clothing/gloves/cargo_gauntlet/proc/on_glove_equip(datum/source, mob/equipper, slot) diff --git a/code/modules/clothing/head/frenchberet.dm b/code/modules/clothing/head/frenchberet.dm index 18f80955e44..b6f01576dbb 100644 --- a/code/modules/clothing/head/frenchberet.dm +++ b/code/modules/clothing/head/frenchberet.dm @@ -10,7 +10,7 @@ /obj/item/clothing/head/frenchberet/equipped(mob/M, slot) . = ..() if (slot == ITEM_SLOT_HEAD) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) ADD_TRAIT(M, TRAIT_GARLIC_BREATH, type) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8ac54dbd035..c5883e481ee 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -461,7 +461,7 @@ magnification = user //this polls ghosts visible_message(span_warning("[src] powers up!")) playsound(src, 'sound/machines/ping.ogg', 30, TRUE) - RegisterSignal(magnification, COMSIG_SPECIES_LOSS, .proc/make_fall_off) + RegisterSignal(magnification, COMSIG_SPECIES_LOSS, PROC_REF(make_fall_off)) polling = TRUE var/list/candidates = poll_candidates_for_mob("Do you want to play as a mind magnified monkey?", ROLE_SENTIENCE, ROLE_SENTIENCE, 5 SECONDS, magnification, POLL_IGNORE_SENTIENCE_POTION) polling = FALSE diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index eede789f9e9..572f74d809e 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -206,7 +206,7 @@ /obj/item/clothing/head/warden/drill/equipped(mob/M, slot) . = ..() if (slot == ITEM_SLOT_HEAD) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/modules/clothing/head/tinfoilhat.dm b/code/modules/clothing/head/tinfoilhat.dm index a404a5a3401..813585f213b 100644 --- a/code/modules/clothing/head/tinfoilhat.dm +++ b/code/modules/clothing/head/tinfoilhat.dm @@ -12,7 +12,7 @@ /obj/item/clothing/head/foilhat/Initialize(mapload) . = ..() if(!warped) - AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_HEAD, 6, TRUE, null, CALLBACK(src, .proc/warp_up)) + AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_HEAD, 6, TRUE, null, CALLBACK(src, PROC_REF(warp_up))) else warp_up() @@ -24,7 +24,7 @@ QDEL_NULL(paranoia) paranoia = new() - RegisterSignal(user, COMSIG_HUMAN_SUICIDE_ACT, .proc/call_suicide) + RegisterSignal(user, COMSIG_HUMAN_SUICIDE_ACT, PROC_REF(call_suicide)) user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC) to_chat(user, span_warning("As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ")) @@ -74,7 +74,7 @@ /obj/item/clothing/head/foilhat/proc/call_suicide(datum/source) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/suicide_act, source) //SIGNAL_HANDLER doesn't like things waiting; INVOKE_ASYNC bypasses that + INVOKE_ASYNC(src, PROC_REF(suicide_act), source) //SIGNAL_HANDLER doesn't like things waiting; INVOKE_ASYNC bypasses that return OXYLOSS /obj/item/clothing/head/foilhat/suicide_act(mob/living/user) diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index b1e22391cb2..73ecb520921 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -24,7 +24,7 @@ /obj/item/clothing/mask/equipped(mob/M, slot) . = ..() if (slot == ITEM_SLOT_MASK && modifies_speech) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) @@ -38,7 +38,7 @@ if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) if(vval) if(!modifies_speech) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else if(modifies_speech) UnregisterSignal(M, COMSIG_MOB_SAY) return ..() diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm index aaed40352b7..50756ffcb65 100644 --- a/code/modules/clothing/masks/animal_masks.dm +++ b/code/modules/clothing/masks/animal_masks.dm @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( var/mob/M = loc if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) if(update_speech_mod) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) to_chat(M, span_userdanger("[src] was cursed!")) M.update_inv_wear_mask() diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 8489d8491cf..de23e5c0ebe 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -75,7 +75,7 @@ . = ..() if(can_be_tied && tied == SHOES_UNTIED) our_alert_ref = WEAKREF(user.throw_alert(ALERT_SHOES_KNOT, /atom/movable/screen/alert/shoes/untied)) - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_trip), override=TRUE) /obj/item/clothing/shoes/proc/restore_offsets(mob/user) equipped_before_drop = FALSE @@ -124,7 +124,7 @@ else if(tied == SHOES_UNTIED && our_guy && user == our_guy) our_alert_ref = WEAKREF(our_guy.throw_alert(ALERT_SHOES_KNOT, /atom/movable/screen/alert/shoes/untied)) // if we're the ones unknotting our own laces, of course we know they're untied - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_trip), override=TRUE) /** * handle_tying deals with all the actual tying/untying/knotting, inferring your intent from who you are in relation to the state of the laces @@ -158,7 +158,7 @@ return user.visible_message(span_notice("[user] begins [tied ? "unknotting" : "tying"] the laces of [user.p_their()] [src.name]."), span_notice("You begin [tied ? "unknotting" : "tying"] the laces of your [src.name]...")) - if(do_after(user, lace_time, target = our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy))) + if(do_after(user, lace_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) to_chat(user, span_notice("You [tied ? "unknot" : "tie"] the laces of your [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_TIED, user) @@ -182,7 +182,7 @@ if(HAS_TRAIT(user, TRAIT_CLUMSY)) // based clowns trained their whole lives for this mod_time *= 0.75 - if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy))) + if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) to_chat(user, span_notice("You [tied ? "untie" : "knot"] the laces on [loc]'s [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_KNOTTED, user) @@ -269,6 +269,6 @@ to_chat(user, span_notice("You begin [tied ? "untying" : "tying"] the laces on [src]...")) - if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, .proc/still_shoed, user))) + if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) to_chat(user, span_notice("You [tied ? "untie" : "tie"] the laces on [src].")) adjust_laces(tied ? SHOES_UNTIED : SHOES_TIED, user) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index f7b380f88cc..35eb81d7e0a 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -18,7 +18,7 @@ AddElement(/datum/element/update_icon_updates_onmob) AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * MINERAL_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20) - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) /obj/item/clothing/shoes/clown_shoes/banana_shoes/proc/on_step() SIGNAL_HANDLER diff --git a/code/modules/clothing/shoes/cowboy.dm b/code/modules/clothing/shoes/cowboy.dm index 4225be85dbf..3fb707ab4aa 100644 --- a/code/modules/clothing/shoes/cowboy.dm +++ b/code/modules/clothing/shoes/cowboy.dm @@ -18,7 +18,7 @@ /obj/item/clothing/shoes/cowboy/equipped(mob/living/carbon/user, slot) . = ..() - RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, .proc/table_slam) + RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, PROC_REF(table_slam)) if(slot == ITEM_SLOT_FEET) for(var/mob/living/occupant in occupants) occupant.forceMove(user.drop_location()) @@ -35,7 +35,7 @@ /obj/item/clothing/shoes/cowboy/proc/table_slam(mob/living/source, obj/structure/table/the_table) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_table_slam, source) + INVOKE_ASYNC(src, PROC_REF(handle_table_slam), source) /obj/item/clothing/shoes/cowboy/proc/handle_table_slam(mob/living/user) user.say(pick("Hot damn!", "Hoo-wee!", "Got-dang!"), spans = list(SPAN_YELL), forced=TRUE) diff --git a/code/modules/clothing/shoes/galoshes.dm b/code/modules/clothing/shoes/galoshes.dm index 9fe6b3789b7..621d58b6d29 100644 --- a/code/modules/clothing/shoes/galoshes.dm +++ b/code/modules/clothing/shoes/galoshes.dm @@ -20,7 +20,7 @@ /obj/item/clothing/shoes/galoshes/dry/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) /obj/item/clothing/shoes/galoshes/dry/proc/on_step() SIGNAL_HANDLER diff --git a/code/modules/clothing/shoes/gunboots.dm b/code/modules/clothing/shoes/gunboots.dm index ff285afe509..0b3f2e4b2b4 100644 --- a/code/modules/clothing/shoes/gunboots.dm +++ b/code/modules/clothing/shoes/gunboots.dm @@ -13,12 +13,12 @@ /obj/item/clothing/shoes/gunboots/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_step)) /obj/item/clothing/shoes/gunboots/equipped(mob/user, slot) . = ..() if(slot == ITEM_SLOT_FEET) - RegisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/check_kick) + RegisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(check_kick)) else UnregisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK) @@ -33,7 +33,7 @@ if(!prob(shot_prob)) return - INVOKE_ASYNC(src, .proc/fire_shot) + INVOKE_ASYNC(src, PROC_REF(fire_shot)) /// Stomping on someone while wearing gunboots shoots them point blank /obj/item/clothing/shoes/gunboots/proc/check_kick(mob/living/carbon/human/kicking_person, atom/attacked_atom, proximity) @@ -42,7 +42,7 @@ return var/mob/living/attacked_living = attacked_atom if(attacked_living.body_position == LYING_DOWN) - INVOKE_ASYNC(src, .proc/fire_shot, attacked_living) + INVOKE_ASYNC(src, PROC_REF(fire_shot), attacked_living) /// Actually fire a shot. If no target is provided, just fire off in a random direction /obj/item/clothing/shoes/gunboots/proc/fire_shot(atom/target) diff --git a/code/modules/clothing/shoes/kindlekicks.dm b/code/modules/clothing/shoes/kindlekicks.dm index 0d35641aa01..3ee5a0bfd2a 100644 --- a/code/modules/clothing/shoes/kindlekicks.dm +++ b/code/modules/clothing/shoes/kindlekicks.dm @@ -17,13 +17,13 @@ active = TRUE set_light_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) set_light_on(active) - addtimer(CALLBACK(src, .proc/lightUp), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(lightUp)), 0.5 SECONDS) /obj/item/clothing/shoes/kindle_kicks/proc/lightUp(mob/user) if(lightCycle < 15) set_light_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) lightCycle++ - addtimer(CALLBACK(src, .proc/lightUp), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(lightUp)), 0.5 SECONDS) else lightCycle = 0 active = FALSE diff --git a/code/modules/clothing/spacesuits/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/code/modules/clothing/spacesuits/hardsuit.dm index cdd8e170192..7518f075074 100644 --- a/code/modules/clothing/spacesuits/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/code/modules/clothing/spacesuits/hardsuit.dm @@ -272,7 +272,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) - RegisterSignal(src, COMSIG_ARMOR_PLATED, .proc/upgrade_icon) + RegisterSignal(src, COMSIG_ARMOR_PLATED, PROC_REF(upgrade_icon)) /obj/item/clothing/head/helmet/space/hardsuit/mining/proc/upgrade_icon(datum/source, amount, maxamount) SIGNAL_HANDLER @@ -314,7 +314,7 @@ /obj/item/clothing/suit/space/hardsuit/mining/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) - RegisterSignal(src, COMSIG_ARMOR_PLATED, .proc/upgrade_icon) + RegisterSignal(src, COMSIG_ARMOR_PLATED, PROC_REF(upgrade_icon)) /obj/item/clothing/suit/space/hardsuit/mining/proc/upgrade_icon(datum/source, amount, maxamount) SIGNAL_HANDLER @@ -553,7 +553,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize(mapload) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, .proc/sense_explosion) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) /obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/living/carbon/human/user, slot) ..() @@ -745,7 +745,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move)) listeningTo = user /obj/item/clothing/suit/space/hardsuit/ancient/dropped() diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index e9c745b2dd4..391bda37549 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -139,7 +139,7 @@ /obj/item/clothing/suit/hooded/cloak/godslayer/equipped(mob/user, slot) . = ..() if(slot & ITEM_SLOT_OCLOTHING) - RegisterSignal(user, COMSIG_MOB_STATCHANGE, .proc/resurrect) + RegisterSignal(user, COMSIG_MOB_STATCHANGE, PROC_REF(resurrect)) return UnregisterSignal(user, COMSIG_MOB_STATCHANGE) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 49a7130124e..55ed6c4ac69 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -196,7 +196,7 @@ owner.alpha = 0 in_stealth = TRUE owner.visible_message(span_danger("[owner] is hit by [attack_text] in the chest!")) //We pretend to be hit, since blocking it would stop the message otherwise - addtimer(CALLBACK(src, .proc/end_stealth, owner), stealth_time) + addtimer(CALLBACK(src, PROC_REF(end_stealth), owner), stealth_time) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return TRUE diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index e24fbf497b8..0e029dcaca9 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -80,7 +80,7 @@ UnregisterSignal(detached_pockets, COMSIG_PARENT_QDELETING) detached_pockets = new_pocket if(detached_pockets) - RegisterSignal(detached_pockets, COMSIG_PARENT_QDELETING, .proc/handle_pockets_del) + RegisterSignal(detached_pockets, COMSIG_PARENT_QDELETING, PROC_REF(handle_pockets_del)) /obj/item/clothing/accessory/proc/handle_pockets_del(datum/source) SIGNAL_HANDLER @@ -338,7 +338,7 @@ user.visible_message(span_notice("[user] shows [user.p_their()] attorney's badge."), span_notice("You show your attorney's badge.")) /obj/item/clothing/accessory/lawyers_badge/on_uniform_equip(obj/item/clothing/under/U, mob/living/user) - RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, .proc/table_slam) + RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, PROC_REF(table_slam)) user.bubble_icon = "lawyer" /obj/item/clothing/accessory/lawyers_badge/on_uniform_dropped(obj/item/clothing/under/U, mob/living/user) @@ -347,7 +347,7 @@ /obj/item/clothing/accessory/lawyers_badge/proc/table_slam(mob/living/source, obj/structure/table/the_table) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_table_slam, source) + INVOKE_ASYNC(src, PROC_REF(handle_table_slam), source) /obj/item/clothing/accessory/lawyers_badge/proc/handle_table_slam(mob/living/user) user.say("Objection!!", spans = list(SPAN_YELL), forced=TRUE) @@ -450,7 +450,7 @@ /obj/item/clothing/accessory/allergy_dogtag/on_uniform_equip(obj/item/clothing/under/U, user) . = ..() - RegisterSignal(U,COMSIG_PARENT_EXAMINE,.proc/on_examine) + RegisterSignal(U,COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /obj/item/clothing/accessory/allergy_dogtag/on_uniform_dropped(obj/item/clothing/under/U, user) . = ..() diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index f3af29917d6..e849de7a797 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -34,7 +34,7 @@ if(log.len && !scanning) scanning = TRUE to_chat(user, span_notice("Printing report, please wait...")) - addtimer(CALLBACK(src, .proc/PrintReport), 100) + addtimer(CALLBACK(src, PROC_REF(PrintReport)), 100) else to_chat(user, span_notice("The scanner has no logs or is in use.")) diff --git a/code/modules/economy/holopay.dm b/code/modules/economy/holopay.dm index 256e3c913fb..9e64761c1b7 100644 --- a/code/modules/economy/holopay.dm +++ b/code/modules/economy/holopay.dm @@ -173,10 +173,10 @@ set_light(2) visible_message(span_notice("A holographic pay stand appears.")) /// Start checking if the source projection is in range - RegisterSignal(card, COMSIG_MOVABLE_MOVED, .proc/check_operation) + RegisterSignal(card, COMSIG_MOVABLE_MOVED, PROC_REF(check_operation)) if(card.loc) holder = WEAKREF(card.loc) - RegisterSignal(card.loc, COMSIG_MOVABLE_MOVED, .proc/check_operation) + RegisterSignal(card.loc, COMSIG_MOVABLE_MOVED, PROC_REF(check_operation)) return TRUE /** @@ -190,7 +190,7 @@ if(card_holder) UnregisterSignal(card_holder, COMSIG_MOVABLE_MOVED) holder = WEAKREF(linked_card.loc) - RegisterSignal(linked_card.loc, COMSIG_MOVABLE_MOVED, .proc/check_operation) + RegisterSignal(linked_card.loc, COMSIG_MOVABLE_MOVED, PROC_REF(check_operation)) if(!IN_GIVEN_RANGE(src, linked_card, max_holo_range) || !IN_GIVEN_RANGE(src, linked_card.loc, max_holo_range)) dissapate() diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index a582832a0b6..eeda82a0627 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -26,7 +26,7 @@ for(var/i in 1 to rand(1,defacto_min)) var/mob/living/carbon/human/onecoughman = pick(fake_virus_victims) if(prob(25))//1/4 odds to get a spooky message instead of coughing out loud - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150)) else addtimer(CALLBACK(onecoughman, .mob/proc/emote, pick("cough", "sniff", "sneeze")), rand(30,150))//deliver the message with a slightly randomized time interval so there arent multiple people coughing at the exact same time fake_virus_victims -= onecoughman diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm index fb6abf53c16..5421337d04e 100644 --- a/code/modules/events/fugitive_spawning.dm +++ b/code/modules/events/fugitive_spawning.dm @@ -56,7 +56,7 @@ //after spawning playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE) new /obj/item/storage/toolbox/mechanical(landing_turf) //so they can actually escape maint - addtimer(CALLBACK(src, .proc/spawn_hunters), 10 MINUTES) + addtimer(CALLBACK(src, PROC_REF(spawn_hunters)), 10 MINUTES) role_name = "fugitive hunter" return SUCCESSFUL_SPAWN diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm index 0c4e8bd9787..cd25832a372 100644 --- a/code/modules/events/ghost_role.dm +++ b/code/modules/events/ghost_role.dm @@ -28,7 +28,7 @@ var/waittime = 300 * (2**retry) message_admins("The event will not spawn a [role_name] until certain \ conditions are met. Waiting [waittime/10]s and then retrying.") - addtimer(CALLBACK(src, .proc/try_spawning, 0, ++retry), waittime) + addtimer(CALLBACK(src, PROC_REF(try_spawning), 0, ++retry), waittime) return if(status == MAP_ERROR) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index e40a2d63b60..ddf50128401 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -85,7 +85,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 SSpoints_of_interest.make_point_of_interest(src) - RegisterSignal(src, COMSIG_ATOM_ENTERING, .proc/on_entering_atom) + RegisterSignal(src, COMSIG_ATOM_ENTERING, PROC_REF(on_entering_atom)) if(special_target) SSmove_manager.home_onto(src, special_target) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 6fb07f4829c..594318985f1 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -50,8 +50,8 @@ threat.title = "Business proposition" threat.content = "Ahoy! This be the [ship_name]. Cough up [payoff] credits or you'll walk the plank." threat.possible_answers = list("We'll pay.","We will not be extorted.") - threat.answer_callback = CALLBACK(GLOBAL_PROC, .proc/pirates_answered, threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) - addtimer(CALLBACK(GLOBAL_PROC, .proc/spawn_pirates, threat, ship_template, FALSE), response_max_time) + threat.answer_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pirates_answered), threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_pirates), threat, ship_template, FALSE), response_max_time) SScommunications.send_message(threat,unique = TRUE) /proc/pirates_answered(datum/comm_message/threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) @@ -426,7 +426,7 @@ status_report = "Sending... " pad.visible_message(span_notice("[pad] starts charging up.")) pad.icon_state = pad.warmup_state - sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE) + sending_timer = addtimer(CALLBACK(src, PROC_REF(send),warmup_time, TIMER_STOPPABLE)) /obj/machinery/computer/piratepad_control/proc/stop_sending(custom_report) if(!sending) diff --git a/code/modules/events/rpgtitles.dm b/code/modules/events/rpgtitles.dm index edde7b87bc0..a91710ee8ea 100644 --- a/code/modules/events/rpgtitles.dm +++ b/code/modules/events/rpgtitles.dm @@ -15,8 +15,8 @@ GLOBAL_DATUM(rpgtitle_controller, /datum/rpgtitle_controller) /datum/rpgtitle_controller/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/on_crewmember_join) - RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGGED_IN, .proc/on_mob_login) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(on_crewmember_join)) + RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGGED_IN, PROC_REF(on_mob_login)) handle_current_jobs() /datum/rpgtitle_controller/Destroy(force) diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm index 3e8ba81671c..e0a4869c0b9 100644 --- a/code/modules/events/shuttle_insurance.dm +++ b/code/modules/events/shuttle_insurance.dm @@ -34,7 +34,7 @@ /datum/round_event/shuttle_insurance/start() insurance_message = new("Shuttle Insurance", "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [insurance_evaluation] to cover for your shuttle in case of any disaster.", list("Purchase Insurance.","Reject Offer.")) - insurance_message.answer_callback = CALLBACK(src,.proc/answered) + insurance_message.answer_callback = CALLBACK(src, PROC_REF(answered)) SScommunications.send_message(insurance_message, unique = TRUE) /datum/round_event/shuttle_insurance/proc/answered() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index e706d604168..49846b3599e 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -390,7 +390,7 @@ . = ..() add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index 6ea7b3f5ac6..23e8537b2f9 100644 --- a/code/modules/events/wizard/embeddies.dm +++ b/code/modules/events/wizard/embeddies.dm @@ -40,7 +40,7 @@ GLOBAL_DATUM(global_funny_embedding, /datum/global_funny_embedding) /datum/global_funny_embedding/New() . = ..() //second operation takes MUCH longer, so lets set up signals first. - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, .proc/on_new_item_in_existence) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, PROC_REF(on_new_item_in_existence)) handle_current_items() /datum/global_funny_embedding/Destroy(force) diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 9c35aceedb2..4c3159e218f 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -43,7 +43,7 @@ /obj/item/greentext/Initialize(mapload) . = ..() SSpoints_of_interest.make_point_of_interest(src) - roundend_callback = CALLBACK(src, .proc/check_winner) + roundend_callback = CALLBACK(src, PROC_REF(check_winner)) SSticker.OnRoundend(roundend_callback) /obj/item/greentext/equipped(mob/user, slot, initial = FALSE) diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index 6907fa99be7..2148ef2d3c6 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -59,7 +59,7 @@ GLOBAL_DATUM(rpgloot_controller, /datum/rpgloot_controller) /datum/rpgloot_controller/New() . = ..() //second operation takes MUCH longer, so lets set up signals first. - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, .proc/on_new_item_in_existence) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, PROC_REF(on_new_item_in_existence)) handle_current_items() ///signal sent by a new item being created. diff --git a/code/modules/experisci/destructive_scanner.dm b/code/modules/experisci/destructive_scanner.dm index 5b119db8eb1..49e93be0164 100644 --- a/code/modules/experisci/destructive_scanner.dm +++ b/code/modules/experisci/destructive_scanner.dm @@ -22,7 +22,7 @@ AddComponent(/datum/component/experiment_handler, \ allowed_experiments = list(/datum/experiment/scanning),\ config_mode = EXPERIMENT_CONFIG_CLICK, \ - start_experiment_callback = CALLBACK(src, .proc/activate)) + start_experiment_callback = CALLBACK(src, PROC_REF(activate))) ///Activates the machine; checks if it can actually scan, then starts. /obj/machinery/destructive_scanner/proc/activate() @@ -47,7 +47,7 @@ scanning = TRUE update_icon() playsound(src, 'sound/machines/destructive_scanner/TubeDown.ogg', 100) - addtimer(CALLBACK(src, .proc/start_scanning, aggressive), 1.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_scanning), aggressive), 1.2 SECONDS) ///Starts scanning the fancy scanning effects /obj/machinery/destructive_scanner/proc/start_scanning(aggressive) @@ -55,7 +55,7 @@ playsound(src, 'sound/machines/destructive_scanner/ScanDangerous.ogg', 100, extrarange = 5) else playsound(src, 'sound/machines/destructive_scanner/ScanSafe.ogg', 100) - addtimer(CALLBACK(src, .proc/finish_scanning, aggressive), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_scanning), aggressive), 6 SECONDS) ///Performs the actual scan, happens once the tube effects are done @@ -64,7 +64,7 @@ scanning = FALSE update_icon() playsound(src, 'sound/machines/destructive_scanner/TubeUp.ogg', 100) - addtimer(CALLBACK(src, .proc/open, aggressive), 1.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(open), aggressive), 1.2 SECONDS) ///Opens the machine to let out any contents. If the scan had mobs it'll gib them. /obj/machinery/destructive_scanner/proc/open(aggressive) diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm index cc177a79eb4..c521ef8e313 100644 --- a/code/modules/experisci/experiment/handlers/experiment_handler.dm +++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm @@ -50,25 +50,25 @@ src.start_experiment_callback = start_experiment_callback if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/try_run_handheld_experiment) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/ignored_handheld_experiment_attempt) + RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_run_handheld_experiment)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(ignored_handheld_experiment_attempt)) if(istype(parent, /obj/machinery/doppler_array)) - RegisterSignal(parent, COMSIG_DOPPLER_ARRAY_EXPLOSION_DETECTED, .proc/try_run_doppler_experiment) + RegisterSignal(parent, COMSIG_DOPPLER_ARRAY_EXPLOSION_DETECTED, PROC_REF(try_run_doppler_experiment)) if(istype(parent, /obj/machinery/destructive_scanner)) - RegisterSignal(parent, COMSIG_MACHINERY_DESTRUCTIVE_SCAN, .proc/try_run_destructive_experiment) + RegisterSignal(parent, COMSIG_MACHINERY_DESTRUCTIVE_SCAN, PROC_REF(try_run_destructive_experiment)) if(istype(parent, /obj/machinery/computer/operating)) - RegisterSignal(parent, COMSIG_OPERATING_COMPUTER_DISSECTION_COMPLETE, .proc/try_run_dissection_experiment) + RegisterSignal(parent, COMSIG_OPERATING_COMPUTER_DISSECTION_COMPLETE, PROC_REF(try_run_dissection_experiment)) // Determine UI display mode switch(config_mode) if(EXPERIMENT_CONFIG_ATTACKSELF) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/configure_experiment) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(configure_experiment)) if(EXPERIMENT_CONFIG_ALTCLICK) - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/configure_experiment) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(configure_experiment)) if(EXPERIMENT_CONFIG_CLICK) - RegisterSignal(parent, COMSIG_ATOM_UI_INTERACT, .proc/configure_experiment_click) + RegisterSignal(parent, COMSIG_ATOM_UI_INTERACT, PROC_REF(configure_experiment_click)) if(EXPERIMENT_CONFIG_UI) - RegisterSignal(parent, COMSIG_UI_ACT, .proc/ui_handle_experiment) + RegisterSignal(parent, COMSIG_UI_ACT, PROC_REF(ui_handle_experiment)) // Auto connect to the first visible techweb (useful for always active handlers) // Note this won't work at the moment for non-machines that have been included @@ -92,7 +92,7 @@ SIGNAL_HANDLER if (!should_run_handheld_experiment(source, target, user, params)) return - INVOKE_ASYNC(src, .proc/try_run_handheld_experiment_async, source, target, user, params) + INVOKE_ASYNC(src, PROC_REF(try_run_handheld_experiment_async), source, target, user, params) return COMPONENT_CANCEL_ATTACK_CHAIN /** @@ -240,7 +240,7 @@ SIGNAL_HANDLER switch(action) if("open_experiments") - INVOKE_ASYNC(src, .proc/configure_experiment, null, usr) + INVOKE_ASYNC(src, PROC_REF(configure_experiment), null, usr) /** * Attempts to show the user the experiment configuration panel @@ -250,7 +250,7 @@ */ /datum/component/experiment_handler/proc/configure_experiment(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /** * Attempts to show the user the experiment configuration panel @@ -260,7 +260,7 @@ */ /datum/component/experiment_handler/proc/configure_experiment_click(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, /datum/proc/ui_interact, user) + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) /** * Attempts to link this experiment_handler to a provided techweb diff --git a/code/modules/experisci/experiment/physical_experiments.dm b/code/modules/experisci/experiment/physical_experiments.dm index 659008ffeb4..f710a64aec5 100644 --- a/code/modules/experisci/experiment/physical_experiments.dm +++ b/code/modules/experisci/experiment/physical_experiments.dm @@ -11,7 +11,7 @@ linked_experiment_handler.announce_message("Object is not made out of the correct materials.") return FALSE - RegisterSignal(currently_scanned_atom, COMSIG_ATOM_BULLET_ACT, .proc/check_experiment) + RegisterSignal(currently_scanned_atom, COMSIG_ATOM_BULLET_ACT, PROC_REF(check_experiment)) linked_experiment_handler.announce_message("Experiment ready to start.") return TRUE @@ -43,7 +43,7 @@ linked_experiment_handler.announce_message("Incorrect object for experiment.") return FALSE - RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, .proc/win_arcade) + RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, PROC_REF(win_arcade)) linked_experiment_handler.announce_message("Experiment ready to start.") return TRUE diff --git a/code/modules/explorer_drone/adventure.dm b/code/modules/explorer_drone/adventure.dm index dd2751aa87b..bd2971a4573 100644 --- a/code/modules/explorer_drone/adventure.dm +++ b/code/modules/explorer_drone/adventure.dm @@ -319,9 +319,9 @@ GLOBAL_LIST_EMPTY(explorer_drone_adventure_db_entries) var/delay_time = choice_data[CHOICE_DELAY_FIELD] if(!isnum(delay_time)) CRASH("Invalid delay in adventure [name]") - SEND_SIGNAL(src,COMSIG_ADVENTURE_DELAY_START,delay_time,delay_message) + SEND_SIGNAL(src, COMSIG_ADVENTURE_DELAY_START, delay_time, delay_message) delayed_action = list(delay_time,delay_message) - addtimer(CALLBACK(src,.proc/finish_delay,exit_id),delay_time) + addtimer(CALLBACK(src, PROC_REF(finish_delay), exit_id), delay_time) return navigate_to_node(exit_id) diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm index 8e50c3420e6..1935bfb9c14 100644 --- a/code/modules/explorer_drone/control_console.dm +++ b/code/modules/explorer_drone/control_console.dm @@ -19,8 +19,8 @@ end_drone_control() controlled_drone = drone controlled_drone.controlled = TRUE - RegisterSignal(controlled_drone,COMSIG_PARENT_QDELETING,.proc/drone_destroyed) - RegisterSignal(controlled_drone,COMSIG_EXODRONE_STATUS_CHANGED,.proc/on_exodrone_status_changed) + RegisterSignal(controlled_drone,COMSIG_PARENT_QDELETING, PROC_REF(drone_destroyed)) + RegisterSignal(controlled_drone,COMSIG_EXODRONE_STATUS_CHANGED, PROC_REF(on_exodrone_status_changed)) update_icon() /obj/machinery/computer/exodrone_control_console/proc/on_exodrone_status_changed() diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm index 3f28b312320..c3530986a68 100644 --- a/code/modules/explorer_drone/exodrone.dm +++ b/code/modules/explorer_drone/exodrone.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) distance_to_travel = max(abs(target_site.distance - location.distance),1) travel_target = target_site travel_time = travel_cost_coeff*distance_to_travel - travel_timer_id = addtimer(CALLBACK(src,.proc/finish_travel),travel_time,TIMER_STOPPABLE) + travel_timer_id = addtimer(CALLBACK(src, PROC_REF(finish_travel),travel_time,TIMER_STOPPABLE)) /// Travel cleanup /obj/item/exodrone/proc/finish_travel() @@ -233,10 +233,10 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) /obj/item/exodrone/proc/start_adventure(datum/adventure/adventure) current_adventure = adventure - RegisterSignal(current_adventure,COMSIG_ADVENTURE_FINISHED,.proc/resolve_adventure) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_QUALITY_INIT,.proc/add_tool_qualities) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_START,.proc/adventure_delay_start) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_END,.proc/adventure_delay_end) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_FINISHED, PROC_REF(resolve_adventure)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_QUALITY_INIT, PROC_REF(add_tool_qualities)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_START, PROC_REF(adventure_delay_start)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_END, PROC_REF(adventure_delay_end)) set_status(EXODRONE_ADVENTURE) current_adventure.start_adventure() diff --git a/code/modules/explorer_drone/exploration_events/resource.dm b/code/modules/explorer_drone/exploration_events/resource.dm index b66aa65fd69..2416476312f 100644 --- a/code/modules/explorer_drone/exploration_events/resource.dm +++ b/code/modules/explorer_drone/exploration_events/resource.dm @@ -39,7 +39,7 @@ amount-- if(delay > 0) drone.set_busy(delay_message,delay) - addtimer(CALLBACK(src,.proc/delay_finished,WEAKREF(drone)),delay) + addtimer(CALLBACK(src, PROC_REF(delay_finished), WEAKREF(drone)), delay) else finish_event(drone) diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm index 211e3235e62..e9189c294e9 100644 --- a/code/modules/explorer_drone/loot.dm +++ b/code/modules/explorer_drone/loot.dm @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index()) to_chat(user,span_notice("You begin to charge [src]")) inhand_icon_state = "firelance_charging" user.update_inv_hands() - if(do_after(user,windup_time,interaction_key="firelance",extra_checks = CALLBACK(src, .proc/windup_checks))) + if(do_after(user,windup_time,interaction_key="firelance",extra_checks = CALLBACK(src, PROC_REF(windup_checks)))) var/turf/start_turf = get_turf(user) var/turf/last_turf = get_ranged_target_turf(start_turf,user.dir,melt_range) start_turf.Beam(last_turf,icon_state="solar_beam",time=1 SECONDS) diff --git a/code/modules/explorer_drone/manager.dm b/code/modules/explorer_drone/manager.dm index 7632b15bc76..74a972216a4 100644 --- a/code/modules/explorer_drone/manager.dm +++ b/code/modules/explorer_drone/manager.dm @@ -55,7 +55,7 @@ if(!temp_adventure) feedback_message = "Instantiating adventure failed. Check runtime logs for details." return TRUE - RegisterSignal(temp_adventure,COMSIG_ADVENTURE_FINISHED,.proc/resolve_adventure) + RegisterSignal(temp_adventure,COMSIG_ADVENTURE_FINISHED, PROC_REF(resolve_adventure)) temp_adventure.start_adventure() feedback_message = "Adventure started" return TRUE diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index afc7607f162..bc70ce79a1a 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) if(EXOSCAN_DEEP) scan_power = GLOB.exoscanner_controller.get_scan_power(target) scan_time = (BASE_DEEP_SCAN_TIME*target.distance)/scan_power - scan_timer = addtimer(CALLBACK(src,.proc/resolve_scan),scan_time,TIMER_STOPPABLE) + scan_timer = addtimer(CALLBACK(src, PROC_REF(resolve_scan),scan_time,TIMER_STOPPABLE)) /// Short description for in progress scan /datum/exoscan/proc/ui_description() @@ -172,7 +172,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) /obj/machinery/computer/exoscanner_control/proc/create_scan(scan_type,target) var/datum/exoscan/scan = GLOB.exoscanner_controller.create_scan(scan_type,target) if(scan) - RegisterSignal(scan, COMSIG_EXOSCAN_INTERRUPTED, .proc/scan_failed) + RegisterSignal(scan, COMSIG_EXOSCAN_INTERRUPTED, PROC_REF(scan_failed)) /obj/machinery/computer/exoscanner_control/proc/scan_failed() SIGNAL_HANDLER @@ -200,7 +200,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) /obj/machinery/exoscanner/Initialize(mapload) . = ..() - RegisterSignal(GLOB.exoscanner_controller,list(COMSIG_EXOSCAN_STARTED,COMSIG_EXOSCAN_FINISHED),.proc/scan_change) + RegisterSignal(GLOB.exoscanner_controller,list(COMSIG_EXOSCAN_STARTED,COMSIG_EXOSCAN_FINISHED), PROC_REF(scan_change)) update_readiness() /obj/machinery/exoscanner/proc/scan_change() @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) if(length(GLOB.exoscanner_controller.tracked_dishes) <= 0 || (target && GLOB.exoscanner_controller.get_scan_power(target) <= 0)) return current_scan = new(scan_type,target) - RegisterSignal(current_scan,COMSIG_PARENT_QDELETING,.proc/cleanup_current_scan) + RegisterSignal(current_scan,COMSIG_PARENT_QDELETING, PROC_REF(cleanup_current_scan)) SEND_SIGNAL(src,COMSIG_EXOSCAN_STARTED,current_scan) return current_scan diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index dc9ffc631c8..4ef3e49a0fd 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -64,6 +64,6 @@ dream_fragments.Cut(1,2) to_chat(src, span_notice("... [next_message] ...")) if(LAZYLEN(dream_fragments)) - addtimer(CALLBACK(src, .proc/dream_sequence, dream_fragments), rand(10,30)) + addtimer(CALLBACK(src, PROC_REF(dream_sequence), dream_fragments), rand(10,30)) else dreaming = FALSE diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 8976e5142c8..6a028d67224 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( natural = !forced // Cancel early if the target is deleted - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/target_deleting) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(target_deleting)) /datum/hallucination/proc/target_deleting() SIGNAL_HANDLER @@ -367,7 +367,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.client.images |= fakerune target.playsound_local(wall,'sound/effects/meteorimpact.ogg', 150, 1) bubblegum = new(wall, target) - addtimer(CALLBACK(src, .proc/start_processing), 10) + addtimer(CALLBACK(src, PROC_REF(start_processing)), 10) /datum/hallucination/oh_yeah/proc/start_processing() if (isnull(target)) @@ -441,7 +441,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( process = FALSE target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1) target.playsound_local(source, get_sfx("bodyfall"), 25, 1) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/cablecuff.ogg', 15, 1), 20) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/cablecuff.ogg', 15, 1), 20) if("harmbaton") //zap n slap iterations_left = rand(5, 12) target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1) @@ -492,15 +492,15 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(source, fire_sound, 25, 1) if(prob(50)) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, hit_person_sound, 25, 1), rand(5,10)) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, hit_person_sound, 25, 1), rand(5,10)) hits += 1 else - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, hit_wall_sound, 25, 1), rand(5,10)) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, hit_wall_sound, 25, 1), rand(5,10)) next_action = rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6) if(hits >= number_of_hits && prob(chance_to_fall)) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, get_sfx("bodyfall"), 25, 1), next_action) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, get_sfx("bodyfall"), 25, 1), next_action) qdel(src) return if ("esword") @@ -619,7 +619,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( A = image(image_file,H,"arm_blade", layer=ABOVE_MOB_LAYER) if(target.client) target.client.images |= A - addtimer(CALLBACK(src, .proc/cleanup, item, A, H), rand(15 SECONDS, 25 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(cleanup), item, A, H), rand(15 SECONDS, 25 SECONDS)) return qdel(src) @@ -867,7 +867,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( // Display message if (!is_radio && !target.client?.prefs.read_preference(/datum/preference/toggle/enable_runechat)) var/image/speech_overlay = image('icons/mob/talk.dmi', person, "default0", layer = ABOVE_MOB_LAYER) - INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, speech_overlay, list(target.client), 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), speech_overlay, list(target.client), 30) if (target.client?.prefs.read_preference(/datum/preference/toggle/enable_runechat)) target.create_chat_message(person, understood_language, chosen, spans) to_chat(target, message) @@ -943,7 +943,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(source,'sound/machines/airlock.ogg', 30, 1) if("airlock pry") target.playsound_local(source,'sound/machines/airlock_alien_prying.ogg', 100, 1) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/machines/airlockforced.ogg', 30, 1), 50) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/machines/airlockforced.ogg', 30, 1), 50) if("console") target.playsound_local(source,'sound/machines/terminal_prompt.ogg', 25, 1) if("explosion") @@ -964,12 +964,12 @@ GLOBAL_LIST_INIT(hallucination_list, list( //Deconstructing a wall if("wall decon") target.playsound_local(source, 'sound/items/welder.ogg', 50, 1) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/items/welder2.ogg', 50, 1), 105) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/items/ratchet.ogg', 50, 1), 120) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/items/welder2.ogg', 50, 1), 105) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/items/ratchet.ogg', 50, 1), 120) //Hacking a door if("door hack") target.playsound_local(source, 'sound/items/screwdriver.ogg', 50, 1) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/machines/airlockforced.ogg', 30, 1), rand(40, 80)) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/machines/airlockforced.ogg', 30, 1), rand(40, 80)) qdel(src) /datum/hallucination/mech_sounds @@ -1021,7 +1021,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if("phone") target.playsound_local(source, 'sound/weapons/ring.ogg', 15) for (var/next_rings in 1 to 3) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/ring.ogg', 15), 25 * next_rings) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/ring.ogg', 15), 25 * next_rings) if("hyperspace") target.playsound_local(null, 'sound/runtime/hyperspace/hyperspace_begin.ogg', 50) if("hallelujah") @@ -1040,8 +1040,8 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(source, pick(GLOB.creepy_ambience), 50, 1) if("tesla") //Tesla loose! target.playsound_local(source, 'sound/magic/lightningbolt.ogg', 35, 1) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/magic/lightningbolt.ogg', 65, 1), 30) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/magic/lightningbolt.ogg', 100, 1), 60) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/magic/lightningbolt.ogg', 65, 1), 30) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/magic/lightningbolt.ogg', 100, 1), 60) qdel(src) @@ -1063,7 +1063,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(target, 'sound/effects/clockcult_gateway_disrupted.ogg', 50, FALSE, pressure_affected = FALSE) addtimer(CALLBACK( target, - /mob/.proc/playsound_local, + TYPE_PROC_REF(/mob, playsound_local), target, 'sound/effects/explosion_distant.ogg', 50, @@ -1177,7 +1177,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(ALERT_CHARGE) target.throw_alert(alert_type, /atom/movable/screen/alert/emptycell, override = TRUE) - addtimer(CALLBACK(src, .proc/cleanup), duration) + addtimer(CALLBACK(src, PROC_REF(cleanup)), duration) /datum/hallucination/fake_alert/proc/cleanup() target.clear_alert(alert_type, clear_override = TRUE) @@ -1197,7 +1197,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( LAZYSET(human_mob.hal_screwydoll, specific_limb, severity) human_mob.update_health_hud() - timer_id = addtimer(CALLBACK(src, .proc/cleanup), duration, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(cleanup)), duration, TIMER_STOPPABLE) ///Increments the severity of the damage seen on the doll /datum/hallucination/fake_health_doll/proc/increment_fake_damage() @@ -1351,7 +1351,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /obj/effect/hallucination/danger/lava/Initialize(mapload, _target) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -1373,7 +1373,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /obj/effect/hallucination/danger/chasm/Initialize(mapload, _target) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -1390,7 +1390,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( return to_chat(target, span_userdanger("You fall into the chasm!")) target.Paralyze(40) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, span_notice("It's surprisingly shallow.")), 15) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), target, span_notice("It's surprisingly shallow.")), 15) QDEL_IN(src, 30) /obj/effect/hallucination/danger/anomaly @@ -1400,7 +1400,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( . = ..() START_PROCESSING(SSobj, src) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -1445,10 +1445,10 @@ GLOBAL_LIST_INIT(hallucination_list, list( fakemob = target //ever been so lonely you had to haunt yourself? if(fakemob) delay = rand(20, 50) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, "DEAD: [fakemob.name] says, \"[pick("rip","why did i just drop dead?","hey [target.first_name()]","git gud","you too?","is the AI rogue?",\ + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), target, "DEAD: [fakemob.name] says, \"[pick("rip","why did i just drop dead?","hey [target.first_name()]","git gud","you too?","is the AI rogue?",\ "i[prob(50)?" fucking":""] hate [pick("blood cult", "clock cult", "revenants", "this round","this","myself","admins","you")]")]\""), delay) - addtimer(CALLBACK(src, .proc/cleanup), delay + rand(70, 90)) + addtimer(CALLBACK(src, PROC_REF(cleanup)), delay + rand(70, 90)) /datum/hallucination/death/proc/cleanup() if (target) @@ -1481,7 +1481,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( to_chat(target, span_userdanger("You're set on fire!")) target.throw_alert(ALERT_FIRE, /atom/movable/screen/alert/fire, override = TRUE) times_to_lower_stamina = rand(5, 10) - addtimer(CALLBACK(src, .proc/start_expanding), 20) + addtimer(CALLBACK(src, PROC_REF(start_expanding)), 20) /datum/hallucination/fire/Destroy() . = ..() @@ -1564,13 +1564,13 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(target.client) target.client.images |= shock_image target.client.images |= electrocution_skeleton_anim - addtimer(CALLBACK(src, .proc/reset_shock_animation), 40) + addtimer(CALLBACK(src, PROC_REF(reset_shock_animation)), 40) target.playsound_local(get_turf(src), "sparks", 100, 1) target.staminaloss += 50 target.Stun(40) target.jitteriness += 1000 target.do_jitter_animation(target.jitteriness) - addtimer(CALLBACK(src, .proc/shock_drop), 20) + addtimer(CALLBACK(src, PROC_REF(shock_drop)), 20) /datum/hallucination/shock/proc/reset_shock_animation() if(target.client) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 0efd18b2641..1a5f79c6553 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -95,7 +95,7 @@ return var/mob/living/silicon/robot/bro = user bro.cell.use(30) - addtimer(CALLBACK(reagents, /datum/reagents.proc/add_reagent, refill, trans), 600) + addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent), refill, trans), 600) else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us. if (!is_refillable()) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index f690ca6a1e5..7761718353f 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -655,7 +655,7 @@ to_chat(user, span_info("You light [src] on fire.")) add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) if(!isGlass) - addtimer(CALLBACK(src, .proc/explode), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS) /obj/item/reagent_containers/food/drinks/bottle/molotov/proc/explode() if(!active) @@ -692,7 +692,7 @@ /obj/item/reagent_containers/food/drinks/bottle/pruno/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/check_fermentation) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_fermentation)) /obj/item/reagent_containers/food/drinks/bottle/pruno/Destroy() UnregisterSignal(src, COMSIG_MOVABLE_MOVED) @@ -713,7 +713,7 @@ return if(!fermentation_time_remaining) fermentation_time_remaining = fermentation_time - fermentation_timer = addtimer(CALLBACK(src, .proc/do_fermentation), fermentation_time_remaining, TIMER_UNIQUE|TIMER_STOPPABLE) + fermentation_timer = addtimer(CALLBACK(src, PROC_REF(do_fermentation)), fermentation_time_remaining, TIMER_UNIQUE|TIMER_STOPPABLE) fermentation_time_remaining = null // actually ferment diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index ec004dc3f06..4490ea4fcf8 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -315,8 +315,8 @@ /obj/item/reagent_containers/food/condiment/pack/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_add, TRUE) - RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, .proc/on_reagent_del, TRUE) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_add), TRUE) + RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del), TRUE) /obj/item/reagent_containers/food/condiment/pack/update_icon() SHOULD_CALL_PARENT(FALSE) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 22a2094077f..649b2b8e5b7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( visible_message(span_userdanger("[src] starts glowing... Oh no...")) playsound(src, 'sound/effects/pray_chaplain.ogg', 100) add_filter("entropic_ray", 10, list("type" = "rays", "size" = 35, "color" = COLOR_VIVID_YELLOW)) - addtimer(CALLBACK(src, .proc/blow_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(blow_up)), 5 SECONDS) frying = new /obj/item/food/deepfryholder(src, frying_item) icon_state = "fryer_on" fry_loop.start() diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index 624235af823..d51042f8549 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -23,10 +23,10 @@ cart_table = new(src) cart_tent = new(src) packed_things = list(cart_table, cart_smartfridge, cart_tent, cart_griddle) //middle, left, left, right - RegisterSignal(cart_griddle, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_smartfridge, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_table, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_tent, COMSIG_PARENT_QDELETING, .proc/lost_part) + RegisterSignal(cart_griddle, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_smartfridge, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_table, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_tent, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) /obj/machinery/food_cart/Destroy() if(cart_griddle) @@ -75,7 +75,7 @@ var/turf/T = get_step(grabbed_turf, turn(SOUTH, angle)) var/obj/thing = packed_things[iteration] thing.forceMove(T) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, .proc/lost_part) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(lost_part)) iteration++ unpacked = TRUE diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 3ffa4a42384..a5bf5069ae7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -202,7 +202,7 @@ mob_occupant.ghostize() set_occupant(null) qdel(mob_occupant) - addtimer(CALLBACK(src, .proc/make_meat, skin, allmeat, meat_produced, gibtype, diseases), gibtime) + addtimer(CALLBACK(src, PROC_REF(make_meat), skin, allmeat, meat_produced, gibtype, diseases), gibtime) /obj/machinery/gibber/proc/make_meat(obj/item/stack/sheet/animalhide/skin, list/obj/item/food/meat/slab/allmeat, meat_produced, gibtype, list/datum/disease/diseases) playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) diff --git a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm index ca901546d2e..a57b6b7d9ce 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm @@ -29,7 +29,7 @@ . = ..() grill_loop = new(src, FALSE) meat_sound = new(src, FALSE) //Mojave Sun edit - Removed variant code and also added our meat grilling sound loop - RegisterSignal(src, COMSIG_ATOM_EXPOSE_REAGENT, .proc/on_expose_reagent) + RegisterSignal(src, COMSIG_ATOM_EXPOSE_REAGENT, PROC_REF(on_expose_reagent)) /obj/machinery/griddle/Destroy() QDEL_NULL(grill_loop) @@ -103,9 +103,9 @@ vis_contents += item_to_grill griddled_objects += item_to_grill item_to_grill.flags_1 |= IS_ONTOP_1 - RegisterSignal(item_to_grill, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) - RegisterSignal(item_to_grill, COMSIG_GRILL_COMPLETED, .proc/GrillCompleted) - RegisterSignal(item_to_grill, COMSIG_PARENT_QDELETING, .proc/ItemRemovedFromGrill) + RegisterSignal(item_to_grill, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) + RegisterSignal(item_to_grill, COMSIG_GRILL_COMPLETED, PROC_REF(GrillCompleted)) + RegisterSignal(item_to_grill, COMSIG_PARENT_QDELETING, PROC_REF(ItemRemovedFromGrill)) update_grill_audio() /obj/machinery/griddle/proc/ItemRemovedFromGrill(obj/item/I) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 0ca3f86dc65..1d1ee50d5ee 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -68,7 +68,7 @@ return else if(!grilled_item && user.transferItemToLoc(I, src)) grilled_item = I - RegisterSignal(grilled_item, COMSIG_GRILL_COMPLETED, .proc/GrillCompleted) + RegisterSignal(grilled_item, COMSIG_GRILL_COMPLETED, PROC_REF(GrillCompleted)) ADD_TRAIT(grilled_item, TRAIT_FOOD_GRILLED, "boomers") to_chat(user, span_notice("You put the [grilled_item] on [src].")) update_appearance() diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 2c19df8da99..3439a233768 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -312,7 +312,7 @@ return time-- use_power(500) - addtimer(CALLBACK(src, .proc/loop, type, time, wait), wait) + addtimer(CALLBACK(src, PROC_REF(loop), type, time, wait), wait) /obj/machinery/microwave/power_change() . = ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 3c6cd46266b..6ab9a027fff 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) use_power(500) stored_matter += cube_production addtimer(VARSET_CALLBACK(src, pixel_x, base_pixel_x)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored."))) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored."))) /obj/machinery/monkey_recycler/interact(mob/user) if(stored_matter >= 1) diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm index 8cc23986ac9..7a1d8556436 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm @@ -105,7 +105,7 @@ oven_tray.pixel_y = OVEN_TRAY_Y_OFFSET oven_tray.pixel_x = OVEN_TRAY_X_OFFSET - RegisterSignal(used_tray, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) + RegisterSignal(used_tray, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) update_baking_audio() update_appearance() diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index 6b293c3d967..8ec7a3e5ca1 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -45,8 +45,8 @@ /obj/item/plate/proc/AddToPlate(obj/item/item_to_plate) vis_contents += item_to_plate item_to_plate.flags_1 |= IS_ONTOP_1 - RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) - RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, .proc/ItemMoved) + RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) + RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, PROC_REF(ItemMoved)) update_appearance() ///This proc cleans up any signals on the item when it is removed from a plate, and ensures it has the correct state again. diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 5019fbfc598..1f51d305c53 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -720,7 +720,7 @@ /datum/holiday/xmas/celebrate() . = ..() - SSticker.OnRoundstart(CALLBACK(src, .proc/roundstart_celebrate)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(roundstart_celebrate))) GLOB.maintenance_loot += list( list( /obj/item/toy/xmas_cracker = 3, diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 583c28e3bb5..803b5f0c269 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf spawned -= holo_atom continue - RegisterSignal(holo_atom, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists) + RegisterSignal(holo_atom, COMSIG_PARENT_PREQDELETED, PROC_REF(remove_from_holo_lists)) holo_atom.flags_1 |= HOLOGRAM_1 if(isholoeffect(holo_atom))//activates holo effects and transfers them from the spawned list into the effects list @@ -280,10 +280,10 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf var/atom/holo_effect_product = holo_effect.activate(src)//change name if(istype(holo_effect_product)) spawned += holo_effect_product // we want mobs or objects spawned via holoeffects to be tracked as objects - RegisterSignal(holo_effect_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists) + RegisterSignal(holo_effect_product, COMSIG_PARENT_PREQDELETED, PROC_REF(remove_from_holo_lists)) if(islist(holo_effect_product)) for(var/atom/atom_product as anything in holo_effect_product) - RegisterSignal(atom_product, COMSIG_PARENT_PREQDELETED, .proc/remove_from_holo_lists) + RegisterSignal(atom_product, COMSIG_PARENT_PREQDELETED, PROC_REF(remove_from_holo_lists)) continue if(isobj(holo_atom)) @@ -361,7 +361,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf if(toggleOn) if(last_program && (last_program != offline_program)) - addtimer(CALLBACK(src,.proc/load_program, last_program, TRUE), 25) + addtimer(CALLBACK(src, PROC_REF(load_program), last_program, TRUE), 25) active = TRUE else last_program = program @@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf /obj/machinery/computer/holodeck/power_change() . = ..() - INVOKE_ASYNC(src, .proc/toggle_power, !machine_stat) + INVOKE_ASYNC(src, PROC_REF(toggle_power), !machine_stat) ///shuts down the holodeck and force loads the offline_program /obj/machinery/computer/holodeck/proc/emergency_shutdown() diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index f86c2ee27de..978a06942ac 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -34,7 +34,7 @@ deck = new(loc) safety(!(HC.obj_flags & EMAGGED)) deck.holo = HC - RegisterSignal(deck, COMSIG_PARENT_QDELETING, .proc/handle_card_delete) + RegisterSignal(deck, COMSIG_PARENT_QDELETING, PROC_REF(handle_card_delete)) return deck /obj/effect/holodeck_effect/cards/proc/handle_card_delete(datum/source) @@ -92,7 +92,7 @@ // these vars are not really standardized but all would theoretically create stuff on death for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & our_mob.vars) our_mob.vars[v] = null - RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, .proc/handle_mob_delete) + RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_delete)) return our_mob /obj/effect/holodeck_effect/mobspawner/deactivate(obj/machinery/computer/holodeck/HC) diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index e6df49e2a9f..c900d4aaf9b 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -144,7 +144,7 @@ /turf/open/floor/holofloor/carpet/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 1) /turf/open/floor/holofloor/carpet/update_icon(updates=ALL) . = ..() diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 57330ff9495..1fe169b379f 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -49,7 +49,7 @@ to_chat(user, span_warning("[I] is stuck to your hand!")) return TRUE to_chat(user, span_notice("You place [I] into [src] to start the fermentation process.")) - addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier) + addtimer(CALLBACK(src, PROC_REF(makeWine), fruit), rand(80, 120) * speed_multiplier) return TRUE if(I) if(I.is_refillable()) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 43c85bf108d..9a5d3db91f7 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -98,7 +98,7 @@ /obj/item/food/grown/MakeLeaveTrash() if(trash_type) - AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_OPENABLE, /obj/item/food/grown/.proc/generate_trash) + AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_OPENABLE, TYPE_PROC_REF(/obj/item/food/grown, generate_trash)) return /// Callback proc for bonus behavior for generating trash of grown food. Used by [/datum/element/food_trash]. diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index a40d6b9dbfc..2360d5a5ce4 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -164,7 +164,7 @@ animate(src, time = 1, pixel_z = 12, easing = ELASTIC_EASING) animate(time = 1, pixel_z = 0, easing = BOUNCE_EASING) - addtimer(CALLBACK(src, .proc/explosive_ripening), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explosive_ripening)), 3 SECONDS) for(var/i in 1 to 32) animate(color = (i % 2) ? "#ffffff": "#ff6739", time = 1, easing = QUAD_EASING) diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 20b6d934fd7..0ac8956be40 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -77,7 +77,7 @@ bite_consumption = bite_consumption, \ microwaved_type = microwaved_type, \ junkiness = junkiness, \ - check_liked = CALLBACK(src, .proc/check_holyness)) + check_liked = CALLBACK(src, PROC_REF(check_holyness))) /* * Callback to be used with the edible component. diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index cff6aed3df3..c517f42222f 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -63,9 +63,9 @@ /obj/item/seeds/replicapod/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT), .proc/on_reagent_add) - RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, .proc/on_reagent_del) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT), PROC_REF(on_reagent_add)) + RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles the seeds' reagents datum getting deleted. /obj/item/seeds/replicapod/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index a6f8fba1ac3..bef0f256d37 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -452,7 +452,7 @@ /obj/item/cultivator/rake/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index e4e5ade13b0..7f7734593e1 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -643,7 +643,7 @@ set_weedlevel(0, update_icon = FALSE) var/message = span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) /obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant if( weedlevel > 5 ) @@ -657,7 +657,7 @@ set_weedlevel(0, update_icon = FALSE) // Reset var/message = span_warning("The mutated weeds in [src] spawn some [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) else to_chat(usr, span_warning("The few weeds in [src] seem to react, but only for a moment...")) /** @@ -1118,23 +1118,23 @@ . = ..() if(istype(parent, /obj/machinery/hydroponics)) attached_tray = parent - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SEED, .proc/on_set_seed) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SELFSUSTAINING, .proc/on_set_selfsustaining) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WEEDLEVEL, .proc/on_set_weedlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PESTLEVEL, .proc/on_set_pestlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WATERLEVEL, .proc/on_set_waterlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_HEALTH, .proc/on_set_plant_health) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_TOXIC, .proc/on_set_toxic_level) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_STATUS, .proc/on_set_plant_status) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_ON_HARVEST, .proc/on_harvest) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_PLANT_DEATH, .proc/on_plant_death) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SEED, PROC_REF(on_set_seed)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SELFSUSTAINING, PROC_REF(on_set_selfsustaining)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WEEDLEVEL, PROC_REF(on_set_weedlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PESTLEVEL, PROC_REF(on_set_pestlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WATERLEVEL, PROC_REF(on_set_waterlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_HEALTH, PROC_REF(on_set_plant_health)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_TOXIC, PROC_REF(on_set_toxic_level)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_STATUS, PROC_REF(on_set_plant_status)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_ON_HARVEST, PROC_REF(on_harvest)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_PLANT_DEATH, PROC_REF(on_plant_death)) var/list/reagents_holder_signals = list( COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, ) - RegisterSignal(attached_tray, reagents_holder_signals, .proc/update_reagents_level) + RegisterSignal(attached_tray, reagents_holder_signals, PROC_REF(update_reagents_level)) /obj/item/circuit_component/hydroponics/unregister_usb_parent(atom/movable/parent) attached_tray = null diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 5a56d3f2d10..8b7bcf6aa7d 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -176,7 +176,7 @@ // Add on any bonus lines on examine if(examine_line) - RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) return TRUE @@ -199,9 +199,9 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/squash_plant) - RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, .proc/squash_plant) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/squash_plant) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant)) + RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant)) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant)) /* * Signal proc to squash the plant this trait belongs to, causing a smudge, exposing the target to reagents, and deleting it, @@ -262,7 +262,7 @@ if(!istype(our_plant, /obj/item/grown/bananapeel) && (!our_plant.reagents || !our_plant.reagents.has_reagent(/datum/reagent/lube))) stun_len /= 3 - our_plant.AddComponent(/datum/component/slippery, min(stun_len, 140), NONE, CALLBACK(src, .proc/handle_slip, our_plant)) + our_plant.AddComponent(/datum/component/slippery, min(stun_len, 140), NONE, CALLBACK(src, PROC_REF(handle_slip), our_plant)) /// On slip, sends a signal that our plant was slipped on out. /datum/plant_gene/trait/slip/proc/handle_slip(obj/item/food/grown/our_plant, mob/slipped_target) @@ -287,11 +287,11 @@ var/obj/item/seeds/our_seed = our_plant.get_plant_seed() if(our_seed.get_gene(/datum/plant_gene/trait/squash)) // If we have the squash gene, let that handle slipping - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/zap_target) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(zap_target)) else - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/zap_target) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(zap_target)) - RegisterSignal(our_plant, COMSIG_FOOD_EATEN, .proc/recharge_cells) + RegisterSignal(our_plant, COMSIG_FOOD_EATEN, PROC_REF(recharge_cells)) /* * Zaps the target with a stunning shock. @@ -431,9 +431,9 @@ var/obj/item/seeds/our_seed = our_plant.get_plant_seed() if(our_seed.get_gene(/datum/plant_gene/trait/squash)) // If we have the squash gene, let that handle slipping - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/squash_teleport) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(squash_teleport)) else - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/slip_teleport) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(slip_teleport)) /* * When squashed, makes the target teleport. @@ -524,8 +524,8 @@ return our_plant.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(our_plant, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) - RegisterSignal(our_plant, COMSIG_PARENT_ATTACKBY, .proc/make_battery) + RegisterSignal(our_plant, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) + RegisterSignal(our_plant, COMSIG_PARENT_ATTACKBY, PROC_REF(make_battery)) /* * Signal proc for [COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM] to add context to plant batteries. @@ -600,8 +600,8 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/prickles_inject) - RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, .proc/prickles_inject) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(prickles_inject)) + RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(prickles_inject)) /* * Injects a target with a number of reagents from our plant. @@ -634,7 +634,7 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/make_smoke) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(make_smoke)) /* * Makes a cloud of reagent smoke. @@ -682,7 +682,7 @@ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /datum/plant_gene/trait/invasive/on_new_seed(obj/item/seeds/new_seed) - RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, .proc/try_spread) + RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, PROC_REF(try_spread)) /datum/plant_gene/trait/invasive/on_removed(obj/item/seeds/old_seed) UnregisterSignal(old_seed, COMSIG_SEED_ON_GROW) @@ -776,7 +776,7 @@ if(istype(grown_plant) && ispath(grown_plant.trash_type, /obj/item/grown)) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/laughter) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(laughter)) /* * Play a sound effect from our plant. diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index 02a3d49bb75..1cb858f213a 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -14,7 +14,7 @@ return var/obj/item/seeds/our_seed = our_plant.get_plant_seed() shield_uses = round(our_seed.potency / 20) - our_plant.AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_HANDS, shield_uses, TRUE, CALLBACK(src, .proc/block_magic), CALLBACK(src, .proc/expire)) //deliver us from evil o melon god + our_plant.AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_HANDS, shield_uses, TRUE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire))) //deliver us from evil o melon god /* * The proc called when the holymelon successfully blocks a spell. @@ -53,8 +53,8 @@ if(force_multiplier) var/obj/item/seeds/our_seed = our_plant.get_plant_seed() our_plant.force = round((5 + our_seed.potency * force_multiplier), 1) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK, .proc/on_plant_attack) - RegisterSignal(our_plant, COMSIG_ITEM_AFTERATTACK, .proc/after_plant_attack) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK, PROC_REF(on_plant_attack)) + RegisterSignal(our_plant, COMSIG_ITEM_AFTERATTACK, PROC_REF(after_plant_attack)) /* * Plant effects ON attack. @@ -155,7 +155,7 @@ return our_plant.AddElement(/datum/element/plant_backfire, cancel_action_on_backfire, traits_to_check, genes_to_check) - RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, .proc/backfire_effect) + RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, PROC_REF(backfire_effect)) /* * The backfire effect. Override with plant-specific effects. @@ -239,7 +239,7 @@ return our_chili = WEAKREF(our_plant) - RegisterSignal(our_plant, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/stop_backfire_effect) + RegisterSignal(our_plant, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(stop_backfire_effect)) /* * Begin processing the trait on backfire. @@ -292,7 +292,7 @@ if(prob(50)) to_chat(user, "[our_plant] slips out of your hand!") - INVOKE_ASYNC(our_plant, /obj/item/.proc/attack_self, user) + INVOKE_ASYNC(our_plant, TYPE_PROC_REF(/obj/item, attack_self), user) /// Traits for plants that can be activated to turn into a mob. /datum/plant_gene/trait/mob_transformation @@ -318,9 +318,9 @@ if(dangerous) our_plant.AddElement(/datum/element/plant_backfire, TRUE) - RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, .proc/early_awakening) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/manual_awakening) - RegisterSignal(our_plant, COMSIG_ITEM_PRE_ATTACK, .proc/pre_consumption_check) + RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, PROC_REF(early_awakening)) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(manual_awakening)) + RegisterSignal(our_plant, COMSIG_ITEM_PRE_ATTACK, PROC_REF(pre_consumption_check)) /* * Before we can eat our plant, check to see if it's waking up. Don't eat it if it is. @@ -384,7 +384,7 @@ */ /datum/plant_gene/trait/mob_transformation/proc/begin_awaken(obj/item/our_plant, awaken_time) awakening = TRUE - addtimer(CALLBACK(src, .proc/awaken, our_plant), awaken_time) + addtimer(CALLBACK(src, PROC_REF(awaken), our_plant), awaken_time) /* * Actually awaken the plant, spawning the mob designated by the [killer_plant] typepath. @@ -474,9 +474,9 @@ return our_plant.max_integrity = 40 // Max_integrity is lowered so they explode better, or something like that. - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/trigger_detonation) - RegisterSignal(our_plant, COMSIG_ATOM_EX_ACT, .proc/explosion_reaction) - RegisterSignal(our_plant, COMSIG_OBJ_DECONSTRUCT, .proc/deconstruct_reaction) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(trigger_detonation)) + RegisterSignal(our_plant, COMSIG_ATOM_EX_ACT, PROC_REF(explosion_reaction)) + RegisterSignal(our_plant, COMSIG_OBJ_DECONSTRUCT, PROC_REF(deconstruct_reaction)) /* * Trigger our plant's detonation. @@ -552,7 +552,7 @@ our_plant.color = COLOR_RED playsound(our_plant.drop_location(), 'sound/weapons/armbomb.ogg', 75, TRUE, -3) - addtimer(CALLBACK(src, .proc/detonate, our_plant), rand(1 SECONDS, 6 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(detonate), our_plant), rand(1 SECONDS, 6 SECONDS)) /datum/plant_gene/trait/bomb_plant/potency_based/detonate(obj/item/our_plant) var/obj/item/seeds/our_seed = our_plant.get_plant_seed() @@ -572,9 +572,9 @@ var/datum/weakref/stinky_seed /datum/plant_gene/trait/gas_production/on_new_seed(obj/item/seeds/new_seed) - RegisterSignal(new_seed, COMSIG_SEED_ON_PLANTED, .proc/set_home_tray) - RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, .proc/try_release_gas) - RegisterSignal(new_seed, COMSIG_PARENT_QDELETING, .proc/stop_gas) + RegisterSignal(new_seed, COMSIG_SEED_ON_PLANTED, PROC_REF(set_home_tray)) + RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, PROC_REF(try_release_gas)) + RegisterSignal(new_seed, COMSIG_PARENT_QDELETING, PROC_REF(stop_gas)) stinky_seed = WEAKREF(new_seed) /datum/plant_gene/trait/gas_production/on_removed(obj/item/seeds/old_seed) diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index 39d16e499f2..12a4b17062a 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -89,7 +89,7 @@ samples = list() for(var/key in real_samples) real_keys += text2num(key) - sortTim(real_keys, /proc/cmp_numeric_asc, associative = FALSE) + sortTim(real_keys, GLOBAL_PROC_REF(cmp_numeric_asc), associative = FALSE) for(var/i in 1 to (length(real_keys) - 1)) var/from_key = real_keys[i] diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 1b2d64ed1d0..e1c5899345b 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -209,7 +209,7 @@ /obj/item/instrument/harmonica/equipped(mob/M, slot) . = ..() - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /obj/item/instrument/harmonica/dropped(mob/M) . = ..() diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index 90748d0f18f..139c917dc01 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -32,8 +32,8 @@ /obj/item/instrument/piano_synth/headphones/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_updates_onmob) - RegisterSignal(src, COMSIG_SONG_START, .proc/start_playing) - RegisterSignal(src, COMSIG_SONG_END, .proc/stop_playing) + RegisterSignal(src, COMSIG_SONG_START, PROC_REF(start_playing)) + RegisterSignal(src, COMSIG_SONG_END, PROC_REF(stop_playing)) /** * Called by a component signal when our song starts playing. @@ -100,18 +100,18 @@ var/obj/item/instrument/piano_synth/synth /obj/item/circuit_component/synth/populate_ports() - song = add_input_port("Song", PORT_TYPE_LIST(PORT_TYPE_STRING), trigger = .proc/import_song) - play = add_input_port("Play", PORT_TYPE_SIGNAL, trigger = .proc/start_playing) - stop = add_input_port("Stop", PORT_TYPE_SIGNAL, trigger = .proc/stop_playing) - repetitions = add_input_port("Repetitions", PORT_TYPE_NUMBER, trigger = .proc/set_repetitions) - beats_per_min = add_input_port("BPM", PORT_TYPE_NUMBER, trigger = .proc/set_bpm) - selected_instrument = add_option_port("Selected Instrument", SSinstruments.synthesizer_instrument_ids, trigger = .proc/set_instrument) - volume = add_input_port("Volume", PORT_TYPE_NUMBER, trigger = .proc/set_volume) - volume_dropoff = add_input_port("Volume Dropoff Threshold", PORT_TYPE_NUMBER, trigger = .proc/set_dropoff) - note_shift = add_input_port("Note Shift", PORT_TYPE_NUMBER, trigger = .proc/set_note_shift) - sustain_mode = add_option_port("Note Sustain Mode", SSinstruments.note_sustain_modes, trigger = .proc/set_sustain_mode) - sustain_value = add_input_port("Note Sustain Value", PORT_TYPE_NUMBER, trigger = .proc/set_sustain_value) - note_decay = add_input_port("Held Note Decay", PORT_TYPE_NUMBER, trigger = .proc/set_sustain_decay) + song = add_input_port("Song", PORT_TYPE_LIST(PORT_TYPE_STRING), trigger = PROC_REF(import_song)) + play = add_input_port("Play", PORT_TYPE_SIGNAL, trigger = PROC_REF(start_playing)) + stop = add_input_port("Stop", PORT_TYPE_SIGNAL, trigger = PROC_REF(stop_playing)) + repetitions = add_input_port("Repetitions", PORT_TYPE_NUMBER, trigger = PROC_REF(set_repetitions)) + beats_per_min = add_input_port("BPM", PORT_TYPE_NUMBER, trigger = PROC_REF(set_bpm)) + selected_instrument = add_option_port("Selected Instrument", SSinstruments.synthesizer_instrument_ids, trigger = PROC_REF(set_instrument)) + volume = add_input_port("Volume", PORT_TYPE_NUMBER, trigger = PROC_REF(set_volume)) + volume_dropoff = add_input_port("Volume Dropoff Threshold", PORT_TYPE_NUMBER, trigger = PROC_REF(set_dropoff)) + note_shift = add_input_port("Note Shift", PORT_TYPE_NUMBER, trigger = PROC_REF(set_note_shift)) + sustain_mode = add_option_port("Note Sustain Mode", SSinstruments.note_sustain_modes, trigger = PROC_REF(set_sustain_mode)) + sustain_value = add_input_port("Note Sustain Value", PORT_TYPE_NUMBER, trigger = PROC_REF(set_sustain_value)) + note_decay = add_input_port("Held Note Decay", PORT_TYPE_NUMBER, trigger = PROC_REF(set_sustain_decay)) is_playing = add_output_port("Currently Playing", PORT_TYPE_NUMBER) started_playing = add_output_port("Started Playing", PORT_TYPE_SIGNAL) @@ -120,9 +120,9 @@ /obj/item/circuit_component/synth/register_shell(atom/movable/shell) . = ..() synth = shell - RegisterSignal(synth, COMSIG_SONG_START, .proc/on_song_start) - RegisterSignal(synth, COMSIG_SONG_END, .proc/on_song_end) - RegisterSignal(synth, COMSIG_SONG_SHOULD_STOP_PLAYING, .proc/continue_if_autoplaying) + RegisterSignal(synth, COMSIG_SONG_START, PROC_REF(on_song_start)) + RegisterSignal(synth, COMSIG_SONG_END, PROC_REF(on_song_end)) + RegisterSignal(synth, COMSIG_SONG_SHOULD_STOP_PLAYING, PROC_REF(continue_if_autoplaying)) /obj/item/circuit_component/synth/unregister_shell(atom/movable/shell) if(synth.song.music_player == src) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 7dd8074344c..45abe29d86e 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -154,7 +154,7 @@ tempo = sanitize_tempo(tempo + text2num(href_list["tempo"])) else if(href_list["play"]) - INVOKE_ASYNC(src, .proc/start_playing, usr) + INVOKE_ASYNC(src, PROC_REF(start_playing), usr) else if(href_list["newline"]) var/newline = tgui_input_text(usr, "Enter your line ", parent.name) diff --git a/code/modules/interview/interview.dm b/code/modules/interview/interview.dm index 5f318200589..466f2d7aab2 100644 --- a/code/modules/interview/interview.dm +++ b/code/modules/interview/interview.dm @@ -65,7 +65,7 @@ SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg')) to_chat(owner, "-- Interview Update --" \ + "\n[span_adminsay("Your interview was approved, you will now be reconnected in 5 seconds.")]", confidential = TRUE) - addtimer(CALLBACK(src, .proc/reconnect_owner), 50) + addtimer(CALLBACK(src, PROC_REF(reconnect_owner)), 50) /** * Denies the interview and adds the owner to the cooldown for new interviews. @@ -80,7 +80,7 @@ GLOB.interviews.cooldown_ckeys |= owner_ckey log_admin_private("[key_name(denied_by)] has denied interview #[id] for [owner_ckey][!owner ? "(DC)": ""].") message_admins(span_adminnotice("[key_name(denied_by)] has denied [link_self()] for [owner_ckey][!owner ? "(DC)": ""].")) - addtimer(CALLBACK(GLOB.interviews, /datum/interview_manager.proc/release_from_cooldown, owner_ckey), 180) + addtimer(CALLBACK(GLOB.interviews, TYPE_PROC_REF(/datum/interview_manager, release_from_cooldown), owner_ckey), 180) if (owner) SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg')) to_chat(owner, "-- Interview Update --" \ diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 097d019884e..4dd83a6531a 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -222,7 +222,7 @@ /datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. if(H && GLOB.announcement_systems.len) //timer because these should come after the captain announcement - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/_addtimer, CALLBACK(pick(GLOB.announcement_systems), /obj/machinery/announcement_system/proc/announce, "NEWHEAD", H.real_name, H.job, channels), 1)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, H.job, channels), 1)) //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/job/proc/player_old_enough(client/C) diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 7388e36df58..39a0e877c1f 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -90,7 +90,7 @@ "Invisible Chair" = image(icon = 'icons/mob/actions/actions_mime.dmi', icon_state = "invisible_chair"), "Invisible Box" = image(icon = 'icons/mob/actions/actions_mime.dmi', icon_state = "invisible_box") ) - var/picked_spell = show_radial_menu(user, src, spell_icons, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/picked_spell = show_radial_menu(user, src, spell_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) switch(picked_spell) if("Invisible Wall") user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null)) diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index d9ff110b0c5..73e05fdee74 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -115,7 +115,7 @@ CRASH("Unusual error - [usr] attempted to start implanting of [inserted_skillchip] when the interface state should not have allowed it.") working = TRUE - work_timer = addtimer(CALLBACK(src,.proc/implant),SKILLCHIP_IMPLANT_TIME,TIMER_STOPPABLE) + work_timer = addtimer(CALLBACK(src, PROC_REF(implant),SKILLCHIP_IMPLANT_TIME,TIMER_STOPPABLE)) update_appearance() /// Finish implanting. @@ -142,7 +142,7 @@ CRASH("Unusual error - [usr] attempted to start removal of [to_be_removed] when the interface state should not have allowed it.") working = TRUE - work_timer = addtimer(CALLBACK(src,.proc/remove_skillchip,to_be_removed),SKILLCHIP_REMOVAL_TIME,TIMER_STOPPABLE) + work_timer = addtimer(CALLBACK(src, PROC_REF(remove_skillchip), to_be_removed), SKILLCHIP_REMOVAL_TIME, TIMER_STOPPABLE) update_appearance() /// Finish removal. diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm index 1ec1571ef29..72d6d855c38 100644 --- a/code/modules/mafia/controller.dm +++ b/code/modules/mafia/controller.dm @@ -177,10 +177,10 @@ if(turn == 1) send_message(span_notice("The selected map is [current_map.name]!
      [current_map.description]")) send_message("Day [turn] started! There is no voting on the first day. Say hello to everybody!") - next_phase_timer = addtimer(CALLBACK(src,.proc/check_trial, FALSE),first_day_phase_period,TIMER_STOPPABLE) //no voting period = no votes = instant night + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), FALSE), first_day_phase_period, TIMER_STOPPABLE) //no voting period = no votes = instant night else send_message("Day [turn] started! Voting will start in 1 minute.") - next_phase_timer = addtimer(CALLBACK(src,.proc/start_voting_phase),day_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_voting_phase)), day_phase_period, TIMER_STOPPABLE) SStgui.update_uis(src) @@ -193,7 +193,7 @@ */ /datum/mafia_controller/proc/start_voting_phase() phase = MAFIA_PHASE_VOTING - next_phase_timer = addtimer(CALLBACK(src, .proc/check_trial, TRUE),voting_phase_period,TIMER_STOPPABLE) //be verbose! + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), TRUE),voting_phase_period,TIMER_STOPPABLE) //be verbose! send_message("Voting started! Vote for who you want to see on trial today.") SStgui.update_uis(src) @@ -225,7 +225,7 @@ on_trial = loser on_trial.body.forceMove(get_turf(town_center_landmark)) phase = MAFIA_PHASE_JUDGEMENT - next_phase_timer = addtimer(CALLBACK(src, .proc/lynch),judgement_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(lynch),judgement_phase_period,TIMER_STOPPABLE)) reset_votes("Day") else if(verbose) @@ -254,13 +254,13 @@ if(judgement_guilty_votes.len > judgement_innocent_votes.len) //strictly need majority guilty to lynch send_message(span_red("Guilty wins majority, [on_trial.body.real_name] has been lynched.")) on_trial.kill(src,lynch = TRUE) - addtimer(CALLBACK(src, .proc/send_home, on_trial),judgement_lynch_period) + addtimer(CALLBACK(src, PROC_REF(send_home), on_trial),judgement_lynch_period) else send_message(span_green("Innocent wins majority, [on_trial.body.real_name] has been spared.")) on_trial.body.forceMove(get_turf(on_trial.assigned_landmark)) on_trial = null //day votes are already cleared, so this will skip the trial and check victory/lockdown/whatever else - next_phase_timer = addtimer(CALLBACK(src, .proc/check_trial, FALSE),judgement_lynch_period,TIMER_STOPPABLE)// small pause to see the guy dead, no verbosity since we already did this + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), FALSE),judgement_lynch_period,TIMER_STOPPABLE)// small pause to see the guy dead, no verbosity since we already did this /** * Teenie helper proc to move players back to their home. @@ -375,7 +375,7 @@ for(var/datum/mafia_role/R in all_roles) R.reveal_role(src) phase = MAFIA_PHASE_VICTORY_LAP - next_phase_timer = addtimer(CALLBACK(src,.proc/end_game),victory_lap_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(end_game),victory_lap_period,TIMER_STOPPABLE)) /** * Cleans up the game, resetting variables back to the beginning and removing the map with the generator. @@ -416,9 +416,9 @@ if(D.id != "mafia") //so as to not trigger shutters on station, lol continue if(close) - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) else - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) /** * The actual start of night for players. Mostly info is given at the start of the night as the end of the night is when votes and actions are submitted and tried. @@ -431,7 +431,7 @@ phase = MAFIA_PHASE_NIGHT send_message("Night [turn] started! Lockdown will end in 45 seconds.") SEND_SIGNAL(src,COMSIG_MAFIA_SUNDOWN) - next_phase_timer = addtimer(CALLBACK(src, .proc/resolve_night),night_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(resolve_night),night_phase_period,TIMER_STOPPABLE)) SStgui.update_uis(src) /** @@ -531,7 +531,7 @@ tally[votes[vote_type][votee]] = 1 else tally[votes[vote_type][votee]] += 1 - sortTim(tally,/proc/cmp_numeric_dsc,associative=TRUE) + sortTim(tally, GLOBAL_PROC_REF(cmp_numeric_dsc),associative=TRUE) return length(tally) ? tally[1] : null /** @@ -575,7 +575,7 @@ ADD_TRAIT(H, TRAIT_CANNOT_CRYSTALIZE, MAFIA_TRAIT) H.equipOutfit(player_outfit) H.status_flags |= GODMODE - RegisterSignal(H,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/display_votes) + RegisterSignal(H,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(display_votes)) var/datum/action/innate/mafia_panel/mafia_panel = new(null,src) mafia_panel.Grant(H) var/client/player_client = GLOB.directory[role.player_key] diff --git a/code/modules/mafia/roles.dm b/code/modules/mafia/roles.dm index 2fed9bd5160..24df15bb91b 100644 --- a/code/modules/mafia/roles.dm +++ b/code/modules/mafia/roles.dm @@ -159,7 +159,7 @@ /datum/mafia_role/detective/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/investigate) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(investigate)) /datum/mafia_role/detective/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -219,7 +219,7 @@ /datum/mafia_role/psychologist/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/therapy_reveal) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(therapy_reveal)) /datum/mafia_role/psychologist/validate_action_target(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -259,7 +259,7 @@ /datum/mafia_role/chaplain/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/commune) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(commune)) /datum/mafia_role/chaplain/validate_action_target(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -298,8 +298,8 @@ /datum/mafia_role/md/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/protect) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/end_protection) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(protect)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(end_protection)) /datum/mafia_role/md/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -326,7 +326,7 @@ if(!target.can_action(game, src, "medical assistance")) return - RegisterSignal(target,COMSIG_MAFIA_ON_KILL,.proc/prevent_kill) + RegisterSignal(target,COMSIG_MAFIA_ON_KILL, PROC_REF(prevent_kill)) add_note("N[game.turn] - Protected [target.body.real_name]") /datum/mafia_role/md/proc/prevent_kill(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -361,8 +361,8 @@ /datum/mafia_role/officer/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/defend) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/end_defense) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(defend)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(end_defense)) /datum/mafia_role/officer/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -389,7 +389,7 @@ if(!target.can_action(game, src, "security patrol")) return if(target) - RegisterSignal(target,COMSIG_MAFIA_ON_KILL,.proc/retaliate) + RegisterSignal(target,COMSIG_MAFIA_ON_KILL, PROC_REF(retaliate)) add_note("N[game.turn] - Defended [target.body.real_name]") /datum/mafia_role/officer/proc/retaliate(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -426,8 +426,8 @@ /datum/mafia_role/lawyer/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/roleblock) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/release) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(roleblock)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(release)) /datum/mafia_role/lawyer/proc/roleblock(datum/mafia_controller/game) SIGNAL_HANDLER @@ -467,7 +467,6 @@ /datum/mafia_role/lawyer/proc/release(datum/mafia_controller/game) SIGNAL_HANDLER - . = ..() if(current_target) current_target.role_flags &= ~ROLE_ROLEBLOCKED current_target = null @@ -511,7 +510,7 @@ /datum/mafia_role/hos/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/execute) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(execute)) /datum/mafia_role/hos/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -543,7 +542,7 @@ target.reveal_role(game, verbose = TRUE) if(target.team == MAFIA_TEAM_TOWN) to_chat(body,span_userdanger("You have killed an innocent crewmember. You will die tomorrow night.")) - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/internal_affairs) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(internal_affairs)) role_flags |= ROLE_VULNERABLE /datum/mafia_role/hos/proc/internal_affairs(datum/mafia_controller/game) @@ -575,8 +574,8 @@ /datum/mafia_role/warden/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/night_start) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/night_end) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(night_start)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(night_end)) /datum/mafia_role/warden/handle_action(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -597,7 +596,7 @@ if(protection_status == WARDEN_WILL_LOCKDOWN) to_chat(body,span_danger("Any and all visitors are going to eat buckshot tonight.")) - RegisterSignal(src,COMSIG_MAFIA_ON_VISIT,.proc/self_defense) + RegisterSignal(src,COMSIG_MAFIA_ON_VISIT, PROC_REF(self_defense)) /datum/mafia_role/warden/proc/night_end(datum/mafia_controller/game) SIGNAL_HANDLER @@ -636,7 +635,7 @@ /datum/mafia_role/mafia/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/mafia_text) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(mafia_text)) /datum/mafia_role/mafia/proc/mafia_text(datum/mafia_controller/source) SIGNAL_HANDLER @@ -657,7 +656,7 @@ /datum/mafia_role/mafia/thoughtfeeder/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/investigate) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(investigate)) /datum/mafia_role/mafia/thoughtfeeder/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -704,8 +703,8 @@ /datum/mafia_role/traitor/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/nightkill_immunity) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE,.proc/try_to_kill) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(nightkill_immunity)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE, PROC_REF(try_to_kill)) /datum/mafia_role/traitor/check_total_victory(alive_town, alive_mafia) //serial killers just want teams dead, they cannot be stopped by killing roles anyways return alive_town + alive_mafia <= 1 @@ -766,8 +765,8 @@ /datum/mafia_role/nightmare/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/flickering_immunity) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE,.proc/flicker_or_hunt) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(flickering_immunity)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE, PROC_REF(flicker_or_hunt)) /datum/mafia_role/nightmare/check_total_victory(alive_town, alive_mafia) //nightmares just want teams dead return alive_town + alive_mafia <= 1 @@ -854,9 +853,9 @@ /datum/mafia_role/fugitive/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/night_start) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/night_end) - RegisterSignal(game,COMSIG_MAFIA_GAME_END,.proc/survived) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(night_start)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(night_end)) + RegisterSignal(game,COMSIG_MAFIA_GAME_END, PROC_REF(survived)) /datum/mafia_role/fugitive/handle_action(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -877,7 +876,7 @@ if(protection_status == FUGITIVE_WILL_PRESERVE) to_chat(body,span_danger("Your preparations are complete. Nothing could kill you tonight!")) - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/prevent_death) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(prevent_death)) /datum/mafia_role/fugitive/proc/night_end(datum/mafia_controller/game) SIGNAL_HANDLER @@ -921,7 +920,7 @@ /datum/mafia_role/obsessed/New(datum/mafia_controller/game) //note: obsession is always a townie . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/find_obsession) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(find_obsession)) /datum/mafia_role/obsessed/proc/find_obsession(datum/mafia_controller/game) SIGNAL_HANDLER @@ -937,7 +936,7 @@ //if you still don't have an obsession you're playing a single player game like i can't help your dumb ass to_chat(body, span_userdanger("Your obsession is [obsession.body.real_name]! Get them lynched to win!")) add_note("N[game.turn] - I vowed to watch my obsession, [obsession.body.real_name], hang!") //it'll always be N1 but whatever - RegisterSignal(obsession,COMSIG_MAFIA_ON_KILL,.proc/check_victory) + RegisterSignal(obsession,COMSIG_MAFIA_ON_KILL, PROC_REF(check_victory)) UnregisterSignal(game,COMSIG_MAFIA_SUNDOWN) /datum/mafia_role/obsessed/proc/check_victory(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -967,7 +966,7 @@ /datum/mafia_role/clown/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/prank) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(prank)) /datum/mafia_role/clown/proc/prank(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) SIGNAL_HANDLER diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 846920d0706..8756936a36a 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -606,7 +606,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /obj/effect/mapping_helpers/circuit_spawner/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/spawn_circuit) + INVOKE_ASYNC(src, PROC_REF(spawn_circuit)) /obj/effect/mapping_helpers/circuit_spawner/proc/spawn_circuit() var/list/errors = list() diff --git a/code/modules/mapping/modular_map_loader/modular_map_loader.dm b/code/modules/mapping/modular_map_loader/modular_map_loader.dm index d753c4a439e..f5b336960f2 100644 --- a/code/modules/mapping/modular_map_loader/modular_map_loader.dm +++ b/code/modules/mapping/modular_map_loader/modular_map_loader.dm @@ -15,7 +15,7 @@ INITIALIZE_IMMEDIATE(/obj/modular_map_root) /obj/modular_map_root/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/load_map) + INVOKE_ASYNC(src, PROC_REF(load_map)) /// Randonly selects a map file from the TOML config specified in config_file, loads it, then deletes itself. /obj/modular_map_root/proc/load_map() diff --git a/code/modules/meteors/meteors.dm b/code/modules/meteors/meteors.dm index 63962fe2706..3176ac1e8b2 100644 --- a/code/modules/meteors/meteors.dm +++ b/code/modules/meteors/meteors.dm @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust=1)) //for space dust eve if(!new_loop) return - RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, .proc/handle_stopping) + RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, PROC_REF(handle_stopping)) ///Deals with what happens when we stop moving, IE we die /obj/effect/meteor/proc/handle_stopping() diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index e2d543a7c7e..6a071b4d01b 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -352,7 +352,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) return anti_spam_cd = 1 - addtimer(CALLBACK(src, .proc/clear_cooldown), 50) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), 50) var/turf/landing_spot = get_turf(src) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 15881915ed5..95528715d34 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -33,8 +33,8 @@ /obj/item/kinetic_crusher/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) /obj/item/kinetic_crusher/ComponentInitialize() . = ..() @@ -156,7 +156,7 @@ destabilizer.fire() charged = FALSE update_appearance() - addtimer(CALLBACK(src, .proc/Recharge), charge_time) + addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time) /obj/item/kinetic_crusher/proc/Recharge() if(!charged) @@ -372,7 +372,7 @@ continue playsound(L, 'sound/magic/fireball.ogg', 20, TRUE) new /obj/effect/temp_visual/fire(L.loc) - addtimer(CALLBACK(src, .proc/pushback, L, user), 1) //no free backstabs, we push AFTER module stuff is done + addtimer(CALLBACK(src, PROC_REF(pushback), L, user), 1) //no free backstabs, we push AFTER module stuff is done L.adjustFireLoss(bonus_value, forced = TRUE) /obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user) @@ -436,7 +436,7 @@ /obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user) deadly_shot = TRUE - addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(reset_deadly_shot)), 300, TIMER_UNIQUE|TIMER_OVERRIDE) /obj/item/crusher_trophy/blaster_tubes/proc/reset_deadly_shot() deadly_shot = FALSE diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index b83ea119c4b..33026cdb0f8 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -35,7 +35,7 @@ /obj/item/organ/regenerative_core/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/inert_check), 2400) + addtimer(CALLBACK(src, PROC_REF(inert_check)), 2400) /obj/item/organ/regenerative_core/proc/inert_check() if(!preserved) diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 24fd01cd04f..706e144fa31 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -66,9 +66,9 @@ if(mode == RESONATOR_MODE_MATRIX) icon_state = "shield2" name = "resonance matrix" - RegisterSignal(src, COMSIG_ATOM_ENTERED, .proc/burst) + RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(burst)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/burst, + COMSIG_ATOM_ENTERED = PROC_REF(burst), ) AddElement(/datum/element/connect_loc, loc_connections) . = ..() @@ -81,7 +81,7 @@ transform = matrix()*0.75 animate(src, transform = matrix()*1.5, time = duration) deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/burst), duration, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(burst)), duration, TIMER_STOPPABLE) /obj/effect/temp_visual/resonance/Destroy() if(res) diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 438ea5d8063..46e3004521c 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -112,4 +112,4 @@ L.Paralyze(60) if(ishuman(L)) shake_camera(L, 20, 1) - addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20) + addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living/carbon, vomit)), 20) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 31c1e4869f4..39fa4fc72e4 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -31,7 +31,7 @@ GLOBAL_LIST(labor_sheet_values) if(!initial(sheet.point_value) || (initial(sheet.merge_type) && initial(sheet.merge_type) != sheet_type)) //ignore no-value sheets and x/fifty subtypes continue sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value))) - GLOB.labor_sheet_values = sort_list(sheet_list, /proc/cmp_sheet_list) + GLOB.labor_sheet_values = sort_list(sheet_list, GLOBAL_PROC_REF(cmp_sheet_list)) /obj/machinery/mineral/labor_claim_console/Destroy() QDEL_NULL(Radio) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 7035d185765..2d9f037b875 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -49,7 +49,7 @@ name = harvested_name desc = harvested_desc harvested = TRUE - addtimer(CALLBACK(src, .proc/regrow), rand(regrowth_time_low, regrowth_time_high)) + addtimer(CALLBACK(src, PROC_REF(regrow)), rand(regrowth_time_low, regrowth_time_high)) return TRUE /obj/structure/flora/ash/proc/regrow() diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index a4845398d2b..f2b902501c9 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -193,7 +193,7 @@ for(var/t in RANGE_TURFS(1, source)) new /obj/effect/temp_visual/hierophant/blast/visual(t, user, TRUE) for(var/mob/living/L in range(1, source)) - INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) + INVOKE_ASYNC(src, PROC_REF(teleport_mob), source, L, T, user) sleep(6) //at this point the blasts detonate if(beacon) beacon.icon_state = "hierophant_tele_off" @@ -306,12 +306,12 @@ /obj/item/clothing/head/hooded/hostile_environment/Initialize(mapload) . = ..() update_appearance() - AddComponent(/datum/component/butchering, 5, 150, null, null, null, TRUE, CALLBACK(src, .proc/consume)) + AddComponent(/datum/component/butchering, 5, 150, null, null, null, TRUE, CALLBACK(src, PROC_REF(consume))) AddElement(/datum/element/radiation_protected_clothing) /obj/item/clothing/head/hooded/hostile_environment/equipped(mob/user, slot, initial = FALSE) . = ..() - RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/butcher_target) + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(butcher_target)) var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering) butchering.butchering_enabled = TRUE to_chat(user, span_notice("You feel a bloodlust. You can now butcher corpses with your bare arms.")) @@ -386,10 +386,10 @@ /obj/item/soulscythe/Initialize(mapload) . = ..() soul = new(src) - RegisterSignal(soul, COMSIG_LIVING_RESIST, .proc/on_resist) - RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED, .proc/on_attack) - RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED_SECONDARY, .proc/on_secondary_attack) - RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/on_integrity_change) + RegisterSignal(soul, COMSIG_LIVING_RESIST, PROC_REF(on_resist)) + RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_attack)) + RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED_SECONDARY, PROC_REF(on_secondary_attack)) + RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(on_integrity_change)) /obj/item/soulscythe/examine(mob/user) . = ..() @@ -490,7 +490,7 @@ if(isturf(loc)) return - INVOKE_ASYNC(src, .proc/break_out) + INVOKE_ASYNC(src, PROC_REF(break_out)) /obj/item/soulscythe/proc/break_out() if(!use_blood(10)) @@ -516,16 +516,16 @@ if(!COOLDOWN_FINISHED(src, attack_cooldown) || !isturf(loc)) return if(get_dist(source, attacked_atom) > 1) - INVOKE_ASYNC(src, .proc/shoot_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(shoot_target), attacked_atom) else - INVOKE_ASYNC(src, .proc/slash_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(slash_target), attacked_atom) /obj/item/soulscythe/proc/on_secondary_attack(mob/living/source, atom/attacked_atom, modifiers) SIGNAL_HANDLER if(!COOLDOWN_FINISHED(src, attack_cooldown) || !isturf(loc)) return - INVOKE_ASYNC(src, .proc/charge_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(charge_target), attacked_atom) /obj/item/soulscythe/proc/shoot_target(atom/attacked_atom) if(!use_blood(15)) @@ -553,7 +553,7 @@ COOLDOWN_START(src, attack_cooldown, 1 SECONDS) animate(src) SpinAnimation(5) - addtimer(CALLBACK(src, .proc/reset_spin), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_spin)), 1 SECONDS) visible_message(span_danger("[src] slashes [attacked_atom]!"), span_notice("You slash [attacked_atom]!")) playsound(src, 'sound/weapons/bladeslice.ogg', 50, TRUE) do_attack_animation(attacked_atom, ATTACK_EFFECT_SLASH) @@ -853,7 +853,7 @@ w_class_on = w_class, \ attack_verb_continuous_on = list("cleaves", "swipes", "slashes", "chops"), \ attack_verb_simple_on = list("cleave", "swipe", "slash", "chop")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/cleaving_saw/examine(mob/user) . = ..() @@ -1020,9 +1020,9 @@ targeted_turfs += target_turf balloon_alert(user, "you aim at [target_turf]...") new /obj/effect/temp_visual/telegraphing/thunderbolt(target_turf) - addtimer(CALLBACK(src, .proc/throw_thunderbolt, target_turf, power_boosted), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(throw_thunderbolt), target_turf, power_boosted), 1.5 SECONDS) thunder_charges-- - addtimer(CALLBACK(src, .proc/recharge), thunder_charge_time) + addtimer(CALLBACK(src, PROC_REF(recharge)), thunder_charge_time) log_game("[key_name(user)] fired the staff of storms at [AREACOORD(target_turf)].") /obj/item/storm_staff/proc/recharge(mob/user) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 556d8267b85..cf919429761 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -15,7 +15,7 @@ /obj/structure/closet/crate/necropolis/tendril/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/try_spawn_loot) + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(try_spawn_loot)) /obj/structure/closet/crate/necropolis/tendril/proc/try_spawn_loot(datum/source, obj/item/item, mob/user, params) ///proc that handles key checking and generating loot SIGNAL_HANDLER diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 2e0a1635739..d64e279307d 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -151,7 +151,7 @@ ADD_TRAIT(user, TRAIT_NODEATH, CLOTHING_TRAIT) ADD_TRAIT(user, TRAIT_NOHARDCRIT, CLOTHING_TRAIT) ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, CLOTHING_TRAIT) - RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, .proc/check_health) + RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, PROC_REF(check_health)) icon_state = "memento_mori_active" active_owner = user @@ -264,7 +264,7 @@ /obj/effect/wisp/orbit(atom/thing, radius, clockwise, rotation_speed, rotation_segments, pre_rotation, lockinorbit) . = ..() if(ismob(thing)) - RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, .proc/update_user_sight) + RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight)) var/mob/being = thing being.update_sight() to_chat(thing, span_notice("The wisp enhances your vision.")) @@ -399,7 +399,7 @@ can_destroy = FALSE - addtimer(CALLBACK(src, .proc/unvanish, user), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(unvanish), user), 10 SECONDS) /obj/effect/immortality_talisman/proc/unvanish(mob/user) user.status_flags &= ~GODMODE @@ -561,8 +561,8 @@ . = ..() if(slot == ITEM_SLOT_GLOVES) tool_behaviour = TOOL_MINING - RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/rocksmash) - RegisterSignal(user, COMSIG_MOVABLE_BUMP, .proc/rocksmash) + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(rocksmash)) + RegisterSignal(user, COMSIG_MOVABLE_BUMP, PROC_REF(rocksmash)) else stopmining(user) @@ -777,11 +777,11 @@ living_target.Jitter(5 SECONDS) to_chat(living_target, span_warning("You've been staggered!")) living_target.add_filter("scan", 2, list("type" = "outline", "color" = COLOR_YELLOW, "size" = 1)) - addtimer(CALLBACK(living_target, /atom/.proc/remove_filter, "scan"), 30 SECONDS) + addtimer(CALLBACK(living_target, TYPE_PROC_REF(/atom, remove_filter), "scan"), 30 SECONDS) ranged_ability_user.playsound_local(get_turf(ranged_ability_user), 'sound/magic/smoke.ogg', 50, TRUE) balloon_alert(ranged_ability_user, "[living_target] scanned") COOLDOWN_START(src, scan_cooldown, cooldown_time) - addtimer(CALLBACK(src, /atom/.proc/balloon_alert, ranged_ability_user, "scan recharged"), cooldown_time) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ranged_ability_user, "scan recharged"), cooldown_time) remove_ranged_ability() return TRUE @@ -873,12 +873,12 @@ var/list/input_list = list() var/list/combo_strings = list() var/static/list/combo_list = list( - ATTACK_STRIKE = list(COMBO_STEPS = list(LEFT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/strike), - ATTACK_SLICE = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/slice), - ATTACK_DASH = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/dash), - ATTACK_CUT = list(COMBO_STEPS = list(RIGHT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/cut), - ATTACK_CLOAK = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/cloak), - ATTACK_SHATTER = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/shatter), + ATTACK_STRIKE = list(COMBO_STEPS = list(LEFT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(strike)), + ATTACK_SLICE = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(slice)), + ATTACK_DASH = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(dash)), + ATTACK_CUT = list(COMBO_STEPS = list(RIGHT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(cut)), + ATTACK_CLOAK = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(cloak)), + ATTACK_SHATTER = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(shatter)), ) /obj/item/cursed_katana/Initialize(mapload) @@ -927,7 +927,7 @@ reset_inputs(null, TRUE) return TRUE else - timerid = addtimer(CALLBACK(src, .proc/reset_inputs, user, FALSE), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_inputs), user, FALSE), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) return ..() /obj/item/cursed_katana/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -955,7 +955,7 @@ span_notice("You hilt strike [target]!")) to_chat(target, span_userdanger("You've been struck by [user]!")) playsound(src, 'sound/weapons/genhit3.ogg', 50, TRUE) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/strike_throw_impact) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(strike_throw_impact)) var/atom/throw_target = get_edge_target_turf(target, user.dir) target.throw_at(throw_target, 5, 3, user, FALSE, gentle = TRUE) target.apply_damage(damage = 17, bare_wound_bonus = 10) @@ -1002,7 +1002,7 @@ if(ishostile(target)) var/mob/living/simple_animal/hostile/hostile_target = target hostile_target.LoseTarget() - addtimer(CALLBACK(src, .proc/uncloak, user), 5 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(uncloak), user), 5 SECONDS, TIMER_UNIQUE) /obj/item/cursed_katana/proc/uncloak(mob/user) user.alpha = 255 @@ -1053,7 +1053,7 @@ shattered = TRUE moveToNullspace() balloon_alert(user, "katana shattered") - addtimer(CALLBACK(src, .proc/coagulate, user), 45 SECONDS) + addtimer(CALLBACK(src, PROC_REF(coagulate), user), 45 SECONDS) /obj/item/cursed_katana/proc/coagulate(mob/user) balloon_alert(user, "katana coagulated") diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d533c730e2f..be700c08254 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -24,7 +24,7 @@ /obj/machinery/mineral/proc/register_input_turf() input_turf = get_step(src, input_dir) if(input_turf) // make sure there is actually a turf - RegisterSignal(input_turf, list(COMSIG_ATOM_CREATED, COMSIG_ATOM_ENTERED), .proc/pickup_item) + RegisterSignal(input_turf, list(COMSIG_ATOM_CREATED, COMSIG_ATOM_ENTERED), PROC_REF(pickup_item)) /// Unregisters signals that are registered the machine's input turf, if it has one. /obj/machinery/mineral/proc/unregister_input_turf() diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index d65b201acf0..3a2f948c030 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -149,7 +149,7 @@ if(!console_notify_timer) // gives 5 seconds for a load of ores to be sucked up by the ORM before it sends out request console notifications. This should be enough time for most deposits that people make - console_notify_timer = addtimer(CALLBACK(src, .proc/send_console_message), 5 SECONDS) + console_notify_timer = addtimer(CALLBACK(src, PROC_REF(send_console_message)), 5 SECONDS) /obj/machinery/mineral/ore_redemption/default_unfasten_wrench(mob/user, obj/item/I) . = ..() diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index f01ef40c998..03cb1d4e1a0 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -316,7 +316,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ else user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("You strike \the [src], causing a chain reaction.")) log_bomber(user, "has primed a", src, "for detonation", notify_admins) - det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE) + det_timer = addtimer(CALLBACK(src, PROC_REF(detonate), notify_admins), det_time, TIMER_STOPPABLE) /obj/item/gibtonite/proc/detonate(notify_admins) if(primed) @@ -383,7 +383,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ if (!attack_self(user)) user.visible_message(span_suicide("[user] couldn't flip \the [src]!")) return SHAME - addtimer(CALLBACK(src, .proc/manual_suicide, user), 10)//10 = time takes for flip animation + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 10)//10 = time takes for flip animation return MANUAL_SUICIDE_NONLETHAL /obj/item/coin/proc/manual_suicide(mob/living/user) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 8f3cdfe61ba..78a2a13eb84 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -164,7 +164,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) var/old_color = color color = "#960000" animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 10) /mob/dead/observer/Destroy() if(data_huds_on) @@ -959,7 +959,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp client.perspective = EYE_PERSPECTIVE if(is_secret_level(mob_eye.z) && !client?.holder) sight = null //we dont want ghosts to see through walls in secret areas - RegisterSignal(mob_eye, COMSIG_MOVABLE_Z_CHANGED, .proc/on_observing_z_changed) + RegisterSignal(mob_eye, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_observing_z_changed)) if(mob_eye.hud_used) client.screen = list() LAZYOR(mob_eye.observers, src) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index eaa2012b0ac..13a86b455f5 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new) var/auto_observe = params["auto_observe"] var/atom/poi = SSpoints_of_interest.get_poi_atom_by_ref(ref) - if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, .proc/validate_mob_poi))) \ + if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \ || !SSpoints_of_interest.is_valid_poi(poi) ) to_chat(usr, span_notice("That point of interest is no longer valid.")) @@ -45,7 +45,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new) ) /datum/orbit_menu/ui_static_data(mob/user) - var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, .proc/validate_mob_poi), append_dead_role = FALSE) + var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, PROC_REF(validate_mob_poi)), append_dead_role = FALSE) var/list/new_other_pois = SSpoints_of_interest.get_other_pois() var/list/alive = list() diff --git a/code/modules/mob/living/basic/farm_animals/cows.dm b/code/modules/mob/living/basic/farm_animals/cows.dm index 6cc3f57291f..db6b3d7db97 100644 --- a/code/modules/mob/living/basic/farm_animals/cows.dm +++ b/code/modules/mob/living/basic/farm_animals/cows.dm @@ -34,7 +34,7 @@ tip_time = 0.5 SECONDS, \ untip_time = 0.5 SECONDS, \ self_right_time = rand(25 SECONDS, 50 SECONDS), \ - post_tipped_callback = CALLBACK(src, .proc/after_cow_tipped)) + post_tipped_callback = CALLBACK(src, PROC_REF(after_cow_tipped))) AddElement(/datum/element/pet_bonus, "moos happily!") AddElement(/datum/element/swabable, CELL_LINE_TABLE_COW, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) udder_component() @@ -47,7 +47,7 @@ ///wrapper for the tameable component addition so you can have non tamable cow subtypes /mob/living/basic/cow/proc/make_tameable() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/wheat), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/wheat), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/basic/cow/proc/tamed(mob/living/tamer) can_buckle = TRUE @@ -61,7 +61,7 @@ * tipper - the mob who tipped us */ /mob/living/basic/cow/proc/after_cow_tipped(mob/living/carbon/tipper) - addtimer(CALLBACK(src, .proc/set_tip_react_blackboard, tipper), rand(10 SECONDS, 20 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(set_tip_react_blackboard), tipper), rand(10 SECONDS, 20 SECONDS)) /* * We've been waiting long enough, we're going to tell our AI to begin pleading. @@ -142,7 +142,7 @@ AddComponent(/datum/component/udder, /obj/item/udder, null, null, /datum/reagent/drug/mushroomhallucinogen) /mob/living/basic/cow/moonicorn/make_tameable() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/galaxythistle), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/galaxythistle), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/basic/cow/moonicorn/tamed(mob/living/tamer) . = ..() diff --git a/code/modules/mob/living/basic/vermin/cockroach.dm b/code/modules/mob/living/basic/vermin/cockroach.dm index 89579d8bd92..4f76e02cfb5 100644 --- a/code/modules/mob/living/basic/vermin/cockroach.dm +++ b/code/modules/mob/living/basic/vermin/cockroach.dm @@ -115,7 +115,7 @@ /mob/living/basic/cockroach/hauberoach/Initialize(mapload) . = ..() AddComponent(/datum/component/caltrop, min_damage = 10, max_damage = 15, flags = (CALTROP_BYPASS_SHOES | CALTROP_SILENT)) - AddComponent(/datum/component/squashable, squash_chance = 100, squash_damage = 1, squash_callback = /mob/living/basic/cockroach/hauberoach/.proc/on_squish) + AddComponent(/datum/component/squashable, squash_chance = 100, squash_damage = 1, squash_callback = TYPE_PROC_REF(/mob/living/basic/cockroach/hauberoach, on_squish)) ///Proc used to override the squashing behavior of the normal cockroach. /mob/living/basic/cockroach/hauberoach/proc/on_squish(mob/living/cockroach, mob/living/living_target) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 395d6a73d96..f929fc83954 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -16,7 +16,7 @@ C.regenerate_icons() notransform = TRUE - INVOKE_ASYNC(src, .proc/bloodpool_sink, B) + INVOKE_ASYNC(src, PROC_REF(bloodpool_sink), B) return TRUE @@ -134,7 +134,7 @@ newcolor = rgb(43, 186, 0) add_atom_colour(newcolor, TEMPORARY_COLOUR_PRIORITY) // but only for a few seconds - addtimer(CALLBACK(src, /atom/.proc/remove_atom_colour, TEMPORARY_COLOUR_PRIORITY, newcolor), 6 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, remove_atom_colour), TEMPORARY_COLOUR_PRIORITY, newcolor), 6 SECONDS) /mob/living/proc/phasein(atom/target, forced = FALSE) if(!forced) diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index 3b6730da297..e62374919b0 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -72,7 +72,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) next_ask = world.time + ask_delay searching = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/check_success), ask_delay) + addtimer(CALLBACK(src, PROC_REF(check_success)), ask_delay) /obj/item/mmi/posibrain/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index df117dd7b56..10ab9746650 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -50,7 +50,7 @@ body_position_pixel_y_offset = -32 update_icons() ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPING_TRAIT) //Throwing itself doesn't protect mobs against lava (because gulag). - throw_at(A, MAX_ALIEN_LEAP_DIST, 1, src, FALSE, TRUE, callback = CALLBACK(src, .proc/leap_end)) + throw_at(A, MAX_ALIEN_LEAP_DIST, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(leap_end))) /mob/living/carbon/alien/humanoid/hunter/proc/leap_end() leaping = FALSE diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index e792556ea44..0940303eb34 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -143,7 +143,7 @@ recent_queen_death = TRUE owner.throw_alert(ALERT_XENO_NOQUEEN, /atom/movable/screen/alert/alien_vulnerable) - addtimer(CALLBACK(src, .proc/clear_queen_death), QUEEN_DEATH_DEBUFF_DURATION) + addtimer(CALLBACK(src, PROC_REF(clear_queen_death)), QUEEN_DEATH_DEBUFF_DURATION) /obj/item/organ/alien/hivenode/proc/clear_queen_death() diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 03300d57422..c05d3514659 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -59,8 +59,8 @@ if(stage >= 6) return if(++stage < 6) - INVOKE_ASYNC(src, .proc/RefreshInfectionImage) - addtimer(CALLBACK(src, .proc/advance_embryo_stage), growth_time) + INVOKE_ASYNC(src, PROC_REF(RefreshInfectionImage)) + addtimer(CALLBACK(src, PROC_REF(advance_embryo_stage)), growth_time) /obj/item/organ/body_egg/alien_embryo/egg_process() if(stage == 6 && prob(50)) @@ -85,7 +85,7 @@ if(!candidates.len || !owner) bursting = FALSE stage = 5 // If no ghosts sign up for the Larva, let's regress our growth by one minute, we will try again! - addtimer(CALLBACK(src, .proc/advance_embryo_stage), growth_time) + addtimer(CALLBACK(src, PROC_REF(advance_embryo_stage)), growth_time) return var/mob/dead/observer/ghost = pick(candidates) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 6fb0f9e3043..c166f14b507 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -36,7 +36,7 @@ /obj/item/clothing/mask/facehugger/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) @@ -101,7 +101,7 @@ return if(stat == CONSCIOUS) icon_state = "[base_icon_state]_thrown" - addtimer(CALLBACK(src, .proc/clear_throw_icon_state), 15) + addtimer(CALLBACK(src, PROC_REF(clear_throw_icon_state)), 15) /obj/item/clothing/mask/facehugger/proc/clear_throw_icon_state() if(icon_state == "[base_icon_state]_thrown") @@ -170,7 +170,7 @@ // early returns and validity checks done: attach. attached++ //ensure we detach once we no longer need to be attached - addtimer(CALLBACK(src, .proc/detach), MAX_IMPREGNATION_TIME) + addtimer(CALLBACK(src, PROC_REF(detach)), MAX_IMPREGNATION_TIME) if(!sterile) @@ -179,7 +179,7 @@ GoIdle() //so it doesn't jump the people that tear it off - addtimer(CALLBACK(src, .proc/Impregnate, M), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) + addtimer(CALLBACK(src, PROC_REF(Impregnate), M), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) /obj/item/clothing/mask/facehugger/proc/detach() attached = 0 @@ -227,7 +227,7 @@ icon_state = "[base_icon_state]_inactive" worn_icon_state = "[base_icon_state]_inactive" - addtimer(CALLBACK(src, .proc/GoActive), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME)) + addtimer(CALLBACK(src, PROC_REF(GoActive)), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME)) /obj/item/clothing/mask/facehugger/proc/Die() if(stat == DEAD) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 38cb9675479..3dc7e0ce18d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -10,8 +10,8 @@ GLOB.carbon_list += src var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_PRESHOVE = .proc/disarm_precollide, - COMSIG_CARBON_DISARM_COLLIDE = .proc/disarm_collision, + COMSIG_CARBON_DISARM_PRESHOVE = PROC_REF(disarm_precollide), + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(disarm_collision), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -376,7 +376,7 @@ switch(rand(1,100)+modifier) //91-100=Nothing special happens if(-INFINITY to 0) //attack yourself - INVOKE_ASYNC(I, /obj/item.proc/attack, src, src) + INVOKE_ASYNC(I, TYPE_PROC_REF(/obj/item, attack), src, src) if(1 to 30) //throw it at yourself I.throw_impact(src) if(31 to 60) //Throw object in facing direction @@ -1098,7 +1098,7 @@ for(var/i in artpaths) var/datum/martial_art/M = i artnames[initial(M.name)] = M - var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in sort_list(artnames, /proc/cmp_typepaths_asc) + var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in sort_list(artnames, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!usr) return if(QDELETED(src)) @@ -1114,7 +1114,7 @@ if(!check_rights(NONE)) return var/list/traumas = subtypesof(/datum/brain_trauma) - var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in sort_list(traumas, /proc/cmp_typepaths_asc) + var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in sort_list(traumas, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!usr) return if(QDELETED(src)) @@ -1136,7 +1136,7 @@ if(!check_rights(NONE)) return var/list/hallucinations = subtypesof(/datum/hallucination) - var/result = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in sort_list(hallucinations, /proc/cmp_typepaths_asc) + var/result = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in sort_list(hallucinations, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!usr) return if(QDELETED(src)) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 27ea7ac268f..594c9a9e15c 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -395,7 +395,7 @@ jitteriness += 1000 do_jitter_animation(jitteriness) stuttering += 2 - addtimer(CALLBACK(src, .proc/secondary_shock, should_stun), 20) + addtimer(CALLBACK(src, PROC_REF(secondary_shock), should_stun), 20) return shock_damage ///Called slightly after electrocute act to reduce jittering and apply a secondary stun. @@ -723,8 +723,8 @@ grasped_part = grasping_part grasped_part.grasped_by = src - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/qdel_void) - RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), .proc/qdel_void) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(qdel_void)) + RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), PROC_REF(qdel_void)) user.visible_message(span_danger("[user] grasps at [user.p_their()] [grasped_part.name], trying to stop the bleeding."), span_notice("You grab hold of your [grasped_part.name] tightly."), vision_distance=COMBAT_MESSAGE_RANGE) playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index c03802083ec..b23782ef08a 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -6,7 +6,7 @@ losebreath = 0 if(!gibbed) - INVOKE_ASYNC(src, .proc/emote, "deathgasp") + INVOKE_ASYNC(src, PROC_REF(emote), "deathgasp") reagents.end_metabolization(src) add_memory_in_range(src, 7, MEMORY_DEATH, list(DETAIL_PROTAGONIST = src), memory_flags = MEMORY_FLAG_NOMOOD, story_value = STORY_VALUE_OKAY, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF) @@ -22,7 +22,7 @@ MOJAVE SUN EDIT END */ BT.on_death() /mob/living/carbon/proc/inflate_gib() // Plays an animation that makes mobs appear to inflate before finally gibbing - addtimer(CALLBACK(src, .proc/gib, null, null, TRUE, TRUE), 25) + addtimer(CALLBACK(src, PROC_REF(gib), null, null, TRUE, TRUE), 25) var/matrix/M = matrix() M.Scale(1.8, 1.2) animate(src, time = 40, transform = M, easing = SINE_EASING) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6ee0c4aaf40..a837d5e5734 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -10,7 +10,7 @@ setup_human_dna() if(dna.species) - INVOKE_ASYNC(src, .proc/set_species, dna.species.type) + INVOKE_ASYNC(src, PROC_REF(set_species), dna.species.type) //initialise organs create_internal_organs() //most of it is done in set_species now, this is only for parent call @@ -18,15 +18,15 @@ . = ..() - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, .proc/clean_face) + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) AddComponent(/datum/component/personal_crafting) AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) AddComponent(/datum/component/bloodysoles/feet) AddElement(/datum/element/ridable, /datum/component/riding/creature/human) - AddElement(/datum/element/strippable, GLOB.strippable_human_items, /mob/living/carbon/human/.proc/should_strip) + AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human, should_strip)) GLOB.human_list += src var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -661,7 +661,7 @@ electrocution_skeleton_anim = mutable_appearance(icon, "electrocuted_base") electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART add_overlay(electrocution_skeleton_anim) - addtimer(CALLBACK(src, .proc/end_electrocution_animation, electrocution_skeleton_anim), anim_duration) + addtimer(CALLBACK(src, PROC_REF(end_electrocution_animation), electrocution_skeleton_anim), anim_duration) else //or just do a generic animation flick_overlay_view(image(icon,src,"electrocuted_generic",ABOVE_MOB_LAYER), src, anim_duration) @@ -992,7 +992,7 @@ . = ..() if(!user.mind?.guestbook) return - INVOKE_ASYNC(user.mind.guestbook, /datum/guestbook.proc/try_add_guest, user, src, FALSE) + INVOKE_ASYNC(user.mind.guestbook, TYPE_PROC_REF(/datum/guestbook, try_add_guest), user, src, FALSE) /mob/living/carbon/human/get_screentip_name(client/hovering_client) . = ..() @@ -1017,7 +1017,7 @@ /mob/living/carbon/human/species/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/set_species, race) + INVOKE_ASYNC(src, PROC_REF(set_species), race) /mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update, pref_load) . = ..() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index d6659ff792c..1b2c37acc5a 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1278,7 +1278,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(time_since_irradiated > RAD_MOB_HAIRLOSS && DT_PROB(RAD_MOB_HAIRLOSS_PROB, delta_time)) if(!(source.hairstyle == "Bald") && (HAIR in species_traits)) to_chat(source, span_danger("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/go_bald, source), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(go_bald), source), 5 SECONDS) /** * Makes the target human bald. @@ -1535,7 +1535,7 @@ GLOBAL_LIST_EMPTY(features_by_species) !length(H.internal_organs) && (length(H.bodyparts) <= 1)) var/obj/item/bodypart/chest = H.get_bodypart(BODY_ZONE_CHEST) if(chest?.get_damage() >= 100) - INVOKE_ASYNC(src, .proc/try_to_mcrib, user, I, H) + INVOKE_ASYNC(src, PROC_REF(try_to_mcrib), user, I, H) return TRUE //MOJAVE EDIT END @@ -1773,8 +1773,10 @@ GLOBAL_LIST_EMPTY(features_by_species) * * humi (required) The mob we will targeting */ /datum/species/proc/body_temperature_alerts(mob/living/carbon/human/humi) + var/old_bodytemp = humi.old_bodytemperature + var/bodytemp = humi.bodytemperature // Body temperature is too hot, and we do not have resist traits - if(humi.bodytemperature > bodytemp_heat_damage_limit && !HAS_TRAIT(humi, TRAIT_RESISTHEAT)) + if(bodytemp > bodytemp_heat_damage_limit && !HAS_TRAIT(humi, TRAIT_RESISTHEAT)) // Clear cold mood and apply hot mood SEND_SIGNAL(humi, COMSIG_CLEAR_MOOD_EVENT, "cold") SEND_SIGNAL(humi, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot) @@ -1782,37 +1784,41 @@ GLOBAL_LIST_EMPTY(features_by_species) //Remove any slowdown from the cold. humi.remove_movespeed_modifier(/datum/movespeed_modifier/cold) // display alerts based on how hot it is - switch(humi.bodytemperature) - if(bodytemp_heat_damage_limit to BODYTEMP_HEAT_WARNING_2) - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1) - if(BODYTEMP_HEAT_WARNING_2 to BODYTEMP_HEAT_WARNING_3) - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 2) - else - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 3) + // Can't be a switch due to http://www.byond.com/forum/post/2750423 + if(bodytemp in bodytemp_heat_damage_limit to BODYTEMP_HEAT_WARNING_2) + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1) + else if(bodytemp in BODYTEMP_HEAT_WARNING_2 to BODYTEMP_HEAT_WARNING_3) + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 2) + else + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 3) // Body temperature is too cold, and we do not have resist traits - else if(humi.bodytemperature < bodytemp_cold_damage_limit && !HAS_TRAIT(humi, TRAIT_RESISTCOLD)) + else if(bodytemp < bodytemp_cold_damage_limit && !HAS_TRAIT(humi, TRAIT_RESISTCOLD)) // clear any hot moods and apply cold mood SEND_SIGNAL(humi, COMSIG_CLEAR_MOOD_EVENT, "hot") SEND_SIGNAL(humi, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold) // Apply cold slow down humi.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/cold, multiplicative_slowdown = ((bodytemp_cold_damage_limit - humi.bodytemperature) / COLD_SLOWDOWN_FACTOR)) // Display alerts based how cold it is - switch(humi.bodytemperature) - if(BODYTEMP_COLD_WARNING_2 to bodytemp_cold_damage_limit) - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 1) - if(BODYTEMP_COLD_WARNING_3 to BODYTEMP_COLD_WARNING_2) - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 2) - else - humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 3) + // Can't be a switch due to http://www.byond.com/forum/post/2750423 + if(bodytemp in BODYTEMP_COLD_WARNING_2 to bodytemp_cold_damage_limit) + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 1) + else if(bodytemp in BODYTEMP_COLD_WARNING_3 to BODYTEMP_COLD_WARNING_2) + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 2) + else + humi.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 3) // We are not to hot or cold, remove status and moods - else + else if (old_bodytemp > bodytemp_heat_damage_limit || old_bodytemp < bodytemp_cold_damage_limit) humi.clear_alert(ALERT_TEMPERATURE) humi.remove_movespeed_modifier(/datum/movespeed_modifier/cold) SEND_SIGNAL(humi, COMSIG_CLEAR_MOOD_EVENT, "cold") SEND_SIGNAL(humi, COMSIG_CLEAR_MOOD_EVENT, "hot") + // Store the old bodytemp for future checking + humi.old_bodytemperature = bodytemp + + /** * Used to apply wounds and damage based on core/body temp * vars: @@ -1859,13 +1865,12 @@ GLOBAL_LIST_EMPTY(features_by_species) if(humi.coretemperature < cold_damage_limit && !HAS_TRAIT(humi, TRAIT_RESISTCOLD)) var/damage_type = is_hulk ? BRUTE : BURN // Why? var/damage_mod = coldmod * humi.physiology.cold_mod * (is_hulk ? HULK_COLD_DAMAGE_MOD : 1) - switch(humi.coretemperature) - if(201 to cold_damage_limit) - humi.apply_damage(COLD_DAMAGE_LEVEL_1 * damage_mod * delta_time, damage_type) - if(120 to 200) - humi.apply_damage(COLD_DAMAGE_LEVEL_2 * damage_mod * delta_time, damage_type) - else - humi.apply_damage(COLD_DAMAGE_LEVEL_3 * damage_mod * delta_time, damage_type) + if(humi.coretemperature in 201 to cold_damage_limit) + humi.apply_damage(COLD_DAMAGE_LEVEL_1 * damage_mod * delta_time, damage_type) + if(humi.coretemperature in 120 to 200) + humi.apply_damage(COLD_DAMAGE_LEVEL_2 * damage_mod * delta_time, damage_type) + else + humi.apply_damage(COLD_DAMAGE_LEVEL_3 * damage_mod * delta_time, damage_type) /** * Used to apply burn wounds on random limbs diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index a9441bf52ae..95115abd79b 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -209,9 +209,9 @@ return INITIALIZE_HINT_QDEL owner = new_owner START_PROCESSING(SSobj, src) - RegisterSignal(owner, COMSIG_CLICK_SHIFT, .proc/examinate_check) - RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head) - RegisterSignal(owner, COMSIG_LIVING_REVIVE, .proc/retrieve_head) + RegisterSignal(owner, COMSIG_CLICK_SHIFT, PROC_REF(examinate_check)) + RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, PROC_REF(unlist_head)) + RegisterSignal(owner, COMSIG_LIVING_REVIVE, PROC_REF(retrieve_head)) become_hearing_sensitive(ROUNDSTART_TRAIT) /obj/item/dullahan_relay/Destroy() diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index add9c4ed0ce..9b8fe351e30 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -56,9 +56,9 @@ r1 = GETREDPART(default_color) g1 = GETGREENPART(default_color) b1 = GETBLUEPART(default_color) - RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, .proc/on_emag_act) - RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) - RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act)) + RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) + RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) ethereal_light = ethereal.mob_light() spec_updatehealth(ethereal) C.set_safe_hunger_level() @@ -105,9 +105,9 @@ to_chat(H, span_notice("You feel the light of your body leave you.")) switch(severity) if(EMP_LIGHT) - addtimer(CALLBACK(src, .proc/stop_emp, H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds + addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds if(EMP_HEAVY) - addtimer(CALLBACK(src, .proc/stop_emp, H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds + addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds /datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user) SIGNAL_HANDLER @@ -118,7 +118,7 @@ to_chat(user, span_notice("You tap [H] on the back with your card.")) H.visible_message(span_danger("[H] starts flickering in an array of colors!")) handle_emag(H) - addtimer(CALLBACK(src, .proc/stop_emag, H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. + addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. /// Special handling for getting hit with a light eater /datum/species/ethereal/proc/on_light_eater(mob/living/carbon/human/source, datum/light_eater) @@ -137,7 +137,7 @@ return current_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] spec_updatehealth(H) - addtimer(CALLBACK(src, .proc/handle_emag, H), 5) //Call ourselves every 0.5 seconds to change color + addtimer(CALLBACK(src, PROC_REF(handle_emag), H), 5) //Call ourselves every 0.5 seconds to change color /datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H) emageffect = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index eff7dbc2353..8557ac91b6f 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -559,7 +559,7 @@ var/mob/living/carbon/human/H = owner H.visible_message(span_warning("[H] starts vibrating!"), span_danger("You start charging your bluespace core...")) playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, TRUE) - addtimer(CALLBACK(src, .proc/teleport, H), 15) + addtimer(CALLBACK(src, PROC_REF(teleport), H), 15) /datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H) H.visible_message(span_warning("[H] disappears in a shower of sparks!"), span_danger("You teleport!")) @@ -571,7 +571,7 @@ last_teleport = world.time UpdateButtonIcon() //action icon looks unavailable //action icon looks available again - addtimer(CALLBACK(src, .proc/UpdateButtonIcon), cooldown + 5) + addtimer(CALLBACK(src, PROC_REF(UpdateButtonIcon)), cooldown + 5) //honk @@ -619,7 +619,7 @@ ..() COOLDOWN_START(src, honkooldown, 0) COOLDOWN_START(src, banana_cooldown, banana_delay) - RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech)) var/obj/item/organ/liver/liver = C.getorganslot(ORGAN_SLOT_LIVER) if(liver) ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, SPECIES_TRAIT) @@ -878,7 +878,7 @@ H.forceMove(src) cloth_golem = H to_chat(cloth_golem, span_notice("You start gathering your life energy, preparing to rise again...")) - addtimer(CALLBACK(src, .proc/revive), revive_time) + addtimer(CALLBACK(src, PROC_REF(revive)), revive_time) else return INITIALIZE_HINT_QDEL @@ -1224,7 +1224,7 @@ badtime.appearance_flags = RESET_COLOR H.overlays_standing[FIRE_LAYER+0.5] = badtime H.apply_overlay(FIRE_LAYER+0.5) - addtimer(CALLBACK(H, /mob/living/carbon/.proc/remove_overlay, FIRE_LAYER+0.5), 25) + addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon, remove_overlay), FIRE_LAYER+0.5), 25) else playsound(get_turf(owner),'sound/magic/RATTLEMEBONES.ogg', 100) for(var/mob/living/L in orange(7, get_turf(owner))) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index b62f969d1e7..ac2014547ba 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -711,7 +711,7 @@ to_chat(living_target, span_warning("You feel a foreign presence within your mind...")) currently_linking = TRUE - if(!do_after(owner, 6 SECONDS, target = living_target, extra_checks = CALLBACK(src, .proc/while_link_callback, living_target))) + if(!do_after(owner, 6 SECONDS, target = living_target, extra_checks = CALLBACK(src, PROC_REF(while_link_callback), living_target))) to_chat(owner, span_warning("You can't seem to link [living_target]'s mind.")) to_chat(living_target, span_warning("The foreign presence leaves your mind.")) currently_linking = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 5e0f37de8cf..66af57d66c5 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -44,7 +44,7 @@ /datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) ..() assume_disguise(old_species, H) - RegisterSignal(H, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(H, COMSIG_MOB_SAY, PROC_REF(handle_speech)) H.set_safe_hunger_level() /datum/species/synth/on_species_loss(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/init_signals.dm b/code/modules/mob/living/carbon/init_signals.dm index 2ee2988df7e..92dab3ac9f0 100644 --- a/code/modules/mob/living/carbon/init_signals.dm +++ b/code/modules/mob/living/carbon/init_signals.dm @@ -2,8 +2,8 @@ /mob/living/carbon/register_init_signals() . = ..() - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), .proc/on_nobreath_trait_gain) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOMETABOLISM), .proc/on_nometabolism_trait_gain) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), PROC_REF(on_nobreath_trait_gain)) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOMETABOLISM), PROC_REF(on_nometabolism_trait_gain)) /** * On gain of TRAIT_NOBREATH diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index cc34806f82e..92c1f401bfd 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -132,7 +132,7 @@ wings.close_wings() else wings.open_wings() - addtimer(CALLBACK(wings, open ? /obj/item/organ/external/wings/functional.proc/open_wings : /obj/item/organ/external/wings/functional.proc/close_wings), wing_time) + addtimer(CALLBACK(wings, open ? TYPE_PROC_REF(/obj/item/organ/external/wings/functional, open_wings) : TYPE_PROC_REF(/obj/item/organ/external/wings/functional, close_wings)), wing_time) /datum/emote/living/flap/aflap key = "aflap" @@ -460,7 +460,7 @@ continue var/yawn_delay = rand(0.25 SECONDS, 0.75 SECONDS) * dist_between - addtimer(CALLBACK(src, .proc/propagate_yawn, iter_living), yawn_delay) + addtimer(CALLBACK(src, PROC_REF(propagate_yawn), iter_living), yawn_delay) /// This yawn has been triggered by someone else yawning specifically, likely after a delay. Check again if they don't have the yawned recently trait /datum/emote/living/yawn/proc/propagate_yawn(mob/user) diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index fd7c347c20c..7caacbe97da 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -1,34 +1,34 @@ /// Called on [/mob/living/Initialize(mapload)], for the mob to register to relevant signals. /mob/living/proc/register_init_signals() - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), .proc/on_knockedout_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), .proc/on_knockedout_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEATHCOMA), .proc/on_deathcoma_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEATHCOMA), .proc/on_deathcoma_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEATHCOMA), PROC_REF(on_deathcoma_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEATHCOMA), PROC_REF(on_deathcoma_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), .proc/on_immobilized_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), .proc/on_immobilized_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FLOORED), .proc/on_floored_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FLOORED), .proc/on_floored_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FLOORED), PROC_REF(on_floored_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FLOORED), PROC_REF(on_floored_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FORCED_STANDING), .proc/on_forced_standing_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FORCED_STANDING), .proc/on_forced_standing_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FORCED_STANDING), PROC_REF(on_forced_standing_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FORCED_STANDING), PROC_REF(on_forced_standing_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), .proc/on_handsblocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), .proc/on_handsblocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_handsblocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_handsblocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UI_BLOCKED), .proc/on_ui_blocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_UI_BLOCKED), .proc/on_ui_blocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UI_BLOCKED), PROC_REF(on_ui_blocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_UI_BLOCKED), PROC_REF(on_ui_blocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PULL_BLOCKED), .proc/on_pull_blocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PULL_BLOCKED), .proc/on_pull_blocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PULL_BLOCKED), PROC_REF(on_pull_blocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PULL_BLOCKED), PROC_REF(on_pull_blocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), .proc/on_incapacitated_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), .proc/on_incapacitated_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), PROC_REF(on_incapacitated_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), PROC_REF(on_incapacitated_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_RESTRAINED), .proc/on_restrained_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_RESTRAINED), .proc/on_restrained_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_loss)) RegisterSignal(src, list( SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), @@ -36,13 +36,13 @@ SIGNAL_ADDTRAIT(TRAIT_NODEATH), SIGNAL_REMOVETRAIT(TRAIT_NODEATH), - ), .proc/update_succumb_action) + ), PROC_REF(update_succumb_action)) - RegisterSignal(src, COMSIG_MOVETYPE_FLAG_ENABLED, .proc/on_movement_type_flag_enabled) - RegisterSignal(src, COMSIG_MOVETYPE_FLAG_DISABLED, .proc/on_movement_type_flag_disabled) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_ENABLED, PROC_REF(on_movement_type_flag_enabled)) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_DISABLED, PROC_REF(on_movement_type_flag_disabled)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_SKITTISH), .proc/on_skittish_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_SKITTISH), .proc/on_skittish_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_SKITTISH), PROC_REF(on_skittish_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_SKITTISH), PROC_REF(on_skittish_trait_loss)) /// Called when [TRAIT_KNOCKEDOUT] is added to the mob. /mob/living/proc/on_knockedout_trait_gain(datum/source) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 3f8447ade8c..162e8a4db05 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -194,7 +194,7 @@ /mob/living/proc/gravity_animate() if(!get_filter("gravity")) add_filter("gravity",1,list("type"="motion_blur", "x"=0, "y"=0)) - INVOKE_ASYNC(src, .proc/gravity_pulse_animation) + INVOKE_ASYNC(src, PROC_REF(gravity_pulse_animation)) /mob/living/proc/gravity_pulse_animation() animate(get_filter("gravity"), y = 1, time = 10) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8427ac0f9b8..1008e301769 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -811,7 +811,7 @@ var/obj/effect/proc_holder/spell/spell = S spell.updateButtonIcon() if(excess_healing) - INVOKE_ASYNC(src, .proc/emote, "gasp") + INVOKE_ASYNC(src, PROC_REF(emote), "gasp") log_combat(src, src, "revived") else if(admin_revive) updatehealth() @@ -1858,8 +1858,8 @@ if(!can_look_up()) return changeNext_move(CLICK_CD_LOOK_UP) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, .proc/stop_look_up) //We stop looking up if we move. - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/start_look_up) //We start looking again after we move. + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(stop_look_up)) //We stop looking up if we move. + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(start_look_up)) //We start looking again after we move. start_look_up() /mob/living/proc/start_look_up() @@ -1908,8 +1908,8 @@ if(!can_look_up()) //if we cant look up, we cant look down. return changeNext_move(CLICK_CD_LOOK_UP) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, .proc/stop_look_down) //We stop looking down if we move. - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/start_look_down) //We start looking again after we move. + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(stop_look_down)) //We stop looking down if we move. + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(start_look_down)) //We start looking again after we move. start_look_down() /mob/living/proc/start_look_down() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 6740623b02c..9110177c3e1 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -436,8 +436,8 @@ if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE)) GLOB.cult_narsie.resolved = TRUE sound_to_playing_players('sound/machines/alarm.ogg') - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, 1), 120) - addtimer(CALLBACK(GLOBAL_PROC, .proc/ending_helper), 270) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 1), 120) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270) if(client) makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE) else @@ -470,7 +470,7 @@ type = /atom/movable/screen/fullscreen/flash/black overlay_fullscreen("flash", type) - addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", length), length) + addtimer(CALLBACK(src, PROC_REF(clear_fullscreen), "flash", length), length) return TRUE //called when the mob receives a loud bang diff --git a/code/modules/mob/living/living_fov.dm b/code/modules/mob/living/living_fov.dm index 113fd7b145e..02166b6b9a0 100644 --- a/code/modules/mob/living/living_fov.dm +++ b/code/modules/mob/living/living_fov.dm @@ -13,10 +13,10 @@ if(fov_view) if(rel_x >= -1 && rel_x <= 1 && rel_y >= -1 && rel_y <= 1) //Cheap way to check inside that 3x3 box around you return TRUE //Also checks if both are 0 to stop division by zero - + // Get the vector length so we can create a good directional vector var/vector_len = sqrt(abs(rel_x) ** 2 + abs(rel_y) ** 2) - + /// Getting a direction vector var/dir_x var/dir_y @@ -33,10 +33,10 @@ if(WEST) dir_x = -vector_len dir_y = 0 - + ///Calculate angle var/angle = arccos((dir_x * rel_x + dir_y * rel_y) / (sqrt(dir_x**2 + dir_y**2) * sqrt(rel_x**2 + rel_y**2))) - + /// Calculate vision angle and compare var/vision_angle = (360 - fov_view) / 2 if(angle < vision_angle) @@ -119,7 +119,7 @@ fov_image.transform = matrix fov_image.mouse_opacity = MOUSE_OPACITY_TRANSPARENT mob_client.images += fov_image - addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_client, fov_image, mob_client), 30) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_image_from_client), fov_image, mob_client), 30) /atom/movable/screen/fov_blocker icon = 'mojave/icons/effects/ms_fov.dmi' //MOJAVE EDIT - Original path is icons/effects/fov/field_of_view.dmi diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 9a897834f8b..8b54b087dcb 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -399,7 +399,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( var/image/I = image('icons/mob/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER) I.plane = ABOVE_GAME_PLANE I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA - INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_recipients, 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), I, speech_bubble_recipients, 30) /mob/proc/binarycheck() return FALSE diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c9878d4d3df..7893a57a64d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -145,9 +145,9 @@ create_eye() if(client) - INVOKE_ASYNC(src, .proc/apply_pref_name, /datum/preference/name/ai, client) + INVOKE_ASYNC(src, PROC_REF(apply_pref_name), /datum/preference/name/ai, client) - INVOKE_ASYNC(src, .proc/set_core_display_icon) + INVOKE_ASYNC(src, PROC_REF(set_core_display_icon)) holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default")) @@ -187,8 +187,8 @@ ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, ROUNDSTART_TRAIT) alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z), camera_view = TRUE) - RegisterSignal(alert_control.listener, COMSIG_ALARM_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(alert_control.listener, COMSIG_ALARM_CLEARED, .proc/alarm_cleared) + RegisterSignal(alert_control.listener, COMSIG_ALARM_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(alert_control.listener, COMSIG_ALARM_CLEARED, PROC_REF(alarm_cleared)) /mob/living/silicon/ai/key_down(_key, client/user) if(findtext(_key, "numpad")) //if it's a numpad number, we can convert it to just the number @@ -956,7 +956,7 @@ return else if(mind) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/disconnect_shell) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(disconnect_shell)) deployed_shell = target target.deploy_init(src) mind.transfer_to(target) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index ce2fa69e814..0f4092b9650 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -4,7 +4,7 @@ if(!gibbed) // Will update all AI status displays with a blue screen of death - INVOKE_ASYNC(src, .proc/emote, "bsod") + INVOKE_ASYNC(src, PROC_REF(emote), "bsod") . = ..() @@ -35,7 +35,7 @@ ShutOffDoomsdayDevice() if(explosive) - addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, loc, 3, 6, 12, null, 15), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), loc, 3, 6, 12, null, 15), 1 SECONDS) if(istype(loc, /obj/item/aicard/aitater)) loc.icon_state = "aitater-404" diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index e5b9d84d62f..fe254c61f6d 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -58,7 +58,7 @@ */ /datum/camerachunk/proc/hasChanged(update_now = 0) if(seenby.len || update_now) - addtimer(CALLBACK(src, .proc/update), UPDATE_BUFFER_TIME, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(update)), UPDATE_BUFFER_TIME, TIMER_UNIQUE) else changed = TRUE diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 635042926b7..675da03e620 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -168,4 +168,4 @@ blind_eyes(1) update_sight() to_chat(src, span_alert("You've lost power!")) - addtimer(CALLBACK(src, .proc/start_RestorePowerRoutine), 20) + addtimer(CALLBACK(src, PROC_REF(start_RestorePowerRoutine)), 20) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index d85ec0c56ac..481ddf48bb8 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -20,8 +20,8 @@ if(announce && last_lawchange_announce != world.time) to_chat(src, "Your laws have been changed.") // lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset - addtimer(CALLBACK(src, .proc/show_laws), 0) - addtimer(CALLBACK(src, .proc/deadchat_lawchange), 0) + addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) + addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0) last_lawchange_announce = world.time /mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 2af326b024f..4574d386929 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -171,12 +171,12 @@ aicamera = new /obj/item/camera/siliconcam/ai_camera(src) aicamera.flash_enabled = TRUE - addtimer(CALLBACK(src, .proc/pdaconfig), 5) + addtimer(CALLBACK(src, PROC_REF(pdaconfig)), 5) . = ..() emittersemicd = TRUE - addtimer(CALLBACK(src, .proc/emittercool), 600) + addtimer(CALLBACK(src, PROC_REF(emittercool)), 600) if(!holoform) ADD_TRAIT(src, TRAIT_IMMOBILIZED, PAI_FOLDED) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 2a4b5f8fbb8..b24e3e57ac8 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -17,7 +17,7 @@ return FALSE emittersemicd = TRUE - addtimer(CALLBACK(src, .proc/emittercool), emittercd) + addtimer(CALLBACK(src, PROC_REF(emittercool)), emittercd) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, PAI_FOLDED) REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, PAI_FOLDED) set_density(TRUE) @@ -47,9 +47,9 @@ /mob/living/silicon/pai/proc/fold_in(force = FALSE) emittersemicd = TRUE if(!force) - addtimer(CALLBACK(src, .proc/emittercool), emittercd) + addtimer(CALLBACK(src, PROC_REF(emittercool)), emittercd) else - addtimer(CALLBACK(src, .proc/emittercool), emitteroverloadcd) + addtimer(CALLBACK(src, PROC_REF(emittercool)), emitteroverloadcd) icon_state = "[chassis]" if(!holoform) . = fold_out(force) @@ -83,7 +83,7 @@ sort_list(skins) var/atom/anchor = get_atom_on_turf(src) - var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, .proc/check_menu, anchor), radius = 40, require_near = TRUE) + var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), anchor), radius = 40, require_near = TRUE) if(!choice) return FALSE set_holochassis(choice) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 0c4a0fcdc08..62aa45a462d 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -152,7 +152,7 @@ if(params["list"] == "security") security_records = GLOB.data_core.get_security_records() ui.send_full_update() - addtimer(CALLBACK(src, .proc/refresh_again), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(refresh_again)), 3 SECONDS) if("remote_signaler") signaler.ui_interact(src) if("security_hud") diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index aa62b2d7ba0..568802a82ee 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -78,4 +78,4 @@ /mob/living/silicon/robot/post_lawchange(announce = TRUE) . = ..() - addtimer(CALLBACK(src, .proc/logevent,"Law update processed."), 0, TIMER_UNIQUE | TIMER_OVERRIDE) //Post_Lawchange gets spammed by some law boards, so let's wait it out + addtimer(CALLBACK(src, PROC_REF(logevent), "Law update processed."), 0, TIMER_UNIQUE | TIMER_OVERRIDE) //Post_Lawchange gets spammed by some law boards, so let's wait it out diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 96d320f5bbd..0798ae3a1ce 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -8,17 +8,17 @@ tip_time = 3 SECONDS, \ untip_time = 2 SECONDS, \ self_right_time = 60 SECONDS, \ - post_tipped_callback = CALLBACK(src, .proc/after_tip_over), \ - post_untipped_callback = CALLBACK(src, .proc/after_righted), \ + post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ + post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \ roleplay_friendly = TRUE, \ roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/living/beep), \ - roleplay_callback = CALLBACK(src, .proc/untip_roleplay)) + roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay))) wires = new /datum/wires/robot(src) AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) AddElement(/datum/element/ridable, /datum/component/riding/creature/cyborg) - RegisterSignal(src, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/charge) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) robot_modules_background = new() robot_modules_background.icon_state = "block" @@ -81,15 +81,15 @@ logevent("System brought online.") alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z)) - RegisterSignal(alert_control.listener, COMSIG_ALARM_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(alert_control.listener, COMSIG_ALARM_CLEARED, .proc/alarm_cleared) + RegisterSignal(alert_control.listener, COMSIG_ALARM_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(alert_control.listener, COMSIG_ALARM_CLEARED, PROC_REF(alarm_cleared)) alert_control.listener.RegisterSignal(src, COMSIG_LIVING_DEATH, /datum/alarm_listener/proc/prevent_alarm_changes) alert_control.listener.RegisterSignal(src, COMSIG_LIVING_REVIVE, /datum/alarm_listener/proc/allow_alarm_changes) /mob/living/silicon/robot/model/syndicate/Initialize(mapload) . = ..() laws = new /datum/ai_laws/syndicate_override() - addtimer(CALLBACK(src, .proc/show_playstyle), 5) + addtimer(CALLBACK(src, PROC_REF(show_playstyle)), 5) /mob/living/silicon/robot/proc/create_modularInterface() if(!modularInterface) @@ -744,7 +744,7 @@ hat_offset = model.hat_offset - INVOKE_ASYNC(src, .proc/updatename) + INVOKE_ASYNC(src, PROC_REF(updatename)) /mob/living/silicon/robot/proc/place_on_head(obj/item/new_hat) @@ -783,8 +783,8 @@ return FALSE upgrades += new_upgrade new_upgrade.forceMove(src) - RegisterSignal(new_upgrade, COMSIG_MOVABLE_MOVED, .proc/remove_from_upgrades) - RegisterSignal(new_upgrade, COMSIG_PARENT_QDELETING, .proc/on_upgrade_deleted) + RegisterSignal(new_upgrade, COMSIG_MOVABLE_MOVED, PROC_REF(remove_from_upgrades)) + RegisterSignal(new_upgrade, COMSIG_PARENT_QDELETING, PROC_REF(on_upgrade_deleted)) logevent("Hardware [new_upgrade] installed successfully.") ///Called when an upgrade is moved outside the robot. So don't call this directly, use forceMove etc. diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 911aeaeeec9..a7d4858d1b1 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real return spark_system.start() step_away(src, user, 15) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_away, src, get_turf(user), 15), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_away), src, get_turf(user), 15), 3) /mob/living/silicon/robot/welder_act(mob/living/user, obj/item/tool) if(user.combat_mode && usr != src) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 8334ad36c51..f08063bdd13 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -149,7 +149,7 @@ /mob/living/silicon/robot/model/Initialize(mapload) . = ..() - INVOKE_ASYNC(model, /obj/item/robot_model.proc/transform_to, set_model, TRUE) + INVOKE_ASYNC(model, TYPE_PROC_REF(/obj/item/robot_model, transform_to), set_model, TRUE) /mob/living/silicon/robot/model/clown set_model = /obj/item/robot_model/clown diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 493ec9ef5c2..00b3e950118 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -190,7 +190,7 @@ cyborg.diag_hud_set_aishell() log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.") - INVOKE_ASYNC(new_model, .proc/do_transform_animation) + INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) qdel(src) return new_model @@ -201,7 +201,7 @@ for(var/skin in borg_skins) var/list/details = borg_skins[skin] reskin_icons[skin] = image(icon = details[SKIN_ICON] || 'icons/mob/robots.dmi', icon_state = details[SKIN_ICON_STATE]) - var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, .proc/check_menu, cyborg, old_model), radius = 38, require_near = TRUE) + var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), cyborg, old_model), radius = 38, require_near = TRUE) if(!borg_skin) return FALSE var/list/details = borg_skins[borg_skin] @@ -393,7 +393,7 @@ /datum/action/toggle_buffer/New(Target) if(!allow_buffer_activate) - allow_buffer_activate = CALLBACK(src, .proc/allow_buffer_activate) + allow_buffer_activate = CALLBACK(src, PROC_REF(allow_buffer_activate)) return ..() /datum/action/toggle_buffer/Destroy() @@ -469,7 +469,7 @@ buffer_on = TRUE // Slow em down a bunch robot_owner.add_movespeed_modifier(/datum/movespeed_modifier/auto_wash) - RegisterSignal(robot_owner, COMSIG_MOVABLE_MOVED, .proc/clean) + RegisterSignal(robot_owner, COMSIG_MOVABLE_MOVED, PROC_REF(clean)) //This is basically just about adding a shake to the borg, effect should look ilke an engine's running var/base_x = robot_owner.base_pixel_x var/base_y = robot_owner.base_pixel_y @@ -506,7 +506,7 @@ // Reset our animations animate(pixel_x = base_x, pixel_y = base_y, time = 2) addtimer(CALLBACK(wash_audio, /datum/looping_sound/proc/stop), time_left) - addtimer(CALLBACK(src, .proc/turn_off_wash), finished_by) + addtimer(CALLBACK(src, PROC_REF(turn_off_wash)), finished_by) /// Called by [deactivate_wash] on a timer to allow noises and animation to play out. /// Finally disables the buffer. Doesn't do everything mind, just the stuff that we wanted to delay diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 69e28e45cab..afc1c9c8aa3 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -98,7 +98,7 @@ if(in_cooldown) return - addtimer(CALLBACK(src, .proc/show_alarms), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(show_alarms)), 3 SECONDS) /mob/living/silicon/proc/show_alarms() if(length(alarms_to_show) < 5) diff --git a/code/modules/mob/living/silicon/silicon_movement.dm b/code/modules/mob/living/silicon/silicon_movement.dm index 590326eda1b..cc0a01aa375 100644 --- a/code/modules/mob/living/silicon/silicon_movement.dm +++ b/code/modules/mob/living/silicon/silicon_movement.dm @@ -18,5 +18,5 @@ oldLoc = get_turf(oldLoc) if(!QDELETED(builtInCamera) && !updating && oldLoc != get_turf(src)) updating = TRUE - addtimer(CALLBACK(src, .proc/do_camera_update, oldLoc), SILICON_CAMERA_BUFFER) + addtimer(CALLBACK(src, PROC_REF(do_camera_update), oldLoc), SILICON_CAMERA_BUFFER) #undef SILICON_CAMERA_BUFFER diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index eba10e502d2..ea1c1e7d642 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -31,11 +31,11 @@ if(ismob(AM) && AM == target) visible_message(span_warning("[src] flails his swords and cuts [AM]!")) playsound(src,'sound/effects/beepskyspinsabre.ogg',100,TRUE,-1) - INVOKE_ASYNC(src, .proc/stun_attack, AM) + INVOKE_ASYNC(src, PROC_REF(stun_attack), AM) /mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload) . = ..() - INVOKE_ASYNC(weapon, /obj/item.proc/attack_self, src) + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack_self), src) /mob/living/simple_animal/bot/secbot/grievous/Destroy() QDEL_NULL(weapon) @@ -53,7 +53,7 @@ weapon.attack(C, src) playsound(src, 'sound/weapons/blade1.ogg', 50, TRUE, -1) if(C.stat == DEAD) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 2) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 2) back_to_idle() @@ -109,7 +109,7 @@ if((C.name == oldtarget_name) && (world.time < last_found + 100)) continue - threatlevel = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + threatlevel = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons))) if(!threatlevel) continue @@ -124,7 +124,7 @@ icon_state = "grievous-c" visible_message("[src] points at [C.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break else continue diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 34134da0a52..139e12153c7 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -446,7 +446,7 @@ ejectpai(0) if(bot_mode_flags & BOT_MODE_ON) turn_off() - addtimer(CALLBACK(src, .proc/emp_reset, was_on), severity * 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(emp_reset), was_on), severity * 30 SECONDS) /mob/living/simple_animal/bot/proc/emp_reset(was_on) stat &= ~EMPED @@ -586,7 +586,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(step_count >= 1 && tries < BOT_STEP_MAX_RETRIES) for(var/step_number in 1 to step_count) - addtimer(CALLBACK(src, .proc/bot_step), BOT_STEP_DELAY*(step_number-1)) + addtimer(CALLBACK(src, PROC_REF(bot_step)), BOT_STEP_DELAY*(step_number-1)) else return FALSE return TRUE @@ -629,7 +629,7 @@ Pass a positive integer as an argument to override a bot's default speed. turn_on() //Saves the AI the hassle of having to activate a bot manually. access_card.set_access(REGION_ACCESS_ALL_STATION) //Give the bot all-access while under the AI's command. if(client) - reset_access_timer_id = addtimer(CALLBACK (src, .proc/bot_reset), 60 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time + reset_access_timer_id = addtimer(CALLBACK (src, PROC_REF(bot_reset)), 60 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time to_chat(src, span_notice("[span_big("Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area].")]
      [path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")) if(message) to_chat(calling_ai, span_notice("[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")) @@ -676,7 +676,7 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/bot_patrol() patrol_step() - addtimer(CALLBACK(src, .proc/do_patrol), 5) + addtimer(CALLBACK(src, PROC_REF(do_patrol)), 5) /mob/living/simple_animal/bot/proc/do_patrol() if(mode == BOT_PATROL) @@ -696,7 +696,7 @@ Pass a positive integer as an argument to override a bot's default speed. return if(patrol_target) // has patrol target - INVOKE_ASYNC(src, .proc/target_patrol) + INVOKE_ASYNC(src, PROC_REF(target_patrol)) else // no patrol target, so need a new one speak("Engaging patrol mode.") find_patrol_target() @@ -730,7 +730,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move if(!moved) //Couldn't proceed the next step of the path BOT_STEP_MAX_RETRIES times - addtimer(CALLBACK(src, .proc/patrol_step_not_moved), 2) + addtimer(CALLBACK(src, PROC_REF(patrol_step_not_moved)), 2) else // no path, so calculate new one mode = BOT_START_PATROL @@ -842,7 +842,7 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid) check_bot_access() - INVOKE_ASYNC(src, .proc/do_calc_summon_path, avoid) + INVOKE_ASYNC(src, PROC_REF(do_calc_summon_path), avoid) /mob/living/simple_animal/bot/proc/do_calc_summon_path(turf/avoid) set_path(get_path_to(src, summon_target, 150, id=access_card, exclude=avoid)) @@ -866,7 +866,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/moved = bot_move(summon_target, 3) // Move attempt if(!moved) - addtimer(CALLBACK(src, .proc/summon_step_not_moved), 2) + addtimer(CALLBACK(src, PROC_REF(summon_step_not_moved)), 2) else // no path, so calculate new one calc_summon_path() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 988d5eb7f29..52ec33c228e 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -121,7 +121,7 @@ prefixes = list(command, security, engineering) suffixes = list(research, medical, legal) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -161,7 +161,7 @@ stolen_valor += C.job update_titles() - INVOKE_ASYNC(weapon, /obj/item.proc/attack, C, src) + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack), C, src) C.Knockdown(20) /mob/living/simple_animal/bot/cleanbot/attackby(obj/item/W, mob/living/user, params) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 85ab4c6555b..5facdc1ac16 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -38,7 +38,7 @@ var/threatlevel = 0 if(nearby_carbon.incapacitated()) continue - threatlevel = nearby_carbon.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + threatlevel = nearby_carbon.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons))) if(threatlevel < 4 ) continue var/dst = get_dist(src, nearby_carbon) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index c00d59fd863..be35c3f0279 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -245,7 +245,7 @@ else F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) audible_message(span_danger("[src] makes an excited booping sound.")) - addtimer(CALLBACK(src, .proc/go_idle), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS) path = list() return if(!length(path)) diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 6fcfa1734f9..c75b3785aa6 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -43,10 +43,10 @@ /mob/living/simple_animal/bot/secbot/honkbot/knockOver(mob/living/carbon/tripped_target) . = ..() - INVOKE_ASYNC(src, /mob/living/simple_animal/bot.proc/speak, "Honk!") + INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/simple_animal/bot, speak), "Honk!") playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) /mob/living/simple_animal/bot/secbot/honkbot/bot_reset() ..() @@ -59,11 +59,11 @@ var/judgement_criteria = judgement_criteria() playsound(src, 'sound/items/AirHorn.ogg', 100, TRUE, -1) //HEEEEEEEEEEEENK!! icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) if(!ishuman(current_target)) current_target.stuttering = 20 current_target.Paralyze(8 SECONDS) - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntime) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntime) return current_target.stuttering = 20 var/obj/item/organ/ears/target_ears = current_target.getorganslot(ORGAN_SLOT_EARS) @@ -82,7 +82,7 @@ var/mob/living/carbon/human/human_target = current_target threatlevel = human_target.assess_threat(judgement_criteria) threatlevel -= 6 - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntime) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntime) log_combat(src, current_target, "honked") @@ -98,7 +98,7 @@ . = ..() playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) /mob/living/simple_animal/bot/secbot/honkbot/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers) . = ..() @@ -125,8 +125,8 @@ icon_state = "[initial(icon_state)]-c" limiting_spam = TRUE // prevent spam - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntimehorn) - addtimer(CALLBACK(src, /atom.proc/update_appearance), 3 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntimehorn) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 3 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) //Honkbots don't care for NAP violations /mob/living/simple_animal/bot/secbot/honkbot/check_nap_violations() @@ -141,5 +141,5 @@ playsound(loc, honksound, 50, TRUE, -1) limiting_spam = TRUE // prevent spam icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntimehorn) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntimehorn) diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index 802a1aa50ac..870e738b8c4 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -46,7 +46,7 @@ access_card.add_access(jani_trim.access + jani_trim.wildcard_access) prev_access = access_card.access.Copy() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -171,13 +171,13 @@ frustration = 0 last_found = world.time stop_washing() - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/hygienebot/proc/back_to_hunt() frustration = 0 mode = BOT_HUNT stop_washing() - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/hygienebot/proc/look_for_lowhygiene() for (var/mob/living/carbon/human/H in view(7,src)) //Find the NEET @@ -190,7 +190,7 @@ playsound(loc, 'sound/effects/hygienebot_happy.ogg', 60, 1) visible_message("[src] points at [H.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break else continue diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 85e311fec0c..44f3828fef9 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -144,9 +144,9 @@ tip_time = 3 SECONDS, \ untip_time = 3 SECONDS, \ self_right_time = 3.5 MINUTES, \ - pre_tipped_callback = CALLBACK(src, .proc/pre_tip_over), \ - post_tipped_callback = CALLBACK(src, .proc/after_tip_over), \ - post_untipped_callback = CALLBACK(src, .proc/after_righted)) + pre_tipped_callback = CALLBACK(src, PROC_REF(pre_tip_over)), \ + post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ + post_untipped_callback = CALLBACK(src, PROC_REF(after_righted))) /mob/living/simple_animal/bot/medbot/bot_reset() ..() diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index fe851556b0a..d8865b4a1ad 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -60,10 +60,10 @@ /mob/living/simple_animal/bot/mulebot/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOB_BOT_PRE_STEP, .proc/check_pre_step) - RegisterSignal(src, COMSIG_MOB_CLIENT_PRE_MOVE, .proc/check_pre_step) - RegisterSignal(src, COMSIG_MOB_BOT_STEP, .proc/on_bot_step) - RegisterSignal(src, COMSIG_MOB_CLIENT_MOVED, .proc/on_bot_step) + RegisterSignal(src, COMSIG_MOB_BOT_PRE_STEP, PROC_REF(check_pre_step)) + RegisterSignal(src, COMSIG_MOB_CLIENT_PRE_MOVE, PROC_REF(check_pre_step)) + RegisterSignal(src, COMSIG_MOB_BOT_STEP, PROC_REF(on_bot_step)) + RegisterSignal(src, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_bot_step)) ADD_TRAIT(src, TRAIT_NOMOBSWAP, INNATE_TRAIT) @@ -558,7 +558,7 @@ buzz(SIGH) mode = BOT_WAIT_FOR_NAV blockcount = 0 - addtimer(CALLBACK(src, .proc/process_blocked, next), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(process_blocked), next), 2 SECONDS) return return else @@ -571,7 +571,7 @@ if(BOT_NAV) // calculate new path mode = BOT_WAIT_FOR_NAV - INVOKE_ASYNC(src, .proc/process_nav) + INVOKE_ASYNC(src, PROC_REF(process_nav)) /mob/living/simple_animal/bot/mulebot/proc/process_blocked(turf/next) calc_path(avoid=next) @@ -619,7 +619,7 @@ /mob/living/simple_animal/bot/mulebot/proc/start_home() if(!(bot_mode_flags & BOT_MODE_ON)) return - INVOKE_ASYNC(src, .proc/do_start_home) + INVOKE_ASYNC(src, PROC_REF(do_start_home)) /mob/living/simple_animal/bot/mulebot/proc/do_start_home() set_destination(home_destination) @@ -820,7 +820,7 @@ if(isobserver(AM)) visible_message(span_warning("A ghostly figure appears on [src]!")) - RegisterSignal(AM, COMSIG_MOVABLE_MOVED, .proc/ghostmoved) + RegisterSignal(AM, COMSIG_MOVABLE_MOVED, PROC_REF(ghostmoved)) AM.forceMove(src) else if(!wires.is_cut(WIRE_LOADCHECK)) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 02595e02f62..0123898e7a9 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -110,7 +110,7 @@ prev_access = access_card.access.Copy() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -174,7 +174,7 @@ /mob/living/simple_animal/bot/secbot/proc/retaliate(mob/living/carbon/human/attacking_human) var/judgement_criteria = judgement_criteria() - threatlevel = attacking_human.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threatlevel = attacking_human.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) threatlevel += 6 if(threatlevel >= 4) target = attacking_human @@ -278,7 +278,7 @@ playsound(src, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) current_target.visible_message(span_danger("[src] is trying to put zipties on [current_target]!"),\ span_userdanger("[src] is trying to put zipties on you!")) - addtimer(CALLBACK(src, .proc/handcuff_target, current_target), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(handcuff_target), current_target), 6 SECONDS) /mob/living/simple_animal/bot/secbot/proc/handcuff_target(mob/living/carbon/current_target) if(!(bot_mode_flags & BOT_MODE_ON)) //if he's in a closet or not adjacent, we cancel cuffing. @@ -297,7 +297,7 @@ var/judgement_criteria = judgement_criteria() playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) var/threat = 5 if(harm) @@ -306,11 +306,11 @@ current_target.stuttering = 5 current_target.Paralyze(100) var/mob/living/carbon/human/human_target = current_target - threat = human_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threat = human_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) else current_target.Paralyze(100) current_target.stuttering = 5 - threat = current_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threat = current_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) log_combat(src, target, "stunned") if(security_mode_flags & SECBOT_DECLARE_ARRESTS) @@ -415,13 +415,13 @@ target = null last_found = world.time frustration = 0 - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/secbot/proc/back_to_hunt() set_anchored(FALSE) frustration = 0 mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) // look for a criminal in view of the bot /mob/living/simple_animal/bot/secbot/proc/look_for_perp() @@ -434,7 +434,7 @@ if((nearby_carbons.name == oldtarget_name) && (world.time < last_found + 100)) continue - threatlevel = nearby_carbons.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threatlevel = nearby_carbons.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) if(!threatlevel) continue @@ -455,7 +455,7 @@ visible_message("[src] points at [nearby_carbons.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break /mob/living/simple_animal/bot/secbot/proc/check_for_weapons(obj/item/slot_item) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 26ad57e4dce..5e3f4388ca7 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -71,10 +71,10 @@ /mob/living/simple_animal/pet/dog/corgi/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list( - "speak" = CALLBACK(src, .proc/handle_automated_speech, TRUE), - "wear_hat" = CALLBACK(src, .proc/find_new_hat), - "drop_hat" = CALLBACK(src, .proc/drop_hat), - "spin" = CALLBACK(src, /mob.proc/emote, "spin")), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + "speak" = CALLBACK(src, PROC_REF(handle_automated_speech), TRUE), + "wear_hat" = CALLBACK(src, PROC_REF(find_new_hat)), + "drop_hat" = CALLBACK(src, PROC_REF(drop_hat)), + "spin" = CALLBACK(src, TYPE_PROC_REF(/mob, emote), "spin")), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 6906355c437..65c62f098b8 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -188,8 +188,8 @@ ADD_TRAIT(src, TRAIT_NEGATES_GRAVITY, INNATE_TRAIT) listener = new(list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z)) - RegisterSignal(listener, COMSIG_ALARM_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(listener, COMSIG_ALARM_CLEARED, .proc/alarm_cleared) + RegisterSignal(listener, COMSIG_ALARM_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(listener, COMSIG_ALARM_CLEARED, PROC_REF(alarm_cleared)) listener.RegisterSignal(src, COMSIG_LIVING_DEATH, /datum/alarm_listener/proc/prevent_alarm_changes) listener.RegisterSignal(src, COMSIG_LIVING_REVIVE, /datum/alarm_listener/proc/allow_alarm_changes) @@ -342,8 +342,8 @@ LoadComponent(/datum/component/shy_in_room, drone_bad_areas, "Touching anything in %ROOM could break your laws.") LoadComponent(/datum/component/technoshy, 1 MINUTES, "%TARGET was touched by a being recently, using it could break your laws.") LoadComponent(/datum/component/itempicky, drone_good_items, "Using %TARGET could break your laws.") - RegisterSignal(src, COMSIG_TRY_USE_MACHINE, .proc/blacklist_on_try_use_machine) - RegisterSignal(src, COMSIG_TRY_WIRES_INTERACT, .proc/blacklist_on_try_wires_interact) + RegisterSignal(src, COMSIG_TRY_USE_MACHINE, PROC_REF(blacklist_on_try_use_machine)) + RegisterSignal(src, COMSIG_TRY_WIRES_INTERACT, PROC_REF(blacklist_on_try_wires_interact)) else REMOVE_TRAIT(src, TRAIT_PACIFISM, DRONE_SHY_TRAIT) qdel(GetComponent(/datum/component/shy)) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm index f6cef5d60a1..f931dbebcb2 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm @@ -104,7 +104,7 @@ "Repair Drone" = image(icon = 'icons/mob/drone.dmi', icon_state = REPAIRDRONE), "Scout Drone" = image(icon = 'icons/mob/drone.dmi', icon_state = SCOUTDRONE) ) - var/picked_icon = show_radial_menu(src, src, drone_icons, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) + var/picked_icon = show_radial_menu(src, src, drone_icons, custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 38, require_near = TRUE) switch(picked_icon) if("Maintenance Drone") visualAppearance = MAINTDRONE @@ -116,7 +116,7 @@ "pink" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_pink"), "red" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_red") ) - var/picked_color = show_radial_menu(src, src, drone_colors, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) + var/picked_color = show_radial_menu(src, src, drone_colors, custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 38, require_near = TRUE) if(picked_color) icon_state = "[visualAppearance]_[picked_color]" icon_living = "[visualAppearance]_[picked_color]" diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index fee6211a81b..0ac1d83c35b 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -206,7 +206,7 @@ eggs_left = 0,\ eggs_added_from_eating = rand(1, 4),\ max_eggs_held = 8,\ - egg_laid_callback = CALLBACK(src, .proc/egg_laid)\ + egg_laid_callback = CALLBACK(src, PROC_REF(egg_laid))\ ) ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index f7d0d42bd79..add468b6b77 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -42,7 +42,7 @@ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm index d2dbd54460d..c58c90b064e 100644 --- a/code/modules/mob/living/simple_animal/friendly/trader.dm +++ b/code/modules/mob/living/simple_animal/friendly/trader.dm @@ -147,7 +147,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) . = ..() restock_products() renew_item_demands() - RegisterSignal(src, COMSIG_AI_NODE_REACHED, .proc/reached_next_node) + RegisterSignal(src, COMSIG_AI_NODE_REACHED, PROC_REF(reached_next_node)) AddComponent(/datum/component/generic_animal_patrol, _animal_node_weights = list(), _animal_identifier = IDENTIFIER_GENERIC_SIMPLE, _patrol_move_delay = 8) if(!restock_node_going_towards && length(GLOB.nodes_trader_destination)) restock_node_going_towards = pick(GLOB.nodes_trader_destination) @@ -216,7 +216,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) npc_options["Sell"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_sell") if(!npc_options.len) return FALSE - var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) face_atom(user) switch(npc_result) if("Buy") @@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) "Selling?" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_selling"), "Buying?" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_buying"), ) - var/pick = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/pick = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) switch(pick) if("Lore") say(return_trader_phrase(TRADER_LORE_PHRASE)) @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) if(product_info[TRADER_PRODUCT_INFO_QUANTITY] <= 0) //out of stock item_image.overlays += image(icon = 'icons/hud/radial.dmi', icon_state = "radial_center") items += list("[initial(thing.name)]" = item_image) - var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!pick) return var/obj/item/item_to_buy = display_names[pick] @@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) "Yes" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_yes"), "No" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_no") ) - var/buyer_will_buy = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/buyer_will_buy = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(buyer_will_buy != "Yes") return face_atom(user) @@ -399,7 +399,7 @@ GLOBAL_LIST_EMPTY(nodes_trader_destination) "No" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_no"), ) face_atom(user) - var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(npc_result != "Yes") say(return_trader_phrase(ITEM_SELLING_CANCELED_PHRASE)) return TRUE diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm index ab6657e9245..8da5a278948 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -34,7 +34,7 @@ /mob/living/simple_animal/hostile/guardian/charger/Shoot(atom/targeted_atom) charging = 1 - throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, .proc/charging_end)) + throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(charging_end))) /mob/living/simple_animal/hostile/guardian/charger/proc/charging_end() charging = 0 diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm index b2afdbb9734..49da48bec4c 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -47,9 +47,9 @@ if(bomb_cooldown <= world.time && !stat) to_chat(src, span_danger("Success! Bomb armed!")) bomb_cooldown = world.time + 200 - RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/display_examine) - RegisterSignal(A, boom_signals, .proc/kaboom) - addtimer(CALLBACK(src, .proc/disable, A), 600, TIMER_UNIQUE|TIMER_OVERRIDE) + RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine)) + RegisterSignal(A, boom_signals, PROC_REF(kaboom)) + addtimer(CALLBACK(src, PROC_REF(disable), A), 600, TIMER_UNIQUE|TIMER_OVERRIDE) else to_chat(src, span_danger("Your powers are on cooldown! You must wait 20 seconds between bombs.")) diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index 68828e60abf..dfa63586742 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -17,7 +17,7 @@ /mob/living/simple_animal/hostile/guardian/fire/Initialize(mapload, theme) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm index d5b904fa201..c753e7fcd0e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm @@ -59,7 +59,7 @@ return A.AddElement(/datum/element/forced_gravity, new_gravity) gravito_targets[A] = new_gravity - RegisterSignal(A, COMSIG_MOVABLE_MOVED, .proc/__distance_check) + RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(__distance_check)) playsound(src, 'sound/effects/gravhit.ogg', 100, TRUE) /mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/remove_gravity(atom/target) diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 2bc9517b8d1..b1aae18765b 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -114,7 +114,7 @@ /obj/effect/snare/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/heretic_monsters.dm b/code/modules/mob/living/simple_animal/heretic_monsters.dm index 94227d3a298..3b6fd991024 100644 --- a/code/modules/mob/living/simple_animal/heretic_monsters.dm +++ b/code/modules/mob/living/simple_animal/heretic_monsters.dm @@ -82,7 +82,7 @@ linker_action_path = /datum/action/cooldown/manse_link, \ link_message = on_link_message, \ unlink_message = on_unlink_message, \ - post_unlink_callback = CALLBACK(src, .proc/after_unlink), \ + post_unlink_callback = CALLBACK(src, PROC_REF(after_unlink)), \ speech_action_background_icon_state = "bg_ecult", \ ) @@ -128,7 +128,7 @@ if(QDELETED(unlinked_mob) || unlinked_mob.stat == DEAD) return - INVOKE_ASYNC(unlinked_mob, /mob.proc/emote, "scream") + INVOKE_ASYNC(unlinked_mob, TYPE_PROC_REF(/mob, emote), "scream") unlinked_mob.AdjustParalyzed(0.5 SECONDS) //micro stun // What if we took a linked list... But made it a mob? @@ -183,7 +183,7 @@ worm_length = 3 //code breaks below 3, let's just not allow it. oldloc = loc - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/update_chain_links) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(update_chain_links)) if(!spawn_bodyparts) return diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 910cd39fbe8..65668555441 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -356,7 +356,7 @@ /mob/living/simple_animal/hostile/bee/short/Initialize(mapload, timetolive=50 SECONDS) . = ..() - addtimer(CALLBACK(src, .proc/death), timetolive) + addtimer(CALLBACK(src, PROC_REF(death)), timetolive) /obj/item/trash/bee name = "bee" diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index d893eafa2ec..d9e8b1e9438 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -68,7 +68,7 @@ for(var/i in 1 to summon_amount) var/atom/chosen_minion = pick_n_take(minions) chosen_minion = new chosen_minion(get_step(boss, pick_n_take(directions))) - RegisterSignal(chosen_minion, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), .proc/lost_minion) + RegisterSignal(chosen_minion, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(lost_minion)) summoned_minions++ /// Called when a minion is qdeleted or dies, removes it from our minion list diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 1559ebaba32..f2762cc1653 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -84,7 +84,7 @@ make_tameable() /mob/living/simple_animal/hostile/carp/proc/make_tameable() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/meat), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/meat), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/carp/proc/tamed(mob/living/tamer) can_buckle = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 883148c4b20..eaac05f24ff 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -437,7 +437,7 @@ if(target_atom.anchored) return user.cocoon_target = target_atom - INVOKE_ASYNC(user, /mob/living/simple_animal/hostile/giant_spider/midwife/.proc/cocoon) + INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/simple_animal/hostile/giant_spider/midwife, cocoon)) remove_ranged_ability() return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index d81fb14b5c4..53377a0a263 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -40,7 +40,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/goosement) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(goosement)) /mob/living/simple_animal/hostile/retaliate/goose/proc/goosement(atom/movable/AM, OldLoc, Dir, Forced) SIGNAL_HANDLER @@ -139,7 +139,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/proc/choke(obj/item/reagent_containers/food/plastic) if(stat == DEAD || choking) return - addtimer(CALLBACK(src, .proc/suffocate), 300) + addtimer(CALLBACK(src, PROC_REF(suffocate)), 300) /mob/living/simple_animal/hostile/retaliate/goose/vomit/choke(obj/item/reagent_containers/food/plastic) if(stat == DEAD || choking) @@ -147,9 +147,9 @@ if(prob(25)) visible_message(span_warning("[src] is gagging on \the [plastic]!")) manual_emote("gags!") - addtimer(CALLBACK(src, .proc/vomit), 300) + addtimer(CALLBACK(src, PROC_REF(vomit)), 300) else - addtimer(CALLBACK(src, .proc/suffocate), 300) + addtimer(CALLBACK(src, PROC_REF(suffocate)), 300) /mob/living/simple_animal/hostile/retaliate/goose/Life(delta_time = SSMOBS_DT, times_fired) . = ..() @@ -196,13 +196,13 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_prestart(duration) flick("vomit_start",src) - addtimer(CALLBACK(src, .proc/vomit_start, duration), 13) //13 is the length of the vomit_start animation in gooseloose.dmi + addtimer(CALLBACK(src, PROC_REF(vomit_start), duration), 13) //13 is the length of the vomit_start animation in gooseloose.dmi /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_start(duration) vomiting = TRUE icon_state = "vomit" vomit() - addtimer(CALLBACK(src, .proc/vomit_preend), duration) + addtimer(CALLBACK(src, PROC_REF(vomit_preend)), duration) /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_preend() for (var/obj/item/consumed in contents) //Get rid of any food left in the poor thing @@ -220,7 +220,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/goosement(atom/movable/AM, OldLoc, Dir, Forced) . = ..() if(vomiting) - INVOKE_ASYNC(src, .proc/vomit) // its supposed to keep vomiting if you move + INVOKE_ASYNC(src, PROC_REF(vomit)) // its supposed to keep vomiting if you move return if(prob(vomitCoefficient * 0.2)) vomit_prestart(vomitTimeBonus + 25) @@ -230,9 +230,9 @@ /// A proc to make it easier for admins to make the goose playable by deadchat. /mob/living/simple_animal/hostile/retaliate/goose/vomit/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list( - "vomit" = CALLBACK(src, .proc/vomit_prestart, 25), - "honk" = CALLBACK(src, /atom/movable.proc/say, "HONK!!!"), - "spin" = CALLBACK(src, /mob.proc/emote, "spin")), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + "vomit" = CALLBACK(src, PROC_REF(vomit_prestart), 25), + "honk" = CALLBACK(src, TYPE_PROC_REF(/atom/movable, say), "HONK!!!"), + "spin" = CALLBACK(src, TYPE_PROC_REF(/mob, emote), "spin")), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index c69cf9f90f9..d422396dca6 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -52,7 +52,7 @@ return Infect(target) to_chat(src, span_userdanger("With our egg laid, our death approaches rapidly...")) - addtimer(CALLBACK(src, .proc/death), 100) + addtimer(CALLBACK(src, PROC_REF(death)), 100) /obj/item/organ/body_egg/changeling_egg name = "changeling egg" diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 9158c3ee255..5c31dec1edb 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -88,7 +88,7 @@ /mob/living/simple_animal/hostile/handle_automated_movement() . = ..() if(dodging && target && in_melee && isturf(loc) && isturf(target.loc)) - var/datum/cb = CALLBACK(src,.proc/sidestep) + var/datum/cb = CALLBACK(src, PROC_REF(sidestep)) if(sidestep_per_cycle > 1) //For more than one just spread them equally - this could changed to some sensible distribution later var/sidestep_delay = SSnpcpool.wait / sidestep_per_cycle for(var/i in 1 to sidestep_per_cycle) @@ -253,7 +253,7 @@ //What we do after closing in /mob/living/simple_animal/hostile/proc/MeleeAction(patience = TRUE) if(rapid_melee > 1) - var/datum/callback/cb = CALLBACK(src, .proc/CheckAndAttack) + var/datum/callback/cb = CALLBACK(src, PROC_REF(CheckAndAttack)) var/delay = SSnpcpool.wait / rapid_melee for(var/i in 1 to rapid_melee) addtimer(cb, (i - 1)*delay) @@ -399,7 +399,7 @@ if(rapid > 1) - var/datum/callback/cb = CALLBACK(src, .proc/Shoot, A) + var/datum/callback/cb = CALLBACK(src, PROC_REF(Shoot), A) for(var/i in 1 to rapid) addtimer(cb, (i - 1)*rapid_fire_delay) else @@ -538,7 +538,7 @@ /mob/living/simple_animal/hostile/proc/GainPatience() if(lose_patience_timeout) LosePatience() - lose_patience_timer_id = addtimer(CALLBACK(src, .proc/LoseTarget), lose_patience_timeout, TIMER_STOPPABLE) + lose_patience_timer_id = addtimer(CALLBACK(src, PROC_REF(LoseTarget)), lose_patience_timeout, TIMER_STOPPABLE) /mob/living/simple_animal/hostile/proc/LosePatience() @@ -549,7 +549,7 @@ /mob/living/simple_animal/hostile/proc/LoseSearchObjects() search_objects = 0 deltimer(search_objects_timer_id) - search_objects_timer_id = addtimer(CALLBACK(src, .proc/RegainSearchObjects), search_objects_regain_time, TIMER_STOPPABLE) + search_objects_timer_id = addtimer(CALLBACK(src, PROC_REF(RegainSearchObjects)), search_objects_regain_time, TIMER_STOPPABLE) /mob/living/simple_animal/hostile/proc/RegainSearchObjects(value) @@ -611,4 +611,4 @@ UnregisterSignal(target, COMSIG_PARENT_QDELETING) target = new_target if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/handle_target_del) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_target_del)) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index 8c00469697e..cac0af92f44 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -89,7 +89,7 @@ . = ..() QDEL_IN(src, 100) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) @@ -224,7 +224,7 @@ if(AIStatus == AI_ON && ranged_cooldown <= world.time) projectile_ready = TRUE update_icons() - throw_at(new_turf, max(3,get_dist(src,new_turf)), 1, src, FALSE, callback = CALLBACK(src, .proc/FinishHop)) + throw_at(new_turf, max(3,get_dist(src,new_turf)), 1, src, FALSE, callback = CALLBACK(src, PROC_REF(FinishHop))) /mob/living/simple_animal/hostile/jungle/leaper/proc/FinishHop() set_density(TRUE) @@ -234,18 +234,18 @@ playsound(src.loc, 'sound/effects/meteorimpact.ogg', 100, TRUE) if(target && AIStatus == AI_ON && projectile_ready && !ckey) face_atom(target) - addtimer(CALLBACK(src, .proc/OpenFire, target), 5) + addtimer(CALLBACK(src, PROC_REF(OpenFire), target), 5) /mob/living/simple_animal/hostile/jungle/leaper/proc/BellyFlop() var/turf/new_turf = get_turf(target) hopping = TRUE notransform = TRUE new /obj/effect/temp_visual/leaper_crush(new_turf) - addtimer(CALLBACK(src, .proc/BellyFlopHop, new_turf), 30) + addtimer(CALLBACK(src, PROC_REF(BellyFlopHop), new_turf), 30) /mob/living/simple_animal/hostile/jungle/leaper/proc/BellyFlopHop(turf/T) set_density(FALSE) - throw_at(T, get_dist(src,T),1,src, FALSE, callback = CALLBACK(src, .proc/Crush)) + throw_at(T, get_dist(src,T),1,src, FALSE, callback = CALLBACK(src, PROC_REF(Crush))) /mob/living/simple_animal/hostile/jungle/leaper/proc/Crush() hopping = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm index 57e0b126d69..1960ec7e37e 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm @@ -74,9 +74,9 @@ SSmove_manager.stop_looping(src) update_icons() if(prob(50) && get_dist(src,target) <= 3 || forced_slash_combo) - addtimer(CALLBACK(src, .proc/SlashCombo), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(SlashCombo)), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/LeapAttack), ATTACK_INTERMISSION_TIME + rand(0,3)) + addtimer(CALLBACK(src, PROC_REF(LeapAttack)), ATTACK_INTERMISSION_TIME + rand(0,3)) return attack_state = MOOK_ATTACK_RECOVERY ResetNeutral() @@ -86,9 +86,9 @@ attack_state = MOOK_ATTACK_ACTIVE update_icons() SlashAttack() - addtimer(CALLBACK(src, .proc/SlashAttack), 3) - addtimer(CALLBACK(src, .proc/SlashAttack), 6) - addtimer(CALLBACK(src, .proc/AttackRecovery), 9) + addtimer(CALLBACK(src, PROC_REF(SlashAttack)), 3) + addtimer(CALLBACK(src, PROC_REF(SlashAttack)), 6) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 9) /mob/living/simple_animal/hostile/jungle/mook/proc/SlashAttack() if(target && !stat && attack_state == MOOK_ATTACK_ACTIVE) @@ -117,7 +117,7 @@ playsound(src, 'sound/weapons/thudswoosh.ogg', 25, TRUE) playsound(src, 'sound/voice/mook_leap_yell.ogg', 100, TRUE) var/target_turf = get_turf(target) - throw_at(target_turf, 7, 1, src, FALSE, callback = CALLBACK(src, .proc/AttackRecovery)) + throw_at(target_turf, 7, 1, src, FALSE, callback = CALLBACK(src, PROC_REF(AttackRecovery))) return attack_state = MOOK_ATTACK_RECOVERY ResetNeutral() @@ -136,11 +136,11 @@ if(isliving(target)) var/mob/living/L = target if(L.incapacitated() && L.stat != DEAD) - addtimer(CALLBACK(src, .proc/WarmupAttack, TRUE), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(WarmupAttack), TRUE), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/WarmupAttack), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(WarmupAttack)), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/ResetNeutral), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(ResetNeutral)), ATTACK_INTERMISSION_TIME) /mob/living/simple_animal/hostile/jungle/mook/proc/ResetNeutral() if(attack_state == MOOK_ATTACK_RECOVERY) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm index 002be2a6c0c..89e88926e89 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm @@ -134,7 +134,7 @@ if(get_dist(src,target) >= 4 && prob(40)) SolarBeamStartup(target) return - addtimer(CALLBACK(src, .proc/Volley), 5) + addtimer(CALLBACK(src, PROC_REF(Volley)), 5) /mob/living/simple_animal/hostile/jungle/seedling/proc/SolarBeamStartup(mob/living/living_target)//It's more like requiem than final spark if(combatant_state == SEEDLING_STATE_WARMUP && target) @@ -145,7 +145,7 @@ if(get_dist(src,living_target) > 7) playsound(living_target,'sound/effects/seedling_chargeup.ogg', 100, FALSE) solar_beam_identifier = world.time - addtimer(CALLBACK(src, .proc/Beamu, living_target, solar_beam_identifier), 35) + addtimer(CALLBACK(src, PROC_REF(Beamu), living_target, solar_beam_identifier), 35) /mob/living/simple_animal/hostile/jungle/seedling/proc/Beamu(mob/living/living_target, beam_id = 0) if(combatant_state == SEEDLING_STATE_ACTIVE && living_target && beam_id == solar_beam_identifier) @@ -165,7 +165,7 @@ living_target.adjust_fire_stacks(0.2)//Just here for the showmanship living_target.IgniteMob() playsound(living_target,'sound/weapons/sear.ogg', 50, TRUE) - addtimer(CALLBACK(src, .proc/AttackRecovery), 5) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 5) return AttackRecovery() @@ -173,10 +173,10 @@ if(combatant_state == SEEDLING_STATE_WARMUP && target) combatant_state = SEEDLING_STATE_ACTIVE update_icons() - var/datum/callback/cb = CALLBACK(src, .proc/InaccurateShot) + var/datum/callback/cb = CALLBACK(src, PROC_REF(InaccurateShot)) for(var/i in 1 to 13) addtimer(cb, i) - addtimer(CALLBACK(src, .proc/AttackRecovery), 14) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 14) /mob/living/simple_animal/hostile/jungle/seedling/proc/InaccurateShot() if(!QDELETED(target) && combatant_state == SEEDLING_STATE_ACTIVE && !stat) @@ -196,7 +196,7 @@ ranged_cooldown = world.time + ranged_cooldown_time if(target) face_atom(target) - addtimer(CALLBACK(src, .proc/ResetNeutral), 10) + addtimer(CALLBACK(src, PROC_REF(ResetNeutral)), 10) /mob/living/simple_animal/hostile/jungle/seedling/proc/ResetNeutral() combatant_state = SEEDLING_STATE_NEUTRAL diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index f9390fe6900..ca7524f3d99 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -63,7 +63,7 @@ if(spawn_mecha_type) var/obj/vehicle/sealed/mecha/M = new spawn_mecha_type (get_turf(src)) if(istype(M)) - INVOKE_ASYNC(src, .proc/enter_mecha, M) + INVOKE_ASYNC(src, PROC_REF(enter_mecha), M) /mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/enter_mecha(obj/vehicle/sealed/mecha/M) @@ -231,7 +231,7 @@ if(LAZYACCESSASSOC(mecha.occupant_actions, src, /datum/action/vehicle/sealed/mecha/mech_defense_mode) && !mecha.defense_mode) var/datum/action/vehicle/sealed/mecha/mech_defense_mode/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_defense_mode] action.Trigger(forced_state = TRUE) - addtimer(CALLBACK(action, /datum/action/vehicle/sealed/mecha/mech_defense_mode.proc/Trigger, FALSE), 100) //10 seconds of defense, then toggle off + addtimer(CALLBACK(action, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/mech_defense_mode, Trigger), FALSE), 100) //10 seconds of defense, then toggle off else if(prob(retreat_chance)) //Speed boost if possible @@ -239,7 +239,7 @@ var/datum/action/vehicle/sealed/mecha/mech_overload_mode/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_overload_mode] mecha.leg_overload_mode = FALSE action.Trigger(forced_state = TRUE) - addtimer(CALLBACK(action, /datum/action/vehicle/sealed/mecha/mech_overload_mode.proc/Trigger, FALSE), 100) //10 seconds of speeeeed, then toggle off + addtimer(CALLBACK(action, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/mech_overload_mode, Trigger), FALSE), 100) //10 seconds of speeeeed, then toggle off retreat_distance = 50 addtimer(VARSET_CALLBACK(src, retreat_distance, 0), 10 SECONDS) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index a48d9c4c617..d19216cbf1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -164,7 +164,7 @@ Difficulty: Medium /obj/effect/temp_visual/dir_setting/miner_death/Initialize(mapload, set_dir) . = ..() - INVOKE_ASYNC(src, .proc/fade_out) + INVOKE_ASYNC(src, PROC_REF(fade_out)) /obj/effect/temp_visual/dir_setting/miner_death/proc/fade_out() var/matrix/M = new diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 2249882b095..aac6719397c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -97,8 +97,8 @@ Difficulty: Hard blood_warp.Grant(src) hallucination_charge.spawn_blood = TRUE hallucination_charge_surround.spawn_blood = TRUE - RegisterSignal(src, COMSIG_BLOOD_WARP, .proc/blood_enrage) - RegisterSignal(src, COMSIG_FINISHED_CHARGE, .proc/after_charge) + RegisterSignal(src, COMSIG_BLOOD_WARP, PROC_REF(blood_enrage)) + RegisterSignal(src, COMSIG_FINISHED_CHARGE, PROC_REF(after_charge)) if(spawn_blood) AddElement(/datum/element/blood_walk, /obj/effect/decal/cleanable/blood/bubblegum, 'sound/effects/meteorimpact.ogg', 200) @@ -156,7 +156,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack() var/list/targets = get_mobs_on_blood() if(targets.len) - INVOKE_ASYNC(src, .proc/bloodattack, targets, prob(50)) + INVOKE_ASYNC(src, PROC_REF(bloodattack), targets, prob(50)) return TRUE return FALSE @@ -222,7 +222,7 @@ Difficulty: Hard var/turf/targetturf = get_step(src, dir) L.forceMove(targetturf) playsound(targetturf, 'sound/magic/exit_blood.ogg', 100, TRUE, -1) - addtimer(CALLBACK(src, .proc/devour, L), 2) + addtimer(CALLBACK(src, PROC_REF(devour), L), 2) SLEEP_CHECK_DEATH(1, src) @@ -248,9 +248,9 @@ Difficulty: Hard return FALSE enrage_till = world.time + enrage_time update_approach() - INVOKE_ASYNC(src, .proc/change_move_delay, 3.75) + INVOKE_ASYNC(src, PROC_REF(change_move_delay), 3.75) add_atom_colour(COLOR_BUBBLEGUM_RED, TEMPORARY_COLOUR_PRIORITY) - var/datum/callback/cb = CALLBACK(src, .proc/blood_enrage_end) + var/datum/callback/cb = CALLBACK(src, PROC_REF(blood_enrage_end)) addtimer(cb, enrage_time) /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/after_charge() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index a7ef0917a30..16cabfa94ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -76,8 +76,8 @@ random_shots.Grant(src) shotgun_blast.Grant(src) dir_shots.Grant(src) - RegisterSignal(src, COMSIG_ABILITY_STARTED, .proc/start_attack) - RegisterSignal(src, COMSIG_ABILITY_FINISHED, .proc/finished_attack) + RegisterSignal(src, COMSIG_ABILITY_STARTED, PROC_REF(start_attack)) + RegisterSignal(src, COMSIG_ABILITY_FINISHED, PROC_REF(finished_attack)) AddElement(/datum/element/projectile_shield) /mob/living/simple_animal/hostile/megafauna/colossus/Destroy() @@ -163,7 +163,7 @@ /obj/effect/temp_visual/at_shield/Initialize(mapload, new_target) . = ..() target = new_target - INVOKE_ASYNC(src, /atom/movable.proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, orbit), target, 0, FALSE, 0, 0, FALSE, TRUE) /obj/projectile/colossus name = "death bolt" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index f4eb72fb123..5c7913768e4 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -64,7 +64,7 @@ Difficulty: Extremely Hard ice_shotgun.Grant(src) for(var/obj/structure/frost_miner_prism/prism_to_set in GLOB.frost_miner_prisms) prism_to_set.set_prism_light(LIGHT_COLOR_BLUE, 5) - RegisterSignal(src, COMSIG_ABILITY_STARTED, .proc/start_attack) + RegisterSignal(src, COMSIG_ABILITY_STARTED, PROC_REF(start_attack)) AddElement(/datum/element/knockback, 7, FALSE, TRUE) AddElement(/datum/element/lifesteal, 50) ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) @@ -118,7 +118,7 @@ Difficulty: Extremely Hard if(enraging) return COMPONENT_BLOCK_ABILITY_START if(FROST_MINER_SHOULD_ENRAGE) - INVOKE_ASYNC(src, .proc/check_enraged) + INVOKE_ASYNC(src, PROC_REF(check_enraged)) return COMPONENT_BLOCK_ABILITY_START var/projectile_speed_multiplier = 1 - enraged * 0.5 frost_orbs.projectile_speed_multiplier = projectile_speed_multiplier @@ -234,7 +234,7 @@ Difficulty: Extremely Hard return forceMove(user) to_chat(user, span_notice("You feel a bit safer... but a demonic presence lurks in the back of your head...")) - RegisterSignal(user, COMSIG_LIVING_DEATH, .proc/resurrect) + RegisterSignal(user, COMSIG_LIVING_DEATH, PROC_REF(resurrect)) /// Resurrects the target when they die by moving them and dusting a clone in their place, one life for another /obj/item/resurrection_crystal/proc/resurrect(mob/living/carbon/user, gibbed) @@ -246,12 +246,12 @@ Difficulty: Extremely Hard var/typepath = user.type var/mob/living/carbon/clone = new typepath(user.loc) clone.real_name = user.real_name - INVOKE_ASYNC(user.dna, /datum/dna.proc/transfer_identity, clone) + INVOKE_ASYNC(user.dna, TYPE_PROC_REF(/datum/dna, transfer_identity), clone) clone.updateappearance(mutcolor_update=1) var/turf/T = find_safe_turf() user.forceMove(T) user.revive(full_heal = TRUE, admin_revive = TRUE) - INVOKE_ASYNC(user, /mob/living/carbon.proc/set_species, /datum/species/shadow) + INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/carbon, set_species), /datum/species/shadow) to_chat(user, span_notice("You blink and find yourself in [get_area_name(T)]... feeling a bit darker.")) clone.dust() qdel(src) @@ -266,7 +266,7 @@ Difficulty: Extremely Hard /obj/item/clothing/shoes/winterboots/ice_boots/ice_trail/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) /obj/item/clothing/shoes/winterboots/ice_boots/ice_trail/equipped(mob/user, slot) . = ..() @@ -294,7 +294,7 @@ Difficulty: Extremely Hard return var/reset_turf = T.type T.ChangeTurf(change_turf, flags = CHANGETURF_INHERIT_AIR) - addtimer(CALLBACK(T, /turf.proc/ChangeTurf, reset_turf, null, CHANGETURF_INHERIT_AIR), duration, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), duration, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/item/pickaxe/drill/jackhammer/demonic name = "demonic jackhammer" @@ -342,7 +342,7 @@ Difficulty: Extremely Hard icon_state = "frozen" /datum/status_effect/ice_block_talisman/on_apply() - RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, .proc/owner_moved) + RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(owner_moved)) if(!owner.stat) to_chat(owner, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 69c3ed7db93..2593046ab30 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -93,10 +93,10 @@ meteors.Grant(src) mass_fire.Grant(src) lava_swoop.Grant(src) - RegisterSignal(src, COMSIG_ABILITY_STARTED, .proc/start_attack) - RegisterSignal(src, COMSIG_ABILITY_FINISHED, .proc/finished_attack) - RegisterSignal(src, COMSIG_SWOOP_INVULNERABILITY_STARTED, .proc/swoop_invulnerability_started) - RegisterSignal(src, COMSIG_LAVA_ARENA_FAILED, .proc/on_arena_fail) + RegisterSignal(src, COMSIG_ABILITY_STARTED, PROC_REF(start_attack)) + RegisterSignal(src, COMSIG_ABILITY_FINISHED, PROC_REF(finished_attack)) + RegisterSignal(src, COMSIG_SWOOP_INVULNERABILITY_STARTED, PROC_REF(swoop_invulnerability_started)) + RegisterSignal(src, COMSIG_LAVA_ARENA_FAILED, PROC_REF(on_arena_fail)) /mob/living/simple_animal/hostile/megafauna/dragon/Destroy() QDEL_NULL(fire_cone) @@ -151,7 +151,7 @@ /mob/living/simple_animal/hostile/megafauna/dragon/proc/on_arena_fail() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/arena_escape_enrage) + INVOKE_ASYNC(src, PROC_REF(arena_escape_enrage)) /mob/living/simple_animal/hostile/megafauna/dragon/proc/arena_escape_enrage() // you ran somehow / teleported away from my arena attack now i'm mad fucker SLEEP_CHECK_DEATH(0, src) @@ -240,7 +240,7 @@ /obj/effect/temp_visual/lava_warning/Initialize(mapload, reset_time = 10) . = ..() - INVOKE_ASYNC(src, .proc/fall, reset_time) + INVOKE_ASYNC(src, PROC_REF(fall), reset_time) src.alpha = 63.75 animate(src, alpha = 255, time = duration) @@ -265,7 +265,7 @@ var/lava_turf = /turf/open/lava/smooth var/reset_turf = T.type T.ChangeTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR) - addtimer(CALLBACK(T, /turf.proc/ChangeTurf, reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/effect/temp_visual/drakewall desc = "An ash drakes true flame." @@ -311,7 +311,7 @@ /obj/effect/temp_visual/target/Initialize(mapload, list/flame_hit) . = ..() - INVOKE_ASYNC(src, .proc/fall, flame_hit) + INVOKE_ASYNC(src, PROC_REF(fall), flame_hit) /obj/effect/temp_visual/target/proc/fall(list/flame_hit) var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index dd550099053..aa7e23d4c80 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -206,13 +206,13 @@ Difficulty: Hard else if(prob(70 - anger_modifier)) //a cross blast of some type if(prob(anger_modifier * (2 / target_slowness)) && health < maxHealth * 0.5) //we're super angry do it at all dirs - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.alldirs) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.alldirs) else if(prob(60)) - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.cardinals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.cardinals) else - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.diagonals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.diagonals) else //just release a burst of power - INVOKE_ASYNC(src, .proc/burst, get_turf(src)) + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src)) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(blink_counter, target_slowness, cross_counter) update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = max(0.5 SECONDS, major_attack_cooldown - anger_modifier * 0.75))) @@ -230,7 +230,7 @@ Difficulty: Hard blinking = TRUE SLEEP_CHECK_DEATH(4 + target_slowness, src) animate(src, color = oldcolor, time = 8) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8) SLEEP_CHECK_DEATH(8, src) blinking = FALSE else @@ -246,12 +246,12 @@ Difficulty: Hard while(!QDELETED(target) && cross_counter) cross_counter-- if(prob(60)) - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.cardinals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.cardinals) else - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.diagonals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.diagonals) SLEEP_CHECK_DEATH(6 + target_slowness, src) animate(src, color = oldcolor, time = 8) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8) SLEEP_CHECK_DEATH(8, src) blinking = FALSE @@ -279,7 +279,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(8 + target_slowness, src) update_cooldowns(list(COOLDOWN_UPDATE_SET_CHASER = chaser_cooldown_time)) animate(src, color = oldcolor, time = 8) - addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8) SLEEP_CHECK_DEATH(8, src) blinking = FALSE @@ -297,7 +297,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(2, src) new /obj/effect/temp_visual/hierophant/blast/damaging(T, src, FALSE) for(var/d in directions) - INVOKE_ASYNC(src, .proc/blast_wall, T, d) + INVOKE_ASYNC(src, PROC_REF(blast_wall), T, d) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blast_wall(turf/T, set_dir) //make a wall of blasts beam_range tiles long var/range = beam_range @@ -316,13 +316,13 @@ Difficulty: Hard return update_cooldowns(list(COOLDOWN_UPDATE_SET_ARENA = arena_cooldown_time)) for(var/d in GLOB.cardinals) - INVOKE_ASYNC(src, .proc/arena_squares, T, d) + INVOKE_ASYNC(src, PROC_REF(arena_squares), T, d) for(var/t in RANGE_TURFS(11, T)) if(t && get_dist(t, T) == 11) new /obj/effect/temp_visual/hierophant/wall(t, src) new /obj/effect/temp_visual/hierophant/blast/damaging(t, src, FALSE) if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you! - INVOKE_ASYNC(src, .proc/blink, T) + INVOKE_ASYNC(src, PROC_REF(blink), T) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/arena_squares(turf/T, set_dir) //make a fancy effect extending from the arena target var/turf/previousturf = T @@ -465,10 +465,10 @@ Difficulty: Hard if(ranged_cooldown <= world.time) calculate_rage() update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = max(0.5 SECONDS, ranged_cooldown_time - anger_modifier * 0.75)), ignore_staggered = TRUE) - INVOKE_ASYNC(src, .proc/burst, get_turf(src)) + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src)) else burst_range = 3 - INVOKE_ASYNC(src, .proc/burst, get_turf(src), 0.25) //melee attacks on living mobs cause it to release a fast burst if on cooldown + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src), 0.25) //melee attacks on living mobs cause it to release a fast burst if on cooldown OpenFire() else devour(L) @@ -584,7 +584,7 @@ Difficulty: Hard friendly_fire_check = is_friendly_fire if(new_speed) speed = new_speed - addtimer(CALLBACK(src, .proc/seek_target), 1) + addtimer(CALLBACK(src, PROC_REF(seek_target)), 1) /obj/effect/temp_visual/hierophant/chaser/proc/get_target_dir() . = get_cardinal_dir(src, targetturf) @@ -669,9 +669,9 @@ Difficulty: Hard if(ismineralturf(loc)) //drill mineral turfs var/turf/closed/mineral/M = loc M.gets_drilled(caster) - INVOKE_ASYNC(src, .proc/blast) + INVOKE_ASYNC(src, PROC_REF(blast)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 25e4a51eda7..9ef97b78263 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -161,15 +161,15 @@ minimum_distance = 0 set_varspeed(0) charging = TRUE - addtimer(CALLBACK(src, .proc/reset_charge), 60) + addtimer(CALLBACK(src, PROC_REF(reset_charge)), 60) var/mob/living/L = target if(!istype(L) || L.stat != DEAD) //I know, weird syntax, but it just works. - addtimer(CALLBACK(src, .proc/throw_thyself), 20) + addtimer(CALLBACK(src, PROC_REF(throw_thyself)), 20) ///This is the proc that actually does the throwing. Charge only adds a timer for this. /mob/living/simple_animal/hostile/megafauna/legion/proc/throw_thyself() playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE) - throw_at(target, 7, 1.1, src, FALSE, FALSE, CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/meteorimpact.ogg', 50 * size, TRUE, 2), INFINITY) + throw_at(target, 7, 1.1, src, FALSE, FALSE, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/effects/meteorimpact.ogg', 50 * size, TRUE, 2), INFINITY) ///Deals some extra damage on throw impact. /mob/living/simple_animal/hostile/megafauna/legion/throw_impact(mob/living/hit_atom, datum/thrownthing/throwingdatum) @@ -285,7 +285,7 @@ /obj/structure/legionturret/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/set_up_shot), initial_firing_time) + addtimer(CALLBACK(src, PROC_REF(set_up_shot)), initial_firing_time) ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) ///Handles an extremely basic AI @@ -310,7 +310,7 @@ var/datum/point/vector/V = new(T1.x, T1.y, T1.z, 0, 0, angle) generate_tracer_between_points(V, V.return_vector_after_increments(6), /obj/effect/projectile/tracer/legion/tracer, 0, shot_delay, 0, 0, 0, null) playsound(src, 'sound/machines/airlockopen.ogg', 100, TRUE) - addtimer(CALLBACK(src, .proc/fire_beam, angle), shot_delay) + addtimer(CALLBACK(src, PROC_REF(fire_beam), angle), shot_delay) ///Called shot_delay after the turret shot the tracer. Shoots a projectile into the same direction. /obj/structure/legionturret/proc/fire_beam(angle) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 12d5c58a25b..2f3afbbb8d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -141,7 +141,7 @@ Difficulty: Hard . = ..() stored_move_dirs &= ~direct if(!stored_move_dirs) - INVOKE_ASYNC(GLOBAL_PROC, .proc/wendigo_slam, src, stomp_range, 1, 8) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(wendigo_slam), src, stomp_range, 1, 8) /// Slams the ground around the source throwing back enemies caught nearby, delay is for the radius increase /proc/wendigo_slam(atom/source, range, delay, throw_range) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index a48cb32181f..15dc9602a6e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -89,7 +89,7 @@ set_varspeed(0) warmed_up = TRUE projectiletype = /obj/projectile/temp/basilisk/heated - addtimer(CALLBACK(src, .proc/cool_down), 3000) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 3000) /mob/living/simple_animal/hostile/asteroid/basilisk/proc/cool_down() visible_message(span_warning("[src] appears to be cooling down...")) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index f1cd6903d58..45163e11d3d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -92,7 +92,7 @@ add_overlay("brimdemon_telegraph_dir") visible_message(span_danger("[src] starts charging!")) balloon_alert(src, "charging...") - addtimer(CALLBACK(src, .proc/fire_laser), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fire_laser)), 1 SECONDS) COOLDOWN_START(src, ranged_cooldown, ranged_cooldown_time) /mob/living/simple_animal/hostile/asteroid/brimdemon/Moved() @@ -137,7 +137,7 @@ last_brimbeam.icon_state = "brimbeam_end" var/atom/first_brimbeam = beamparts[1] first_brimbeam.icon_state = "brimbeam_start" - addtimer(CALLBACK(src, .proc/end_laser), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(end_laser)), 2 SECONDS) /// Deletes all the brimbeam parts and sets variables back to their initial ones. /mob/living/simple_animal/hostile/asteroid/brimdemon/proc/end_laser() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index f3a1e65b875..e3f21be9ceb 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -49,10 +49,10 @@ our_loop = SSmove_manager.force_move(src, move_target, delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) if(!our_loop) return - RegisterSignal(move_target, COMSIG_MOB_STATCHANGE, .proc/stat_change) - RegisterSignal(move_target, COMSIG_MOVABLE_Z_CHANGED, .proc/target_z_change) - RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, .proc/our_z_change) - RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, .proc/handle_loop_end) + RegisterSignal(move_target, COMSIG_MOB_STATCHANGE, PROC_REF(stat_change)) + RegisterSignal(move_target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(target_z_change)) + RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(our_z_change)) + RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, PROC_REF(handle_loop_end)) /mob/living/simple_animal/hostile/asteroid/curseblob/proc/stat_change(datum/source, new_stat) SIGNAL_HANDLER diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 4f1f109afd8..0318e99b373 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -151,8 +151,8 @@ While using this makes the system rely on OnFire, it still gives options for tim if(boosted) mychild.playsound_local(get_turf(mychild), 'sound/effects/magic.ogg', 40, 0) to_chat(mychild, "Someone has activated your tumor. You will be returned to fight shortly, get ready!") - addtimer(CALLBACK(src, .proc/return_elite), 30) - INVOKE_ASYNC(src, .proc/arena_checks) + addtimer(CALLBACK(src, PROC_REF(return_elite)), 30) + INVOKE_ASYNC(src, PROC_REF(arena_checks)) if(TUMOR_INACTIVE) if(HAS_TRAIT(user, TRAIT_ELITE_CHALLENGER)) user.visible_message(span_warning("[user] reaches for [src] with [user.p_their()] arm, but nothing happens."), @@ -163,7 +163,7 @@ While using this makes the system rely on OnFire, it still gives options for tim visible_message(span_boldwarning("[src] begins to convulse. Your instincts tell you to step back.")) make_activator(user) if(!boosted) - addtimer(CALLBACK(src, .proc/spawn_elite), 30) + addtimer(CALLBACK(src, PROC_REF(spawn_elite)), 30) return visible_message(span_boldwarning("Something within [src] stirs...")) var/list/candidates = poll_candidates_for_mob("Do you want to play as a lavaland elite?", ROLE_SENTIENCE, ROLE_SENTIENCE, 5 SECONDS, src, POLL_IGNORE_SENTIENCE_POTION) @@ -172,7 +172,7 @@ While using this makes the system rely on OnFire, it still gives options for tim elitemind = pick(candidates) elitemind.playsound_local(get_turf(elitemind), 'sound/effects/magic.ogg', 40, 0) to_chat(elitemind, "You have been chosen to play as a Lavaland Elite.\nIn a few seconds, you will be summoned on Lavaland as a monster to fight your activator, in a fight to the death.\nYour attacks can be switched using the buttons on the top left of the HUD, and used by clicking on targets or tiles similar to a gun.\nWhile the opponent might have an upper hand with powerful mining equipment and tools, you have great power normally limited by AI mobs.\nIf you want to win, you'll have to use your powers in creative ways to ensure the kill. It's suggested you try using them all as soon as possible.\nShould you win, you'll receive extra information regarding what to do after. Good luck!") - addtimer(CALLBACK(src, .proc/spawn_elite, elitemind), 100) + addtimer(CALLBACK(src, PROC_REF(spawn_elite), elitemind), 100) else visible_message(span_boldwarning("The stirring stops, and nothing emerges. Perhaps try again later.")) activity = TUMOR_INACTIVE @@ -188,8 +188,8 @@ While using this makes the system rely on OnFire, it still gives options for tim mychild.sentience_act() notify_ghosts("\A [mychild] has been awakened in \the [get_area(src)]!", source = mychild, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Lavaland Elite awakened") icon_state = "tumor_popped" - RegisterSignal(mychild, COMSIG_PARENT_QDELETING, .proc/mychild_gone_missing) - INVOKE_ASYNC(src, .proc/arena_checks) + RegisterSignal(mychild, COMSIG_PARENT_QDELETING, PROC_REF(mychild_gone_missing)) + INVOKE_ASYNC(src, PROC_REF(arena_checks)) /obj/structure/elite_tumor/proc/mychild_gone_missing() SIGNAL_HANDLER @@ -221,7 +221,7 @@ While using this makes the system rely on OnFire, it still gives options for tim return activator = user ADD_TRAIT(user, TRAIT_ELITE_CHALLENGER, REF(src)) - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/clear_activator) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(clear_activator)) /obj/structure/elite_tumor/proc/clear_activator(mob/source) SIGNAL_HANDLER @@ -254,11 +254,11 @@ While using this makes the system rely on OnFire, it still gives options for tim /obj/structure/elite_tumor/proc/arena_checks() if(activity != TUMOR_ACTIVE || QDELETED(src)) return - INVOKE_ASYNC(src, .proc/fighters_check) //Checks to see if our fighters died. - INVOKE_ASYNC(src, .proc/arena_trap) //Gets another arena trap queued up for when this one runs out. - INVOKE_ASYNC(src, .proc/border_check) //Checks to see if our fighters got out of the arena somehow. + INVOKE_ASYNC(src, PROC_REF(fighters_check)) //Checks to see if our fighters died. + INVOKE_ASYNC(src, PROC_REF(arena_trap)) //Gets another arena trap queued up for when this one runs out. + INVOKE_ASYNC(src, PROC_REF(border_check)) //Checks to see if our fighters got out of the arena somehow. if(!QDELETED(src)) - addtimer(CALLBACK(src, .proc/arena_checks), 50) + addtimer(CALLBACK(src, PROC_REF(arena_checks)), 50) /obj/structure/elite_tumor/proc/fighters_check() if(QDELETED(mychild) || mychild.stat == DEAD) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index 301c06a21e7..2e30bd5bbb3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -139,7 +139,7 @@ color = "#FF0000" set_varspeed(0) move_to_delay = 3 - addtimer(CALLBACK(src, .proc/reset_rage), 65) + addtimer(CALLBACK(src, PROC_REF(reset_rage)), 65) /mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/reset_rage() color = "#FFFFFF" @@ -216,11 +216,11 @@ retract() else deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/retract), 10, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE) /obj/effect/temp_visual/goliath_tentacle/broodmother/patch/Initialize(mapload, new_spawner) . = ..() - INVOKE_ASYNC(src, .proc/createpatch) + INVOKE_ASYNC(src, PROC_REF(createpatch)) /obj/effect/temp_visual/goliath_tentacle/broodmother/patch/proc/createpatch() var/tentacle_locs = spiral_range_turfs(1, get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 26e6485cd01..63b06ea9e61 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -53,7 +53,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/herald/death() . = ..() if(!is_mirror) - addtimer(CALLBACK(src, .proc/become_ghost), 8) + addtimer(CALLBACK(src, PROC_REF(become_ghost)), 8) if(my_mirror != null) qdel(my_mirror) @@ -145,13 +145,13 @@ var/target_turf = get_turf(target) var/angle_to_target = get_angle(src, target_turf) shoot_projectile(target_turf, angle_to_target, FALSE, TRUE) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 2) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 4) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 2) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 4) if(health < maxHealth * 0.5 && !is_mirror) playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 10) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 12) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 14) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 10) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 12) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 14) /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_circleshot(offset) var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315) @@ -168,11 +168,11 @@ if(!is_mirror) icon_state = "herald_enraged" playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/herald_circleshot, 0), 5) + addtimer(CALLBACK(src, PROC_REF(herald_circleshot), 0), 5) if(health < maxHealth * 0.5 && !is_mirror) playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/herald_circleshot, 22.5), 15) - addtimer(CALLBACK(src, .proc/unenrage), 20) + addtimer(CALLBACK(src, PROC_REF(herald_circleshot), 22.5), 15) + addtimer(CALLBACK(src, PROC_REF(unenrage)), 20) /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_teleshot(target) ranged_cooldown = world.time + 30 @@ -276,4 +276,4 @@ owner.visible_message(span_danger("[owner]'s [src] emits a loud noise as [owner] is struck!")) var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315) playsound(get_turf(owner), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/reactionshot, owner), 10) + addtimer(CALLBACK(src, PROC_REF(reactionshot), owner), 10) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index c050407b86f..abebe00f7aa 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -123,7 +123,7 @@ T = get_step(T, dir_to_target) playsound(src,'sound/magic/demon_attack1.ogg', 200, 1) visible_message(span_boldwarning("[src] prepares to charge!")) - addtimer(CALLBACK(src, .proc/legionnaire_charge_2, dir_to_target, 0), 4) + addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), dir_to_target, 0), 4) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(move_dir, times_ran) if(times_ran >= 6) @@ -156,7 +156,7 @@ L.safe_throw_at(throwtarget, 10, 1, src) L.Paralyze(20) L.adjustBruteLoss(melee_damage_upper) - addtimer(CALLBACK(src, .proc/legionnaire_charge_2, move_dir, (times_ran + 1)), 0.7) + addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), move_dir, (times_ran + 1)), 0.7) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/head_detach(target) ranged_cooldown = world.time + 1 SECONDS @@ -183,7 +183,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/onHeadDeath() myhead = null - addtimer(CALLBACK(src, .proc/regain_head), 50) + addtimer(CALLBACK(src, PROC_REF(regain_head)), 50) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/regain_head() has_head = TRUE @@ -282,7 +282,7 @@ /obj/structure/legionnaire_bonfire/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index 6c9510c7675..a26275e4319 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -118,7 +118,7 @@ new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(T, src) T = get_step(T, angleused) procsleft = procsleft - 1 - addtimer(CALLBACK(src, .proc/singular_shot_line, procsleft, angleused, T), cooldown_time * 0.1) + addtimer(CALLBACK(src, PROC_REF(singular_shot_line), procsleft, angleused, T), cooldown_time * 0.1) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/magic_box(target) ranged_cooldown = world.time + cooldown_time @@ -136,7 +136,7 @@ new /obj/effect/temp_visual/hierophant/telegraph(turf_target, src) new /obj/effect/temp_visual/hierophant/telegraph(source, src) playsound(source,'sound/machines/airlockopen.ogg', 200, 1) - addtimer(CALLBACK(src, .proc/pandora_teleport_2, turf_target, source), 2) + addtimer(CALLBACK(src, PROC_REF(pandora_teleport_2), turf_target, source), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(turf/T, turf/source) new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src) @@ -148,7 +148,7 @@ animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out visible_message(span_hierophant_warning("[src] fades out!")) set_density(FALSE) - addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 2) + addtimer(CALLBACK(src, PROC_REF(pandora_teleport_3), T), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(turf/T) forceMove(T) @@ -161,7 +161,7 @@ var/turf/T = get_turf(target) new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(T, src) var/max_size = 3 - addtimer(CALLBACK(src, .proc/aoe_squares_2, T, 0, max_size), 2) + addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, 0, max_size), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(turf/T, ring, max_size) if(ring > max_size) @@ -169,7 +169,7 @@ for(var/t in spiral_range_turfs(ring, T)) if(get_dist(t, T) == ring) new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(t, src) - addtimer(CALLBACK(src, .proc/aoe_squares_2, T, (ring + 1), max_size), cooldown_time * 0.1) + addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, (ring + 1), max_size), cooldown_time * 0.1) //The specific version of hiero's squares pandora uses /obj/effect/temp_visual/hierophant/blast/damaging/pandora diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index e109fe5803b..27621040c78 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -103,7 +103,7 @@ retreat_distance = 10 minimum_distance = 10 if(will_burrow) - addtimer(CALLBACK(src, .proc/Burrow), chase_time) + addtimer(CALLBACK(src, PROC_REF(Burrow)), chase_time) /mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget() if(istype(target, /obj/item/stack/ore)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index b94d833e683..d7384a4597b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -108,7 +108,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/Initialize(mapload) . = ..() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/ash_flora), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/ash_flora), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/asteroid/goliath/beast/attackby(obj/item/O, mob/user, params) if(!istype(O, /obj/item/saddle) || saddled) @@ -197,7 +197,7 @@ var/turf/closed/mineral/M = loc M.gets_drilled() deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/tripanim), 7, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(tripanim)), 7, TIMER_STOPPABLE) /obj/effect/temp_visual/goliath_tentacle/original/Initialize(mapload, new_spawner) . = ..() @@ -211,7 +211,7 @@ /obj/effect/temp_visual/goliath_tentacle/proc/tripanim() icon_state = "Goliath_tentacle_wiggle" deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/trip), 3, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(trip)), 3, TIMER_STOPPABLE) /obj/effect/temp_visual/goliath_tentacle/proc/trip() var/latched = FALSE @@ -226,7 +226,7 @@ retract() else deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/retract), 10, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE) /obj/effect/temp_visual/goliath_tentacle/proc/retract() icon_state = "Goliath_tentacle_retract" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index ceb6f29f523..f907ff7a2bc 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -47,7 +47,7 @@ /mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize(mapload) . = ..() if(wanted_objects.len) - AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, .proc/regenerate_icons), CALLBACK(src, .proc/regenerate_icons)) + AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons))) ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) /mob/living/simple_animal/hostile/asteroid/gutlunch/CanAttack(atom/the_target) // Gutlunch-specific version of CanAttack to handle stupid stat_exclusive = true crap so we don't have to do it for literally every single simple_animal/hostile except the two that spawn in lavaland diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 6491af064aa..cece8449c05 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -96,7 +96,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/death), 100) + addtimer(CALLBACK(src, PROC_REF(death)), 100) AddElement(/datum/element/simple_flying) AddComponent(/datum/component/swarming) AddComponent(/datum/component/clickbox, icon_state = clickbox_state, max_scale = clickbox_max_scale) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 31d73874fee..3f3ec5c683a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -92,7 +92,7 @@ /mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting if(!retreat_distance && prob(33)) retreat_distance = 5 - addtimer(CALLBACK(src, .proc/stop_retreat), 30) + addtimer(CALLBACK(src, PROC_REF(stop_retreat)), 30) . = ..() /mob/living/simple_animal/hostile/mushroom/proc/stop_retreat() @@ -141,7 +141,7 @@ revive(full_heal = TRUE, admin_revive = FALSE) UpdateMushroomCap() recovery_cooldown = 1 - addtimer(CALLBACK(src, .proc/recovery_recharge), 300) + addtimer(CALLBACK(src, PROC_REF(recovery_recharge)), 300) /mob/living/simple_animal/hostile/mushroom/proc/recovery_recharge() recovery_cooldown = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index 82f2cde55aa..b7c483cbe7c 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -165,8 +165,8 @@ /datum/action/cooldown/metabolicboost/proc/trigger_boost() var/mob/living/simple_animal/hostile/ooze/ooze = owner ooze.add_movespeed_modifier(/datum/movespeed_modifier/metabolicboost) - var/timerid = addtimer(CALLBACK(src, .proc/HeatUp), 1 SECONDS, TIMER_STOPPABLE | TIMER_LOOP) //Heat up every second - addtimer(CALLBACK(src, .proc/FinishSpeedup, timerid), 6 SECONDS) + var/timerid = addtimer(CALLBACK(src, PROC_REF(HeatUp)), 1 SECONDS, TIMER_STOPPABLE | TIMER_LOOP) //Heat up every second + addtimer(CALLBACK(src, PROC_REF(FinishSpeedup), timerid), 6 SECONDS) to_chat(ooze, span_notice("You start feel a lot quicker.")) active = TRUE ooze.adjust_ooze_nutrition(-10) @@ -200,8 +200,8 @@ ///Register for owner death /datum/action/consume/New(Target) . = ..() - RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/on_owner_death) - RegisterSignal(owner, COMSIG_PARENT_PREQDELETED, .proc/handle_mob_deletion) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_death)) + RegisterSignal(owner, COMSIG_PARENT_PREQDELETED, PROC_REF(handle_mob_deletion)) /datum/action/consume/proc/handle_mob_deletion() SIGNAL_HANDLER @@ -233,7 +233,7 @@ /datum/action/consume/proc/start_consuming(mob/living/target) vored_mob = target vored_mob.forceMove(owner) ///AAAAAAAAAAAAAAAAAAAAAAHHH!!! - RegisterSignal(vored_mob, COMSIG_PARENT_PREQDELETED, .proc/handle_mob_deletion) + RegisterSignal(vored_mob, COMSIG_PARENT_PREQDELETED, PROC_REF(handle_mob_deletion)) playsound(owner,'sound/items/eatfood.ogg', rand(30,50), TRUE) owner.visible_message(span_warning("[src] devours [target]!"), span_notice("You devour [target].")) START_PROCESSING(SSprocessing, src) diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm index 4bc3466dfc8..c31ad1af49f 100644 --- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -156,7 +156,7 @@ /mob/living/simple_animal/hostile/regalrat/controlled/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/get_player) + INVOKE_ASYNC(src, PROC_REF(get_player)) var/kingdom = pick("Plague","Miasma","Maintenance","Trash","Garbage","Rat","Vermin","Cheese") var/title = pick("King","Lord","Prince","Emperor","Supreme","Overlord","Master","Shogun","Bojar","Tsar") name = "[kingdom] [title]" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 5e849e96d34..25c0e05ae42 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -97,7 +97,7 @@ banana_rustle.Grant(src) banana_bunch = new() banana_bunch.Grant(src) - + /mob/living/simple_animal/hostile/retaliate/clown/banana/Destroy() . = ..() QDEL_NULL(banana_rustle) @@ -168,7 +168,7 @@ . = ..() new /obj/item/food/grown/banana/bunch(get_step(owner.loc, owner.dir)) playsound(owner, 'sound/items/bikehorn.ogg', 60) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, owner, 'sound/creatures/clown/hohoho.ogg', 100, 1), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, 'sound/creatures/clown/hohoho.ogg', 100, 1), 1 SECONDS) StartCooldown() /mob/living/simple_animal/hostile/retaliate/clown/honkling @@ -400,7 +400,7 @@ my_regurgitate = new AddAbility(my_regurgitate) add_cell_sample() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/cheesiehonkers, /obj/item/food/cornchips), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/cheesiehonkers, /obj/item/food/cornchips), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton/attacked_by(obj/item/I, mob/living/user) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 4af209c2fc1..3cdc4996cc1 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -44,7 +44,7 @@ butcher_results = list(/obj/item/food/nugget = 5) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) add_cell_sample() diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 0997df14537..4a5f1f73c02 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -313,7 +313,7 @@ if(D.density) return delayFire += 1.5 - addtimer(CALLBACK(src, .proc/dragon_fire_line, T), delayFire) + addtimer(CALLBACK(src, PROC_REF(dragon_fire_line), T), delayFire) /** * What occurs on each tile to actually create the fire. @@ -393,7 +393,7 @@ fully_heal() add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) add_movespeed_modifier(/datum/movespeed_modifier/dragon_rage) - addtimer(CALLBACK(src, .proc/rift_depower), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(rift_depower)), 30 SECONDS) /** * Gives Space Dragon their the rift speed buff permanantly. @@ -449,7 +449,7 @@ /mob/living/simple_animal/hostile/space_dragon/proc/useGust(timer) if(timer != 10) pixel_y = pixel_y + 2; - addtimer(CALLBACK(src, .proc/useGust, timer + 1), 1.5) + addtimer(CALLBACK(src, PROC_REF(useGust), timer + 1), 1.5) return pixel_y = 0 icon_state = "spacedragon_gust_2" @@ -471,7 +471,7 @@ var/throwtarget = get_edge_target_turf(target, dir_to_target) L.safe_throw_at(throwtarget, 10, 1, src) L.Paralyze(50) - addtimer(CALLBACK(src, .proc/reset_status), 4 + ((tiredness * tiredness_mult) / 10)) + addtimer(CALLBACK(src, PROC_REF(reset_status)), 4 + ((tiredness * tiredness_mult) / 10)) tiredness = tiredness + (gust_tiredness * tiredness_mult) /** diff --git a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm index 3d866e60081..7f9e34e7440 100644 --- a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm +++ b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm @@ -30,7 +30,7 @@ tentacle_slap = new(src, src) AddAbility(tentacle_slap) add_cell_sample() - AddComponent(/datum/component/tameable, list(/obj/item/food/fries, /obj/item/food/cheesyfries, /obj/item/food/cornchips, /obj/item/food/carrotfries), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, list(/obj/item/food/fries, /obj/item/food/cheesyfries, /obj/item/food/cornchips, /obj/item/food/carrotfries), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/vatbeast/Destroy() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 728f3bf0e79..c69ce91312e 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -44,8 +44,8 @@ for(var/turf/T in anchors) vines += Beam(T, "vine", maxdistance=5, beam_type=/obj/effect/ebeam/vine) finish_time = world.time + growth_time - addtimer(CALLBACK(src, .proc/bear_fruit), growth_time) - addtimer(CALLBACK(src, .proc/progress_growth), growth_time/4) + addtimer(CALLBACK(src, PROC_REF(bear_fruit)), growth_time) + addtimer(CALLBACK(src, PROC_REF(progress_growth)), growth_time/4) countdown.start() /obj/structure/alien/resin/flower_bud/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) @@ -76,7 +76,7 @@ icon_state = "bud[growth_icon]" if(growth_icon == FINAL_BUD_GROWTH_ICON) return - addtimer(CALLBACK(src, .proc/progress_growth), growth_time/4) + addtimer(CALLBACK(src, PROC_REF(progress_growth)), growth_time/4) /obj/effect/ebeam/vine name = "thick vine" @@ -86,7 +86,7 @@ /obj/effect/ebeam/vine/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -183,7 +183,7 @@ return var/datum/beam/newVine = Beam(the_target, icon_state = "vine", maxdistance = vine_grab_distance, beam_type=/obj/effect/ebeam/vine) - RegisterSignal(newVine, COMSIG_PARENT_QDELETING, .proc/remove_vine, newVine) + RegisterSignal(newVine, COMSIG_PARENT_QDELETING, PROC_REF(remove_vine), newVine) vines += newVine if(isliving(the_target)) var/mob/living/L = the_target diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index 5ddbfe6fd65..258760aaef6 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -27,7 +27,7 @@ /mob/living/simple_animal/hostile/zombie/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/setup_visuals) + INVOKE_ASYNC(src, PROC_REF(setup_visuals)) /mob/living/simple_animal/hostile/zombie/proc/setup_visuals() var/datum/job/job = SSjob.GetJob(zombiejob) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 7c930aa3c94..53b89b0e0dc 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -673,7 +673,7 @@ return relaydrive(user, direction) /mob/living/simple_animal/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) - . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 5afb8ac74a0..67ef8c592ce 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -382,7 +382,7 @@ else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(33)) step(src, pick(GLOB.cardinals)) else if(!AIproc) - INVOKE_ASYNC(src, .proc/AIprocess) + INVOKE_ASYNC(src, PROC_REF(AIprocess)) /mob/living/simple_animal/slime/handle_automated_movement() return //slime random movement is currently handled in handle_targets() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index bd047480c3a..c2116b905ba 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -119,8 +119,8 @@ /mob/living/simple_animal/slime/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles removing signal hooks incase someone is crazy enough to reset the reagents datum. /mob/living/simple_animal/slime/proc/on_reagents_del(datum/reagents/reagents) @@ -487,7 +487,7 @@ if(user) step_away(src,user,15) - addtimer(CALLBACK(src, .proc/slime_move, user), 0.3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(slime_move), user), 0.3 SECONDS) /mob/living/simple_animal/slime/proc/slime_move(mob/user) @@ -514,7 +514,7 @@ if(old_target && !SLIME_CARES_ABOUT(old_target)) UnregisterSignal(old_target, COMSIG_PARENT_QDELETING) if(Target) - RegisterSignal(Target, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(Target, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/set_leader(new_leader) var/old_leader = Leader @@ -522,19 +522,19 @@ if(old_leader && !SLIME_CARES_ABOUT(old_leader)) UnregisterSignal(old_leader, COMSIG_PARENT_QDELETING) if(Leader) - RegisterSignal(Leader, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(Leader, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/add_friendship(new_friend, amount = 1) if(!Friends[new_friend]) Friends[new_friend] = 0 Friends[new_friend] += amount if(new_friend) - RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/set_friendship(new_friend, amount = 1) Friends[new_friend] = amount if(new_friend) - RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/remove_friend(friend) Friends -= friend diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e85d1fee5f9..e538873ff52 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -496,7 +496,7 @@ else result = examinify.examine(src) client.recent_examines[ref_to_atom] = world.time // set to when we last normal examine'd them - addtimer(CALLBACK(src, .proc/clear_from_recent_examines, ref_to_atom), RECENT_EXAMINE_MAX_WINDOW) + addtimer(CALLBACK(src, PROC_REF(clear_from_recent_examines), ref_to_atom), RECENT_EXAMINE_MAX_WINDOW) handle_eye_contact(examinify) else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? @@ -553,7 +553,7 @@ /// our current intent, so we can go back to it after touching var/previous_combat_mode = combat_mode set_combat_mode(FALSE) - INVOKE_ASYNC(examined_thing, /atom/proc/attack_hand, src) + INVOKE_ASYNC(examined_thing, TYPE_PROC_REF(/atom, attack_hand), src) set_combat_mode(previous_combat_mode) return TRUE @@ -592,11 +592,11 @@ // check to see if their face is blocked or, if not, a signal blocks it if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT) var/msg = span_smallnotice("You make eye contact with [examined_mob].") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, src, msg), 3) // so the examine signal has time to fire and this will print after + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 3) // so the examine signal has time to fire and this will print after if(!imagined_eye_contact && is_face_visible() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT) var/msg = span_smallnotice("[src] makes eye contact with you.") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, examined_mob, msg), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 3) /** * Point at an atom @@ -1347,7 +1347,7 @@ UnregisterSignal(active_storage, COMSIG_PARENT_QDELETING) active_storage = new_active_storage if(active_storage) - RegisterSignal(active_storage, COMSIG_PARENT_QDELETING, .proc/active_storage_deleted) + RegisterSignal(active_storage, COMSIG_PARENT_QDELETING, PROC_REF(active_storage_deleted)) /mob/proc/active_storage_deleted(datum/source) SIGNAL_HANDLER diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 6dba85eb3e6..3cbcfbbee06 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -104,6 +104,8 @@ /// Default body temperature var/bodytemperature = BODYTEMP_NORMAL //310.15K / 98.6F + /// Our body temperatue as of the last process, prevents pointless work when handling alerts + var/old_bodytemperature = 0 /// Drowsyness level of the mob var/drowsyness = 0//Carbon /// Dizziness level of the mob diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index efbc1a0a2b3..07f41a68327 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -16,7 +16,7 @@ new /obj/effect/temp_visual/monkeyify(loc) - transformation_timer = addtimer(CALLBACK(src, .proc/finish_monkeyize), TRANSFORMATION_DURATION, TIMER_UNIQUE) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_monkeyize)), TRANSFORMATION_DURATION, TIMER_UNIQUE) /mob/living/carbon/proc/finish_monkeyize() transformation_timer = null @@ -47,7 +47,7 @@ invisibility = INVISIBILITY_MAXIMUM new /obj/effect/temp_visual/monkeyify/humanify(loc) - transformation_timer = addtimer(CALLBACK(src, .proc/finish_humanize, species), TRANSFORMATION_DURATION, TIMER_UNIQUE) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_humanize), species), TRANSFORMATION_DURATION, TIMER_UNIQUE) /mob/living/carbon/proc/finish_humanize(species = /datum/species/human) transformation_timer = null @@ -152,7 +152,7 @@ . = R if(R.ckey && is_banned_from(R.ckey, JOB_CYBORG)) - INVOKE_ASYNC(R, /mob/living/silicon/robot.proc/replace_banned_cyborg) + INVOKE_ASYNC(R, TYPE_PROC_REF(/mob/living/silicon/robot, replace_banned_cyborg)) qdel(src) /mob/living/Robotize(delete_items = 0, transfer_after = TRUE) @@ -306,7 +306,7 @@ /mob/living/carbon/human/Animalize() var/list/mobtypes = typesof(/mob/living/simple_animal) - var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, /proc/cmp_typepaths_asc)) + var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(mobpath)) return if(!safe_animal(mobpath)) @@ -340,7 +340,7 @@ /mob/proc/Animalize() var/list/mobtypes = typesof(/mob/living/simple_animal) - var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, /proc/cmp_typepaths_asc)) + var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(mobpath)) return if(!safe_animal(mobpath)) diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index 5a5adb6443b..0670f8cf225 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -214,10 +214,10 @@ . = ..() switch(spawn_when) if(CORPSE_INSTANT) - INVOKE_ASYNC(src, .proc/create) + INVOKE_ASYNC(src, PROC_REF(create)) if(CORPSE_ROUNDSTART) if(mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP)) - INVOKE_ASYNC(src, .proc/create) + INVOKE_ASYNC(src, PROC_REF(create)) /obj/effect/mob_spawn/corpse/special(mob/living/spawned_mob) . = ..() diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm index c49f43d85d7..2e9fe6b91a0 100644 --- a/code/modules/mod/mod_actions.dm +++ b/code/modules/mod/mod_actions.dm @@ -73,7 +73,7 @@ if(!ai_action) background_icon_state = "bg_tech" UpdateButtonIcon() - addtimer(CALLBACK(src, .proc/reset_ready), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_ready)), 3 SECONDS) return var/obj/item/mod/control/mod = target reset_ready() @@ -138,9 +138,9 @@ desc = "Quickly activate [linked_module]." icon_icon = linked_module.icon button_icon_state = linked_module.icon_state - RegisterSignal(linked_module, COMSIG_MODULE_ACTIVATED, .proc/on_module_activate) - RegisterSignal(linked_module, COMSIG_MODULE_DEACTIVATED, .proc/on_module_deactivate) - RegisterSignal(linked_module, COMSIG_MODULE_USED, .proc/on_module_use) + RegisterSignal(linked_module, COMSIG_MODULE_ACTIVATED, PROC_REF(on_module_activate)) + RegisterSignal(linked_module, COMSIG_MODULE_DEACTIVATED, PROC_REF(on_module_deactivate)) + RegisterSignal(linked_module, COMSIG_MODULE_USED, PROC_REF(on_module_use)) /datum/action/item_action/mod/pinned_module/Destroy() module.pinned_to -= pinner_ref @@ -174,7 +174,7 @@ if(!COOLDOWN_FINISHED(module, cooldown_timer)) var/image/cooldown_image = image(icon = 'icons/hud/radial.dmi', icon_state = "module_cooldown") current_button.add_overlay(cooldown_image) - addtimer(CALLBACK(current_button, /image.proc/cut_overlay, cooldown_image), COOLDOWN_TIMELEFT(module, cooldown_timer)) + addtimer(CALLBACK(current_button, TYPE_PROC_REF(/image, cut_overlay), cooldown_image), COOLDOWN_TIMELEFT(module, cooldown_timer)) /datum/action/item_action/mod/pinned_module/proc/on_module_activate(datum/source) diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 58cd73fafcf..7c61f781fe4 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -81,7 +81,7 @@ return wearer.loc.relaymove(wearer, direction) else if(wearer) ADD_TRAIT(wearer, TRAIT_FORCED_STANDING, MOD_TRAIT) - addtimer(CALLBACK(src, .proc/ai_fall), AI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(ai_fall)), AI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) var/atom/movable/mover = wearer || src return step(mover, direction) @@ -107,7 +107,7 @@ if(!ai) return ai.apply_damage(150, BURN) - INVOKE_ASYNC(ai, /mob/living/silicon/ai.proc/death) + INVOKE_ASYNC(ai, TYPE_PROC_REF(/mob/living/silicon/ai, death)) ai.forceMove(src) stored_ai = WEAKREF(ai) icon_state = "minicard-filled" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 05930871872..f37b2ce9948 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -140,8 +140,8 @@ for(var/obj/item/mod/module/module as anything in initial_modules) module = new module(src) install(module) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(src, COMSIG_SPEED_POTION_APPLIED, .proc/on_potion) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(src, COMSIG_SPEED_POTION_APPLIED, PROC_REF(on_potion)) movedelay = CONFIG_GET(number/movedelay/run_delay) /obj/item/mod/control/Destroy() @@ -440,8 +440,8 @@ /obj/item/mod/control/proc/set_wearer(mob/user) wearer = user SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer) - RegisterSignal(wearer, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(src, COMSIG_ITEM_PRE_UNEQUIP, .proc/on_unequip) + RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(src, COMSIG_ITEM_PRE_UNEQUIP, PROC_REF(on_unequip)) update_charge_alert() for(var/obj/item/mod/module/module as anything in modules) module.on_equip() @@ -650,7 +650,7 @@ if(mod_parts.Find(part)) conceal(wearer, part) if(active) - INVOKE_ASYNC(src, .proc/toggle_activate, wearer, TRUE) + INVOKE_ASYNC(src, PROC_REF(toggle_activate), wearer, TRUE) return /obj/item/mod/control/proc/on_potion(atom/movable/source, obj/item/slimepotion/speed/speed_potion, mob/living/user) diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index f5c7e1a795d..87f8b6c6731 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -82,10 +82,10 @@ . = ..() if(cell) install_cell(cell) - RegisterSignal(mod, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(mod, COMSIG_MOD_WEARER_SET, .proc/on_wearer_set) + RegisterSignal(mod, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(mod, COMSIG_MOD_WEARER_SET, PROC_REF(on_wearer_set)) if(mod.wearer) on_wearer_set(mod, mod.wearer) @@ -141,7 +141,7 @@ /obj/item/mod/core/standard/proc/install_cell(new_cell) cell = new_cell cell.forceMove(src) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) /obj/item/mod/core/standard/proc/uninstall_cell() if(!cell) @@ -169,7 +169,7 @@ if(mod.seconds_electrified && charge_amount() && mod.shock(user)) return COMPONENT_CANCEL_ATTACK_CHAIN if(mod.open && mod.loc == user) - INVOKE_ASYNC(src, .proc/mod_uninstall_cell, user) + INVOKE_ASYNC(src, PROC_REF(mod_uninstall_cell), user) return COMPONENT_CANCEL_ATTACK_CHAIN return NONE @@ -210,8 +210,8 @@ /obj/item/mod/core/standard/proc/on_wearer_set(datum/source, mob/user) SIGNAL_HANDLER - RegisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge) - RegisterSignal(mod, COMSIG_MOD_WEARER_UNSET, .proc/on_wearer_unset) + RegisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) + RegisterSignal(mod, COMSIG_MOD_WEARER_UNSET, PROC_REF(on_wearer_unset)) /obj/item/mod/core/standard/proc/on_wearer_unset(datum/source, mob/user) SIGNAL_HANDLER @@ -281,7 +281,7 @@ /obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit) . = ..() - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/core/plasma/uninstall() UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index d00f0cb148c..56cba7359d7 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -49,8 +49,8 @@ if(ispath(device)) device = new device(src) ADD_TRAIT(device, TRAIT_NODROP, MOD_TRAIT) - RegisterSignal(device, COMSIG_PARENT_PREQDELETED, .proc/on_device_deletion) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) + RegisterSignal(device, COMSIG_PARENT_PREQDELETED, PROC_REF(on_device_deletion)) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) /obj/item/mod/module/Destroy() mod?.uninstall(src) @@ -124,8 +124,8 @@ if(device) if(mod.wearer.put_in_hands(device)) balloon_alert(mod.wearer, "[device] extended") - RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, .proc/dropkey) + RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey)) else balloon_alert(mod.wearer, "can't extend [device]!") mod.wearer.transferItemToLoc(device, src, force = TRUE) @@ -173,7 +173,7 @@ if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED) & MOD_ABORT_USE) return FALSE COOLDOWN_START(src, cooldown_timer, cooldown_time) - addtimer(CALLBACK(mod.wearer, /mob.proc/update_inv_back), cooldown_time) + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_inv_back)), cooldown_time) mod.wearer.update_inv_back() SEND_SIGNAL(src, COMSIG_MODULE_USED) return TRUE @@ -283,7 +283,7 @@ mod.selected_module.used_signal = COMSIG_MOB_MIDDLECLICKON if(ALT_CLICK) mod.selected_module.used_signal = COMSIG_MOB_ALTCLICKON - RegisterSignal(mod.wearer, mod.selected_module.used_signal, /obj/item/mod/module.proc/on_special_click) + RegisterSignal(mod.wearer, mod.selected_module.used_signal, TYPE_PROC_REF(/obj/item/mod/module, on_special_click)) /// Pins the module to the user's action buttons /obj/item/mod/module/proc/pin(mob/user) diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index e90170c2873..fc0a5e6f64a 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -63,7 +63,7 @@ kinesis_beam = mod.wearer.Beam(grabbed_atom, "kinesis") kinesis_catcher = mod.wearer.overlay_fullscreen("kinesis", /atom/movable/screen/fullscreen/kinesis, 0) kinesis_catcher.kinesis_user = mod.wearer - kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, /atom/movable/screen/fullscreen/kinesis.proc/on_move) + kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/fullscreen/kinesis, on_move)) soundloop.start() /obj/item/mod/module/anomaly_locked/kinesis/on_deactivation(display_message = TRUE) @@ -178,7 +178,7 @@ /obj/item/mod/module/anomaly_locked/kinesis/proc/launch() playsound(grabbed_atom, 'sound/magic/repulse.ogg', 100, TRUE) - RegisterSignal(grabbed_atom, COMSIG_MOVABLE_IMPACT, .proc/launch_impact) + RegisterSignal(grabbed_atom, COMSIG_MOVABLE_IMPACT, PROC_REF(launch_impact)) var/turf/target_turf = get_turf_in_angle(get_angle(mod.wearer, grabbed_atom), get_turf(src), 10) grabbed_atom.throw_at(target_turf, range = grab_range, speed = grabbed_atom.density ? 3 : 4, thrower = mod.wearer, spin = isitem(grabbed_atom)) diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index 35a288c540e..8ff5ec88fd3 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -117,7 +117,7 @@ ADD_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT) animate(module.mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y) module.mod.add_overlay(jet_icon) - RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) balloon_alert(imp_in, "suit recalled") return TRUE diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 9e18d63a140..30a28928ce7 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -110,7 +110,7 @@ /obj/item/mod/module/energy_shield/on_suit_activation() mod.AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \ charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, recharge_path = recharge_path, starting_charges = charges, shield_icon_file = shield_icon_file, shield_icon = shield_icon) - RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, .proc/shield_reaction) + RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(shield_reaction)) /obj/item/mod/module/energy_shield/on_suit_deactivation() var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded) @@ -280,7 +280,7 @@ flame.preparePixelProjectile(target, mod.wearer) flame.firer = mod.wearer playsound(src, 'sound/items/modsuit/flamethrower.ogg', 75, TRUE) - INVOKE_ASYNC(flame, /obj/projectile.proc/fire) + INVOKE_ASYNC(flame, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/projectile/bullet/incendiary/backblast/flamethrower diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index cafa27d2e22..0676d33ab50 100644 --- a/code/modules/mod/modules/modules_engineering.dm +++ b/code/modules/mod/modules/modules_engineering.dm @@ -105,7 +105,7 @@ tether.preparePixelProjectile(target, mod.wearer) tether.firer = mod.wearer playsound(src, 'sound/weapons/batonextend.ogg', 25, TRUE) - INVOKE_ASYNC(tether, /obj/projectile.proc/fire) + INVOKE_ASYNC(tether, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/projectile/tether @@ -152,7 +152,7 @@ /obj/item/mod/module/rad_protection/on_suit_activation() AddComponent(/datum/component/geiger_sound) ADD_TRAIT(mod.wearer, TRAIT_BYPASS_EARLY_IRRADIATED_CHECK, MOD_TRAIT) - RegisterSignal(mod.wearer, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(mod.wearer, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) for(var/obj/item/part in mod.mod_parts) ADD_TRAIT(part, TRAIT_RADIATION_PROTECTED_CLOTHING, MOD_TRAIT) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 9d8896261b4..e292d655c5b 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -32,7 +32,7 @@ modstorage.max_combined_w_class = max_combined_w_class modstorage.max_items = max_items SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, FALSE) - RegisterSignal(mod.chestplate, COMSIG_ITEM_PRE_UNEQUIP, .proc/on_chestplate_unequip) + RegisterSignal(mod.chestplate, COMSIG_ITEM_PRE_UNEQUIP, PROC_REF(on_chestplate_unequip)) /obj/item/mod/module/storage/on_uninstall() var/datum/component/storage/modstorage = mod.GetComponent(/datum/component/storage) @@ -112,9 +112,9 @@ if(!.) return ion_trail.start() - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move_react) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react)) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(spacemove_react)) if(full_speed) mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) @@ -344,7 +344,7 @@ incompatible_modules = list(/obj/item/mod/module/longfall) /obj/item/mod/module/longfall/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT, .proc/z_impact_react) + RegisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT, PROC_REF(z_impact_react)) /obj/item/mod/module/longfall/on_suit_deactivation() UnregisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT) @@ -404,10 +404,10 @@ var/dna = null /obj/item/mod/module/dna_lock/on_install() - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_mod_activation) - RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, .proc/on_mod_removal) - RegisterSignal(mod, COMSIG_ATOM_EMP_ACT, .proc/on_emp) - RegisterSignal(mod, COMSIG_ATOM_EMAG_ACT, .proc/on_emag) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_mod_activation)) + RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, PROC_REF(on_mod_removal)) + RegisterSignal(mod, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp)) + RegisterSignal(mod, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag)) /obj/item/mod/module/dna_lock/on_uninstall() UnregisterSignal(mod, COMSIG_MOD_ACTIVATE) @@ -530,9 +530,9 @@ //Need to subtract the beret because its annoying /obj/item/mod/module/hat_stabilizer/on_suit_activation() - RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, .proc/add_examine) - RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, .proc/place_hat) - RegisterSignal(mod.helmet, COMSIG_ATOM_ATTACK_HAND_SECONDARY, .proc/remove_hat) + RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, PROC_REF(add_examine)) + RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, PROC_REF(place_hat)) + RegisterSignal(mod.helmet, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(remove_hat)) /obj/item/mod/module/hat_stabilizer/on_suit_deactivation() if(attached_hat) //knock off the helmet if its on their head. Or, technically, auto-rightclick it for them; that way it saves us code, AND gives them the bubble diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 61f676827d7..779fd2e2818 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -18,7 +18,7 @@ mod.activation_step_time *= 2 /obj/item/mod/module/springlock/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS, .proc/on_wearer_exposed) + RegisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS, PROC_REF(on_wearer_exposed)) /obj/item/mod/module/springlock/on_suit_deactivation() UnregisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS) @@ -31,8 +31,8 @@ return //remove non-touch reagent exposure to_chat(mod.wearer, span_danger("[src] makes an ominous click sound...")) playsound(src, 'sound/items/modsuit/springlock.ogg', 75, TRUE) - addtimer(CALLBACK(src, .proc/snap_shut), rand(3 SECONDS, 5 SECONDS)) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_spring_block) + addtimer(CALLBACK(src, PROC_REF(snap_shut)), rand(3 SECONDS, 5 SECONDS)) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_spring_block)) ///Signal fired when wearer attempts to activate/deactivate suits /obj/item/mod/module/springlock/proc/on_activate_spring_block(datum/source, user) @@ -281,7 +281,7 @@ return playsound(src, 'sound/effects/curseattack.ogg', 50) mod.wearer.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/check_upstairs) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_upstairs)) mod.wearer.update_gravity(mod.wearer.has_gravity()) ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT) check_upstairs() //todo at some point flip your screen around @@ -313,7 +313,7 @@ if(current_turf && istype(turf_above)) current_turf.zFall(mod.wearer) else if(!turf_above && istype(current_turf) && current_turf.planetary_atmos) //nothing holding you down - INVOKE_ASYNC(src, .proc/fly_away) + INVOKE_ASYNC(src, PROC_REF(fly_away)) else if(!(step_count % 2)) playsound(current_turf, 'sound/items/modsuit/atrocinator_step.ogg', 50) step_count++ diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 9f42354b48f..a3f082cf9b3 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -156,7 +156,7 @@ projectile.preparePixelProjectile(target, mod.wearer) projectile.firer = mod.wearer playsound(src, 'sound/mecha/hydraulic.ogg', 25, TRUE) - INVOKE_ASYNC(projectile, /obj/projectile.proc/fire) + INVOKE_ASYNC(projectile, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/projectile/organ diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm index dfed572fe7c..534c2a4a837 100644 --- a/code/modules/mod/modules/modules_science.dm +++ b/code/modules/mod/modules/modules_science.dm @@ -36,7 +36,7 @@ if(!.) return mod.wearer.research_scanner++ - RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, .proc/sense_explosion) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) /obj/item/mod/module/reagent_scanner/advanced/on_deactivation(display_message = TRUE) . = ..() diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index 17bc3dc7b60..a6ca4712087 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -23,10 +23,10 @@ if(!.) return if(bumpoff) - RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, .proc/unstealth) - RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_unarmed_attack) - RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act) - RegisterSignal(mod.wearer, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), .proc/unstealth) + RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, PROC_REF(unstealth)) + RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) + RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) + RegisterSignal(mod.wearer, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), PROC_REF(unstealth)) animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS) drain_power(use_power_cost) diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index aba395da5c9..d1bb005a4e6 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -112,7 +112,7 @@ . = ..() if(!.) return - RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, .proc/bump_mine) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, PROC_REF(bump_mine)) /obj/item/mod/module/drill/on_deactivation(display_message = TRUE) . = ..() @@ -161,7 +161,7 @@ var/list/ores = list() /obj/item/mod/module/orebag/on_equip() - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/ore_pickup) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(ore_pickup)) /obj/item/mod/module/orebag/on_unequip() UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED) @@ -170,7 +170,7 @@ SIGNAL_HANDLER for(var/obj/item/stack/ore/ore in get_turf(mod.wearer)) - INVOKE_ASYNC(src, .proc/move_ore, ore) + INVOKE_ASYNC(src, PROC_REF(move_ore), ore) playsound(src, "rustle", 50, TRUE) /obj/item/mod/module/orebag/proc/move_ore(obj/item/stack/ore) @@ -237,7 +237,7 @@ mod.wearer.transform = mod.wearer.transform.Turn(angle) mod.wearer.throw_at(get_ranged_target_turf_direct(mod.wearer, target, power), \ range = power, speed = max(round(0.2*power), 1), thrower = mod.wearer, spin = FALSE, \ - callback = CALLBACK(src, .proc/on_throw_end, target, -angle)) + callback = CALLBACK(src, PROC_REF(on_throw_end), target, -angle)) /obj/item/mod/module/hydraulic/proc/on_throw_end(atom/target, angle) if(!mod?.wearer) @@ -259,7 +259,7 @@ disposal_tag = pick(GLOB.TAGGERLOCATIONS) /obj/item/mod/module/disposal_connector/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) /obj/item/mod/module/disposal_connector/on_suit_deactivation() UnregisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING) @@ -312,7 +312,7 @@ new /obj/effect/temp_visual/mook_dust(get_turf(locker)) playsound(locker, 'sound/effects/gravhit.ogg', 75, TRUE) locker.throw_at(mod.wearer, range = 7, speed = 3, force = MOVE_FORCE_WEAK, \ - callback = CALLBACK(src, .proc/check_locker, locker)) + callback = CALLBACK(src, PROC_REF(check_locker), locker)) /obj/item/mod/module/magnet/on_deactivation(display_message = TRUE) . = ..() @@ -328,7 +328,7 @@ return mod.wearer.start_pulling(locker) locker.strong_grab = TRUE - RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, .proc/on_stop_pull) + RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_stop_pull)) /obj/item/mod/module/magnet/proc/on_stop_pull(obj/structure/closet/locker, atom/movable/last_puller) SIGNAL_HANDLER @@ -382,7 +382,7 @@ /obj/item/mod/module/ash_accretion/on_suit_activation() ADD_TRAIT(mod.wearer, TRAIT_ASHSTORM_IMMUNE, MOD_TRAIT) ADD_TRAIT(mod.wearer, TRAIT_SNOWSTORM_IMMUNE, MOD_TRAIT) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /obj/item/mod/module/ash_accretion/on_suit_deactivation() REMOVE_TRAIT(mod.wearer, TRAIT_ASHSTORM_IMMUNE, MOD_TRAIT) @@ -478,7 +478,7 @@ mod.wearer.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) mod.wearer.AddElement(/datum/element/footstep, FOOTSTEP_OBJ_ROBOT, 1, -6, sound_vary = TRUE) mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere) - RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, .proc/on_statchange) + RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange)) /obj/item/mod/module/sphere_transform/on_deactivation(display_message = TRUE) . = ..() @@ -487,7 +487,7 @@ playsound(src, 'sound/items/modsuit/ballout.ogg', 100) mod.wearer.base_pixel_y = 0 animate(mod.wearer, animate_time, pixel_y = mod.wearer.base_pixel_y) - addtimer(CALLBACK(mod.wearer, /atom.proc/remove_filter, list("mod_ball", "mod_blur", "mod_outline")), animate_time) + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/atom, remove_filter), list("mod_ball", "mod_blur", "mod_outline")), animate_time) REMOVE_TRAIT(mod.wearer, TRAIT_LAVA_IMMUNE, MOD_TRAIT) REMOVE_TRAIT(mod.wearer, TRAIT_HANDS_BLOCKED, MOD_TRAIT) REMOVE_TRAIT(mod.wearer, TRAIT_FORCED_STANDING, MOD_TRAIT) @@ -513,7 +513,7 @@ bomb.preparePixelProjectile(target, mod.wearer) bomb.firer = mod.wearer playsound(src, 'sound/weapons/gun/general/grenade_launch.ogg', 75, TRUE) - INVOKE_ASYNC(bomb, /obj/projectile.proc/fire) + INVOKE_ASYNC(bomb, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/item/mod/module/sphere_transform/on_active_process(delta_time) @@ -576,11 +576,11 @@ explosion_image.pixel_x = -32 explosion_image.pixel_y = -32 explosion_image.plane = ABOVE_GAME_PLANE - addtimer(CALLBACK(src, .proc/prime), prime_time) + addtimer(CALLBACK(src, PROC_REF(prime)), prime_time) /obj/structure/mining_bomb/proc/prime() add_overlay(explosion_image) - addtimer(CALLBACK(src, .proc/boom), explosion_time) + addtimer(CALLBACK(src, PROC_REF(boom)), explosion_time) /obj/structure/mining_bomb/proc/boom() visible_message(span_danger("[src] explodes!")) diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index 69bcbe667c2..4e1298a57de 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -20,8 +20,8 @@ var/true_owner_ckey /obj/item/mod/module/eradication_lock/on_install() - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_mod_activation) - RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, .proc/on_mod_removal) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_mod_activation)) + RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, PROC_REF(on_mod_removal)) /obj/item/mod/module/eradication_lock/on_uninstall() UnregisterSignal(mod, COMSIG_MOD_ACTIVATE) @@ -74,10 +74,10 @@ playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE) //stops all mods from triggering during rewinding for(var/obj/item/mod/module/module as anything in mod.modules) - RegisterSignal(module, COMSIG_MODULE_TRIGGERED, .proc/on_module_triggered) + RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered)) mod.wearer.AddComponent(/datum/component/dejavu/timeline, 1, 10 SECONDS) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_block) - addtimer(CALLBACK(src, .proc/unblock_suit_activation), 10 SECONDS) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block)) + addtimer(CALLBACK(src, PROC_REF(unblock_suit_activation)), 10 SECONDS) ///Unregisters the modsuit deactivation blocking signal, after dejavu functionality finishes. /obj/item/mod/module/rewinder/proc/unblock_suit_activation() @@ -121,9 +121,9 @@ return //stops all mods from triggering during timestop- including timestop itself for(var/obj/item/mod/module/module as anything in mod.modules) - RegisterSignal(module, COMSIG_MODULE_TRIGGERED, .proc/on_module_triggered) + RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered)) timestop = new /obj/effect/timestop/channelled(get_turf(mod.wearer), 2, INFINITY, list(mod.wearer)) - RegisterSignal(timestop, COMSIG_PARENT_QDELETING, .proc/unblock_suit_activation) + RegisterSignal(timestop, COMSIG_PARENT_QDELETING, PROC_REF(unblock_suit_activation)) ///Unregisters the modsuit deactivation blocking signal, after timestop functionality finishes. /obj/item/mod/module/timestopper/proc/unblock_suit_activation(datum/source) @@ -176,7 +176,7 @@ mod.wearer.setStaminaLoss(0, 0) phased_mob = new(get_turf(mod.wearer.loc)) mod.wearer.forceMove(phased_mob) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_block) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block)) else //phasing in QDEL_NULL(phased_mob) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 63829177fd1..87e74f258df 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -82,7 +82,7 @@ if(active_program?.tap(A, user, params)) user.do_attack_animation(A) //Emulate this animation since we kill the attack in three lines playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1) //Likewise for the tap sound - addtimer(CALLBACK(src, .proc/play_ping), 0.5 SECONDS, TIMER_UNIQUE) //Slightly delayed ping to indicate success + addtimer(CALLBACK(src, PROC_REF(play_ping)), 0.5 SECONDS, TIMER_UNIQUE) //Slightly delayed ping to indicate success return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN return ..() @@ -426,7 +426,7 @@ var/mob/user = usr if(user && istype(user)) //Here to prevent programs sleeping in destroy - INVOKE_ASYNC(src, /datum/proc/ui_interact, user) // Re-open the UI on this computer. It should show the main screen now. + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) // Re-open the UI on this computer. It should show the main screen now. update_appearance() // Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on) diff --git a/code/modules/modular_computers/file_system/programs/alarm.dm b/code/modules/modular_computers/file_system/programs/alarm.dm index 134472c27e2..ddab298ae59 100644 --- a/code/modules/modular_computers/file_system/programs/alarm.dm +++ b/code/modules/modular_computers/file_system/programs/alarm.dm @@ -19,7 +19,7 @@ //Or if we're on station. Otherwise, die. var/list/allowed_areas = GLOB.the_station_areas + typesof(/area/mine) alert_control = new(computer, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), listener_areas = allowed_areas) - RegisterSignal(alert_control.listener, list(COMSIG_ALARM_TRIGGERED, COMSIG_ALARM_CLEARED), .proc/update_alarm_display) + RegisterSignal(alert_control.listener, list(COMSIG_ALARM_TRIGGERED, COMSIG_ALARM_CLEARED), PROC_REF(update_alarm_display)) return ..() /datum/computer_file/program/alarm_monitor/Destroy() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 4e5afa32a72..825283bf9c0 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -22,7 +22,7 @@ if(istype(computer, /obj/item/modular_computer/tablet/integrated)) //If this is a borg's integrated tablet var/obj/item/modular_computer/tablet/integrated/modularInterface = computer to_chat(modularInterface.borgo,span_userdanger("SYSTEM PURGE DETECTED/")) - addtimer(CALLBACK(modularInterface.borgo, /mob/living/silicon/robot/.proc/death), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(modularInterface.borgo, TYPE_PROC_REF(/mob/living/silicon/robot, death)), 2 SECONDS, TIMER_UNIQUE) return computer.visible_message(span_notice("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.")) diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm index 14c190a1903..b13e359284e 100644 --- a/code/modules/modular_computers/file_system/programs/radar.dm +++ b/code/modules/modular_computers/file_system/programs/radar.dm @@ -274,9 +274,9 @@ if(!.) return - RegisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED, .proc/on_nuke_armed) + RegisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED, PROC_REF(on_nuke_armed)) if(computer) - RegisterSignal(computer, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(computer, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/computer_file/program/radar/fission360/kill_program(forced) UnregisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED) diff --git a/code/modules/modular_computers/file_system/programs/signaler.dm b/code/modules/modular_computers/file_system/programs/signaler.dm index 125b43e4d67..a28fe8994f8 100644 --- a/code/modules/modular_computers/file_system/programs/signaler.dm +++ b/code/modules/modular_computers/file_system/programs/signaler.dm @@ -43,7 +43,7 @@ return switch(action) if("signal") - INVOKE_ASYNC(src, .proc/signal) + INVOKE_ASYNC(src, PROC_REF(signal)) . = TRUE if("freq") var/new_signal_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index 8490eae2467..8a1e8f5277f 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -55,7 +55,7 @@ if (!crystal.include_in_cims || !isturf(crystal.loc) || !(is_station_level(crystal.z) || is_mining_level(crystal.z) || crystal.z == user_turf.z)) continue supermatters.Add(crystal) - RegisterSignal(crystal, COMSIG_PARENT_QDELETING, .proc/react_to_del) + RegisterSignal(crystal, COMSIG_PARENT_QDELETING, PROC_REF(react_to_del)) /datum/computer_file/program/supermatter_monitor/proc/get_status() . = SUPERMATTER_INACTIVE @@ -71,8 +71,8 @@ */ /datum/computer_file/program/supermatter_monitor/proc/set_signals() if(active) - RegisterSignal(active, COMSIG_SUPERMATTER_DELAM_ALARM, .proc/send_alert, override = TRUE) - RegisterSignal(active, COMSIG_SUPERMATTER_DELAM_START_ALARM, .proc/send_start_alert, override = TRUE) + RegisterSignal(active, COMSIG_SUPERMATTER_DELAM_ALARM, PROC_REF(send_alert), override = TRUE) + RegisterSignal(active, COMSIG_SUPERMATTER_DELAM_START_ALARM, PROC_REF(send_start_alert), override = TRUE) /** * Removes the signal listener for Supermatter delaminations from the selected supermatter. diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index a446bf828db..30b1c21d19b 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -306,6 +306,6 @@ credits -= total_price say("Enjoy your new product!") state = 3 - addtimer(CALLBACK(src, .proc/reset_order), 100) + addtimer(CALLBACK(src, PROC_REF(reset_order)), 100) return TRUE return FALSE diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm index ff368603eba..1c554af437f 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm @@ -31,7 +31,7 @@ a_boost = FALSE to_chat(ninja, span_notice("You have used the adrenaline boost.")) s_coold = 6 - addtimer(CALLBACK(src, .proc/ninjaboost_after), 70) + addtimer(CALLBACK(src, PROC_REF(ninjaboost_after)), 70) /** * Proc called to inject the ninja with radium. diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm index 4220cca57df..51f150dba69 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list( playsound(ninja, 'sound/effects/sparks1.ogg', 10, TRUE) if (phase < NINJA_COMPLETE_PHASE) - addtimer(CALLBACK(src, .proc/ninitialize, delay, ninja, phase + 1), delay) + addtimer(CALLBACK(src, PROC_REF(ninitialize), delay, ninja, phase + 1), delay) /** * Deinitializes the ninja suit @@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list( playsound(ninja, 'sound/items/deconstruct.ogg', 10, TRUE) if (phase < NINJA_COMPLETE_PHASE) - addtimer(CALLBACK(src, .proc/deinitialize, delay, ninja, phase + 1), delay) + addtimer(CALLBACK(src, PROC_REF(deinitialize), delay, ninja, phase + 1), delay) else unlock_suit(ninja) ninja.regenerate_icons() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 668d92dc567..e837d35907b 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -104,7 +104,7 @@ return if(toppaper) UnregisterSignal(toppaper, COMSIG_ATOM_UPDATED_ICON) - RegisterSignal(weapon, COMSIG_ATOM_UPDATED_ICON, .proc/on_top_paper_change) + RegisterSignal(weapon, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_top_paper_change)) toppaper_ref = WEAKREF(weapon) to_chat(user, span_notice("You clip [weapon] onto [src].")) else if(istype(weapon, /obj/item/pen) && !pen) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index e2c5504c2ac..14e839e092e 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -250,7 +250,7 @@ throw_speed_on = 4, \ sharpness_on = SHARP_EDGED, \ w_class_on = WEIGHT_CLASS_NORMAL) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/pen/edagger/suicide_act(mob/user) . = BRUTELOSS diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 7b29aad80d6..7d5a6b679e2 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -61,7 +61,7 @@ var/list/data = list() data["has_item"] = !copier_empty() data["num_copies"] = num_copies - + try var/list/blanks = json_decode(file2text("config/blanks.json")) if (blanks != null) @@ -72,7 +72,7 @@ data["forms_exist"] = FALSE catch() data["forms_exist"] = FALSE - + if(photo_copy) data["is_photo"] = TRUE data["color_mode"] = color_mode @@ -111,19 +111,19 @@ return FALSE // Basic paper if(istype(paper_copy, /obj/item/paper)) - do_copy_loop(CALLBACK(src, .proc/make_paper_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy)), usr) return TRUE // Copying photo. if(photo_copy) - do_copy_loop(CALLBACK(src, .proc/make_photo_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy)), usr) return TRUE // Copying Documents. if(document_copy) - do_copy_loop(CALLBACK(src, .proc/make_document_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_document_copy)), usr) return TRUE // ASS COPY. By Miauw if(ass) - do_copy_loop(CALLBACK(src, .proc/make_ass_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_ass_copy)), usr) return TRUE // Remove the paper/photo/document from the photocopier. @@ -185,7 +185,7 @@ if (toner_cartridge.charges - PAPER_TONER_USE < 0) to_chat(usr, span_warning("There is not enough toner in [src] to print the form, please replace the cartridge.")) return FALSE - do_copy_loop(CALLBACK(src, .proc/make_blank_print), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_blank_print)), usr) var/obj/item/paper/printblank = new /obj/item/paper (loc) var/printname = params["name"] var/list/printinfo @@ -223,7 +223,7 @@ if(attempt_charge(src, user) & COMPONENT_OBJ_CANCEL_CHARGE) break addtimer(copy_cb, i SECONDS) - addtimer(CALLBACK(src, .proc/reset_busy), i SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_busy)), i SECONDS) /** * Sets busy to `FALSE`. Created as a proc so it can be used in callbacks. diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index 36dec11944e..a7db3565319 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -202,7 +202,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32) tickets += theirticket if(obj_flags & EMAGGED) //Emag the machine to destroy the HOP's life. ready = FALSE - addtimer(CALLBACK(src, .proc/reset_cooldown), cooldown)//Small cooldown to prevent piles of flaming tickets + addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown)//Small cooldown to prevent piles of flaming tickets theirticket.fire_act() user.dropItemToGround(theirticket) user.adjust_fire_stacks(1) diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index d2cbde580d8..57e912fd178 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -142,11 +142,11 @@ return on = FALSE - addtimer(CALLBACK(src, .proc/cooldown), cooldown) + addtimer(CALLBACK(src, PROC_REF(cooldown)), cooldown) icon_state = state_off - INVOKE_ASYNC(src, .proc/captureimage, target, user, picture_size_x - 1, picture_size_y - 1) + INVOKE_ASYNC(src, PROC_REF(captureimage), target, user, picture_size_x - 1, picture_size_y - 1) /obj/item/camera/proc/cooldown() @@ -163,7 +163,7 @@ /obj/item/camera/proc/captureimage(atom/target, mob/user, size_x = 1, size_y = 1) if(flash_enabled) set_light_on(TRUE) - addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) blending = TRUE var/turf/target_turf = get_turf(target) if(!isturf(target_turf)) @@ -280,13 +280,13 @@ picture_target = add_input_port("Picture Target", PORT_TYPE_ATOM) picture_coord_x = add_input_port("Picture Coordinate X", PORT_TYPE_NUMBER) picture_coord_y = add_input_port("Picture Coordinate Y", PORT_TYPE_NUMBER) - adjust_size_x = add_input_port("Picture Size X", PORT_TYPE_NUMBER, trigger = .proc/sanitize_picture_size) - adjust_size_y = add_input_port("Picture Size Y", PORT_TYPE_NUMBER, trigger = .proc/sanitize_picture_size) + adjust_size_x = add_input_port("Picture Size X", PORT_TYPE_NUMBER, trigger = PROC_REF(sanitize_picture_size)) + adjust_size_y = add_input_port("Picture Size Y", PORT_TYPE_NUMBER, trigger = PROC_REF(sanitize_picture_size)) /obj/item/circuit_component/camera/register_shell(atom/movable/shell) . = ..() camera = shell - RegisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED, .proc/on_image_captured) + RegisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED, PROC_REF(on_image_captured)) /obj/item/circuit_component/camera/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED) @@ -311,6 +311,6 @@ return if(!camera.can_target(target)) return - INVOKE_ASYNC(camera, /obj/item/camera.proc/captureimage, target, null, camera.picture_size_y - 1, camera.picture_size_y - 1) + INVOKE_ASYNC(camera, TYPE_PROC_REF(/obj/item/camera, captureimage), target, null, camera.picture_size_y - 1, camera.picture_size_y - 1) #undef CAMERA_PICTURE_SIZE_HARD_LIMIT diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index dfb9885c400..12e5b403122 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -129,7 +129,7 @@ All the important duct code: add_neighbour(D, direction) //Delegate to timer subsystem so its handled the next tick and doesnt cause byond to mistake it for an infinite loop and kill the game - addtimer(CALLBACK(D, .proc/attempt_connect)) + addtimer(CALLBACK(D, PROC_REF(attempt_connect))) return TRUE diff --git a/code/modules/plumbing/plumbers/fermenter.dm b/code/modules/plumbing/plumbers/fermenter.dm index 73f2d330495..a0e210fa60e 100644 --- a/code/modules/plumbing/plumbers/fermenter.dm +++ b/code/modules/plumbing/plumbers/fermenter.dm @@ -15,7 +15,7 @@ . = ..() AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index b8a2f6d0676..5400cb289de 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -14,7 +14,7 @@ . = ..() AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/plumbing/plumbers/plumbing_buffer.dm b/code/modules/plumbing/plumbers/plumbing_buffer.dm index 4ffd7fe0874..98616d8894d 100644 --- a/code/modules/plumbing/plumbers/plumbing_buffer.dm +++ b/code/modules/plumbing/plumbers/plumbing_buffer.dm @@ -20,8 +20,8 @@ /obj/machinery/plumbing/buffer/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/buffer/proc/on_reagents_del(datum/reagents/reagents) @@ -68,7 +68,7 @@ neighbour.attempt_connect() //technically this would runtime if you made about 200~ buffers add_overlay(icon_state + "_alert") - addtimer(CALLBACK(src, /atom/.proc/cut_overlay, icon_state + "_alert"), 20) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), icon_state + "_alert"), 20) /obj/machinery/plumbing/buffer/attack_hand_secondary(mob/user, modifiers) . = ..() diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm index 3268a6561cb..4d940680239 100644 --- a/code/modules/plumbing/plumbers/reaction_chamber.dm +++ b/code/modules/plumbing/plumbers/reaction_chamber.dm @@ -45,8 +45,8 @@ /obj/machinery/plumbing/reaction_chamber/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/reaction_chamber/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 75b7d94fcc3..21cf6501ae3 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -215,7 +215,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET name = "\improper [get_area_name(area, TRUE)] APC" set_machine_stat(machine_stat | MAINT) update_appearance() - addtimer(CALLBACK(src, .proc/update), 5) + addtimer(CALLBACK(src, PROC_REF(update)), 5) dir = ndir // offset APC_PIXEL_OFFSET pixels in direction of dir @@ -308,7 +308,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET make_terminal() - addtimer(CALLBACK(src, .proc/update), 5) + addtimer(CALLBACK(src, PROC_REF(update)), 5) /obj/machinery/power/apc/should_atmos_process(datum/gas_mixture/air, exposed_temperature) return (exposed_temperature > 2000) @@ -1098,7 +1098,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET for(var/obj/machinery/light/L in area) if(!initial(L.no_emergency)) //If there was an override set on creation, keep that override L.no_emergency = emergency_lights - INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE) + INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) CHECK_TICK return TRUE @@ -1121,7 +1121,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET return to_chat(malf, span_notice("Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")) malf.malfhack = src - malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE) + malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai, malfhacked), src), 600, TIMER_STOPPABLE) var/atom/movable/screen/alert/hackingapc/A A = malf.throw_alert(ALERT_HACKING_APC, /atom/movable/screen/alert/hackingapc) @@ -1473,7 +1473,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET environ = APC_CHANNEL_OFF update_appearance() update() - addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), 600) + addtimer(CALLBACK(src, PROC_REF(reset), APC_RESET_EMP), 600) /obj/machinery/power/apc/blob_act(obj/structure/blob/B) set_broken() @@ -1499,7 +1499,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET return if( cell && cell.charge>=20) cell.use(20) - INVOKE_ASYNC(src, .proc/break_lights) + INVOKE_ASYNC(src, PROC_REF(break_lights)) /obj/machinery/power/apc/proc/break_lights() for(var/obj/machinery/light/L in area) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8610cbb8aab..a781e86d4a6 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri GLOB.cable_list += src //add it to the global cable list Connect_cable() AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_eat)) /obj/structure/cable/proc/on_rat_eat(datum/source, mob/living/simple_animal/hostile/regalrat/king) SIGNAL_HANDLER @@ -389,7 +389,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(first) first = FALSE continue - addtimer(CALLBACK(O, .proc/auto_propagate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables + addtimer(CALLBACK(O, PROC_REF(auto_propagate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables /////////////////////////////////////////////// // The cable coil object, used for laying cable @@ -493,7 +493,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri "Cable restraints" = restraints_icon ) - var/layer_result = show_radial_menu(user, src, radial_menu, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/layer_result = show_radial_menu(user, src, radial_menu, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(layer_result) @@ -720,7 +720,7 @@ GLOBAL_LIST(hub_radial_layer_list) "Machinery" = image(icon = 'icons/obj/power.dmi', icon_state = "smes") ) - var/layer_result = show_radial_menu(user, src, GLOB.hub_radial_layer_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/layer_result = show_radial_menu(user, src, GLOB.hub_radial_layer_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return var/CL @@ -768,7 +768,7 @@ GLOBAL_LIST(hub_radial_layer_list) /obj/structure/cable/multilayer/CtrlClick(mob/living/user) to_chat(user, span_warning("You push the reset button.")) - addtimer(CALLBACK(src, .proc/Reload), 10, TIMER_UNIQUE) //spam protect + addtimer(CALLBACK(src, PROC_REF(Reload)), 10, TIMER_UNIQUE) //spam protect // This is a mapping aid. In order for this to be placed on a map and function, all three layers need to have their nodes active /obj/structure/cable/multilayer/connected diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 8cbadc0cde6..14fdf4885b9 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -62,8 +62,8 @@ /obj/item/stock_parts/cell/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/item/stock_parts/cell/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 4f347151b76..18f7111eb7e 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -83,7 +83,7 @@ if(start_with_cell && !no_emergency) cell = new/obj/item/stock_parts/cell/emergency_light(src) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) AddElement(/datum/element/atmos_sensitive, mapload) return INITIALIZE_HINT_LATELOAD @@ -96,7 +96,7 @@ if("bulb") if(prob(5)) break_light_tube(TRUE) - addtimer(CALLBACK(src, .proc/update, FALSE), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(update), FALSE), 0.1 SECONDS) /obj/machinery/light/Destroy() var/area/local_area = get_area(src) @@ -200,7 +200,7 @@ if(!start_only) do_sparks(3, TRUE, src) var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX) - addtimer(CALLBACK(src, .proc/broken_sparks), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT) + addtimer(CALLBACK(src, PROC_REF(broken_sparks)), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT) /obj/machinery/light/process() if (!cell) diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index c9a39ba40fc..6d3bbc25a04 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -79,7 +79,7 @@ AddComponent(/datum/component/caltrop, min_damage = force) update() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -95,8 +95,8 @@ /obj/item/light/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /** * Handles rigging the cell if it contains enough plasma. diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 0d78d59e03f..fb61db2cddb 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -210,7 +210,7 @@ By design, d1 is the smallest direction and d2 is the highest pipe_icon.color = pipe_cleaner_colors[color] possible_colors += list("[color]" = pipe_icon) - var/selected_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE) + var/selected_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE) if(!selected_color) return color = pipe_cleaner_colors[selected_color] diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 1c4b621da8c..780942a630a 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -19,7 +19,7 @@ /obj/machinery/power/Destroy() disconnect_from_network() - addtimer(CALLBACK(GLOBAL_PROC, .proc/update_cable_icons_on_turf, get_turf(src)), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(update_cable_icons_on_turf), get_turf(src)), 3) return ..() /////////////////////////////// diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index 2b41ee3a282..cdeb292b312 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -71,7 +71,7 @@ span_hear("You hear a loud electrical crack!")) playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) - addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, src, 2, 3, 4, null, 8), 10 SECONDS) // Not a normal explosion. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), src, 2, 3, 4, null, ), 10 SECONDS) // Not a normal explosion. /obj/machinery/power/rtg/abductor/bullet_act(obj/projectile/Proj) . = ..() diff --git a/code/modules/power/singularity/boh_tear.dm b/code/modules/power/singularity/boh_tear.dm index 651579515d3..4397e31ff76 100644 --- a/code/modules/power/singularity/boh_tear.dm +++ b/code/modules/power/singularity/boh_tear.dm @@ -41,7 +41,7 @@ to_chat(jedi, span_userdanger("You don't feel like you are real anymore.")) jedi.dust_animation() jedi.spawn_dust() - addtimer(CALLBACK(src, /atom/proc/attack_hand, jedi), 0.5 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, attack_hand), jedi), 0.5 SECONDS) return COMPONENT_CANCEL_ATTACK_CHAIN #undef BOH_TEAR_CONSUME_RANGE diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index fb9abb17a68..00cbfc414f5 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -22,9 +22,9 @@ /obj/machinery/field/containment/Initialize(mapload) . = ..() air_update_turf(TRUE, TRUE) - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -162,4 +162,4 @@ to_chat(considered_atom, span_userdanger("The field repels you with tremendous force!")) playsound(src, 'sound/effects/gravhit.ogg', 50, TRUE) considered_atom.throw_at(target, 200, 4) - addtimer(CALLBACK(src, .proc/clear_shock), 5) + addtimer(CALLBACK(src, PROC_REF(clear_shock)), 5) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 7e60c9f7fad..cac9d62c6b2 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -66,7 +66,7 @@ no power level overlay is currently in the overlays list. . = ..() fields = list() connected_gens = list() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity_if_active) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) /obj/machinery/field/generator/anchored/Initialize(mapload) . = ..() @@ -201,8 +201,8 @@ no power level overlay is currently in the overlays list. active = FG_OFFLINE can_atmos_pass = ATMOS_PASS_YES air_update_turf(TRUE, FALSE) - INVOKE_ASYNC(src, .proc/cleanup) - addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS) + INVOKE_ASYNC(src, PROC_REF(cleanup)) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS) /obj/machinery/field/generator/proc/cool_down() if(active || warming_up <= 0) @@ -210,11 +210,11 @@ no power level overlay is currently in the overlays list. warming_up-- update_appearance() if(warming_up > 0) - addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS) /obj/machinery/field/generator/proc/turn_on() active = FG_CHARGING - addtimer(CALLBACK(src, .proc/warm_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(warm_up)), 5 SECONDS) /obj/machinery/field/generator/proc/warm_up() if(!active) @@ -224,7 +224,7 @@ no power level overlay is currently in the overlays list. if(warming_up >= 3) start_fields() else - addtimer(CALLBACK(src, .proc/warm_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(warm_up)), 5 SECONDS) /obj/machinery/field/generator/proc/calc_power(set_power_draw) var/power_draw = 2 + fields.len @@ -277,10 +277,10 @@ no power level overlay is currently in the overlays list. move_resist = INFINITY can_atmos_pass = ATMOS_PASS_NO air_update_turf(TRUE, TRUE) - addtimer(CALLBACK(src, .proc/setup_field, 1), 1) - addtimer(CALLBACK(src, .proc/setup_field, 2), 2) - addtimer(CALLBACK(src, .proc/setup_field, 4), 3) - addtimer(CALLBACK(src, .proc/setup_field, 8), 4) + addtimer(CALLBACK(src, PROC_REF(setup_field), 1), 1) + addtimer(CALLBACK(src, PROC_REF(setup_field), 2), 2) + addtimer(CALLBACK(src, PROC_REF(setup_field), 4), 3) + addtimer(CALLBACK(src, PROC_REF(setup_field), 8), 4) addtimer(VARSET_CALLBACK(src, active, FG_ONLINE), 5) /obj/machinery/field/generator/proc/setup_field(NSEW) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 93355b1828f..14456670a83 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -44,7 +44,7 @@ singularity = WEAKREF(AddComponent( /datum/component/singularity, \ bsa_targetable = FALSE, \ - consume_callback = CALLBACK(src, .proc/consume), \ + consume_callback = CALLBACK(src, PROC_REF(consume)), \ consume_range = NARSIE_CONSUME_RANGE, \ disregard_failed_movements = TRUE, \ grav_pull = NARSIE_GRAV_PULL, \ @@ -87,7 +87,7 @@ souls_needed[player] = TRUE soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75) - INVOKE_ASYNC(GLOBAL_PROC, .proc/begin_the_end) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(begin_the_end)) /obj/narsie/Destroy() send_to_playing_players(span_narsie("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"")) @@ -194,7 +194,7 @@ /obj/narsie/proc/narsie_spawn_animation() setDir(SOUTH) flick("narsie_spawn_anim", src) - addtimer(CALLBACK(src, .proc/narsie_spawn_animation_end), 3.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(narsie_spawn_animation_end)), 3.5 SECONDS) /obj/narsie/proc/narsie_spawn_animation_end() var/datum/component/singularity/singularity_component = singularity.resolve() @@ -211,34 +211,34 @@ * * [/proc/cult_ending_helper()] */ /proc/begin_the_end() - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_end_begin_check), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_end_begin_check)), 5 SECONDS) ///First crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_end_begin_check() if(QDELETED(GLOB.cult_narsie)) // uno priority_announce("Status report? We detected an anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, 2), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2), 2 SECONDS) return priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg') - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_end_second_check), 50 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_end_second_check)), 50 SECONDS) ///Second crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_end_second_check() if(QDELETED(GLOB.cult_narsie)) // dos priority_announce("Simulations aborted, sensors report that the acasual event is normalizing. Good work, crew.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, 2), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2), 2 SECONDS) return priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs") - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_start_destroy_station), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_start_destroy_station)), 5 SECONDS) ///security level and shuttle lockdowns for [/proc/begin_the_end()] /proc/narsie_start_destroy_station() set_security_level("delta") SSshuttle.registerHostileEnvironment(GLOB.cult_narsie) SSshuttle.lockdown = TRUE - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_apocalypse), 1 MINUTES) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_apocalypse)), 1 MINUTES) ///Third crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_apocalypse() @@ -246,18 +246,18 @@ priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') SSshuttle.clearHostileEnvironment(GLOB.cult_narsie) GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_last_second_win), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_last_second_win)), 2 SECONDS) return if(GLOB.cult_narsie.resolved == FALSE) GLOB.cult_narsie.resolved = TRUE sound_to_playing_players('sound/machines/alarm.ogg') - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 12 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 12 SECONDS) ///Called only if the crew managed to destroy narsie at the very last second for [/proc/begin_the_end()] /proc/narsie_last_second_win() set_security_level("red") SSshuttle.lockdown = FALSE - INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2) + INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(cult_ending_helper), 2) ///Helper to set the round to end asap. Current usage Cult round end code /proc/ending_helper() @@ -269,11 +269,11 @@ */ /proc/cult_ending_helper(ending_type = 0) if(ending_type == 2) //narsie fukkin died - Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) + Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) else if(ending_type) //no explosion - Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) + Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) else // explosion - Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) + Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) #undef NARSIE_CHANCE_TO_PICK_NEW_TARGET #undef NARSIE_CONSUME_RANGE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 16253e11401..4b10dafbb7c 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -53,7 +53,7 @@ var/datum/component/singularity/new_component = AddComponent( /datum/component/singularity, \ - consume_callback = CALLBACK(src, .proc/consume), \ + consume_callback = CALLBACK(src, PROC_REF(consume)), \ ) singularity_component = WEAKREF(new_component) @@ -102,7 +102,7 @@ rip_u.dismember(BURN) //nice try jedi qdel(rip_u) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/carbon_tk_part_two, jedi), 0.1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(carbon_tk_part_two), jedi), 0.1 SECONDS) /obj/singularity/proc/carbon_tk_part_two(mob/living/carbon/jedi) if(QDELETED(jedi)) @@ -118,7 +118,7 @@ rip_u.dismember(BURN) qdel(rip_u) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/carbon_tk_part_three, jedi), 0.1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(carbon_tk_part_three), jedi), 0.1 SECONDS) /obj/singularity/proc/carbon_tk_part_three(mob/living/carbon/jedi) if(QDELETED(jedi)) @@ -441,7 +441,7 @@ return gain /obj/singularity/deadchat_plays(mode = DEMOCRACY_MODE, cooldown = 12 SECONDS) - . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 2441cdcf41e..10dc6228754 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -38,7 +38,7 @@ panel.plane = ABOVE_GAME_PLANE Make(S) connect_to_network() - RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/queue_update_solar_exposure) + RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(queue_update_solar_exposure)) /obj/machinery/power/solar/Destroy() unset_control() //remove from control computer @@ -317,7 +317,7 @@ /obj/machinery/power/solar_control/Initialize(mapload) . = ..() azimuth_rate = SSsun.base_rotation - RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/timed_track) + RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(timed_track)) connect_to_network() if(powernet) set_panels(azimuth_target) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f6401e52231..7adeaa3566f 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -264,10 +264,10 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) GLOB.main_supermatter_engine = src AddElement(/datum/element/bsa_blocker) - RegisterSignal(src, COMSIG_ATOM_BSA_BEAM, .proc/call_explode) + RegisterSignal(src, COMSIG_ATOM_BSA_BEAM, PROC_REF(call_explode)) var/static/list/loc_connections = list( - COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = .proc/tram_contents_consume, + COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = PROC_REF(tram_contents_consume), ) AddElement(/datum/element/connect_loc, loc_connections) //Speficially for the tram, hacky diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 996a4f887db..f2555177fa6 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -89,7 +89,7 @@ if(!anchored || panel_open) return ..() obj_flags |= BEING_SHOCKED - addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 1 SECONDS) flick("coilhit", src) if(!(zap_flags & ZAP_GENERATES_POWER)) //Prevent infinite recursive power return 0 diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index d25cb645c78..9a4243b1cfb 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -127,7 +127,7 @@ energy_to_raise = energy_to_raise * 1.25 playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30) - addtimer(CALLBACK(src, .proc/new_mini_ball), 100) + addtimer(CALLBACK(src, PROC_REF(new_mini_ball)), 100) else if(energy < energy_to_lower && orbiting_balls.len) energy_to_raise = energy_to_raise / 1.25 energy_to_lower = (energy_to_raise / 1.25) - 20 diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 47a8c963b98..d2eac8ce502 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -20,7 +20,7 @@ . = ..() Make(S) connect_to_network() - RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/sun_update) + RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(sun_update)) /obj/machinery/power/tracker/Destroy() unset_control() //remove from control computer diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 546a5bfdbc8..faecf0a92b7 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -107,7 +107,7 @@ if(!modules || !modules.len) return for(var/datum/map_generator_module/mod in modules) - INVOKE_ASYNC(mod, /datum/map_generator_module.proc/generate) + INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, generate)) //Requests the mapGeneratorModule(s) to (re)generate this one turf @@ -118,7 +118,7 @@ if(!modules || !modules.len) return for(var/datum/map_generator_module/mod in modules) - INVOKE_ASYNC(mod, /datum/map_generator_module.proc/place, T) + INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, place), T) //Replaces all paths in the module list with actual module datums diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm index af15418927d..4430263e583 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -56,7 +56,7 @@ return ..() /*/obj/item/ammo_casing/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_ammo) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out. + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ammo) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out.) /** * @@ -137,6 +137,6 @@ SpinAnimation(10, 1) var/turf/T = get_turf(src) if(still_warm && T?.bullet_sizzle) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/items/welder.ogg', 20, 1), bounce_delay) //If the turf is made of water and the shell casing is still hot, make a sizzling sound when it's ejected. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/items/welder.ogg', 20, 1), bounce_delay) //If the turf is made of water and the shell casing is still hot, make a sizzling sound when it's ejected. else if(T?.bullet_bounce_sound) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, T.bullet_bounce_sound, 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, T.bullet_bounce_sound, 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them. diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 663852c9a9c..017980bd39a 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -43,7 +43,7 @@ top_off(starting=TRUE) /*/obj/item/ammo_box/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_box) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out. + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_box) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out.) /obj/item/ammo_box/proc/add_notes_box() var/list/readout = list() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 5032f110c82..fe1f8936c59 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -294,7 +294,7 @@ else if(G.can_trigger_gun(user)) bonus_spread += dual_wield_spread loop_counter++ - addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter) + addtimer(CALLBACK(G, TYPE_PROC_REF(/obj/item/gun, process_fire), target, user, TRUE, params, null, bonus_spread), loop_counter) return process_fire(target, user, TRUE, params, null, bonus_spread) @@ -402,7 +402,7 @@ if(burst_size > 1) firing_burst = TRUE for(var/i = 1 to burst_size) - addtimer(CALLBACK(src, .proc/process_burst, user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), modified_delay * (i - 1)) + addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), modified_delay * (i - 1)) else if(chambered) if(user && HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. @@ -428,7 +428,7 @@ process_chamber(shooter = user) update_appearance() semicd = TRUE - addtimer(CALLBACK(src, .proc/reset_semicd), modified_delay) + addtimer(CALLBACK(src, PROC_REF(reset_semicd)), modified_delay) if(user) user.update_inv_hands() diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 5053e6f30d4..d257a5ccb6b 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -131,10 +131,10 @@ else chamber_round(replace_new_round = TRUE) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_reload) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_reload)) /* /obj/item/gun/ballistic/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_ballistic) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out. + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ballistic) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out.) /** * @@ -551,7 +551,7 @@ var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) B.Remove(user) B.forceMove(T) - var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, user) + var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_atom_to_turf), /obj/effect/gibspawner/generic, B, 1, FALSE, user) B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner) return(BRUTELOSS) else diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm index 224f1dc09f0..3a719fde29c 100644 --- a/code/modules/projectiles/guns/ballistic/bow.dm +++ b/code/modules/projectiles/guns/ballistic/bow.dm @@ -77,7 +77,7 @@ /obj/item/ammo_casing/caseless/arrow/despawning/dropped() . = ..() - addtimer(CALLBACK(src, .proc/floor_vanish), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 5 SECONDS) /obj/item/ammo_casing/caseless/arrow/despawning/proc/floor_vanish() if(isturf(loc)) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 84b1d02e0e6..b38f9a29f24 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -58,10 +58,10 @@ if(selfcharge) START_PROCESSING(SSobj, src) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge)) /* /obj/item/gun/energy/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_energy) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out. + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_energy) //MOJAVE EDIT - Comments out this proc because weapon_description in general is commented out.) /** * diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm index 370b98177c1..f07d62c1121 100644 --- a/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -237,7 +237,7 @@ if(aiming) delay_penalty(aiming_time_increase_user_movement) process_aim() - INVOKE_ASYNC(src, .proc/aiming_beam, TRUE) + INVOKE_ASYNC(src, PROC_REF(aiming_beam), TRUE) /obj/item/gun/energy/beam_rifle/proc/start_aiming() aiming_time_left = aiming_time @@ -265,7 +265,7 @@ current_user = null if(istype(user)) current_user = user - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move)) listeningTo = user /obj/item/gun/energy/beam_rifle/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 5c3ce77b736..acb431fb9cb 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -107,7 +107,7 @@ if(!QDELING(src) && !holds_charge) // Put it on a delay because moving item from slot to hand // calls dropped(). - addtimer(CALLBACK(src, .proc/empty_if_not_held), 2) + addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 2) /obj/item/gun/energy/kinetic_accelerator/proc/empty_if_not_held() if(!ismob(loc)) @@ -138,7 +138,7 @@ carried = 1 deltimer(recharge_timerid) - recharge_timerid = addtimer(CALLBACK(src, .proc/reload), recharge_time * carried, TIMER_STOPPABLE) + recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE) /obj/item/gun/energy/kinetic_accelerator/emp_act(severity) return diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 4ea68efdd1c..77a1bbbb0e0 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -302,7 +302,7 @@ /obj/item/gun/energy/wormhole_projector/proc/create_portal(obj/projectile/beam/wormhole/W, turf/target) var/obj/effect/portal/P = new /obj/effect/portal(target, 300, null, FALSE, null) - RegisterSignal(P, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) + RegisterSignal(P, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) if(istype(W, /obj/projectile/beam/wormhole/orange)) qdel(p_orange) p_orange = P diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 0565a6d330b..2da069bad13 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -57,7 +57,7 @@ chambered = new ammo_type(src) if(can_charge) START_PROCESSING(SSobj, src) - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge)) /obj/item/gun/magic/Destroy() diff --git a/code/modules/projectiles/guns/special/blastcannon.dm b/code/modules/projectiles/guns/special/blastcannon.dm index b9a89658028..497547f2058 100644 --- a/code/modules/projectiles/guns/special/blastcannon.dm +++ b/code/modules/projectiles/guns/special/blastcannon.dm @@ -51,7 +51,7 @@ . = ..() if(!pin) pin = new - RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/channel_blastwave) + RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, PROC_REF(channel_blastwave)) AddElement(/datum/element/update_icon_updates_onmob) /obj/item/gun/blastcannon/Destroy() @@ -161,15 +161,15 @@ return if(!ismob(loc)) - INVOKE_ASYNC(src, .proc/fire_dropped, heavy, medium, light) + INVOKE_ASYNC(src, PROC_REF(fire_dropped), heavy, medium, light) return var/mob/holding = loc var/target = cached_target?.resolve() if(target && (holding.get_active_held_item() == src) && cached_firer && (holding == cached_firer.resolve())) - INVOKE_ASYNC(src, .proc/fire_intentionally, target, holding, heavy, medium, light, cached_modifiers) + INVOKE_ASYNC(src, PROC_REF(fire_intentionally), target, holding, heavy, medium, light, cached_modifiers) else - INVOKE_ASYNC(src, .proc/fire_accidentally, holding, heavy, medium, light) + INVOKE_ASYNC(src, PROC_REF(fire_accidentally), holding, heavy, medium, light) return /** diff --git a/code/modules/projectiles/guns/special/grenade_launcher.dm b/code/modules/projectiles/guns/special/grenade_launcher.dm index 89b6e48cac1..b31197089bc 100644 --- a/code/modules/projectiles/guns/special/grenade_launcher.dm +++ b/code/modules/projectiles/guns/special/grenade_launcher.dm @@ -45,4 +45,4 @@ F.active = 1 F.icon_state = initial(F.icon_state) + "_active" playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) - addtimer(CALLBACK(F, /obj/item/grenade.proc/detonate), 15) + addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade, detonate)), 15) diff --git a/code/modules/projectiles/guns/special/medbeam.dm b/code/modules/projectiles/guns/special/medbeam.dm index 26a41fddee0..ccab7c6960d 100644 --- a/code/modules/projectiles/guns/special/medbeam.dm +++ b/code/modules/projectiles/guns/special/medbeam.dm @@ -68,7 +68,7 @@ current_target = target active = TRUE current_beam = user.Beam(current_target, icon_state="medbeam", time = 10 MINUTES, maxdistance = max_range, beam_type = /obj/effect/ebeam/medical) - RegisterSignal(current_beam, COMSIG_PARENT_QDELETING, .proc/beam_died)//this is a WAY better rangecheck than what was done before (process check) + RegisterSignal(current_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died)) //this is a WAY better rangecheck than what was done before (process check) SSblackbox.record_feedback("tally", "gun_fired", 1, type) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 96476b81a47..c4f1380b143 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -174,7 +174,7 @@ ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes var/embed_falloff_tile var/static/list/projectile_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) /obj/projectile/Initialize(mapload) diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm index 6b454e1d5d8..851c2eebe94 100644 --- a/code/modules/projectiles/projectile/energy/net_snare.dm +++ b/code/modules/projectiles/projectile/energy/net_snare.dm @@ -40,7 +40,7 @@ else com.target_ref = null - addtimer(CALLBACK(src, .proc/pop, teletarget), 30) + addtimer(CALLBACK(src, PROC_REF(pop), teletarget), 30) /obj/effect/nettingportal/proc/pop(teletarget) if(teletarget) diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 655a82c69d0..2b8c789146e 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -23,7 +23,7 @@ if(C.dna && C.dna.check_mutation(/datum/mutation/human/hulk)) C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") else if((C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE)) - addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, jitter), 5) + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), jitter), 5) /obj/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet do_sparks(1, TRUE, src) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index bdb3487648d..e75519b6d78 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -291,7 +291,7 @@ /obj/structure/closet/decay/Initialize(mapload) . = ..() if(auto_destroy) - addtimer(CALLBACK(src, .proc/bust_open), 5 MINUTES) + addtimer(CALLBACK(src, PROC_REF(bust_open)), 5 MINUTES) /obj/structure/closet/decay/after_weld(weld_state) if(weld_state) @@ -307,12 +307,12 @@ icon_state = weakened_icon update_appearance() - addtimer(CALLBACK(src, .proc/decay), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS) ///Fade away into nothing /obj/structure/closet/decay/proc/decay() animate(src, alpha = 0, time = 3 SECONDS) - addtimer(CALLBACK(src, .proc/decay_finished), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(decay_finished)), 3 SECONDS) /obj/structure/closet/decay/proc/decay_finished() dump_contents() diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm index 718b9520932..73caa607b83 100644 --- a/code/modules/projectiles/projectile/special/hallucination.dm +++ b/code/modules/projectiles/projectile/special/hallucination.dm @@ -100,7 +100,7 @@ layer = ABOVE_MOB_LAYER hal_target.client.images += blood animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 5) - addtimer(CALLBACK(src, .proc/cleanup_blood), 5) + addtimer(CALLBACK(src, PROC_REF(cleanup_blood)), 5) /obj/projectile/hallucination/proc/cleanup_blood(image/blood) hal_target.client.images -= blood @@ -171,7 +171,7 @@ if(hal_target.dna && hal_target.dna.check_mutation(/datum/mutation/human/hulk)) hal_target.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") else if((hal_target.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(hal_target, TRAIT_STUNIMMUNE)) - addtimer(CALLBACK(hal_target, /mob/living/carbon.proc/do_jitter_animation, 20), 5) + addtimer(CALLBACK(hal_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 20), 5) /obj/projectile/hallucination/disabler name = "disabler beam" diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index 31b49f713d7..9d8349883af 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -311,7 +311,7 @@ /obj/item/thermometer/ui_close(mob/user) . = ..() - INVOKE_ASYNC(src, .proc/remove_thermometer, user) + INVOKE_ASYNC(src, PROC_REF(remove_thermometer), user) /obj/item/thermometer/ui_status(mob/user) if(!(in_range(src, user))) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 621ce65cdc8..a228ed321f6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -89,11 +89,11 @@ /obj/machinery/chem_dispenser/Initialize(mapload) . = ..() - dispensable_reagents = sort_list(dispensable_reagents, /proc/cmp_reagents_asc) + dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) if(emagged_reagents) - emagged_reagents = sort_list(emagged_reagents, /proc/cmp_reagents_asc) + emagged_reagents = sort_list(emagged_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) if(upgrade_reagents) - upgrade_reagents = sort_list(upgrade_reagents, /proc/cmp_reagents_asc) + upgrade_reagents = sort_list(upgrade_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) if(is_operational) begin_processing() update_appearance() diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 0c9b9d5cf7c..01699914c4c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -76,7 +76,7 @@ beaker = null if(new_beaker) beaker = new_beaker - RegisterSignal(beaker.reagents, COMSIG_REAGENTS_REACTION_STEP, .proc/on_reaction_step) + RegisterSignal(beaker.reagents, COMSIG_REAGENTS_REACTION_STEP, PROC_REF(on_reaction_step)) update_appearance() return TRUE @@ -212,7 +212,7 @@ */ /obj/machinery/chem_heater/proc/add_ui_client_list(new_ui) LAZYADD(ui_client_list, new_ui) - RegisterSignal(new_ui, COMSIG_PARENT_QDELETING, .proc/on_ui_deletion) + RegisterSignal(new_ui, COMSIG_PARENT_QDELETING, PROC_REF(on_ui_deletion)) ///This removes an open ui instance from the ui list and deregsiters the signal /obj/machinery/chem_heater/proc/remove_ui_client_list(old_ui) @@ -458,17 +458,16 @@ To continue set your target temperature to 390K."} /obj/machinery/chem_heater/proc/get_purity_color(datum/equilibrium/equilibrium) var/_reagent = equilibrium.reaction.results[1] var/datum/reagent/reagent = equilibrium.holder.get_reagent(_reagent) - switch(reagent.purity) - if(1 to INFINITY) - return "blue" - if(0.8 to 1) - return "green" - if(reagent.inverse_chem_val to 0.8) - return "olive" - if(equilibrium.reaction.purity_min to reagent.inverse_chem_val) - return "orange" - if(-INFINITY to equilibrium.reaction.purity_min) - return "red" + if(reagent.purity in 1 to INFINITY) + return "blue" + else if(reagent.purity in 0.8 to 1) + return "green" + else if(reagent.purity in reagent.inverse_chem_val to 0.8) + return "olive" + else if(reagent.purity in equilibrium.reaction.purity_min to reagent.inverse_chem_val) + return "orange" + else if(reagent.purity in -INFINITY to equilibrium.reaction.purity_min) + return "red" //Has a lot of buffer and is upgraded /obj/machinery/chem_heater/debug diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 41e46defec1..611c2c6f513 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -220,7 +220,7 @@ update_appearance() var/turf/source_turf = get_turf(src) log_virus("A culture bottle was printed for the virus [A.admin_details()] at [loc_name(source_turf)] by [key_name(usr)]") - addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50) + addtimer(CALLBACK(src, PROC_REF(reset_replicator_cooldown)), 50) . = TRUE if("create_vaccine_bottle") if (wait) @@ -232,7 +232,7 @@ B.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id)) wait = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 200) + addtimer(CALLBACK(src, PROC_REF(reset_replicator_cooldown)), 200) . = TRUE diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 51b31a3a05f..720bc290a54 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -254,7 +254,7 @@ var/offset = prob(50) ? -2 : 2 var/old_pixel_x = pixel_x animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = -1) //start shaking - addtimer(CALLBACK(src, .proc/stop_shaking, old_pixel_x), duration) + addtimer(CALLBACK(src, PROC_REF(stop_shaking), old_pixel_x), duration) /obj/machinery/reagentgrinder/proc/stop_shaking(old_px) animate(src) @@ -268,7 +268,7 @@ playsound(src, 'sound/machines/blender.ogg', 50, TRUE) else playsound(src, 'sound/machines/juicer.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/stop_operating), time / speed) + addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed) /obj/machinery/reagentgrinder/proc/stop_operating() operating = FALSE diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index b7ffdbfef6c..d99c10c0c8f 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2164,7 +2164,7 @@ All effects don't start immediately, but rather get worse over time; the rate is var/minimum_name_percent = 0.35 name = "" - var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE) + var/list/names_in_order = sortTim(names, GLOBAL_PROC_REF(cmp_numeric_dsc), TRUE) var/named = FALSE for(var/fruit_name in names) if(names[fruit_name] >= minimum_name_percent) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 71686778ae6..2f53bee3cdf 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -518,8 +518,8 @@ . = ..() SEND_SIGNAL(dancer, COMSIG_ADD_MOOD_EVENT, "vibing", /datum/mood_event/high, name) - RegisterSignal(dancer, COMSIG_MOB_EMOTED("flip"), .proc/on_flip) - RegisterSignal(dancer, COMSIG_MOB_EMOTED("spin"), .proc/on_spin) + RegisterSignal(dancer, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) + RegisterSignal(dancer, COMSIG_MOB_EMOTED("spin"), PROC_REF(on_spin)) if(!dancer.hud_used) return @@ -641,7 +641,7 @@ . = ..() playsound(invisible_man, 'sound/chemistry/saturnx_fade.ogg', 40) to_chat(invisible_man, span_nicegreen("You feel pins and needles all over your skin as your body suddenly becomes transparent!")) - addtimer(CALLBACK(src, .proc/turn_man_invisible, invisible_man), 10) //just a quick delay to synch up the sound. + addtimer(CALLBACK(src, PROC_REF(turn_man_invisible), invisible_man), 10) //just a quick delay to synch up the sound. if(!invisible_man.hud_used) return diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 63e4eaa1aa2..797bdb46fa6 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -367,7 +367,7 @@ victim.set_confusion(max(exposed_mob.get_confusion(), 5)) // 10 seconds victim.Knockdown(3 SECONDS) victim.add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray) - addtimer(CALLBACK(victim, /mob.proc/remove_movespeed_modifier, /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS) + addtimer(CALLBACK(victim, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS) victim.update_damage_hud() if(methods & INGEST) if(!holder.has_reagent(/datum/reagent/consumable/milk)) @@ -765,7 +765,7 @@ /datum/reagent/consumable/tinlux/proc/add_reagent_light(mob/living/living_holder) var/obj/effect/dummy/lighting_obj/moblight/mob_light_obj = living_holder.mob_light(2) LAZYSET(mobs_affected, living_holder, mob_light_obj) - RegisterSignal(living_holder, COMSIG_PARENT_QDELETING, .proc/on_living_holder_deletion) + RegisterSignal(living_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_living_holder_deletion)) /datum/reagent/consumable/tinlux/proc/remove_reagent_light(mob/living/living_holder) UnregisterSignal(living_holder, COMSIG_PARENT_QDELETING) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index c1015a3cd4f..9d2ba2a76e0 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -88,7 +88,7 @@ Basically, we fill the time between now and 2s from now with hands based off the var/hands = 1 var/time = 2 / delta_time while(hands < delta_time) //we already made a hand now so start from 1 - LAZYADD(timer_ids, addtimer(CALLBACK(src, .proc/spawn_hands, owner), (time*hands) SECONDS, TIMER_STOPPABLE)) //keep track of all the timers we set up + LAZYADD(timer_ids, addtimer(CALLBACK(src, PROC_REF(spawn_hands), owner), (time*hands) SECONDS, TIMER_STOPPABLE)) //keep track of all the timers we set up hands += time return ..() @@ -141,8 +141,8 @@ Basically, we fill the time between now and 2s from now with hands based off the var/mob/living/carbon/consumer = L if(!consumer) return - RegisterSignal(consumer, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(consumer, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(consumer, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(consumer, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/liver/this_liver = consumer.getorganslot(ORGAN_SLOT_LIVER) this_liver.alcohol_tolerance *= 2 @@ -368,8 +368,8 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/inverse/healing/convermol/on_mob_add(mob/living/owner, amount) . = ..() - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/lungs/lungs = owner.getorganslot(ORGAN_SLOT_LUNGS) if(!lungs) return @@ -697,8 +697,8 @@ Basically, we fill the time between now and 2s from now with hands based off the original_heart.organ_flags |= ORGAN_FROZEN //Not actually frozen, but we want to pause decay manual_heart.Insert(carbon_mob, special = TRUE) //these last so instert doesn't call them - RegisterSignal(carbon_mob, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(carbon_mob, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(carbon_mob, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(carbon_mob, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) to_chat(owner, span_userdanger("You feel your heart suddenly stop beating on it's own - you'll have to manually beat it!")) ..() @@ -799,7 +799,7 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/owner, delta_time, times_fired) randomSpan = pick(list("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia")) - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) to_chat(owner, span_warning("Your hearing seems to be a bit off!")) ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 259e4219589..e77e7b1a2c8 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -652,8 +652,8 @@ /datum/reagent/medicine/oculine/on_mob_add(mob/living/owner) if(!iscarbon(owner)) return - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) if(!eyes) return @@ -730,7 +730,7 @@ /datum/reagent/medicine/inacusiate/on_mob_add(mob/living/owner, amount) . = ..() if(creation_purity >= 1) - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) //Lets us hear whispers from far away! /datum/reagent/medicine/inacusiate/proc/owner_hear(datum/source, message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) @@ -867,9 +867,9 @@ exposed_mob.notify_ghost_cloning("Your body is being revived with Strange Reagent!") exposed_mob.do_jitter_animation(10) var/excess_healing = 5*(reac_volume-amount_to_revive) //excess reagent will heal blood and organs across the board - addtimer(CALLBACK(exposed_mob, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds - addtimer(CALLBACK(exposed_mob, /mob/living/carbon.proc/do_jitter_animation, 10), 80) - addtimer(CALLBACK(exposed_mob, /mob/living.proc/revive, FALSE, FALSE, excess_healing), 79) + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 80) + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living, revive), FALSE, FALSE, excess_healing), 79) ..() /datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M, delta_time, times_fired) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 936c30140ce..fc790180147 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2077,7 +2077,7 @@ var/datum/callback/color_callback /datum/reagent/colorful_reagent/New() - color_callback = CALLBACK(src, .proc/UpdateColor) + color_callback = CALLBACK(src, PROC_REF(UpdateColor)) SSticker.OnRoundstart(color_callback) return ..() @@ -2112,7 +2112,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/hair_dye/New() - SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateColor)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateColor))) return ..() /datum/reagent/hair_dye/proc/UpdateColor() @@ -2639,7 +2639,7 @@ /datum/reagent/gravitum/expose_obj(obj/exposed_obj, volume) . = ..() exposed_obj.AddElement(/datum/element/forced_gravity, 0) - addtimer(CALLBACK(exposed_obj, .proc/_RemoveElement, list(/datum/element/forced_gravity, 0)), volume * time_multiplier) + addtimer(CALLBACK(exposed_obj, PROC_REF(_RemoveElement), list(/datum/element/forced_gravity, 0)), volume * time_multiplier) /datum/reagent/gravitum/on_mob_metabolize(mob/living/L) L.AddElement(/datum/element/forced_gravity, 0) //0 is the gravity, and in this case weightless diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index a6520a2cd8b..2c1427a0928 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -106,7 +106,7 @@ /datum/reagent/gunpowder/on_new(data) . = ..() if(holder?.my_atom) - RegisterSignal(holder.my_atom, COMSIG_ATOM_EX_ACT, .proc/on_ex_act) + RegisterSignal(holder.my_atom, COMSIG_ATOM_EX_ACT, PROC_REF(on_ex_act)) /datum/reagent/gunpowder/Destroy() if(holder?.my_atom) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 1abba7c6719..1ae710898f0 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -87,7 +87,7 @@ /datum/reagent/toxin/plasma/on_new(data) . = ..() - RegisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE, .proc/on_temp_change) + RegisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE, PROC_REF(on_temp_change)) /datum/reagent/toxin/plasma/Destroy() UnregisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index bc133b55a48..58552ef1c95 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -61,7 +61,7 @@ /datum/chemical_reaction/New() . = ..() - SSticker.OnRoundstart(CALLBACK(src,.proc/update_info)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(update_info))) /** * Updates information during the roundstart @@ -288,10 +288,10 @@ else if(setting_type) if(step_away(X, T) && moving_power > 1) //Can happen twice at most. So this is fine. - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_away, X, T), 2) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_away), X, T), 2) else if(step_towards(X, T) && moving_power > 1) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_towards, X, T), 2) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_towards), X, T), 2) //////////////////Generic explosions/failures//////////////////// // It is HIGHLY, HIGHLY recomended that you consume all/a good volume of the reagents/products in an explosion - because it will just keep going forever until the reaction stops diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 0c375886a69..c533a8fee14 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -156,7 +156,7 @@ mix_message = "Sparks start flying around the gunpowder!" /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) + addtimer(CALLBACK(src, PROC_REF(default_explode), holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) /datum/chemical_reaction/thermite results = list(/datum/reagent/thermite = 3) @@ -548,14 +548,14 @@ var/T3 = created_volume * 120 var/added_delay = 0.5 SECONDS if(created_volume >= 75) - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T1), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T1), added_delay) added_delay += 1.5 SECONDS if(created_volume >= 40) - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T2), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T2), added_delay) added_delay += 1.5 SECONDS if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast. - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T3), added_delay) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T3), added_delay) + addtimer(CALLBACK(src, PROC_REF(default_explode), holder, created_volume, modifier, strengthdiv), added_delay) /datum/chemical_reaction/reagent_explosion/teslium_lightning/proc/zappy_zappy(datum/reagents/holder, power) if(QDELETED(holder.my_atom)) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 331a8431dac..3c0bd1d7ef5 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -100,25 +100,25 @@ var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate violently!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) /datum/chemical_reaction/slime/slimemobspawn/lesser required_reagents = list(/datum/reagent/blood = 1) /datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate violently!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/friendly required_reagents = list(/datum/reagent/water = 1) /datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/spider required_reagents = list(/datum/reagent/spider_extract = 1) @@ -126,7 +126,7 @@ /datum/chemical_reaction/slime/slimemobspawn/spider/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate crikey-ingly!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/giant_spider/midwife, "neutral", FALSE), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/giant_spider/midwife, "neutral", FALSE), 50) //Silver @@ -202,11 +202,11 @@ /datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/turf/T = get_turf(holder.my_atom) T.visible_message(span_danger("The slime extract starts to feel extremely cold!")) - addtimer(CALLBACK(src, .proc/freeze, holder), 50) + addtimer(CALLBACK(src, PROC_REF(freeze), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimefreeze/proc/freeze(datum/reagents/holder) if(holder?.my_atom) @@ -240,11 +240,11 @@ /datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/turf/T = get_turf(holder.my_atom) T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) - addtimer(CALLBACK(src, .proc/slime_burn, holder), 50) + addtimer(CALLBACK(src, PROC_REF(slime_burn), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimefire/proc/slime_burn(datum/reagents/holder) if(holder?.my_atom) @@ -396,11 +396,11 @@ message_admins("Slime Explosion reaction started at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]") log_game("Slime Explosion reaction started at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].") T.visible_message(span_danger("The slime extract begins to vibrate violently !")) - addtimer(CALLBACK(src, .proc/boom, holder), 50) + addtimer(CALLBACK(src, PROC_REF(boom), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimeexplosion/proc/boom(datum/reagents/holder) if(holder?.my_atom) @@ -499,7 +499,7 @@ required_other = TRUE /datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) - addtimer(CALLBACK(src, .proc/slime_stop, holder), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(slime_stop), holder), 5 SECONDS) /datum/chemical_reaction/slime/slimestop/proc/slime_stop(datum/reagents/holder) var/obj/item/slime_extract/sepia/extract = holder.my_atom @@ -564,7 +564,7 @@ S.visible_message(span_danger("Infused with plasma, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE - addtimer(CALLBACK(S, /obj/item/grenade.proc/detonate), rand(15,60)) + addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60)) else var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom)) S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")) @@ -581,7 +581,7 @@ S.visible_message(span_danger("Infused with slime jelly, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE - addtimer(CALLBACK(S, /obj/item/grenade.proc/detonate), rand(15,60)) + addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60)) var/lastkey = holder.my_atom.fingerprintslast var/touch_msg = "N/A" if(lastkey) diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm index 56090bb5eda..e817009df48 100644 --- a/code/modules/reagents/chemistry/recipes/special.dm +++ b/code/modules/reagents/chemistry/recipes/special.dm @@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents()) if(SSpersistence.initialized) UpdateInfo() else - SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateInfo)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateInfo))) /obj/item/paper/secretrecipe/ui_static_data(mob/living/user) . = ..() diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index d33a65a4171..5de7050ad95 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -39,8 +39,8 @@ /obj/item/reagent_containers/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /obj/item/reagent_containers/attack(mob/living/M, mob/living/user, params) if (!user.combat_mode) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 936af732b31..d6a4a3ffef9 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -34,7 +34,7 @@ else to_chat(user, span_notice("You swallow a gulp of [src].")) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, M, user) - addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) + addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE) if(iscarbon(M)) var/mob/living/carbon/carbon_drinker = M diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index bdc404b6cb3..1d252861f1a 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -52,7 +52,7 @@ ///Runs the consumption code, can be overriden for special effects /obj/item/reagent_containers/pill/proc/on_consumption(mob/M, mob/user) if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, M, span_notice("[pick(strings(REDPILL_FILE, "redpill_questions"))]")), 50) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), M, span_notice("[pick(strings(REDPILL_FILE, "redpill_questions"))]")), 50) if(reagents.total_volume) reagents.trans_to(M, reagents.total_volume, transfered_by = user, methods = apply_type) diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index ca2f05ce664..e843fb44330 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -80,9 +80,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) ///Leaving onto conveyor detection won't work at this point, but that's alright since it's an optimization anyway ///Should be fine without it var/static/list/loc_connections = list( - COMSIG_ATOM_EXITED = .proc/conveyable_exit, - COMSIG_ATOM_ENTERED = .proc/conveyable_enter, - COMSIG_ATOM_CREATED = .proc/conveyable_enter + COMSIG_ATOM_EXITED = PROC_REF(conveyable_exit), + COMSIG_ATOM_ENTERED = PROC_REF(conveyable_enter), + COMSIG_ATOM_CREATED = PROC_REF(conveyable_enter) ) AddElement(/datum/element/connect_loc, loc_connections) update_move_direction() @@ -129,10 +129,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) continue neighbors["[direction]"] = TRUE valid.neighbors["[DIRFLIP(direction)]"] = TRUE - RegisterSignal(valid, COMSIG_MOVABLE_MOVED, .proc/nearby_belt_changed, override=TRUE) - RegisterSignal(valid, COMSIG_PARENT_QDELETING, .proc/nearby_belt_changed, override=TRUE) - valid.RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/nearby_belt_changed, override=TRUE) - valid.RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/nearby_belt_changed, override=TRUE) + RegisterSignal(valid, COMSIG_MOVABLE_MOVED, PROC_REF(nearby_belt_changed), override=TRUE) + RegisterSignal(valid, COMSIG_PARENT_QDELETING, PROC_REF(nearby_belt_changed), override=TRUE) + valid.RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(nearby_belt_changed), override=TRUE) + valid.RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(nearby_belt_changed), override=TRUE) /obj/machinery/conveyor/proc/nearby_belt_changed(datum/source) SIGNAL_HANDLER @@ -550,7 +550,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) if(!attached_switch) return - INVOKE_ASYNC(src, .proc/update_conveyers, port) + INVOKE_ASYNC(src, PROC_REF(update_conveyers), port) /obj/item/circuit_component/conveyor_switch/proc/update_conveyers(datum/port/input/port) if(!attached_switch) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 6e0b405f13b..dea0a34a603 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -40,9 +40,9 @@ air_contents = new /datum/gas_mixture() //gas.volume = 1.05 * CELLSTANDARD update_appearance() - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_rummage) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_rummage)) var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_COLLIDE = .proc/trash_carbon, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(trash_carbon), ) AddElement(/datum/element/connect_loc, loc_connections) return INITIALIZE_HINT_LATELOAD //we need turfs to have air @@ -527,7 +527,7 @@ /obj/machinery/disposal/proc/on_rat_rummage(datum/source, mob/living/simple_animal/hostile/regalrat/king) SIGNAL_HANDLER - INVOKE_ASYNC(src, /obj/machinery/disposal/.proc/rat_rummage, king) + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/disposal, rat_rummage), king) /obj/machinery/disposal/proc/trash_carbon(datum/source, mob/living/carbon/shover, mob/living/carbon/target, shove_blocked) SIGNAL_HANDLER diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index 5f24bc63241..97eb41fba8e 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -33,7 +33,7 @@ pipename = initial(pipe_type.name) - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) if(flip) diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 3168a36e631..d7aee5d13cf 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -70,9 +70,9 @@ var/delay = world.tick_lag var/datum/move_loop/our_loop = SSmove_manager.move_disposals(src, delay = delay, timeout = delay * count) if(our_loop) - RegisterSignal(our_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(our_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/try_expel) - RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, .proc/movement_stop) + RegisterSignal(our_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(our_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(try_expel)) + RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stop)) current_pipe = loc /obj/structure/disposalholder/proc/pre_move(datum/move_loop/source) diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm index 1e27373184f..6486c11f01c 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -55,9 +55,9 @@ if((start_eject + 30) < world.time) start_eject = world.time playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE, FALSE) - addtimer(CALLBACK(src, .proc/expel_holder, H, TRUE), 20) + addtimer(CALLBACK(src, PROC_REF(expel_holder), H, TRUE), 20) else - addtimer(CALLBACK(src, .proc/expel_holder, H), 20) + addtimer(CALLBACK(src, PROC_REF(expel_holder), H), 20) /obj/structure/disposaloutlet/proc/expel_holder(obj/structure/disposalholder/H, playsound=FALSE) if(playsound) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8832dc783a1..24c30574e01 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -12,7 +12,7 @@ /obj/structure/big_delivery/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) /obj/structure/big_delivery/interact(mob/user) to_chat(user, span_notice("You start to unwrap the package...")) @@ -190,7 +190,7 @@ /obj/item/small_delivery/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) /obj/item/small_delivery/contents_explosion(severity, target) switch(severity) diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index c44b852542e..9c3693288f7 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -20,7 +20,7 @@ /obj/structure/altar_of_gods/ComponentInitialize() . = ..() - AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, .proc/reflect_sect_in_icons)) + AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, PROC_REF(reflect_sect_in_icons))) /obj/structure/altar_of_gods/Destroy() GLOB.chaplain_altars -= src @@ -91,7 +91,7 @@ /obj/item/ritual_totem/Initialize(mapload) . = ..() - AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, 1, FALSE, CALLBACK(src, .proc/block_magic), CALLBACK(src, .proc/expire))//one charge of anti_magic + AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, 1, FALSE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire)))//one charge of anti_magic AddComponent(/datum/component/religious_tool, RELIGION_TOOL_INVOKE, FALSE) /obj/item/ritual_totem/proc/block_magic(mob/user, major) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index 9a054b4712d..9602570cc95 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -345,7 +345,7 @@ to_chat(user, span_warning("Wait for them to decide on whether to join or not!")) return FALSE if(!(possible_crusader in sect.possible_crusaders)) - INVOKE_ASYNC(sect, /datum/religion_sect/honorbound.proc/invite_crusader, possible_crusader) + INVOKE_ASYNC(sect, TYPE_PROC_REF(/datum/religion_sect/honorbound, invite_crusader), possible_crusader) to_chat(user, span_notice("They have been given the option to consider joining the crusade against evil. Wait for them to decide and try again.")) return FALSE new_crusader = possible_crusader diff --git a/code/modules/religion/sparring/ceremonial_gear.dm b/code/modules/religion/sparring/ceremonial_gear.dm index e1bccad2a94..ddd291fd3ea 100644 --- a/code/modules/religion/sparring/ceremonial_gear.dm +++ b/code/modules/religion/sparring/ceremonial_gear.dm @@ -29,7 +29,7 @@ /obj/item/ceremonial_blade/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 40, 105) - RegisterSignal(src, COMSIG_ITEM_SHARPEN_ACT, .proc/block_sharpening) + RegisterSignal(src, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(block_sharpening)) /obj/item/ceremonial_blade/melee_attack_chain(mob/user, atom/target, params) if(!HAS_TRAIT(target, TRAIT_SPARRING)) diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm index 391b8378e16..cf26579589c 100644 --- a/code/modules/religion/sparring/sparring_datum.dm +++ b/code/modules/religion/sparring/sparring_datum.dm @@ -33,26 +33,26 @@ /datum/sparring_match/proc/hook_signals(mob/living/carbon/human/sparring) //weapon conditions if(weapons_condition < CONDITION_ANY_WEAPON) - RegisterSignal(sparring, COMSIG_MOB_FIRED_GUN, .proc/gun_violation) - RegisterSignal(sparring, COMSIG_MOB_GRENADE_ARMED, .proc/grenade_violation) + RegisterSignal(sparring, COMSIG_MOB_FIRED_GUN, PROC_REF(gun_violation)) + RegisterSignal(sparring, COMSIG_MOB_GRENADE_ARMED, PROC_REF(grenade_violation)) if(weapons_condition <= CONDITION_CEREMONIAL_ONLY) - RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, .proc/melee_violation) + RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, PROC_REF(melee_violation)) //arena conditions - RegisterSignal(sparring, COMSIG_MOVABLE_MOVED, .proc/arena_violation) + RegisterSignal(sparring, COMSIG_MOVABLE_MOVED, PROC_REF(arena_violation)) //severe violations (insta violation win for other party) conditions - RegisterSignal(sparring, COMSIG_MOVABLE_TELEPORTED, .proc/teleport_violation) + RegisterSignal(sparring, COMSIG_MOVABLE_TELEPORTED, PROC_REF(teleport_violation)) //win conditions - RegisterSignal(sparring, COMSIG_MOB_STATCHANGE, .proc/check_for_victory) + RegisterSignal(sparring, COMSIG_MOB_STATCHANGE, PROC_REF(check_for_victory)) //flub conditions - RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, .proc/outsider_interference) - RegisterSignal(sparring, COMSIG_ATOM_HULK_ATTACK, .proc/hulk_interference) - RegisterSignal(sparring, COMSIG_ATOM_ATTACK_HAND, .proc/hand_interference) - RegisterSignal(sparring, COMSIG_ATOM_ATTACK_PAW, .proc/paw_interference) - RegisterSignal(sparring, COMSIG_ATOM_HITBY, .proc/thrown_interference) - RegisterSignal(sparring, COMSIG_ATOM_BULLET_ACT, .proc/projectile_interference) + RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, PROC_REF(outsider_interference)) + RegisterSignal(sparring, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_interference)) + RegisterSignal(sparring, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_interference)) + RegisterSignal(sparring, COMSIG_ATOM_ATTACK_PAW, PROC_REF(paw_interference)) + RegisterSignal(sparring, COMSIG_ATOM_HITBY, PROC_REF(thrown_interference)) + RegisterSignal(sparring, COMSIG_ATOM_BULLET_ACT, PROC_REF(projectile_interference)) //severe flubs (insta match ender, no winners) conditions - RegisterSignal(sparring, COMSIG_LIVING_DEATH, .proc/death_flub) - RegisterSignal(sparring, COMSIG_PARENT_QDELETING, .proc/deletion_flub) + RegisterSignal(sparring, COMSIG_LIVING_DEATH, PROC_REF(death_flub)) + RegisterSignal(sparring, COMSIG_PARENT_QDELETING, PROC_REF(deletion_flub)) /datum/sparring_match/proc/unhook_signals(mob/living/carbon/human/sparring) if(!sparring) @@ -91,14 +91,14 @@ SIGNAL_HANDLER if(attacker == chaplain || attacker == opponent) return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/hulk_interference(datum/source, mob/attacker) SIGNAL_HANDLER if((attacker == chaplain || attacker == opponent)) // fist fighting a hulk is so dumb. i can't fathom why you would do this. return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/hand_interference(datum/source, mob/living/attacker) SIGNAL_HANDLER @@ -106,7 +106,7 @@ //you can pretty much always use fists as a participant return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/paw_interference(datum/source, mob/living/attacker) SIGNAL_HANDLER @@ -115,7 +115,7 @@ //you can pretty much always use paws as a participant return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/thrown_interference(datum/source, atom/movable/thrown_movable, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum) SIGNAL_HANDLER @@ -124,7 +124,7 @@ var/obj/item/thrown_item = thrown_movable var/mob/thrown_by = thrown_item.thrownby?.resolve() if(thrown_item.throwforce < honorbound.health && ishuman(thrown_by)) - INVOKE_ASYNC(src, .proc/flub, thrown_by) + INVOKE_ASYNC(src, PROC_REF(flub), thrown_by) /datum/sparring_match/proc/projectile_interference(datum/participant, obj/projectile/proj) SIGNAL_HANDLER @@ -134,7 +134,7 @@ var/mob/living/interfering if(isliving(proj.firer)) interfering = proj.firer - INVOKE_ASYNC(src, .proc/flub, interfering) + INVOKE_ASYNC(src, PROC_REF(flub), interfering) ///someone randomly fucking died /datum/sparring_match/proc/death_flub(datum/deceased) diff --git a/code/modules/research/anomaly/explosive_compressor.dm b/code/modules/research/anomaly/explosive_compressor.dm index f7c81c1630b..88b692f5584 100644 --- a/code/modules/research/anomaly/explosive_compressor.dm +++ b/code/modules/research/anomaly/explosive_compressor.dm @@ -32,7 +32,7 @@ /obj/machinery/research/explosive_compressor/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/check_test) + RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, PROC_REF(check_test)) /obj/machinery/research/explosive_compressor/Destroy() UnregisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION) @@ -151,7 +151,7 @@ testing = TRUE test_status = null inserted_bomb.toggle_valve() - timeout_timer = addtimer(CALLBACK(src, .proc/timeout_test), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) + timeout_timer = addtimer(CALLBACK(src, PROC_REF(timeout_test)), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) return /** diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 65af7ec4355..ecc7a1e262a 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -38,7 +38,7 @@ Note: Must be placed within 3 tiles of the R&D Console loaded_item = O to_chat(user, span_notice("You add the [O.name] to the [src.name]!")) flick("d_analyzer_la", src) - addtimer(CALLBACK(src, .proc/finish_loading), 10) + addtimer(CALLBACK(src, PROC_REF(finish_loading)), 10) updateUsrDialog() /obj/machinery/rnd/destructive_analyzer/proc/finish_loading() @@ -55,7 +55,7 @@ Note: Must be placed within 3 tiles of the R&D Console if(!innermode) flick("d_analyzer_process", src) busy = TRUE - addtimer(CALLBACK(src, .proc/reset_busy), 24) + addtimer(CALLBACK(src, PROC_REF(reset_busy)), 24) use_power(250) if(thing == loaded_item) loaded_item = null diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a225699e40a..cdd70722928 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -512,12 +512,12 @@ investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR) if(globalMalf == 99) visible_message(span_warning("[src] begins to glow and vibrate. It's going to blow!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) if(globalMalf == 100) visible_message(span_warning("[src] begins to glow and vibrate. It's going to blow!")) - addtimer(CALLBACK(src, .proc/honk), 50) + addtimer(CALLBACK(src, PROC_REF(honk)), 50) - addtimer(CALLBACK(src, .proc/reset_exp), resetTime) + addtimer(CALLBACK(src, PROC_REF(reset_exp)), resetTime) /obj/machinery/rnd/experimentor/proc/boom() explosion(src, devastation_range = 1, heavy_impact_range = 5, light_impact_range = 10, flash_range = 5, adminlog = TRUE) @@ -580,7 +580,7 @@ revealed = TRUE name = realName reset_timer = rand(reset_timer, reset_timer * 5) - realProc = pick(.proc/teleport,.proc/explode,.proc/rapidDupe,.proc/petSpray,.proc/flash,.proc/clean,.proc/corgicannon) + realProc = pick(PROC_REF(teleport), PROC_REF(explode), PROC_REF(rapidDupe), PROC_REF(petSpray), PROC_REF(flash), PROC_REF(clean), PROC_REF(corgicannon)) /obj/item/relic/attack_self(mob/user) if(!revealed) @@ -604,7 +604,7 @@ /obj/item/relic/proc/corgicannon(mob/user) playsound(src, "sparks", rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user)) - C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, .proc/throwSmoke, C)) + C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throwSmoke), C)) warn_admins(user, "Corgi Cannon", 0) /obj/item/relic/proc/clean(mob/user) @@ -652,7 +652,7 @@ /obj/item/relic/proc/explode(mob/user) to_chat(user, span_danger("[src] begins to heat up!")) - addtimer(CALLBACK(src, .proc/do_explode, user), rand(35, 100)) + addtimer(CALLBACK(src, PROC_REF(do_explode), user), rand(35, 100)) /obj/item/relic/proc/do_explode(mob/user) if(loc == user) @@ -663,7 +663,7 @@ /obj/item/relic/proc/teleport(mob/user) to_chat(user, span_notice("[src] begins to vibrate!")) - addtimer(CALLBACK(src, .proc/do_the_teleport, user), rand(10, 30)) + addtimer(CALLBACK(src, PROC_REF(do_the_teleport), user), rand(10, 30)) /obj/item/relic/proc/do_the_teleport(mob/user) var/turf/userturf = get_turf(user) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 64399375d98..e25deadcefe 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -177,8 +177,8 @@ if(production_animation) flick(production_animation, src) var/timecoeff = D.lathe_time_factor / efficiency_coeff - addtimer(CALLBACK(src, .proc/reset_busy), (30 * timecoeff * amount) ** 0.5) - addtimer(CALLBACK(src, .proc/do_print, D.build_path, amount, efficient_mats, D.dangerous_construction), (32 * timecoeff * amount) ** 0.8) + addtimer(CALLBACK(src, PROC_REF(reset_busy)), (30 * timecoeff * amount) ** 0.5) + addtimer(CALLBACK(src, PROC_REF(do_print), D.build_path, amount, efficient_mats, D.dangerous_construction), (32 * timecoeff * amount) ** 0.8) return TRUE /obj/machinery/rnd/production/proc/search(string) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 88c3b7ed77b..cbae45504e7 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -121,4 +121,4 @@ stack_name = S.name use_power(min(1000, (amount_inserted / 100))) add_overlay("protolathe_[stack_name]") - addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), "protolathe_[stack_name]"), 10) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 98c4de3a38c..426780308ef 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -69,7 +69,7 @@ if(. & EMP_PROTECT_SELF) return set_machine_stat(machine_stat | EMPED) - addtimer(CALLBACK(src, .proc/unemp), 600) + addtimer(CALLBACK(src, PROC_REF(unemp)), 600) refresh_working() /obj/machinery/rnd/server/proc/unemp() diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 31021782092..e857ab0611b 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -54,8 +54,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good /obj/item/storage/part_replacer/bluespace/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_ENTERED, .proc/on_part_entered) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_part_exited) + RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(on_part_entered)) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_part_exited)) /** * Signal handler for when a part has been inserted into the BRPED. @@ -72,7 +72,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good if(length(inserted_component.reagents.reagent_list)) inserted_component.reagents.clear_reagents() to_chat(usr, span_notice("[src] churns as [inserted_component] has its reagents emptied into bluespace.")) - RegisterSignal(inserted_component.reagents, COMSIG_REAGENTS_PRE_ADD_REAGENT, .proc/on_insered_component_reagent_pre_add) + RegisterSignal(inserted_component.reagents, COMSIG_REAGENTS_PRE_ADD_REAGENT, PROC_REF(on_insered_component_reagent_pre_add)) if(!istype(inserted_component, /obj/item/stock_parts/cell)) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index a8329ceee74..5ec0478edec 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1988,7 +1988,7 @@ /datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way. . = ..() if(!SSassets.initialized) - RegisterSignal(SSassets, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/register_uplink_items) + RegisterSignal(SSassets, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(register_uplink_items)) else register_uplink_items() diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 1b896db669f..df9aa34adec 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -67,7 +67,7 @@ var/icon/bluespace /datum/status_effect/slimerecall/on_apply() - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/resistField) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(resistField)) to_chat(owner, span_danger("You feel a sudden tug from an unknown force, and feel a pull to bluespace!")) to_chat(owner, span_notice("Resist if you wish avoid the force!")) bluespace = icon('icons/effects/effects.dmi',"chronofield") @@ -101,7 +101,7 @@ var/obj/structure/ice_stasis/cube /datum/status_effect/frozenstasis/on_apply() - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/breakCube) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(breakCube)) cube = new /obj/structure/ice_stasis(get_turf(owner)) owner.forceMove(cube) owner.status_flags |= GODMODE diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 070ae53849e..49db3d45805 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -260,7 +260,7 @@ Burning extracts: /obj/item/slimecross/burning/oil/do_effect(mob/user) user.visible_message(span_warning("[user] activates [src]. It's going to explode!"), span_danger("You activate [src]. It crackles in anticipation")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /// Inflicts a blastwave upon every mob within a small radius. /obj/item/slimecross/burning/oil/proc/boom() diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index ba108763483..3776034de25 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -169,7 +169,7 @@ Charged extracts: if(!istype(H)) to_chat(user, span_warning("You must be a humanoid to use this!")) return - var/racechoice = tgui_input_list(H, "Choose your slime subspecies", "Slime Selection", sort_list(subtypesof(/datum/species/jelly), /proc/cmp_typepaths_asc)) + var/racechoice = tgui_input_list(H, "Choose your slime subspecies", "Slime Selection", sort_list(subtypesof(/datum/species/jelly), GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(racechoice)) to_chat(user, span_notice("You decide not to become a slime for now.")) return @@ -196,7 +196,7 @@ Charged extracts: /obj/item/slimecross/charged/gold/do_effect(mob/user) user.visible_message(span_warning("[src] starts shuddering violently!")) - addtimer(CALLBACK(src, .proc/startTimer), 50) + addtimer(CALLBACK(src, PROC_REF(startTimer)), 50) /obj/item/slimecross/charged/gold/proc/startTimer() START_PROCESSING(SSobj, src) @@ -221,7 +221,7 @@ Charged extracts: /obj/item/slimecross/charged/oil/do_effect(mob/user) user.visible_message(span_danger("[src] begins to shake with rapidly increasing force!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/charged/oil/proc/boom() explosion(src, devastation_range = 2, heavy_impact_range = 3, light_impact_range = 4, explosion_cause = src) //Much smaller effect than normal oils, but devastatingly strong where it does hit. diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm index 09c22a92b08..8eb91212a3c 100644 --- a/code/modules/research/xenobiology/crossbreeding/chilling.dm +++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm @@ -287,7 +287,7 @@ Chilling extracts: /obj/item/slimecross/chilling/oil/do_effect(mob/user) user.visible_message(span_danger("[src] begins to shake with muted intensity!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/chilling/oil/proc/boom() explosion(src, devastation_range = -1, heavy_impact_range = -1, light_impact_range = 10, explosion_cause = src) //Large radius, but mostly light damage, and no flash. diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm index 6bead094b35..ab6f9381086 100644 --- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm +++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm @@ -32,7 +32,7 @@ Self-sustaining extracts: return ..() /obj/item/autoslime/attack_self(mob/user) - var/reagentselect = tgui_input_list(user, "Reagent the extract will produce.", "Self-sustaining Reaction", sort_list(extract.activate_reagents, /proc/cmp_typepaths_asc)) + var/reagentselect = tgui_input_list(user, "Reagent the extract will produce.", "Self-sustaining Reaction", sort_list(extract.activate_reagents, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(reagentselect)) return var/amount = 5 diff --git a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm index d01e4a32138..43d013abd2d 100644 --- a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm +++ b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm @@ -8,7 +8,7 @@ ///Adds the swabbing component to the biopsy tool /obj/item/biopsy_tool/Initialize(mapload) . = ..() - AddComponent(/datum/component/swabbing, FALSE, FALSE, TRUE, CALLBACK(src, .proc/update_swab_icon), max_items = 1) + AddComponent(/datum/component/swabbing, FALSE, FALSE, TRUE, CALLBACK(src, PROC_REF(update_swab_icon)), max_items = 1) /obj/item/biopsy_tool/proc/update_swab_icon(list/swabbed_items) diff --git a/code/modules/research/xenobiology/vatgrowing/swab.dm b/code/modules/research/xenobiology/vatgrowing/swab.dm index ab9b83ad965..92dd767ea16 100644 --- a/code/modules/research/xenobiology/vatgrowing/swab.dm +++ b/code/modules/research/xenobiology/vatgrowing/swab.dm @@ -9,7 +9,7 @@ ///Adds the swabbing component to the biopsy tool /obj/item/swab/Initialize(mapload) . = ..() - AddComponent(/datum/component/swabbing, TRUE, TRUE, FALSE, null, CALLBACK(src, .proc/update_swab_icon), max_items = 1) + AddComponent(/datum/component/swabbing, TRUE, TRUE, FALSE, null, CALLBACK(src, PROC_REF(update_swab_icon)), max_items = 1) /obj/item/swab/proc/update_swab_icon(overlays, list/swabbed_items) if(LAZYLEN(swabbed_items)) diff --git a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm index b34ebf6d514..663fb49025e 100644 --- a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm +++ b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm @@ -16,8 +16,8 @@ /obj/machinery/plumbing/growing_vat/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/growing_vat/proc/on_reagents_del(datum/reagents/reagents) @@ -62,7 +62,7 @@ to_chat(user, span_warning("You put some of the sample in the vat!")) playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE) update_appearance() - RegisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED, .proc/on_sample_growth_completed) + RegisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED, PROC_REF(on_sample_growth_completed)) ///Adds text for when there is a sample in the vat /obj/machinery/plumbing/growing_vat/examine(mob/user) @@ -131,7 +131,7 @@ /obj/machinery/plumbing/growing_vat/proc/on_sample_growth_completed() SIGNAL_HANDLER if(resampler_active) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(src), 'sound/effects/servostep.ogg', 100, 1), 1.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/servostep.ogg', 100, 1), 1.5 SECONDS) biological_sample.reset_sample() return SPARE_SAMPLE UnregisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index d8329e537f1..631b4cb2916 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -85,12 +85,12 @@ /obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user) ..() - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl) - RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl) - RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl) - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, .proc/XenoSlimeClickAlt) - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, .proc/XenoSlimeClickShift) - RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, .proc/XenoTurfClickShift) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl)) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl)) + RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl)) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt)) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift)) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift)) //Checks for recycler on every interact, prevents issues with load order on certain maps. if(!connected_recycler) @@ -362,7 +362,7 @@ to_chat(C, span_warning("No potion loaded.")) return if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE)) - INVOKE_ASYNC(X.current_potion, /obj/item/slimepotion/slime.proc/attack, S, C) + INVOKE_ASYNC(X.current_potion, TYPE_PROC_REF(/obj/item/slimepotion/slime, attack), S, C) //Picks up slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 4991c822df6..147051d9163 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -270,7 +270,7 @@ to_chat(user, span_warning("Your glow is already enhanced!")) return species.update_glow(user, 5) - addtimer(CALLBACK(species, /datum/species/jelly/luminescent.proc/update_glow, user, LUMINESCENT_DEFAULT_GLOW), 600) + addtimer(CALLBACK(species, TYPE_PROC_REF(/datum/species/jelly/luminescent, update_glow), user, LUMINESCENT_DEFAULT_GLOW), 600) to_chat(user, span_notice("You start glowing brighter.")) if(SLIME_ACTIVATE_MAJOR) @@ -477,7 +477,7 @@ return to_chat(user, span_notice("You feel your skin harden and become more resistant.")) species.armor += 25 - addtimer(CALLBACK(src, .proc/reset_armor, species), 1200) + addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200) return 450 if(SLIME_ACTIVATE_MAJOR) diff --git a/code/modules/ruins/icemoonruin_code/wrath.dm b/code/modules/ruins/icemoonruin_code/wrath.dm index 469a05ea052..9f258b454b0 100644 --- a/code/modules/ruins/icemoonruin_code/wrath.dm +++ b/code/modules/ruins/icemoonruin_code/wrath.dm @@ -14,7 +14,7 @@ /obj/item/clothing/gloves/butchering/equipped(mob/user, slot, initial = FALSE) . = ..() - RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/butcher_target) + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(butcher_target)) var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering) butchering.butchering_enabled = TRUE diff --git a/code/modules/ruins/lavalandruin_code/biodome_winter.dm b/code/modules/ruins/lavalandruin_code/biodome_winter.dm index 98aa475b8c2..69010103bbc 100644 --- a/code/modules/ruins/lavalandruin_code/biodome_winter.dm +++ b/code/modules/ruins/lavalandruin_code/biodome_winter.dm @@ -31,7 +31,7 @@ if(ismovable(hit_atom) && !caught && (!thrown_by || thrown_by && COOLDOWN_FINISHED(src, freeze_cooldown))) freeze(hit_atom) if(thrown_by && !caught) - addtimer(CALLBACK(src, /atom/movable.proc/throw_at, thrown_by, throw_range+2, throw_speed, null, TRUE), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, throw_range+2, throw_speed, null, TRUE), 1) /obj/item/freeze_cube/proc/freeze(atom/movable/hit_atom) playsound(src, 'sound/effects/glassbr3.ogg', 50, TRUE) diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 73a31bb76f2..7f668a1b281 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -135,7 +135,7 @@ return 0 /obj/effect/sliding_puzzle/proc/elements_in_order() - return sortTim(elements,cmp=/proc/cmp_xy_desc) + return sortTim(elements,cmp = GLOBAL_PROC_REF(cmp_xy_desc)) /obj/effect/sliding_puzzle/proc/get_base_icon() var/icon/I = new('icons/obj/puzzle.dmi') diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index 8d36ac3bf58..7fc2d11cda3 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -64,7 +64,7 @@ deadmind = H.get_ghost(FALSE, TRUE) to_chat(deadmind, "Your body has been returned to the nest. You are being remade anew, and will awaken shortly.
      Your memories will remain intact in your new body, as your soul is being salvaged") SEND_SOUND(deadmind, sound('sound/magic/enter_blood.ogg',volume=100)) - addtimer(CALLBACK(src, .proc/remake_walker, H.mind, H.real_name), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(remake_walker), H.mind, H.real_name), 20 SECONDS) new /obj/effect/gibspawner/generic(get_turf(H)) qdel(H) return diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index e2d8ce268f9..5536559b506 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -47,7 +47,7 @@ add_overlay(dais_overlay) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -269,7 +269,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) . = ..() icon_state = "[tile_key][rand(1, tile_random_sprite_max)]" var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -298,7 +298,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) switch(fall_on_cross) if(COLLAPSE_ON_CROSS, DESTROY_ON_CROSS) if((I && I.w_class >= WEIGHT_CLASS_BULKY) || (L && !(L.movement_type & FLYING) && L.mob_size >= MOB_SIZE_HUMAN)) //too heavy! too big! aaah! - INVOKE_ASYNC(src, .proc/collapse) + INVOKE_ASYNC(src, PROC_REF(collapse)) if(UNIQUE_EFFECT) crossed_effect(AM) @@ -317,7 +317,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) if(break_that_sucker) QDEL_IN(src, 10) else - addtimer(CALLBACK(src, .proc/rebuild), 55) + addtimer(CALLBACK(src, PROC_REF(rebuild)), 55) /obj/structure/stone_tile/proc/rebuild() pixel_x = initial(pixel_x) diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 8def3775a8e..f84dc064a77 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -32,7 +32,7 @@ icon_screen = "slots_screen_working" update_appearance() playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, FALSE) - addtimer(CALLBACK(src, .proc/determine_victor, user), 50) + addtimer(CALLBACK(src, PROC_REF(determine_victor), user), 50) /obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user) icon_screen = "slots_screen" @@ -64,7 +64,7 @@ /obj/structure/cursed_money/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/collapse), 600) + addtimer(CALLBACK(src, PROC_REF(collapse)), 600) /obj/structure/cursed_money/proc/collapse() visible_message("[src] falls in on itself, \ diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 8faf880d2a1..746e9c7b613 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -19,7 +19,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) /obj/item/hilbertshotel/Initialize(mapload) . = ..() //Load templates - INVOKE_ASYNC(src, .proc/prepare_rooms) + INVOKE_ASYNC(src, PROC_REF(prepare_rooms)) /obj/item/hilbertshotel/proc/prepare_rooms() hotelRoomTemp = new() @@ -325,12 +325,12 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/datum/action/peephole_cancel/PHC = new user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) PHC.Grant(user) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, /atom/.proc/check_eye, user) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom, check_eye), user) /turf/closed/indestructible/hoteldoor/check_eye(mob/user) if(get_dist(get_turf(src), get_turf(user)) >= 2) for(var/datum/action/peephole_cancel/PHC in user.actions) - INVOKE_ASYNC(PHC, /datum/action/peephole_cancel.proc/Trigger) + INVOKE_ASYNC(PHC, TYPE_PROC_REF(/datum/action/peephole_cancel, Trigger)) /datum/action/peephole_cancel name = "Cancel View" diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm index 3efca0798de..3ceda480cc7 100644 --- a/code/modules/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/ruins/spaceruin_code/oldstation.dm @@ -127,10 +127,10 @@ if(!occupant || !mod_unit || busy) return set_busy(TRUE, "[initial(icon_state)]_raising") - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_active"), 2.5 SECONDS) - addtimer(CALLBACK(src, .proc/play_install_sound), 2.5 SECONDS) - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_falling"), 5 SECONDS) - addtimer(CALLBACK(src, .proc/complete_process), 7.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_active"), 2.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(play_install_sound)), 2.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_falling"), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(complete_process)), 7.5 SECONDS) /obj/machinery/mod_installer/proc/complete_process() set_busy(FALSE) @@ -163,7 +163,7 @@ if(!state_open) return FALSE ..() - addtimer(CALLBACK(src, .proc/start_process), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_process)), 1 SECONDS) return TRUE /obj/machinery/mod_installer/relaymove(mob/living/user, direction) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index b1faed4eaea..98c8cc433a3 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -26,7 +26,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) /obj/machinery/keycard_auth/Initialize(mapload) . = ..() - ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, .proc/triggerEvent)) + ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, PROC_REF(triggerEvent))) /obj/machinery/keycard_auth/Destroy() GLOB.keycard_events.clearEvent("triggerEvent", ev) @@ -107,7 +107,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) event = event_type waiting = TRUE GLOB.keycard_events.fireEvent("triggerEvent", src) - addtimer(CALLBACK(src, .proc/eventSent), 20) + addtimer(CALLBACK(src, PROC_REF(eventSent)), 20) /obj/machinery/keycard_auth/proc/eventSent() triggerer = null @@ -117,7 +117,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) /obj/machinery/keycard_auth/proc/triggerEvent(source) event_source = source update_appearance() - addtimer(CALLBACK(src, .proc/eventTriggered), 20) + addtimer(CALLBACK(src, PROC_REF(eventTriggered)), 20) /obj/machinery/keycard_auth/proc/eventTriggered() event_source = null diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index b2a0e3302db..c9e7b6421f3 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -205,7 +205,7 @@ if(mode != SHUTTLE_CALL) announce_arrival(mob, rank) else - LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/announce_arrival, mob, rank)) + LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, PROC_REF(announce_arrival), mob, rank)) /obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value) switch(var_name) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 380df875ee9..883ea0dfad7 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -104,7 +104,7 @@ return var/old_len = authorized.len - addtimer(CALLBACK(src, .proc/clear_recent_action, user), SHUTTLE_CONSOLE_ACTION_DELAY) + addtimer(CALLBACK(src, PROC_REF(clear_recent_action), user), SHUTTLE_CONSOLE_ACTION_DELAY) switch(action) if("authorize") @@ -499,7 +499,7 @@ launch_status = ENDGAME_LAUNCHED setTimer(SSshuttle.emergency_escape_time * engine_coeff) priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority") - INVOKE_ASYNC(SSticker, /datum/controller/subsystem/ticker.proc/poll_hearts) + INVOKE_ASYNC(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker, poll_hearts)) SSmapping.mapvote() //If no map vote has been run yet, start one. if(SHUTTLE_STRANDED, SHUTTLE_DISABLED) @@ -590,7 +590,7 @@ /obj/machinery/computer/shuttle/pod/Initialize(mapload) . = ..() - RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_lock) + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_lock)) /obj/machinery/computer/shuttle/pod/ComponentInitialize() . = ..() diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index b77ba605f2c..a8ffbb61a9b 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -184,7 +184,7 @@ All ShuttleMove procs go here for(var/obj/machinery/door/airlock/other_airlock in range(2, src)) // includes src, extended because some escape pods have 1 plating turf exposed to space other_airlock.shuttledocked = FALSE other_airlock.air_tight = TRUE - INVOKE_ASYNC(other_airlock, /obj/machinery/door/.proc/close, FALSE, TRUE) // force crush + INVOKE_ASYNC(other_airlock, TYPE_PROC_REF(/obj/machinery/door, close), FALSE, TRUE) // force crush /obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index d69bce3de54..54426bc9ae0 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -15,7 +15,7 @@ /obj/effect/abstract/ripple/Initialize(mapload, time_left) . = ..() animate(src, alpha=255, time=time_left) - addtimer(CALLBACK(src, .proc/stop_animation), 8, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(stop_animation)), 8, TIMER_CLIENT_TIME) /obj/effect/abstract/ripple/proc/stop_animation() icon_state = "medi_holo_no_anim" diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index a441523b91f..8e6b96d5018 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -93,7 +93,7 @@ L.visible_message(span_revennotice("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious."), span_revendanger("[desc]")) // Don't let them sit suround unconscious forever - addtimer(CALLBACK(src, .proc/sleeper_dreams, L), 100) + addtimer(CALLBACK(src, PROC_REF(sleeper_dreams), L), 100) // Existing sleepers for(var/i in found) @@ -148,7 +148,7 @@ . = ..() access_card.add_access(list(ACCESS_CENT_BAR)) become_area_sensitive(ROUNDSTART_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/check_barstaff_godmode) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode)) check_barstaff_godmode() /mob/living/simple_animal/hostile/alien/maid/barmaid @@ -171,7 +171,7 @@ ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) become_area_sensitive(ROUNDSTART_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/check_barstaff_godmode) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode)) check_barstaff_godmode() /mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy() @@ -199,7 +199,7 @@ /obj/structure/table/wood/shuttle_bar/Initialize(mapload, _buildstack) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index 8e35be95735..d7248d8b125 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -157,7 +157,7 @@ /obj/effect/proc_holder/spell/aimed/spell_cards/on_activation(mob/M) QDEL_NULL(lockon_component) - lockon_component = M.AddComponent(/datum/component/lockon_aiming, 5, GLOB.typecache_living, 1, null, CALLBACK(src, .proc/on_lockon_component)) + lockon_component = M.AddComponent(/datum/component/lockon_aiming, 5, GLOB.typecache_living, 1, null, CALLBACK(src, PROC_REF(on_lockon_component))) /obj/effect/proc_holder/spell/aimed/spell_cards/proc/on_lockon_component(list/locked_weakrefs) if(!length(locked_weakrefs)) diff --git a/code/modules/spells/spell_types/area_teleport.dm b/code/modules/spells/spell_types/area_teleport.dm index 3463d9fa6ea..2f5fce16c8b 100644 --- a/code/modules/spells/spell_types/area_teleport.dm +++ b/code/modules/spells/spell_types/area_teleport.dm @@ -18,7 +18,7 @@ return invocation(thearea,user) if(charge_type == "recharge" && recharge) - INVOKE_ASYNC(src, .proc/start_recharge) + INVOKE_ASYNC(src, PROC_REF(start_recharge)) cast(targets,thearea,user) after_cast(targets) diff --git a/code/modules/spells/spell_types/cone_spells.dm b/code/modules/spells/spell_types/cone_spells.dm index 47f3348778d..d6480521d21 100644 --- a/code/modules/spells/spell_types/cone_spells.dm +++ b/code/modules/spells/spell_types/cone_spells.dm @@ -114,4 +114,4 @@ var/list/cone_turfs = cone_helper(get_turf(user), user.dir, cone_levels) for(var/list/turf_list in cone_turfs) level_counter++ - addtimer(CALLBACK(src, .proc/do_cone_effects, turf_list, level_counter), 2 * level_counter) + addtimer(CALLBACK(src, PROC_REF(do_cone_effects), turf_list, level_counter), 2 * level_counter) diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index 836821c42b3..4c9a256b49c 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -216,7 +216,7 @@ target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1) user.playsound_local(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1) target.become_blind(ABYSSAL_GAZE_BLIND) - addtimer(CALLBACK(src, .proc/cure_blindness, target), 40) + addtimer(CALLBACK(src, PROC_REF(cure_blindness), target), 40) if(ishuman(targets[1])) var/mob/living/carbon/human/humi = targets[1] humi.adjust_coretemperature(-200) diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm index 27bfba57def..e078b4aa793 100644 --- a/code/modules/spells/spell_types/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/ethereal_jaunt.dm @@ -37,7 +37,7 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets,mob/user = usr) //magnets, so mostly hardcoded play_sound("enter",user) for(var/mob/living/target in targets) - INVOKE_ASYNC(src, .proc/do_jaunt, target) + INVOKE_ASYNC(src, PROC_REF(do_jaunt), target) /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target) target.notransform = 1 @@ -55,7 +55,7 @@ REMOVE_TRAIT(target, TRAIT_IMMOBILIZED, type) var/turf/exit_point = get_turf(holder) //Hopefully this gets updated, otherwise this is our fallback LAZYINITLIST(exit_point_list) - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, .proc/update_exit_point, target) + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(update_exit_point), target) sleep(jaunt_duration) UnregisterSignal(holder, COMSIG_MOVABLE_MOVED) diff --git a/code/modules/spells/spell_types/genetic.dm b/code/modules/spells/spell_types/genetic.dm index f68f6f984ba..adc03676559 100644 --- a/code/modules/spells/spell_types/genetic.dm +++ b/code/modules/spells/spell_types/genetic.dm @@ -31,7 +31,7 @@ ADD_TRAIT(target, A, GENETICS_SPELL) active_on += target if(duration < charge_max) - addtimer(CALLBACK(src, .proc/remove, target), duration, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(remove), target), duration, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/effect/proc_holder/spell/targeted/genetic/Destroy() . = ..() diff --git a/code/modules/spells/spell_types/knock.dm b/code/modules/spells/spell_types/knock.dm index 921bbe5a9e0..d31aef1b348 100644 --- a/code/modules/spells/spell_types/knock.dm +++ b/code/modules/spells/spell_types/knock.dm @@ -16,9 +16,9 @@ SEND_SOUND(user, sound('sound/magic/knock.ogg')) for(var/turf/T in targets) for(var/obj/machinery/door/door in T.contents) - INVOKE_ASYNC(src, .proc/open_door, door) + INVOKE_ASYNC(src, PROC_REF(open_door), door) for(var/obj/structure/closet/C in T.contents) - INVOKE_ASYNC(src, .proc/open_closet, C) + INVOKE_ASYNC(src, PROC_REF(open_closet), C) /obj/effect/proc_holder/spell/aoe_turf/knock/proc/open_door(obj/machinery/door/door) if(istype(door, /obj/machinery/door/airlock)) diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index 58b3a8787c4..e2ac54ecaed 100644 --- a/code/modules/spells/spell_types/mime.dm +++ b/code/modules/spells/spell_types/mime.dm @@ -92,7 +92,7 @@ for (var/obj/item/storage/box/mime/B in T) user.put_in_hands(B) B.alpha = 255 - addtimer(CALLBACK(B, /obj/item/storage/box/mime/.proc/emptyStorage, FALSE), (summon_lifespan - 1)) + addtimer(CALLBACK(B, TYPE_PROC_REF(/obj/item/storage/box/mime, emptyStorage), FALSE), (summon_lifespan - 1)) /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_box/Click() if(usr?.mind) diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index 7a31b45c0f7..c95c3517cfc 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( if(GLOB.summon_magic) GLOB.summon_magic.survivor_probability = survivor_probability else - GLOB.summon_magic = new /datum/summon_things_controller(/proc/give_magic, survivor_probability) + GLOB.summon_magic = new /datum/summon_things_controller(GLOBAL_PROC_REF(give_magic), survivor_probability) GLOB.summon_magic.give_out_gear() /* @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( if(GLOB.summon_guns) GLOB.summon_guns.survivor_probability = survivor_probability else - GLOB.summon_guns = new /datum/summon_things_controller(/proc/give_guns, survivor_probability) + GLOB.summon_guns = new /datum/summon_things_controller(GLOBAL_PROC_REF(give_guns), survivor_probability) GLOB.summon_guns.give_out_gear() /* @@ -268,7 +268,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( src.survivor_probability = survivor_probability src.give_proc_path = give_proc_path - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/gear_up_new_crew) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(gear_up_new_crew)) /datum/summon_things_controller/Destroy(force, ...) . = ..() diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index 9e856bf9d68..223e771c5e9 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -46,7 +46,7 @@ var/image/animal_image = image(icon = initial(animal.icon), icon_state = initial(animal.icon_state)) display_animals += list(initial(animal.name) = animal_image) sort_list(display_animals) - var/new_shapeshift_type = show_radial_menu(shapeshifted_targets, shapeshifted_targets, display_animals, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE) + var/new_shapeshift_type = show_radial_menu(shapeshifted_targets, shapeshifted_targets, display_animals, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 38, require_near = TRUE) if(shapeshift_type) return shapeshift_type = new_shapeshift_type @@ -168,8 +168,8 @@ shape.apply_damage(damapply, source.convert_damage_type, forced = TRUE, wound_bonus=CANT_WOUND); shape.blood_volume = stored.blood_volume; - RegisterSignal(shape, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), .proc/shape_death) - RegisterSignal(stored, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), .proc/caster_death) + RegisterSignal(shape, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(shape_death)) + RegisterSignal(stored, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(caster_death)) /obj/shapeshift_holder/Destroy() // restore_form manages signal unregistering. If restoring is TRUE, we've already unregistered the signals and we're here diff --git a/code/modules/spells/spell_types/spacetime_distortion.dm b/code/modules/spells/spell_types/spacetime_distortion.dm index 714cf1e28da..ff40db27896 100644 --- a/code/modules/spells/spell_types/spacetime_distortion.dm +++ b/code/modules/spells/spell_types/spacetime_distortion.dm @@ -37,7 +37,7 @@ perform(turf_steps,user=user) /obj/effect/proc_holder/spell/spacetime_dist/after_cast(list/targets) - addtimer(CALLBACK(src, .proc/clean_turfs), duration) + addtimer(CALLBACK(src, PROC_REF(clean_turfs)), duration) /obj/effect/proc_holder/spell/spacetime_dist/cast(list/targets, mob/user = usr) effects = list() @@ -85,7 +85,7 @@ . = ..() setDir(pick(GLOB.cardinals)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index a4b18d0b355..7f6759d070b 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -121,8 +121,8 @@ /obj/item/bodypart/Initialize(mapload) . = ..() if(can_be_disabled) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) if(status != BODYPART_ORGANIC) grind_results = null @@ -640,7 +640,7 @@ last_maxed = FALSE else if(!last_maxed && owner.stat < UNCONSCIOUS) - INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") last_maxed = TRUE set_disabled(FALSE) // we only care about the paralysis trait return @@ -649,7 +649,7 @@ if(total_damage >= max_damage * disable_threshold) if(!last_maxed) if(owner.stat < UNCONSCIOUS) - INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") last_maxed = TRUE set_disabled(TRUE) return @@ -695,8 +695,8 @@ if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) set_can_be_disabled(FALSE) needs_update_disabled = FALSE - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), .proc/on_owner_nolimbdisable_trait_loss) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), .proc/on_owner_nolimbdisable_trait_gain) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), PROC_REF(on_owner_nolimbdisable_trait_loss)) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), PROC_REF(on_owner_nolimbdisable_trait_gain)) if(needs_update_disabled) update_disabled() @@ -711,8 +711,8 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) CRASH("set_can_be_disabled to TRUE with for limb whose owner has TRAIT_NOLIMBDISABLE") - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_gain) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_loss) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) update_disabled() else if(.) if(owner) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 0b18f8de895..88fc3f27d83 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -17,7 +17,7 @@ affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50), wound_bonus=CANT_WOUND) //Damage the chest based on limb's existing damage if(!silent) limb_owner.visible_message(span_danger("[limb_owner]'s [name] is violently dismembered!")) - INVOKE_ASYNC(limb_owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(limb_owner, TYPE_PROC_REF(/mob, emote), "scream") playsound(get_turf(limb_owner), 'sound/effects/dismember.ogg', 80, TRUE) SEND_SIGNAL(limb_owner, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) limb_owner.mind?.add_memory(MEMORY_DISMEMBERED, list(DETAIL_LOST_LIMB = src, DETAIL_PROTAGONIST = limb_owner), story_value = STORY_VALUE_AMAZING) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 07f4a95253c..ddcced2a485 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -83,10 +83,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM)) @@ -102,7 +102,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_ARM trait. @@ -110,7 +110,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/l_arm/set_disabled(new_disabled) @@ -182,10 +182,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM)) @@ -201,7 +201,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_R_ARM trait. @@ -209,7 +209,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/r_arm/set_disabled(new_disabled) @@ -279,10 +279,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_LEG)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_LEG)) @@ -298,7 +298,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_LEG trait. @@ -306,7 +306,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/l_leg/set_disabled(new_disabled) @@ -374,10 +374,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_LEG)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_LEG)) @@ -393,7 +393,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_R_LEG trait. @@ -401,7 +401,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/r_leg/set_disabled(new_disabled) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 516c61913a2..218fc738aef 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -78,8 +78,8 @@ var/side = zone == BODY_ZONE_R_ARM? RIGHT_HANDS : LEFT_HANDS hand = arm_owner.hand_bodyparts[side] if(hand) - RegisterSignal(hand, COMSIG_ITEM_ATTACK_SELF, .proc/on_item_attack_self) //If the limb gets an attack-self, open the menu. Only happens when hand is empty - RegisterSignal(arm_owner, COMSIG_KB_MOB_DROPITEM_DOWN, .proc/dropkey) //We're nodrop, but we'll watch for the drop hotkey anyway and then stow if possible. + RegisterSignal(hand, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_item_attack_self)) //If the limb gets an attack-self), open the menu. Only happens when hand is empty + RegisterSignal(arm_owner, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey)) //We're nodrop, but we'll watch for the drop hotkey anyway and then stow if possible. /obj/item/organ/cyberimp/arm/Remove(mob/living/carbon/arm_owner, special = 0) Retract() @@ -90,7 +90,7 @@ /obj/item/organ/cyberimp/arm/proc/on_item_attack_self() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/ui_action_click) + INVOKE_ASYNC(src, PROC_REF(ui_action_click)) /obj/item/organ/cyberimp/arm/emp_act(severity) . = ..() diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 7d3f569911a..9db86888895 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -23,7 +23,7 @@ synthesizing = TRUE to_chat(owner, span_notice("You feel less hungry...")) owner.adjust_nutrition(25 * delta_time) - addtimer(CALLBACK(src, .proc/synth_cool), 50) + addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50) /obj/item/organ/cyberimp/chest/nutriment/proc/synth_cool() synthesizing = FALSE @@ -59,7 +59,7 @@ if(reviving) switch(owner.stat) if(UNCONSCIOUS, HARD_CRIT) - addtimer(CALLBACK(src, .proc/heal), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(heal)), 3 SECONDS) else COOLDOWN_START(src, reviver_cooldown, revive_cost) reviving = FALSE @@ -105,7 +105,7 @@ if(human_owner.stat != DEAD && prob(50 / severity) && human_owner.can_heartattack()) human_owner.set_heartattack(TRUE) to_chat(human_owner, span_userdanger("You feel a horrible agony in your chest!")) - addtimer(CALLBACK(src, .proc/undo_heart_attack), 600 / severity) + addtimer(CALLBACK(src, PROC_REF(undo_heart_attack)), 600 / severity) /obj/item/organ/cyberimp/chest/reviver/proc/undo_heart_attack() var/mob/living/carbon/human/human_owner = owner @@ -154,9 +154,9 @@ if(allow_thrust(0.01)) on = TRUE ion_trail.start() - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move_react) - RegisterSignal(owner, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) + RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react)) + RegisterSignal(owner, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(spacemove_react)) owner.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic) if(!silent) to_chat(owner, span_notice("You turn your thrusters set on.")) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 2832ca9696d..928ec15fe63 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -62,7 +62,7 @@ stored_items += held_item to_chat(owner, span_notice("Your [owner.get_held_index_name(owner.get_held_index_of_item(held_item))]'s grip tightens.")) ADD_TRAIT(held_item, TRAIT_NODROP, IMPLANT_TRAIT) - RegisterSignal(held_item, COMSIG_ITEM_DROPPED, .proc/on_held_item_dropped) + RegisterSignal(held_item, COMSIG_ITEM_DROPPED, PROC_REF(on_held_item_dropped)) else release_items() to_chat(owner, span_notice("Your hands relax...")) @@ -122,12 +122,12 @@ /obj/item/organ/cyberimp/brain/anti_stun/Insert() . = ..() - RegisterSignal(owner, signalCache, .proc/on_signal) + RegisterSignal(owner, signalCache, PROC_REF(on_signal)) /obj/item/organ/cyberimp/brain/anti_stun/proc/on_signal(datum/source, amount) SIGNAL_HANDLER if(!(organ_flags & ORGAN_FAILING) && amount > 0) - addtimer(CALLBACK(src, .proc/clear_stuns), stun_cap_amount, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(clear_stuns)), stun_cap_amount, TIMER_UNIQUE|TIMER_OVERRIDE) /obj/item/organ/cyberimp/brain/anti_stun/proc/clear_stuns() if(owner || !(organ_flags & ORGAN_FAILING)) @@ -141,7 +141,7 @@ if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF) return organ_flags |= ORGAN_FAILING - addtimer(CALLBACK(src, .proc/reboot), 90 / severity) + addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity) /obj/item/organ/cyberimp/brain/anti_stun/proc/reboot() organ_flags &= ~ORGAN_FAILING diff --git a/code/modules/surgery/organs/external/_external_organs.dm b/code/modules/surgery/organs/external/_external_organs.dm index 4a5a1fe0f6f..c9bb31c6fde 100644 --- a/code/modules/surgery/organs/external/_external_organs.dm +++ b/code/modules/surgery/organs/external/_external_organs.dm @@ -220,8 +220,8 @@ /obj/item/organ/external/antennae/Insert(mob/living/carbon/reciever, special, drop_if_replaced) . = ..() - RegisterSignal(reciever, COMSIG_HUMAN_BURNING, .proc/try_burn_antennae) - RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, .proc/heal_antennae) + RegisterSignal(reciever, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_antennae)) + RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_antennae)) /obj/item/organ/external/antennae/Remove(mob/living/carbon/organ_owner, special) . = ..() diff --git a/code/modules/surgery/organs/external/wings.dm b/code/modules/surgery/organs/external/wings.dm index c81ae060569..41c98bbc88b 100644 --- a/code/modules/surgery/organs/external/wings.dm +++ b/code/modules/surgery/organs/external/wings.dm @@ -183,9 +183,9 @@ /obj/item/organ/external/wings/moth/Insert(mob/living/carbon/reciever, special, drop_if_replaced) . = ..() - RegisterSignal(reciever, COMSIG_HUMAN_BURNING, .proc/try_burn_wings) - RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, .proc/heal_wings) - RegisterSignal(reciever, COMSIG_MOVABLE_PRE_MOVE, .proc/update_float_move) + RegisterSignal(reciever, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_wings)) + RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_wings)) + RegisterSignal(reciever, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(update_float_move)) /obj/item/organ/external/wings/moth/Remove(mob/living/carbon/organ_owner, special) . = ..() diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index df4442aaa6a..dded45ccce5 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -322,7 +322,7 @@ /obj/item/organ/eyes/robotic/glow/Insert(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = FALSE) . = ..() - RegisterSignal(eye_owner, COMSIG_ATOM_DIR_CHANGE, .proc/update_visuals) + RegisterSignal(eye_owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(update_visuals)) /obj/item/organ/eyes/robotic/glow/Remove(mob/living/carbon/eye_owner, special = FALSE) . = ..() diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index ef98d9c876a..52fb0bbf132 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -30,7 +30,7 @@ /obj/item/organ/heart/Remove(mob/living/carbon/heartless, special = 0) ..() if(!special) - addtimer(CALLBACK(src, .proc/stop_if_unowned), 120) + addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 120) /obj/item/organ/heart/proc/stop_if_unowned() if(!owner) @@ -42,7 +42,7 @@ user.visible_message("[user] squeezes [src] to \ make it beat again!",span_notice("You squeeze [src] to make it beat again!")) Restart() - addtimer(CALLBACK(src, .proc/stop_if_unowned), 80) + addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 80) /obj/item/organ/heart/proc/Stop() beating = FALSE @@ -223,7 +223,7 @@ Stop() owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \ span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!")) - addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Restart)), 10 SECONDS) /obj/item/organ/heart/cybernetic/on_life(delta_time, times_fired) . = ..() @@ -277,9 +277,9 @@ /obj/item/organ/heart/ethereal/Insert(mob/living/carbon/owner, special = 0) . = ..() - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/on_owner_fully_heal) - RegisterSignal(owner, COMSIG_PARENT_PREQDELETED, .proc/owner_deleted) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) + RegisterSignal(owner, COMSIG_PARENT_PREQDELETED, PROC_REF(owner_deleted)) /obj/item/organ/heart/ethereal/Remove(mob/living/carbon/owner, special = 0) UnregisterSignal(owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_PARENT_PREQDELETED)) @@ -340,11 +340,11 @@ ) ADD_TRAIT(victim, TRAIT_CORPSELOCKED, SPECIES_TRAIT) - crystalize_timer_id = addtimer(CALLBACK(src, .proc/crystalize, victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE) + crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE) - RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, .proc/reset_crystalizing) - RegisterSignal(victim, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(victim, COMSIG_MOB_APPLY_DAMAGE, .proc/on_take_damage) + RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, PROC_REF(reset_crystalizing)) + RegisterSignal(victim, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(victim, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage)) ///Ran when disarmed, prevents the ethereal from reviving /obj/item/organ/heart/ethereal/proc/reset_crystalizing(mob/living/defender, mob/living/attacker, zone) @@ -354,7 +354,7 @@ span_notice("The crystals on your corpse are gently broken off, and will need some time to recover."), ) deltimer(crystalize_timer_id) - crystalize_timer_id = addtimer(CALLBACK(src, .proc/crystalize, defender), CRYSTALIZE_DISARM_WAIT_TIME, TIMER_STOPPABLE) //Lets us restart the timer on disarm + crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), defender), CRYSTALIZE_DISARM_WAIT_TIME, TIMER_STOPPABLE) //Lets us restart the timer on disarm ///Actually spawns the crystal which puts the ethereal in it. @@ -443,11 +443,11 @@ playsound(get_turf(src), 'sound/effects/ethereal_crystalization.ogg', 50) ethereal_heart.owner.forceMove(src) //put that ethereal in add_atom_colour(ethereal_heart.ethereal_color, FIXED_COLOUR_PRIORITY) - crystal_heal_timer = addtimer(CALLBACK(src, .proc/heal_ethereal), CRYSTALIZE_HEAL_TIME, TIMER_STOPPABLE) + crystal_heal_timer = addtimer(CALLBACK(src, PROC_REF(heal_ethereal)), CRYSTALIZE_HEAL_TIME, TIMER_STOPPABLE) set_light(4, 10, ethereal_heart.ethereal_color) update_icon() flick("ethereal_crystal_forming", src) - addtimer(CALLBACK(src, .proc/start_crystalization), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_crystalization)), 1 SECONDS) /obj/structure/ethereal_crystal/proc/start_crystalization() being_built = FALSE diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 0571234f68b..bf5d5348ccb 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -28,7 +28,7 @@ . = ..() // If the liver handles foods like a clown, it honks like a bike horn // Don't think about it too much. - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_COMEDY_METABOLISM), .proc/on_add_comedy_metabolism) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_add_comedy_metabolism)) /* Signal handler for the liver gaining the TRAIT_COMEDY_METABOLISM trait * diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 4698983f7e2..a1ff1186d72 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -51,7 +51,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) initial_reagents = food_reagents,\ foodtypes = RAW | MEAT | GROSS,\ volume = reagent_vol,\ - after_eat = CALLBACK(src, .proc/OnEatFrom)) + after_eat = CALLBACK(src, PROC_REF(OnEatFrom))) /* * Insert the organ into the select mob. * @@ -78,7 +78,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) reciever.internal_organs |= src reciever.internal_organs_slot[slot] = src moveToNullspace() - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, .proc/on_owner_examine) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_owner_examine)) for(var/datum/action/action as anything in actions) action.Grant(reciever) STOP_PROCESSING(SSobj, src) diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm index 199a236cbf5..4192ed4955b 100644 --- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm @@ -14,8 +14,8 @@ /obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/carbon, special = 0) . = ..() - RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/charge) - RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_electrocute) + RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) + RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute)) ADD_TRAIT(owner, TRAIT_NOHUNGER, src) /obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/carbon, special = 0) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index e80535477b7..f3f39acec95 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -51,7 +51,7 @@ if(say_mod && tongue_owner.dna && tongue_owner.dna.species) tongue_owner.dna.species.say_mod = say_mod if (modifies_speech) - RegisterSignal(tongue_owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) tongue_owner.UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) /* This could be slightly simpler, by making the removal of the @@ -68,7 +68,7 @@ if(say_mod && tongue_owner.dna && tongue_owner.dna.species) tongue_owner.dna.species.say_mod = initial(tongue_owner.dna.species.say_mod) UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) - tongue_owner.RegisterSignal(tongue_owner, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech) + tongue_owner.RegisterSignal(tongue_owner, COMSIG_MOB_SAY, TYPE_PROC_REF(/mob/living/carbon, handle_tongueless_speech)) REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) @@ -118,7 +118,7 @@ /datum/action/item_action/organ_action/statue/New(Target) . = ..() statue = new - RegisterSignal(statue, COMSIG_PARENT_QDELETING, .proc/statue_destroyed) + RegisterSignal(statue, COMSIG_PARENT_QDELETING, PROC_REF(statue_destroyed)) /datum/action/item_action/organ_action/statue/Destroy() UnregisterSignal(statue, COMSIG_PARENT_QDELETING) @@ -161,7 +161,7 @@ statue.forceMove(get_turf(becoming_statue)) becoming_statue.forceMove(statue) statue.update_integrity(becoming_statue.health) - RegisterSignal(becoming_statue, COMSIG_MOVABLE_MOVED, .proc/human_left_statue) + RegisterSignal(becoming_statue, COMSIG_MOVABLE_MOVED, PROC_REF(human_left_statue)) //somehow they used an exploit/teleportation to leave statue, lets clean up /datum/action/item_action/organ_action/statue/proc/human_left_statue(atom/movable/mover, atom/oldloc, direction) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 8b9e41f8585..0e439aeac51 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -84,7 +84,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -130,7 +130,7 @@ /obj/item/surgicaldrill/suicide_act(mob/user) user.visible_message(span_suicide("[user] rams [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")) - addtimer(CALLBACK(user, /mob/living/carbon.proc/gib, null, null, TRUE, TRUE), 25) + addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon, gib), null, null, TRUE, TRUE), 25) user.SpinAnimation(3, 10) playsound(user, 'sound/machines/juicer.ogg', 20, TRUE) return (MANUAL_SUICIDE) @@ -283,7 +283,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -324,7 +324,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -417,8 +417,8 @@ for(var/obj/item/bodypart/thing in user.bodyparts) if(thing.body_part == CHEST) continue - addtimer(CALLBACK(thing, /obj/item/bodypart/.proc/dismember), timer) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, user, 'sound/weapons/bladeslice.ogg', 70), timer) + addtimer(CALLBACK(thing, TYPE_PROC_REF(/obj/item/bodypart, dismember)), timer) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), user, 'sound/weapons/bladeslice.ogg', 70), timer) timer += 1 SECONDS sleep(timer) return BRUTELOSS diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index c200de97852..2849f93edd3 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -206,7 +206,7 @@ return if(!COOLDOWN_FINISHED(src, refresh_cooldown)) refreshing = TRUE - addtimer(CALLBACK(src, .proc/send_full_update, custom_data, force), COOLDOWN_TIMELEFT(src, refresh_cooldown), TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(send_full_update), custom_data, force), COOLDOWN_TIMELEFT(src, refresh_cooldown), TIMER_UNIQUE) return refreshing = FALSE var/should_update_data = force || status >= UI_UPDATE diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index e2e2096ac99..bc3f8f314e0 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -37,7 +37,7 @@ src.client = client window = new(client, id) winset(client, "tgui_say", "size=1,1;is-visible=0;") - window.subscribe(src, .proc/on_message) + window.subscribe(src, PROC_REF(on_message)) window.is_browser = TRUE /** diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 8c4832a2ab5..a6367c088d6 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -60,7 +60,7 @@ if(!window_open || !client.typing_indicators || !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER)) return FALSE client_mob.create_typing_indicator() - addtimer(CALLBACK(src, .proc/stop_typing), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) /** * Callback to remove the typing indicator after a brief period of inactivity. diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index 3c927488fa1..9fb8b02b019 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -16,7 +16,7 @@ /datum/tgui_panel/New(client/client, id) src.client = client window = new(client, id) - window.subscribe(src, .proc/on_message) + window.subscribe(src, PROC_REF(on_message)) /datum/tgui_panel/Del() window.unsubscribe(src) @@ -52,7 +52,7 @@ window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) // Other setup request_telemetry() - addtimer(CALLBACK(src, .proc/on_initialize_timed_out), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) /** * private diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index 11ab9bb803b..23fdaa9e787 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -88,7 +88,7 @@ Notes: /datum/tooltip/proc/hide() if (queueHide) - addtimer(CALLBACK(src, .proc/do_hide), 1) + addtimer(CALLBACK(src, PROC_REF(do_hide)), 1) else do_hide() diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm index d273310155a..e1c2959dda8 100644 --- a/code/modules/unit_tests/combat.dm +++ b/code/modules/unit_tests/combat.dm @@ -57,9 +57,9 @@ var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) var/obj/item/storage/toolbox/toolbox = allocate(/obj/item/storage/toolbox) - RegisterSignal(toolbox, COMSIG_ITEM_PRE_ATTACK, .proc/pre_attack_hit) - RegisterSignal(toolbox, COMSIG_ITEM_ATTACK, .proc/attack_hit) - RegisterSignal(toolbox, COMSIG_ITEM_AFTERATTACK, .proc/post_attack_hit) + RegisterSignal(toolbox, COMSIG_ITEM_PRE_ATTACK, PROC_REF(pre_attack_hit)) + RegisterSignal(toolbox, COMSIG_ITEM_ATTACK, PROC_REF(attack_hit)) + RegisterSignal(toolbox, COMSIG_ITEM_AFTERATTACK, PROC_REF(post_attack_hit)) attacker.put_in_active_hand(toolbox, forced = TRUE) attacker.set_combat_mode(TRUE) diff --git a/code/modules/unit_tests/connect_loc.dm b/code/modules/unit_tests/connect_loc.dm index a0b4f618991..69cd4fa0985 100644 --- a/code/modules/unit_tests/connect_loc.dm +++ b/code/modules/unit_tests/connect_loc.dm @@ -63,7 +63,7 @@ . = ..() var/static/list/connections = list( - COMSIG_MOCK_SIGNAL = .proc/on_receive_mock_signal, + COMSIG_MOCK_SIGNAL = PROC_REF(on_receive_mock_signal), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm index efa6c34b592..3889e062bda 100644 --- a/code/modules/unit_tests/emoting.dm +++ b/code/modules/unit_tests/emoting.dm @@ -3,7 +3,7 @@ /datum/unit_test/emoting/Run() var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human) - RegisterSignal(human, COMSIG_MOB_EMOTE, .proc/on_emote_used) + RegisterSignal(human, COMSIG_MOB_EMOTE, PROC_REF(on_emote_used)) human.say("*shrug") TEST_ASSERT_EQUAL(emotes_used, 1, "Human did not shrug") diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 97639c4946e..fb484945aff 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -118,7 +118,7 @@ GLOBAL_VAR(test_log) if(length(focused_tests)) tests_to_run = focused_tests - tests_to_run = sortTim(tests_to_run, /proc/cmp_unit_test_priority) + tests_to_run = sortTim(tests_to_run, GLOBAL_PROC_REF(cmp_unit_test_priority)) var/list/test_results = list() diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index 66d7e39c29c..ea34f63a2bb 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -58,7 +58,7 @@ if(occupant_amount() >= max_occupants) return FALSE var/atom/old_loc = loc - if(do_mob(forcer, kidnapped, get_enter_delay(kidnapped), extra_checks=CALLBACK(src, /obj/vehicle/sealed/car.proc/is_car_stationary, old_loc))) + if(do_mob(forcer, kidnapped, get_enter_delay(kidnapped), extra_checks=CALLBACK(src, TYPE_PROC_REF(/obj/vehicle/sealed/car, is_car_stationary), old_loc))) mob_forced_enter(kidnapped, silent) return TRUE return FALSE diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 2c68c55baf3..27601a40f8f 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -41,7 +41,7 @@ var/mob/living/carbon/human/H = M if(is_clown_job(H.mind?.assigned_role)) //Ensures only clowns can drive the car. (Including more at once) add_control_flags(H, VEHICLE_CONTROL_DRIVE) - RegisterSignal(H, COMSIG_MOB_CLICKON, .proc/fire_cannon_at) + RegisterSignal(H, COMSIG_MOB_CLICKON, PROC_REF(fire_cannon_at)) M.log_message("has entered [src] as a possible driver", LOG_ATTACK) return add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED) @@ -58,7 +58,7 @@ message_admins("[ADMIN_LOOKUPFLW(forced_mob)] was forced into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an explosion.") forced_mob.log_message("was forced into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an explosion.", LOG_GAME) audible_message(span_userdanger("You hear a rattling sound coming from the engine. That can't be good..."), null, 1) - addtimer(CALLBACK(src, .proc/irish_car_bomb), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(irish_car_bomb)), 5 SECONDS) /obj/vehicle/sealed/car/clowncar/proc/irish_car_bomb() dump_mobs() @@ -161,7 +161,7 @@ visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system.")) icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" - addtimer(CALLBACK(src, .proc/reset_icon), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_icon)), 10 SECONDS) if(4) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas.")) var/datum/reagents/funnychems = new/datum/reagents(300) @@ -173,8 +173,8 @@ smoke.start() if(5) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail.")) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/cover_in_oil) - addtimer(CALLBACK(src, .proc/stop_dropping_oil), 3 SECONDS) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(cover_in_oil)) + addtimer(CALLBACK(src, PROC_REF(stop_dropping_oil)), 3 SECONDS) if(6) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car lets out a comedic toot.")) playsound(src, 'sound/vehicles/clowncar_fart.ogg', 100) @@ -205,7 +205,7 @@ if(cannonmode) //canon active, deactivate flick("clowncar_fromfire", src) icon_state = "clowncar" - addtimer(CALLBACK(src, .proc/deactivate_cannon), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(deactivate_cannon)), 2 SECONDS) playsound(src, 'sound/vehicles/clowncar_cannonmode2.ogg', 75) visible_message(span_danger("The [src] starts going back into mobile mode.")) else @@ -213,7 +213,7 @@ flick("clowncar_tofire", src) icon_state = "clowncar_fire" visible_message(span_danger("The [src] opens up and reveals a large cannon.")) - addtimer(CALLBACK(src, .proc/activate_cannon), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(activate_cannon)), 2 SECONDS) playsound(src, 'sound/vehicles/clowncar_cannonmode1.ogg', 75) cannonmode = CLOWN_CANNON_BUSY diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index d15350bf0c8..baed500fd8b 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -177,9 +177,9 @@ . = ..() if(enclosed) internal_tank = new (src) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , .proc/disconnect_air) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_stepsound) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(disconnect_air)) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_stepsound)) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) spark_system.set_up(2, 0, src) spark_system.attach(src) @@ -513,7 +513,7 @@ for(var/mob/M in speech_bubble_recipients) if(M.client) speech_bubble_recipients.Add(M.client) - INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), image('icons/mob/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) //////////////////////////// ///// Action processing //// @@ -558,7 +558,7 @@ return if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, livinguser, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK) return - INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, modifiers) + INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, modifiers) return if((selected.range & MECHA_MELEE) && Adjacent(target)) if(isliving(target) && selected.harmful && HAS_TRAIT(livinguser, TRAIT_PACIFISM)) @@ -566,7 +566,7 @@ return if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, livinguser, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK) return - INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, modifiers) + INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, modifiers) return if(!(livinguser in return_controllers_with_flag(VEHICLE_CONTROL_MELEE))) to_chat(livinguser, span_warning("You're in the wrong seat to interact with your hands.")) @@ -1100,10 +1100,10 @@ /obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags) - RegisterSignal(M, COMSIG_LIVING_DEATH, .proc/mob_exit) - RegisterSignal(M, COMSIG_MOB_CLICKON, .proc/on_mouseclick) - RegisterSignal(M, COMSIG_MOB_MIDDLECLICKON, .proc/on_middlemouseclick) //For AIs - RegisterSignal(M, COMSIG_MOB_SAY, .proc/display_speech_bubble) + RegisterSignal(M, COMSIG_LIVING_DEATH, PROC_REF(mob_exit)) + RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick)) + RegisterSignal(M, COMSIG_MOB_MIDDLECLICKON, PROC_REF(on_middlemouseclick)) //For AIs + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble)) . = ..() update_appearance() diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index fb0b34ae2aa..d46460380d5 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -17,8 +17,8 @@ /obj/vehicle/sealed/mecha/combat/durand/Initialize(mapload) . = ..() shield = new /obj/durand_shield(loc, src, layer, dir) - RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, .proc/relay) - RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, .proc/prehit) + RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(relay)) + RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, PROC_REF(prehit)) /obj/vehicle/sealed/mecha/combat/durand/Destroy() @@ -55,7 +55,7 @@ if(defense_mode) var/datum/action/action = LAZYACCESSASSOC(occupant_actions, M, /datum/action/vehicle/sealed/mecha/mech_defense_mode) if(action) - INVOKE_ASYNC(action, /datum/action.proc/Trigger, FALSE) + INVOKE_ASYNC(action, TYPE_PROC_REF(/datum/action, Trigger), FALSE) return ..() ///Relays the signal from the action button to the shield, and creates a new shield if the old one is MIA. @@ -166,7 +166,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe chassis = _chassis layer = _layer setDir(_dir) - RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, .proc/activate) + RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(activate)) /obj/durand_shield/Destroy() @@ -218,7 +218,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe playsound(src, 'sound/mecha/mech_shield_raise.ogg', 50, FALSE) set_light(l_range = MINIMUM_USEFUL_LIGHT_RANGE , l_power = 5, l_color = "#00FFFF") icon_state = "shield" - RegisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE, .proc/resetdir) + RegisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE, PROC_REF(resetdir)) else flick("shield_drop", src) playsound(src, 'sound/mecha/mech_shield_drop.ogg', 50, FALSE) diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm index 7a3152b593c..4d038d5bd70 100644 --- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm +++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm @@ -76,7 +76,7 @@ abort_skyfall() return chassis.balloon_alert(owner, "charging skyfall...") - INVOKE_ASYNC(src, .proc/skyfall_charge_loop) + INVOKE_ASYNC(src, PROC_REF(skyfall_charge_loop)) /** * ## skyfall_charge_loop @@ -115,7 +115,7 @@ S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_SKYFALL, skyfall_cooldown_time) button_icon_state = "mech_savannah_cooldown" UpdateButtonIcon() - addtimer(CALLBACK(src, /datum/action/vehicle/sealed/mecha/skyfall.proc/reset_button_icon), skyfall_cooldown_time) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/skyfall, reset_button_icon)), skyfall_cooldown_time) for(var/mob/living/shaken in range(7, chassis)) shake_camera(shaken, 3, 3) @@ -132,7 +132,7 @@ chassis.plane = GAME_PLANE_UPPER_FOV_HIDDEN animate(chassis, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) animate(chassis, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising mech (just like pods hehe) - addtimer(CALLBACK(src, .proc/begin_landing), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(begin_landing)), 2 SECONDS) /** * ## begin_landing @@ -143,7 +143,7 @@ /datum/action/vehicle/sealed/mecha/skyfall/proc/begin_landing() animate(chassis, pixel_z = 0, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) animate(chassis, alpha = 255, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(src, .proc/land), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(land)), 1 SECONDS) /** * ## land @@ -263,8 +263,8 @@ chassis.balloon_alert(owner, "missile mode on (click to target)") aiming_missile = TRUE rockets_left = 3 - RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, .proc/on_melee_click) - RegisterSignal(chassis, COMSIG_MECHA_EQUIPMENT_CLICK, .proc/on_equipment_click) + RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, PROC_REF(on_melee_click)) + RegisterSignal(chassis, COMSIG_MECHA_EQUIPMENT_CLICK, PROC_REF(on_equipment_click)) owner.client.mouse_override_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi' owner.update_mouse_pointer() owner.overlay_fullscreen("ivanov", /atom/movable/screen/fullscreen/ivanov_display, 1) @@ -320,7 +320,7 @@ )) button_icon_state = "mech_ivanov_cooldown" UpdateButtonIcon() - addtimer(CALLBACK(src, /datum/action/vehicle/sealed/mecha/ivanov_strike.proc/reset_button_icon), strike_cooldown_time) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/ivanov_strike, reset_button_icon)), strike_cooldown_time) //misc effects @@ -344,7 +344,7 @@ return INITIALIZE_HINT_QDEL src.mecha = mecha animate(src, alpha = 255, TOTAL_SKYFALL_LEAP_TIME/2, easing = CIRCULAR_EASING|EASE_OUT) - RegisterSignal(mecha, COMSIG_MOVABLE_MOVED, .proc/follow) + RegisterSignal(mecha, COMSIG_MOVABLE_MOVED, PROC_REF(follow)) QDEL_IN(src, TOTAL_SKYFALL_LEAP_TIME) //when the animations land /obj/effect/skyfall_landingzone/Destroy(force) diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index bcb67080e6f..0ffd8306590 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -296,8 +296,8 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles detaching signal hooks incase someone is crazy enough to make this edible. /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm index 673f8eafed4..cfa756ff75a 100644 --- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm @@ -203,7 +203,7 @@ var/delay = 2 var/datum/move_loop/our_loop = water.move_at(pick(targets), delay, 4) - RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, .proc/water_finished_moving) + RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, PROC_REF(water_finished_moving)) /obj/item/mecha_parts/mecha_equipment/extinguisher/proc/water_finished_moving(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index b1d1bcb1ef8..58a4bf3a104 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -399,7 +399,7 @@ var/turf/T = get_turf(src) message_admins("[ADMIN_LOOKUPFLW(user)] fired a [F] in [ADMIN_VERBOSEJMP(T)]") log_game("[key_name(user)] fired a [F] in [AREACOORD(T)]") - addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/detonate), det_time) + addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, detonate)), det_time) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze name = "\improper SOB-3 grenade launcher" diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index 990105a6a04..ea8f699adf9 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -603,7 +603,7 @@ /obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(item_inserted, id_inserted, amount_inserted) var/datum/material/M = id_inserted add_overlay("fab-load-[M.name]") - addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), "fab-load-[M.name]"), 10) /obj/machinery/mecha_part_fabricator/screwdriver_act(mob/living/user, obj/item/I) if(..()) diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm index 6b6dd9af574..948a2eaf91a 100644 --- a/code/modules/vehicles/mecha/mecha_construction_paths.dm +++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm @@ -421,7 +421,7 @@ outer_plating_amount=1 /datum/component/construction/mecha/gygax/action(datum/source, atom/used_atom, mob/user) - return INVOKE_ASYNC(src, .proc/check_step, used_atom,user) + return INVOKE_ASYNC(src, PROC_REF(check_step), used_atom,user) /datum/component/construction/mecha/gygax/custom_action(obj/item/I, mob/living/user, diff) if(!..()) diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm index 9d31dbd025a..31006459df1 100644 --- a/code/modules/vehicles/mecha/mecha_topic.dm +++ b/code/modules/vehicles/mecha/mecha_topic.dm @@ -415,7 +415,7 @@ if(href_list["repair_int_control_lost"]) to_chat(occupants, "[icon2html(src, occupants)][span_notice("Recalibrating coordination system...")]") log_message("Recalibration of coordination system started.", LOG_MECHA) - addtimer(CALLBACK(src, .proc/stationary_repair, loc), 100, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(stationary_repair), loc), 100, TIMER_UNIQUE) ///Repairs internal damage if the mech hasn't moved. /obj/vehicle/sealed/mecha/proc/stationary_repair(location) diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm index aaa4cd3a59f..ef1a1431147 100644 --- a/code/modules/vehicles/mecha/mecha_wreckage.dm +++ b/code/modules/vehicles/mecha/mecha_wreckage.dm @@ -32,7 +32,7 @@ return AI = AI_pilot AI.apply_damage(150, BURN) //Give the AI a bit of damage from the "shock" of being suddenly shut down - INVOKE_ASYNC(AI, /mob/living/silicon.proc/death) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair. + INVOKE_ASYNC(AI, TYPE_PROC_REF(/mob/living/silicon, death)) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair. AI.forceMove(src) //Put the dead AI inside the wreckage for recovery add_overlay(mutable_appearance('icons/obj/guns/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon AI.controlled_equipment = null diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm index 6cd47265b38..8c1a8b175d6 100644 --- a/code/modules/vehicles/mecha/working/clarke.dm +++ b/code/modules/vehicles/mecha/working/clarke.dm @@ -84,7 +84,7 @@ UpdateButtonIcon() COOLDOWN_START(src, search_cooldown, SEARCH_COOLDOWN) addtimer(VARSET_CALLBACK(src, button_icon_state, "mech_search_ruins"), SEARCH_COOLDOWN) - addtimer(CALLBACK(src, .proc/UpdateButtonIcon), SEARCH_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(UpdateButtonIcon)), SEARCH_COOLDOWN) var/obj/pinpointed_ruin for(var/obj/effect/landmark/ruin/ruin_landmark as anything in GLOB.ruin_landmarks) if(ruin_landmark.z != chassis.z) @@ -95,7 +95,7 @@ chassis.balloon_alert(living_owner, "no ruins!") return var/datum/status_effect/agent_pinpointer/ruin_pinpointer = living_owner.apply_status_effect(/datum/status_effect/agent_pinpointer/ruin) - ruin_pinpointer.RegisterSignal(living_owner, COMSIG_MOVABLE_MOVED, /datum/status_effect/agent_pinpointer/ruin.proc/cancel_self) + ruin_pinpointer.RegisterSignal(living_owner, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/datum/status_effect/agent_pinpointer/ruin, cancel_self)) ruin_pinpointer.scan_target = pinpointed_ruin chassis.balloon_alert(living_owner, "pinpointing nearest ruin") diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index 4b0457e5457..1381f508e5e 100644 --- a/code/modules/vehicles/pimpin_ride.dm +++ b/code/modules/vehicles/pimpin_ride.dm @@ -40,7 +40,7 @@ return to_chat(user, span_notice("You hook the trashbag onto [src].")) trash_bag = I - RegisterSignal(trash_bag, COMSIG_PARENT_QDELETING, .proc/bag_deleted) + RegisterSignal(trash_bag, COMSIG_PARENT_QDELETING, PROC_REF(bag_deleted)) SEND_SIGNAL(src, COMSIG_VACUUM_BAG_ATTACH, I) update_appearance() else if(istype(I, /obj/item/janicart_upgrade)) @@ -86,7 +86,7 @@ */ /obj/vehicle/ridden/janicart/proc/bag_deleted(datum/source) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_remove_bag) + INVOKE_ASYNC(src, PROC_REF(try_remove_bag)) /** * Attempts to remove the attached trash bag, returns true if bag was removed diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index f3430474431..a9cedabe8f4 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -155,7 +155,7 @@ victim.Paralyze(1.5 SECONDS) skater.adjustStaminaLoss(instability) victim.visible_message(span_danger("[victim] straight up gets grinded into the ground by [skater]'s [src]! Radical!")) - addtimer(CALLBACK(src, .proc/grind), 1) + addtimer(CALLBACK(src, PROC_REF(grind)), 1) /obj/vehicle/ridden/scooter/skateboard/MouseDrop(atom/over_object) . = ..() diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index b1930e6fcc0..1da92f51f44 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -321,7 +321,7 @@ rider.client.give_award(/datum/award/achievement/misc/tram_surfer, rider) vehicle.grinding = TRUE vehicle.icon_state = "[initial(vehicle.icon_state)]-grind" - addtimer(CALLBACK(vehicle, /obj/vehicle/ridden/scooter/skateboard/.proc/grind), 2) + addtimer(CALLBACK(vehicle, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard/, grind)), 2) //VIM ACTION DATUMS diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm index a2799634833..578ef030d64 100644 --- a/code/modules/vehicles/vehicle_key.dm +++ b/code/modules/vehicles/vehicle_key.dm @@ -20,7 +20,7 @@ return SHAME user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] ear and starts [user.p_their()] motor! It looks like [user.p_theyre()] trying to commit suicide!")) user.say("Vroom vroom!!", forced="secway key suicide") //Not doing a shamestate here, because even if they fail to speak they're spinning. - addtimer(CALLBACK(user, /mob/living/.proc/gib), 20) + addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, gib)), 20) return MANUAL_SUICIDE /obj/item/key/janitor @@ -36,14 +36,14 @@ if(SKILL_LEVEL_APPRENTICE to SKILL_LEVEL_JOURNEYMAN) //At least they tried user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has inefficiently become one with the janicart! It looks like [user.p_theyre()] trying to commit suicide!")) user.AddElement(/datum/element/cleaning) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 51) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 51) return MANUAL_SUICIDE if(SKILL_LEVEL_EXPERT to SKILL_LEVEL_MASTER) //They are worthy enough, but can it go even further beyond? user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has skillfully become one with the janicart! It looks like [user.p_theyre()] trying to commit suicide!")) user.AddElement(/datum/element/cleaning) for(var/i in 1 to 100) - addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 101) + addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101) return MANUAL_SUICIDE if(SKILL_LEVEL_LEGENDARY to INFINITY) //Holy shit, look at that janny go! user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has epically become one with the janicart, and they're even in overdrive mode! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -51,8 +51,8 @@ playsound(src, 'sound//magic/lightning_chargeup.ogg', 50, TRUE, -1) user.reagents.add_reagent(/datum/reagent/drug/methamphetamine, 10) //Gotta go fast! for(var/i in 1 to 150) - addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 151) + addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 151) return MANUAL_SUICIDE /obj/item/key/proc/manual_suicide(mob/living/user) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 9d3e2fa1566..2bda0f2dec3 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -878,7 +878,7 @@ GLOBAL_LIST_EMPTY(vending_products) allowed_configs += "[initial(item.greyscale_config_inhand_right)]" var/datum/greyscale_modify_menu/menu = new( - src, usr, allowed_configs, CALLBACK(src, .proc/vend_greyscale, params), + src, usr, allowed_configs, CALLBACK(src, PROC_REF(vend_greyscale), params), starting_icon_state=initial(fake_atom.icon_state), starting_config=initial(fake_atom.greyscale_config), starting_colors=initial(fake_atom.greyscale_colors) diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm index ff89f8b0e4a..ad544354298 100644 --- a/code/modules/wiremod/components/abstract/module.dm +++ b/code/modules/wiremod/components/abstract/module.dm @@ -171,9 +171,9 @@ /obj/item/circuit_component/module/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, .proc/handle_set_cell) - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, .proc/handle_set_on) - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, .proc/handle_set_shell) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, PROC_REF(handle_set_cell)) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, PROC_REF(handle_set_on)) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(handle_set_shell)) internal_circuit.set_cell(added_to.cell) internal_circuit.set_shell(added_to.shell) internal_circuit.set_on(added_to.on) diff --git a/code/modules/wiremod/components/abstract/variable.dm b/code/modules/wiremod/components/abstract/variable.dm index 8beab633dd9..3042a7e0686 100644 --- a/code/modules/wiremod/components/abstract/variable.dm +++ b/code/modules/wiremod/components/abstract/variable.dm @@ -61,4 +61,4 @@ current_variable = variable if(should_listen) current_variable.add_listener(src) - RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, .proc/remove_current_variable) + RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_variable)) diff --git a/code/modules/wiremod/components/action/mmi.dm b/code/modules/wiremod/components/action/mmi.dm index 3e3c3ef7414..75e0fedd938 100644 --- a/code/modules/wiremod/components/action/mmi.dm +++ b/code/modules/wiremod/components/action/mmi.dm @@ -78,7 +78,7 @@ /obj/item/circuit_component/mmi/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, .proc/handle_attack_by) + RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attack_by)) /obj/item/circuit_component/mmi/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_PARENT_ATTACKBY) @@ -101,8 +101,8 @@ if(to_add.brainmob) update_mmi_mob(to_add, null, to_add.brainmob) brain = to_add - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/remove_current_brain) - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/mmi_moved) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_brain)) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(mmi_moved)) /obj/item/circuit_component/mmi/proc/mmi_moved(atom/movable/mmi) SIGNAL_HANDLER @@ -132,7 +132,7 @@ UnregisterSignal(old_mmi, COMSIG_MOB_CLICKON) if(new_mmi) new_mmi.remote_control = src - RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, .proc/handle_mmi_attack) + RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, PROC_REF(handle_mmi_attack)) /obj/item/circuit_component/mmi/relaymove(mob/living/user, direct) if(user != brain.brainmob) diff --git a/code/modules/wiremod/components/action/pathfind.dm b/code/modules/wiremod/components/action/pathfind.dm index 540e228ee10..ad602c32c6b 100644 --- a/code/modules/wiremod/components/action/pathfind.dm +++ b/code/modules/wiremod/components/action/pathfind.dm @@ -45,7 +45,7 @@ reason_failed = add_output_port("Fail reason", PORT_TYPE_STRING) /obj/item/circuit_component/pathfind/input_received(datum/port/input/port) - INVOKE_ASYNC(src, .proc/perform_pathfinding, port) + INVOKE_ASYNC(src, PROC_REF(perform_pathfinding), port) /obj/item/circuit_component/pathfind/proc/perform_pathfinding(datum/port/input/port) var/target_X = input_X.value diff --git a/code/modules/wiremod/components/action/printer.dm b/code/modules/wiremod/components/action/printer.dm index 4ef07c1d253..615e4c8803d 100644 --- a/code/modules/wiremod/components/action/printer.dm +++ b/code/modules/wiremod/components/action/printer.dm @@ -29,12 +29,12 @@ var/max_paper_capacity = 10 /obj/item/circuit_component/printer/populate_ports() - print = add_input_port("Print", PORT_TYPE_STRING, trigger = .proc/print_on_paper) + print = add_input_port("Print", PORT_TYPE_STRING, trigger = PROC_REF(print_on_paper)) text_color_red = add_input_port("Color (Red)", PORT_TYPE_NUMBER, trigger = null, default = 0) text_color_green = add_input_port("Color (Green)", PORT_TYPE_NUMBER, trigger = null, default = 0) text_color_blue = add_input_port("Color (Blue)", PORT_TYPE_NUMBER, trigger = null, default = 0) signature = add_input_port("Signature", PORT_TYPE_STRING, trigger = null, default = "signature") - eject = add_input_port("Eject", PORT_TYPE_SIGNAL, trigger = .proc/eject_paper, order = 2) + eject = add_input_port("Eject", PORT_TYPE_SIGNAL, trigger = PROC_REF(eject_paper), order = 2) /obj/item/circuit_component/printer/populate_options() var/static/typeface_options = list( @@ -62,8 +62,8 @@ return ..() /obj/item/circuit_component/printer/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY_SECONDARY, .proc/handle_secondary_attackby) - RegisterSignal(shell, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(shell, COMSIG_PARENT_ATTACKBY_SECONDARY, PROC_REF(handle_secondary_attackby)) + RegisterSignal(shell, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /obj/item/circuit_component/printer/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list(COMSIG_PARENT_ATTACKBY_SECONDARY, COMSIG_PARENT_EXAMINE)) diff --git a/code/modules/wiremod/components/action/pull.dm b/code/modules/wiremod/components/action/pull.dm index 9b6f2e3e7f4..8c83e938b00 100644 --- a/code/modules/wiremod/components/action/pull.dm +++ b/code/modules/wiremod/components/action/pull.dm @@ -24,4 +24,4 @@ if(!istype(shell) || get_dist(shell, target_atom) > 1 || shell.z != target_atom.z) return - INVOKE_ASYNC(shell, /atom/movable.proc/start_pulling, target_atom) + INVOKE_ASYNC(shell, TYPE_PROC_REF(/atom/movable, start_pulling), target_atom) diff --git a/code/modules/wiremod/components/action/radio.dm b/code/modules/wiremod/components/action/radio.dm index 76c81b3d38b..e45b72c7f0c 100644 --- a/code/modules/wiremod/components/action/radio.dm +++ b/code/modules/wiremod/components/action/radio.dm @@ -47,7 +47,7 @@ freq.set_value(sanitize_frequency(freq.value, TRUE)) /obj/item/circuit_component/radio/input_received(datum/port/input/port) - INVOKE_ASYNC(src, .proc/handle_radio_input, port) + INVOKE_ASYNC(src, PROC_REF(handle_radio_input), port) /obj/item/circuit_component/radio/proc/handle_radio_input(datum/port/input/port) var/frequency = freq.value diff --git a/code/modules/wiremod/components/admin/animate.dm b/code/modules/wiremod/components/admin/animate.dm index 4af25578f3e..c3b26464b1b 100644 --- a/code/modules/wiremod/components/admin/animate.dm +++ b/code/modules/wiremod/components/admin/animate.dm @@ -35,7 +35,7 @@ target = add_input_port("Target", PORT_TYPE_ATOM) parallel = add_input_port("Parallel", PORT_TYPE_NUMBER, default = 1) animation_loops = add_input_port("Loops", PORT_TYPE_NUMBER) - stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = .proc/stop_animations) + stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = PROC_REF(stop_animations)) animate_event = add_output_port("Perform Animation", PORT_TYPE_INSTANT_SIGNAL) /obj/item/circuit_component/begin_animation/pre_input_received(datum/port/input/port) diff --git a/code/modules/wiremod/components/admin/input_request.dm b/code/modules/wiremod/components/admin/input_request.dm index b0efdb4ea42..13dfacba357 100644 --- a/code/modules/wiremod/components/admin/input_request.dm +++ b/code/modules/wiremod/components/admin/input_request.dm @@ -53,7 +53,7 @@ if(!istype(player)) return - INVOKE_ASYNC(src, .proc/request_input_from_player, player) + INVOKE_ASYNC(src, PROC_REF(request_input_from_player), player) /obj/item/circuit_component/input_request/proc/request_input_from_player(mob/player) var/new_option = input_options.value diff --git a/code/modules/wiremod/components/admin/proccall.dm b/code/modules/wiremod/components/admin/proccall.dm index 56aa5a3b7b9..56baaee1447 100644 --- a/code/modules/wiremod/components/admin/proccall.dm +++ b/code/modules/wiremod/components/admin/proccall.dm @@ -180,7 +180,7 @@ params = recursive_list_resolve(params) log_admin_circuit("[parent.get_creator()] proccalled '[to_invoke]' on [called_on] with params \[[params.Join(", ")]].") - INVOKE_ASYNC(src, .proc/do_proccall, called_on, to_invoke, params) + INVOKE_ASYNC(src, PROC_REF(do_proccall), called_on, to_invoke, params) /obj/item/circuit_component/proccall/proc/do_proccall(called_on, to_invoke, params) var/result = HandleUserlessProcCall(parent.get_creator(), called_on, to_invoke, params) diff --git a/code/modules/wiremod/components/admin/save_shell.dm b/code/modules/wiremod/components/admin/save_shell.dm index 4727d460baa..768983c9e20 100644 --- a/code/modules/wiremod/components/admin/save_shell.dm +++ b/code/modules/wiremod/components/admin/save_shell.dm @@ -19,8 +19,8 @@ /obj/item/circuit_component/save_shell/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load) - RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, .proc/on_pre_save_to_json) + RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load)) + RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, PROC_REF(on_pre_save_to_json)) /obj/item/circuit_component/save_shell/removed_from(obj/item/integrated_circuit/removed_from) UnregisterSignal(removed_from, list(COMSIG_CIRCUIT_POST_LOAD, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON)) diff --git a/code/modules/wiremod/components/admin/sdql.dm b/code/modules/wiremod/components/admin/sdql.dm index effa4be8976..548471e20fa 100644 --- a/code/modules/wiremod/components/admin/sdql.dm +++ b/code/modules/wiremod/components/admin/sdql.dm @@ -23,7 +23,7 @@ if(GLOB.AdminProcCaller) return TRUE - INVOKE_ASYNC(src, .proc/execute_sdql, port) + INVOKE_ASYNC(src, PROC_REF(execute_sdql), port) /obj/item/circuit_component/sdql_operation/proc/execute_sdql(datum/port/input/port) var/operation = sdql_operation.value diff --git a/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm b/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm index 326a24e0110..a80ba26794c 100644 --- a/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm +++ b/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm @@ -64,9 +64,9 @@ /obj/item/circuit_component/signal_handler/populate_ports() instant = add_input_port("Instant", PORT_TYPE_NUMBER, order = 0.5, trigger = null, default = 1) - register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/register_signals) - unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals) - unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals_all) + register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(register_signals)) + unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals)) + unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals_all)) add_source_entity() event_triggered = add_output_port("Triggered", PORT_TYPE_INSTANT_SIGNAL, order = 2) @@ -134,7 +134,7 @@ if(target_datum) log_admin_circuit("[parent.get_creator()] registered the signal '[registered_signal]' on [target_datum]") // We override because an admin may try registering a signal on the same object/datum again, so this prevents any runtimes from occuring - RegisterSignal(target_datum, registered_signal, .proc/handle_signal_received, override = TRUE) + RegisterSignal(target_datum, registered_signal, PROC_REF(handle_signal_received), override = TRUE) registered_entities |= WEAKREF(target_datum) /obj/item/circuit_component/signal_handler/proc/load_new_ports(list/ports_to_load) @@ -148,7 +148,7 @@ signal_ports = ports_to_load for(var/list/data in signal_ports) if(data["is_response"]) - var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = .proc/handle_bitflag_received) + var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = PROC_REF(handle_bitflag_received)) input_signal_ports[bitflag_input] = data["bitflag"] else output_signal_ports += add_output_port(data["name"], data["type"], order = 1) diff --git a/code/modules/wiremod/components/atom/hear.dm b/code/modules/wiremod/components/atom/hear.dm index af660d2d67c..9587e1fb385 100644 --- a/code/modules/wiremod/components/atom/hear.dm +++ b/code/modules/wiremod/components/atom/hear.dm @@ -30,7 +30,7 @@ /obj/item/circuit_component/hear/register_shell(atom/movable/shell) if(parent.loc != shell) shell.become_hearing_sensitive(CIRCUIT_HEAR_TRAIT) - RegisterSignal(shell, COMSIG_MOVABLE_HEAR, .proc/on_shell_hear) + RegisterSignal(shell, COMSIG_MOVABLE_HEAR, PROC_REF(on_shell_hear)) /obj/item/circuit_component/hear/unregister_shell(atom/movable/shell) REMOVE_TRAIT(shell, TRAIT_HEARING_SENSITIVE, CIRCUIT_HEAR_TRAIT) diff --git a/code/modules/wiremod/components/bci/hud/counter_overlay.dm b/code/modules/wiremod/components/bci/hud/counter_overlay.dm index 973f4f9be01..685469a04ba 100644 --- a/code/modules/wiremod/components/bci/hud/counter_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/counter_overlay.dm @@ -34,7 +34,7 @@ /obj/item/circuit_component/counter_overlay/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/cyberimp/bci)) bci = shell - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/counter_overlay/unregister_shell(atom/movable/shell) bci = null diff --git a/code/modules/wiremod/components/bci/hud/object_overlay.dm b/code/modules/wiremod/components/bci/hud/object_overlay.dm index 7822b465869..eec881b0cc6 100644 --- a/code/modules/wiremod/components/bci/hud/object_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/object_overlay.dm @@ -63,7 +63,7 @@ /obj/item/circuit_component/object_overlay/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/cyberimp/bci)) bci = shell - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/object_overlay/unregister_shell(atom/movable/shell) bci = null diff --git a/code/modules/wiremod/components/bci/hud/target_intercept.dm b/code/modules/wiremod/components/bci/hud/target_intercept.dm index fea25a3599b..6e63494db2c 100644 --- a/code/modules/wiremod/components/bci/hud/target_intercept.dm +++ b/code/modules/wiremod/components/bci/hud/target_intercept.dm @@ -25,7 +25,7 @@ /obj/item/circuit_component/target_intercept/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/cyberimp/bci)) bci = shell - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/target_intercept/unregister_shell(atom/movable/shell) bci = null diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm index 8f302e5f371..b4baf2c9659 100644 --- a/code/modules/wiremod/components/id/access_checker.dm +++ b/code/modules/wiremod/components/id/access_checker.dm @@ -36,7 +36,7 @@ /obj/item/circuit_component/compare/access/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load) + RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load)) /obj/item/circuit_component/compare/access/removed_from(obj/item/integrated_circuit/removed_from) UnregisterSignal(removed_from, COMSIG_CIRCUIT_POST_LOAD) diff --git a/code/modules/wiremod/components/list/filter.dm b/code/modules/wiremod/components/list/filter.dm index eddcb4e5b50..1e1756c60fd 100644 --- a/code/modules/wiremod/components/list/filter.dm +++ b/code/modules/wiremod/components/list/filter.dm @@ -49,7 +49,7 @@ /obj/item/circuit_component/filter_list/populate_ports() list_to_filter = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY)) - accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = .proc/accept_entry_port) + accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = PROC_REF(accept_entry_port)) element = add_output_port("Element", PORT_TYPE_ANY) current_index = add_output_port("Index", PORT_TYPE_NUMBER) diff --git a/code/modules/wiremod/components/list/foreach.dm b/code/modules/wiremod/components/list/foreach.dm index 78324bf566a..a3728192960 100644 --- a/code/modules/wiremod/components/list/foreach.dm +++ b/code/modules/wiremod/components/list/foreach.dm @@ -41,8 +41,8 @@ /obj/item/circuit_component/foreach/populate_ports() list_to_iterate = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY)) - next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = .proc/trigger_next_index) - reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = .proc/restart) + next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_next_index)) + reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(restart)) element = add_output_port("Element", PORT_TYPE_ANY) current_index = add_output_port("Index", PORT_TYPE_NUMBER) diff --git a/code/modules/wiremod/components/ntnet/ntnet_receive.dm b/code/modules/wiremod/components/ntnet/ntnet_receive.dm index dae0c668682..31e557dcd96 100644 --- a/code/modules/wiremod/components/ntnet/ntnet_receive.dm +++ b/code/modules/wiremod/components/ntnet/ntnet_receive.dm @@ -27,7 +27,7 @@ /obj/item/circuit_component/ntnet_receive/populate_ports() data_package = add_output_port("Data Package", PORT_TYPE_LIST(PORT_TYPE_ANY)) enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) /obj/item/circuit_component/ntnet_receive/pre_input_received(datum/port/input/port) if(port == list_options) diff --git a/code/modules/wiremod/components/utility/delay.dm b/code/modules/wiremod/components/utility/delay.dm index 5db2f327365..a1e317d6fa8 100644 --- a/code/modules/wiremod/components/utility/delay.dm +++ b/code/modules/wiremod/components/utility/delay.dm @@ -25,8 +25,8 @@ /obj/item/circuit_component/delay/populate_ports() delay_amount = add_input_port("Delay", PORT_TYPE_NUMBER, trigger = null) - trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = .proc/trigger_delay) - interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = .proc/interrupt_timer) + trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_delay)) + interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = PROC_REF(interrupt_timer)) output = add_output_port("Result", PORT_TYPE_SIGNAL) @@ -35,7 +35,7 @@ var/delay = delay_amount.value if(delay > COMP_DELAY_MIN_VALUE) // Convert delay into deciseconds - timer_id = addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE) + timer_id = addtimer(CALLBACK(output, TYPE_PROC_REF(/datum/port/output, set_output), trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE) else if(timer_id != TIMER_ID_NULL) deltimer(timer_id) diff --git a/code/modules/wiremod/core/component.dm b/code/modules/wiremod/core/component.dm index 41e9ee88abf..a86ca0237fc 100644 --- a/code/modules/wiremod/core/component.dm +++ b/code/modules/wiremod/core/component.dm @@ -69,7 +69,7 @@ return /// Extension of add_input_port. Simplifies the code to make an option port to reduce boilerplate -/obj/item/circuit_component/proc/add_option_port(name, list/list_to_use, order = 0, trigger = .proc/input_received) +/obj/item/circuit_component/proc/add_option_port(name, list/list_to_use, order = 0, trigger = PROC_REF(input_received)) return add_input_port(name, PORT_TYPE_OPTION, order = order, trigger = trigger, port_type = /datum/port/input/option, extra_args = list("possible_options" = list_to_use)) /obj/item/circuit_component/Initialize(mapload) @@ -151,14 +151,14 @@ * * type - The datatype it handles * * trigger - Whether this input port triggers an update on the component when updated. */ -/obj/item/circuit_component/proc/add_input_port(name, type, order = 1, trigger = .proc/input_received, default = null, port_type = /datum/port/input, extra_args = null) +/obj/item/circuit_component/proc/add_input_port(name, type, order = 1, trigger = PROC_REF(input_received), default = null, port_type = /datum/port/input, extra_args = null) var/list/arguments = list(src) arguments += args if(extra_args) arguments += extra_args var/datum/port/input/input_port = new port_type(arglist(arguments)) input_ports += input_port - sortTim(input_ports, /proc/cmp_port_order_asc) + sortTim(input_ports, GLOBAL_PROC_REF(cmp_port_order_asc)) if(parent) SStgui.update_uis(parent) return input_port @@ -187,7 +187,7 @@ arguments += args var/datum/port/output/output_port = new(arglist(arguments)) output_ports += output_port - sortTim(output_ports, /proc/cmp_port_order_asc) + sortTim(output_ports, GLOBAL_PROC_REF(cmp_port_order_asc)) return output_port /** @@ -268,7 +268,7 @@ if(!cell?.use(power_usage_per_input)) return FALSE - if((!port || port.trigger == .proc/input_received) && (circuit_flags & CIRCUIT_FLAG_INPUT_SIGNAL) && !COMPONENT_TRIGGERED_BY(trigger_input, port)) + if((!port || port.trigger == PROC_REF(input_received)) && (circuit_flags & CIRCUIT_FLAG_INPUT_SIGNAL) && !COMPONENT_TRIGGERED_BY(trigger_input, port)) return FALSE return TRUE diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 0bbc37c5a03..5d8cb876a6b 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -29,8 +29,8 @@ current_unlocked_designs[design.build_path] = design.id - RegisterSignal(techweb, COMSIG_TECHWEB_ADD_DESIGN, .proc/on_research) - RegisterSignal(techweb, COMSIG_TECHWEB_REMOVE_DESIGN, .proc/on_removed) + RegisterSignal(techweb, COMSIG_TECHWEB_ADD_DESIGN, PROC_REF(on_research)) + RegisterSignal(techweb, COMSIG_TECHWEB_REMOVE_DESIGN, PROC_REF(on_removed)) materials = AddComponent( \ /datum/component/remote_materials, \ @@ -339,7 +339,7 @@ /obj/machinery/module_duplicator/proc/print_module(list/design) flick("module-fab-print", src) - addtimer(CALLBACK(src, .proc/finish_module_print, design), 1.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_module_print), design), 1.6 SECONDS) /obj/machinery/module_duplicator/proc/finish_module_print(list/design) var/atom/movable/created_atom @@ -403,7 +403,7 @@ return ..() flick("module-fab-scan", src) - addtimer(CALLBACK(src, .proc/finish_module_scan, user, data), 1.4 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_module_scan), user, data), 1.4 SECONDS) /obj/machinery/module_duplicator/proc/finish_module_scan(mob/user, data) scanned_designs += list(data) diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm index f0b96d32d50..fba12742c0a 100644 --- a/code/modules/wiremod/core/integrated_circuit.dm +++ b/code/modules/wiremod/core/integrated_circuit.dm @@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) GLOB.integrated_circuits += src - RegisterSignal(src, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) + RegisterSignal(src, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, PROC_REF(on_atom_usb_cable_try_attach)) /obj/item/integrated_circuit/loaded/Initialize(mapload) . = ..() @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) set_on(TRUE) SEND_SIGNAL(src, COMSIG_CIRCUIT_SET_SHELL, new_shell) shell = new_shell - RegisterSignal(shell, COMSIG_PARENT_QDELETING, .proc/remove_current_shell) + RegisterSignal(shell, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_shell)) for(var/obj/item/circuit_component/attached_component as anything in attached_components) attached_component.register_shell(shell) // Their input ports may be updated with user values, but the outputs haven't updated @@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) to_add.parent = src attached_components += to_add current_size += to_add.circuit_size - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/component_move_handler) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(component_move_handler)) SStgui.update_uis(src) if(shell) @@ -603,7 +603,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) component.variable_name.set_input(params["variable"]) component.rel_x = text2num(params["rel_x"]) component.rel_y = text2num(params["rel_y"]) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, .proc/clear_setter_or_getter) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, PROC_REF(clear_setter_or_getter)) setter_and_getter_count++ return TRUE if("move_screen") diff --git a/code/modules/wiremod/core/marker.dm b/code/modules/wiremod/core/marker.dm index 82d34be37a7..193699dd082 100644 --- a/code/modules/wiremod/core/marker.dm +++ b/code/modules/wiremod/core/marker.dm @@ -34,7 +34,7 @@ say("Marked [target].") marked_atom = target - RegisterSignal(marked_atom, COMSIG_PARENT_QDELETING, .proc/cleanup_marked_atom) + RegisterSignal(marked_atom, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_marked_atom)) update_icon() flick("multitool_circuit_flick", src) playsound(src.loc, 'sound/misc/compiler-stage2.ogg', 30, TRUE) diff --git a/code/modules/wiremod/core/port.dm b/code/modules/wiremod/core/port.dm index b43f9b4a0d9..7418a4501f2 100644 --- a/code/modules/wiremod/core/port.dm +++ b/code/modules/wiremod/core/port.dm @@ -58,7 +58,7 @@ else src.value = datatype_handler.convert_value(src, value, force) if(isdatum(value)) - RegisterSignal(value, COMSIG_PARENT_QDELETING, .proc/null_value) + RegisterSignal(value, COMSIG_PARENT_QDELETING, PROC_REF(null_value)) SEND_SIGNAL(src, COMSIG_PORT_SET_VALUE, value) /** @@ -186,9 +186,9 @@ if(output in connected_ports) return connected_ports += output - RegisterSignal(output, COMSIG_PORT_SET_VALUE, .proc/receive_value) - RegisterSignal(output, COMSIG_PORT_SET_TYPE, .proc/check_type) - RegisterSignal(output, COMSIG_PORT_DISCONNECT, .proc/disconnect) + RegisterSignal(output, COMSIG_PORT_SET_VALUE, PROC_REF(receive_value)) + RegisterSignal(output, COMSIG_PORT_SET_TYPE, PROC_REF(check_type)) + RegisterSignal(output, COMSIG_PORT_DISCONNECT, PROC_REF(disconnect)) // For signals, we don't update the input to prevent sending a signal when connecting ports. if(!(datatype_handler.datatype_flags & DATATYPE_FLAG_AVOID_VALUE_UPDATE)) set_input(output.value) @@ -223,7 +223,7 @@ */ /datum/port/input/proc/receive_value(datum/port/output/output, value) SIGNAL_HANDLER - SScircuit_component.add_callback(src, CALLBACK(src, .proc/set_input, value)) + SScircuit_component.add_callback(src, CALLBACK(src, PROC_REF(set_input), value)) /// Signal handler proc to null the input if an atom is deleted. An update is not sent because this was not set by anything. /datum/port/proc/null_value(datum/source) diff --git a/code/modules/wiremod/core/usb_cable.dm b/code/modules/wiremod/core/usb_cable.dm index ed0f1053a3d..d38965a2a1e 100644 --- a/code/modules/wiremod/core/usb_cable.dm +++ b/code/modules/wiremod/core/usb_cable.dm @@ -19,7 +19,7 @@ /obj/item/usb_cable/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) /obj/item/usb_cable/examine(mob/user) . = ..() @@ -85,9 +85,9 @@ return OXYLOSS /obj/item/usb_cable/proc/register_circuit_signals() - RegisterSignal(attached_circuit, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, .proc/on_circuit_qdeling) - RegisterSignal(attached_circuit.shell, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(attached_circuit, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_qdeling)) + RegisterSignal(attached_circuit.shell, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) /obj/item/usb_cable/proc/unregister_circuit_signals(obj/item/integrated_circuit/old_circuit) UnregisterSignal(attached_circuit, list( diff --git a/code/modules/wiremod/core/variable.dm b/code/modules/wiremod/core/variable.dm index 2bebc4e7e89..b39e8161ee7 100644 --- a/code/modules/wiremod/core/variable.dm +++ b/code/modules/wiremod/core/variable.dm @@ -45,7 +45,7 @@ /// Adds a listener to receive inputs when the variable has a value that is set. /datum/circuit_variable/proc/add_listener(obj/item/circuit_component/to_add) listeners += to_add - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/on_listener_qdel) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(on_listener_qdel)) /// Removes a listener to receive inputs when the variable has a value that is set. Listener will usually clean themselves up /datum/circuit_variable/proc/remove_listener(obj/item/circuit_component/to_remove) diff --git a/code/modules/wiremod/shell/airlock.dm b/code/modules/wiremod/shell/airlock.dm index b88740175f2..ae775e0a8fd 100644 --- a/code/modules/wiremod/shell/airlock.dm +++ b/code/modules/wiremod/shell/airlock.dm @@ -88,9 +88,9 @@ . = ..() if(istype(shell, /obj/machinery/door/airlock)) attached_airlock = shell - RegisterSignal(shell, COMSIG_AIRLOCK_SET_BOLT, .proc/on_airlock_set_bolted) - RegisterSignal(shell, COMSIG_AIRLOCK_OPEN, .proc/on_airlock_open) - RegisterSignal(shell, COMSIG_AIRLOCK_CLOSE, .proc/on_airlock_closed) + RegisterSignal(shell, COMSIG_AIRLOCK_SET_BOLT, PROC_REF(on_airlock_set_bolted)) + RegisterSignal(shell, COMSIG_AIRLOCK_OPEN, PROC_REF(on_airlock_open)) + RegisterSignal(shell, COMSIG_AIRLOCK_CLOSE, PROC_REF(on_airlock_closed)) /obj/item/circuit_component/airlock/unregister_shell(atom/movable/shell) attached_airlock = null @@ -129,9 +129,9 @@ if(COMPONENT_TRIGGERED_BY(unbolt, port)) attached_airlock.unbolt() if(COMPONENT_TRIGGERED_BY(open, port) && attached_airlock.density) - INVOKE_ASYNC(attached_airlock, /obj/machinery/door/airlock.proc/open) + INVOKE_ASYNC(attached_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, open)) if(COMPONENT_TRIGGERED_BY(close, port) && !attached_airlock.density) - INVOKE_ASYNC(attached_airlock, /obj/machinery/door/airlock.proc/close) + INVOKE_ASYNC(attached_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, close)) /obj/item/circuit_component/airlock_access_event @@ -156,7 +156,7 @@ . = ..() if(istype(shell, /obj/machinery/door/airlock)) attached_airlock = shell - RegisterSignal(shell, COMSIG_AIRLOCK_SHELL_ALLOWED , .proc/handle_allowed) + RegisterSignal(shell, COMSIG_AIRLOCK_SHELL_ALLOWED, PROC_REF(handle_allowed)) /obj/item/circuit_component/airlock_access_event/unregister_shell(atom/movable/shell) attached_airlock = null @@ -167,7 +167,7 @@ /obj/item/circuit_component/airlock_access_event/populate_ports() - open_airlock = add_input_port("Should Open Airlock", PORT_TYPE_RESPONSE_SIGNAL, trigger = .proc/should_open_airlock) + open_airlock = add_input_port("Should Open Airlock", PORT_TYPE_RESPONSE_SIGNAL, trigger = PROC_REF(should_open_airlock)) accessing_entity = add_output_port("Accessing Entity", PORT_TYPE_ATOM) event_triggered = add_output_port("Event Triggered", PORT_TYPE_INSTANT_SIGNAL) @@ -193,4 +193,4 @@ return if(result["should_open"]) - return COMPONENT_AIRLOCK_SHELL_ALLOW + return COMPONENT_AIRLOCK_SHELL_ALLOW diff --git a/code/modules/wiremod/shell/assembly.dm b/code/modules/wiremod/shell/assembly.dm index b93c96b885d..96ba78e114e 100644 --- a/code/modules/wiremod/shell/assembly.dm +++ b/code/modules/wiremod/shell/assembly.dm @@ -34,7 +34,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/assembly_input/register_shell(atom/movable/shell) - RegisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF), .proc/on_pulsed) + RegisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF), PROC_REF(on_pulsed)) /obj/item/circuit_component/assembly_input/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF)) diff --git a/code/modules/wiremod/shell/bot.dm b/code/modules/wiremod/shell/bot.dm index ca7cab94d21..3b84fbcf8ae 100644 --- a/code/modules/wiremod/shell/bot.dm +++ b/code/modules/wiremod/shell/bot.dm @@ -35,7 +35,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/bot/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(shell, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) /obj/item/circuit_component/bot/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ATOM_ATTACK_HAND) diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index e0244f5b017..3e9029f4719 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -123,8 +123,8 @@ charge_action = new(src) bci.actions += list(charge_action) - RegisterSignal(shell, COMSIG_ORGAN_IMPLANTED, .proc/on_organ_implanted) - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_organ_implanted)) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/bci_core/unregister_shell(atom/movable/shell) var/obj/item/organ/cyberimp/bci/bci = shell @@ -162,9 +162,9 @@ user_port.set_output(owner) user = WEAKREF(owner) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge) - RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_electrocute) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) + RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute)) /obj/item/circuit_component/bci_core/proc/on_organ_removed(datum/source, mob/living/carbon/owner) SIGNAL_HANDLER @@ -402,9 +402,9 @@ locked = TRUE set_busy(TRUE, "[initial(icon_state)]_raising") - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_active"), 1 SECONDS) - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_falling"), 2 SECONDS) - addtimer(CALLBACK(src, .proc/complete_process, locked_state), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_active"), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_falling"), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(complete_process), locked_state), 3 SECONDS) /obj/machinery/bci_implanter/proc/complete_process(locked_state) locked = locked_state @@ -456,7 +456,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) return FALSE - addtimer(CALLBACK(src, .proc/start_process), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_process)), 1 SECONDS) return TRUE /obj/machinery/bci_implanter/relaymove(mob/living/user, direction) diff --git a/code/modules/wiremod/shell/compact_remote.dm b/code/modules/wiremod/shell/compact_remote.dm index 41c2bdc8f92..806ed9d28a3 100644 --- a/code/modules/wiremod/shell/compact_remote.dm +++ b/code/modules/wiremod/shell/compact_remote.dm @@ -34,7 +34,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/compact_remote/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, .proc/send_trigger) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(send_trigger)) /obj/item/circuit_component/compact_remote/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ITEM_ATTACK_SELF) diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm index 9cb40208047..78ae4e1641f 100644 --- a/code/modules/wiremod/shell/controller.dm +++ b/code/modules/wiremod/shell/controller.dm @@ -40,9 +40,9 @@ right = add_output_port("Extra Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/controller/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, .proc/send_trigger) - RegisterSignal(shell, COMSIG_CLICK_ALT, .proc/send_alternate_signal) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF_SECONDARY, .proc/send_right_signal) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(send_trigger)) + RegisterSignal(shell, COMSIG_CLICK_ALT, PROC_REF(send_alternate_signal)) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF_SECONDARY, PROC_REF(send_right_signal)) /obj/item/circuit_component/controller/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list( diff --git a/code/modules/wiremod/shell/dispenser.dm b/code/modules/wiremod/shell/dispenser.dm index a6aaeb4070e..d29a5d65417 100644 --- a/code/modules/wiremod/shell/dispenser.dm +++ b/code/modules/wiremod/shell/dispenser.dm @@ -31,8 +31,8 @@ /obj/structure/dispenser_bot/proc/add_item(obj/item/to_add) stored_items += to_add to_add.forceMove(src) - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/handle_stored_item_moved) - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/handle_stored_item_deleted) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(handle_stored_item_moved)) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(handle_stored_item_deleted)) SEND_SIGNAL(src, COMSIG_DISPENSERBOT_ADD_ITEM, to_add) /obj/structure/dispenser_bot/proc/handle_stored_item_moved(obj/item/moving_item, atom/location) @@ -116,8 +116,8 @@ /obj/item/circuit_component/dispenser_bot/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_DISPENSERBOT_ADD_ITEM, .proc/on_shell_add_item) - RegisterSignal(shell, COMSIG_DISPENSERBOT_REMOVE_ITEM, .proc/on_shell_remove_item) + RegisterSignal(shell, COMSIG_DISPENSERBOT_ADD_ITEM, PROC_REF(on_shell_add_item)) + RegisterSignal(shell, COMSIG_DISPENSERBOT_REMOVE_ITEM, PROC_REF(on_shell_remove_item)) /obj/item/circuit_component/dispenser_bot/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list( @@ -160,7 +160,7 @@ RegisterSignal(vendor_component, list( COMSIG_PARENT_QDELETING, COMSIG_CIRCUIT_COMPONENT_REMOVED, - ), .proc/remove_vendor_component) + ), PROC_REF(remove_vendor_component)) /obj/item/circuit_component/vendor_component display_name = "Vend" @@ -188,7 +188,7 @@ /obj/item/circuit_component/vendor_component/populate_ports() item_to_vend = add_input_port("Item", PORT_TYPE_ATOM, trigger = null) - vend_item = add_input_port("Vend Item", PORT_TYPE_SIGNAL, trigger = .proc/vend_item) + vend_item = add_input_port("Vend Item", PORT_TYPE_SIGNAL, trigger = PROC_REF(vend_item)) /obj/item/circuit_component/vendor_component/proc/vend_item(datum/port/input/port, list/return_values) CIRCUIT_TRIGGER diff --git a/code/modules/wiremod/shell/gun.dm b/code/modules/wiremod/shell/gun.dm index ff37c9046dd..e78ea27d65b 100644 --- a/code/modules/wiremod/shell/gun.dm +++ b/code/modules/wiremod/shell/gun.dm @@ -55,9 +55,9 @@ signal = add_output_port("Shot", PORT_TYPE_SIGNAL) /obj/item/circuit_component/wiremod_gun/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_PROJECTILE_ON_HIT, .proc/handle_shot) + RegisterSignal(shell, COMSIG_PROJECTILE_ON_HIT, PROC_REF(handle_shot)) if(istype(shell, /obj/item/gun/energy)) - RegisterSignal(shell, COMSIG_GUN_CHAMBER_PROCESSED, .proc/handle_chamber) + RegisterSignal(shell, COMSIG_GUN_CHAMBER_PROCESSED, PROC_REF(handle_chamber)) /obj/item/circuit_component/wiremod_gun/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list(COMSIG_PROJECTILE_ON_HIT, COMSIG_GUN_CHAMBER_PROCESSED)) diff --git a/code/modules/wiremod/shell/module.dm b/code/modules/wiremod/shell/module.dm index b3a8275d607..e419f623acc 100644 --- a/code/modules/wiremod/shell/module.dm +++ b/code/modules/wiremod/shell/module.dm @@ -23,7 +23,7 @@ . = COMPONENT_OVERRIDE_POWER_USAGE /obj/item/mod/module/circuit/on_install() - RegisterSignal(shell?.attached_circuit, COMSIG_CIRCUIT_PRE_POWER_USAGE, .proc/override_power_usage) + RegisterSignal(shell?.attached_circuit, COMSIG_CIRCUIT_PRE_POWER_USAGE, PROC_REF(override_power_usage)) /obj/item/mod/module/circuit/on_uninstall() UnregisterSignal(shell?.attached_circuit, COMSIG_CIRCUIT_PRE_POWER_USAGE) @@ -107,7 +107,7 @@ . = ..() if(istype(shell, /obj/item/mod/module)) attached_module = shell - RegisterSignal(attached_module, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(attached_module, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /obj/item/circuit_component/mod_adapter_core/unregister_shell(atom/movable/shell) UnregisterSignal(attached_module, COMSIG_MOVABLE_MOVED) @@ -122,15 +122,15 @@ if(potential_module.name == module_to_select.value) module = potential_module if(COMPONENT_TRIGGERED_BY(toggle_suit, port)) - INVOKE_ASYNC(attached_module.mod, /obj/item/mod/control.proc/toggle_activate, attached_module.mod.wearer) + INVOKE_ASYNC(attached_module.mod, TYPE_PROC_REF(/obj/item/mod/control, toggle_activate), attached_module.mod.wearer) if(attached_module.mod.active && module && COMPONENT_TRIGGERED_BY(select_module, port)) - INVOKE_ASYNC(module, /obj/item/mod/module.proc/on_select) + INVOKE_ASYNC(module, TYPE_PROC_REF(/obj/item/mod/module, on_select)) /obj/item/circuit_component/mod_adapter_core/proc/on_move(atom/movable/source, atom/old_loc, dir, forced) SIGNAL_HANDLER if(istype(source.loc, /obj/item/mod/control)) - RegisterSignal(source.loc, COMSIG_MOD_MODULE_SELECTED, .proc/on_module_select) - RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, .proc/equip_check) + RegisterSignal(source.loc, COMSIG_MOD_MODULE_SELECTED, PROC_REF(on_module_select)) + RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, PROC_REF(equip_check)) equip_check() else if(istype(old_loc, /obj/item/mod/control)) UnregisterSignal(old_loc, list(COMSIG_MOD_MODULE_SELECTED, COMSIG_ITEM_EQUIPPED)) diff --git a/code/modules/wiremod/shell/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm index 50474b91b0a..2ee9cf6fa02 100644 --- a/code/modules/wiremod/shell/moneybot.dm +++ b/code/modules/wiremod/shell/moneybot.dm @@ -103,9 +103,9 @@ if(istype(shell, /obj/structure/money_bot)) attached_bot = shell total_money.set_output(attached_bot.stored_money) - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, .proc/handle_money_insert) - RegisterSignal(shell, COMSIG_MONEYBOT_ADD_MONEY, .proc/handle_money_update) - RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, .proc/on_set_locked) + RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_money_insert)) + RegisterSignal(shell, COMSIG_MONEYBOT_ADD_MONEY, PROC_REF(handle_money_update)) + RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, PROC_REF(on_set_locked)) attached_bot.locked = parent.locked /obj/item/circuit_component/money_bot/unregister_shell(atom/movable/shell) diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm index 87f53c03925..b99823d47ba 100644 --- a/code/modules/wiremod/shell/scanner.dm +++ b/code/modules/wiremod/shell/scanner.dm @@ -41,7 +41,7 @@ signal = add_output_port("Scanned", PORT_TYPE_SIGNAL) /obj/item/circuit_component/wiremod_scanner/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_AFTERATTACK, .proc/handle_afterattack) + RegisterSignal(shell, COMSIG_ITEM_AFTERATTACK, PROC_REF(handle_afterattack)) /obj/item/circuit_component/wiremod_scanner/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ITEM_AFTERATTACK) diff --git a/code/modules/wiremod/shell/scanner_gate.dm b/code/modules/wiremod/shell/scanner_gate.dm index 7c40e8bfaf4..245b8525dfe 100644 --- a/code/modules/wiremod/shell/scanner_gate.dm +++ b/code/modules/wiremod/shell/scanner_gate.dm @@ -9,7 +9,7 @@ . = ..() set_scanline("passive") var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -34,7 +34,7 @@ cut_overlays() add_overlay(type) if(duration) - addtimer(CALLBACK(src, .proc/set_scanline, "passive"), duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) /obj/item/circuit_component/scanner_gate display_name = "Scanner Gate" @@ -52,8 +52,8 @@ . = ..() if(istype(shell, /obj/structure/scanner_gate_shell)) attached_gate = shell - RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, .proc/on_trigger) - RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, .proc/on_set_locked) + RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, PROC_REF(on_trigger)) + RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, PROC_REF(on_set_locked)) attached_gate.locked = parent.locked /obj/item/circuit_component/scanner_gate/unregister_shell(atom/movable/shell) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 42cec530da3..26179528037 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -66,7 +66,7 @@ not even death can stop, you will rise again!") var/revive_time = rand(revive_time_min, revive_time_max) var/flags = TIMER_STOPPABLE - timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags) + timer_id = addtimer(CALLBACK(src, PROC_REF(zombify)), revive_time, flags) /obj/item/organ/zombie_infection/proc/zombify() timer_id = null diff --git a/dependencies.sh b/dependencies.sh index be45f943e6e..4f98e45698c 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -4,11 +4,11 @@ #Final authority on what's required to fully build the project # byond version -export BYOND_MAJOR=514 -export BYOND_MINOR=1569 +export BYOND_MAJOR=515 +export BYOND_MINOR=1633 #rust_g git tag -export RUST_G_VERSION=3.0.0 +export RUST_G_VERSION=3.1.0 #node version export NODE_VERSION=14 diff --git a/mojave/code/_onclick/hud/alert_text.dm b/mojave/code/_onclick/hud/alert_text.dm index 3316a970d56..acf893e7185 100644 --- a/mojave/code/_onclick/hud/alert_text.dm +++ b/mojave/code/_onclick/hud/alert_text.dm @@ -21,7 +21,7 @@ animate(thealert, transform = matrix(), time = 2.5, easing = CUBIC_EASING) if(thealert.timeout) - addtimer(CALLBACK(src, .proc/alert_text_timeout, thealert), thealert.timeout) + addtimer(CALLBACK(src, PROC_REF(alert_text_timeout), thealert), thealert.timeout) return thealert /mob/proc/alert_text_timeout(atom/movable/screen/alert/text/alert) diff --git a/mojave/code/controllers/subsystem/advanced_pathfinding.dm b/mojave/code/controllers/subsystem/advanced_pathfinding.dm index 7e14f041557..04a39940ec0 100644 --- a/mojave/code/controllers/subsystem/advanced_pathfinding.dm +++ b/mojave/code/controllers/subsystem/advanced_pathfinding.dm @@ -57,7 +57,7 @@ if(!length(paths_to_check) || length(paths_checked) > PATHFINDER_MAX_TRIES) return //We created a atom path for each adjacent atom, we sort every atoms by their heuristic score - sortTim(paths_to_check, /proc/cmp_path_step, TRUE) //Very cheap cause almost sorted + sortTim(paths_to_check, GLOBAL_PROC_REF(cmp_path_step), TRUE) //Very cheap cause almost sorted current_path = paths_to_check[paths_to_check[1]] //We take the atom with the smaller heuristic score (distance to goal + distance already made) current_atom = current_path.current_atom paths_checked[current_atom] = current_path diff --git a/mojave/code/datums/ai/movement/ai_movement_bypass_tables.dm b/mojave/code/datums/ai/movement/ai_movement_bypass_tables.dm index d594a375f2a..baddbe2dba2 100644 --- a/mojave/code/datums/ai/movement/ai_movement_bypass_tables.dm +++ b/mojave/code/datums/ai/movement/ai_movement_bypass_tables.dm @@ -39,7 +39,7 @@ thing.set_density(FALSE) step(the_pawn, get_dir(the_pawn.loc, thing.loc)) thing.set_density(preserved_density) - addtimer(CALLBACK(src, .proc/enable_movement, controller), 20) + addtimer(CALLBACK(src, PROC_REF(enable_movement), controller), 20) controller.ai_traits |= STOP_MOVING return MOVELOOP_SKIP_STEP if(istype(thing, /obj/structure/ms13/frame)) @@ -69,8 +69,8 @@ jump_height = 15 animate(the_pawn, pixel_y = jump_height, time = 1, easing = SINE_EASING) thing.set_density(preserved_density) - addtimer(CALLBACK(src, .proc/end_jump, the_pawn), 2) - addtimer(CALLBACK(src, .proc/enable_movement, controller), 20) + addtimer(CALLBACK(src, PROC_REF(end_jump), the_pawn), 2) + addtimer(CALLBACK(src, PROC_REF(enable_movement), controller), 20) controller.ai_traits |= STOP_MOVING return MOVELOOP_SKIP_STEP diff --git a/mojave/code/datums/components/clothing_nv_visor.dm b/mojave/code/datums/components/clothing_nv_visor.dm index d24d6688576..449b62b9125 100644 --- a/mojave/code/datums/components/clothing_nv_visor.dm +++ b/mojave/code/datums/components/clothing_nv_visor.dm @@ -22,9 +22,9 @@ src.visor_up = clothing_parent.up //Initial values could vary, so we need to get it. /datum/component/clothing_nv_visor/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, .proc/on_visor_toggle) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, PROC_REF(on_visor_toggle)) /datum/component/clothing_nv_visor/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_CLOTHING_VISOR_TOGGLE)) diff --git a/mojave/code/datums/components/fixeye.dm b/mojave/code/datums/components/fixeye.dm index 8644cff057c..5ed6d1a1aae 100644 --- a/mojave/code/datums/components/fixeye.dm +++ b/mojave/code/datums/components/fixeye.dm @@ -19,14 +19,14 @@ /datum/component/fixeye/RegisterWithParent() var/mob/living/living_parent = parent // this shit uses a fuckton of signals because i wanted it to be very feature complete - RegisterSignal(living_parent, COMSIG_FIXEYE_TOGGLE, .proc/user_toggle_fixeye) - RegisterSignal(living_parent, COMSIG_FIXEYE_DISABLE, .proc/safe_disable_fixeye) - RegisterSignal(living_parent, COMSIG_FIXEYE_ENABLE, .proc/safe_enable_fixeye) - RegisterSignal(living_parent, COMSIG_FIXEYE_LOCK, .proc/lock_fixeye) - RegisterSignal(living_parent, COMSIG_FIXEYE_UNLOCK, .proc/unlock_fixeye) - RegisterSignal(living_parent, COMSIG_LIVING_DEATH, .proc/on_death) - RegisterSignal(living_parent, COMSIG_MOB_LOGOUT, .proc/on_logout) - RegisterSignal(living_parent, COMSIG_FIXEYE_CHECK, .proc/check_flags) + RegisterSignal(living_parent, COMSIG_FIXEYE_TOGGLE, PROC_REF(user_toggle_fixeye)) + RegisterSignal(living_parent, COMSIG_FIXEYE_DISABLE, PROC_REF(safe_disable_fixeye)) + RegisterSignal(living_parent, COMSIG_FIXEYE_ENABLE, PROC_REF(safe_enable_fixeye)) + RegisterSignal(living_parent, COMSIG_FIXEYE_LOCK, PROC_REF(lock_fixeye)) + RegisterSignal(living_parent, COMSIG_FIXEYE_UNLOCK, PROC_REF(unlock_fixeye)) + RegisterSignal(living_parent, COMSIG_LIVING_DEATH, PROC_REF(on_death)) + RegisterSignal(living_parent, COMSIG_MOB_LOGOUT, PROC_REF(on_logout)) + RegisterSignal(living_parent, COMSIG_FIXEYE_CHECK, PROC_REF(check_flags)) /datum/component/fixeye/UnregisterFromParent() var/mob/living/living_source = parent @@ -78,9 +78,9 @@ if(!silent) source.playsound_local(source, 'mojave/sound/ms13interface/fixeye_on.ogg', 25, FALSE, pressure_affected = FALSE) faced_dir = source.dir - RegisterSignal(source, COMSIG_ATOM_PRE_DIR_CHANGE, .proc/before_dir_change) - RegisterSignal(source, COMSIG_MOB_CLIENT_MOVED, .proc/on_client_move) - RegisterSignal(source, COMSIG_MOB_CLICKON, .proc/on_clickon) + RegisterSignal(source, COMSIG_ATOM_PRE_DIR_CHANGE, PROC_REF(before_dir_change)) + RegisterSignal(source, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_client_move)) + RegisterSignal(source, COMSIG_MOB_CLICKON, PROC_REF(on_clickon)) /// Safely (as in respecting requirements and toggle flag) calls disable_fixeye /datum/component/fixeye/proc/safe_disable_fixeye(mob/living/source, silent = FALSE, forced = FALSE) @@ -183,4 +183,4 @@ else new_dir = NORTH source.setDir(new_dir) - RegisterSignal(source, COMSIG_ATOM_PRE_DIR_CHANGE, .proc/before_dir_change) + RegisterSignal(source, COMSIG_ATOM_PRE_DIR_CHANGE, PROC_REF(before_dir_change)) diff --git a/mojave/code/datums/components/generic_animal_patrol.dm b/mojave/code/datums/components/generic_animal_patrol.dm index eb44d66a6ec..9246d24dc8e 100644 --- a/mojave/code/datums/components/generic_animal_patrol.dm +++ b/mojave/code/datums/components/generic_animal_patrol.dm @@ -31,7 +31,7 @@ move_delay = _patrol_move_delay var/obj/effect/ai_node/linted_current_node = current_node //For linter target_node = linted_current_node.get_best_adj_node(node_weights, identifier) - RegisterSignal(parent, COMSIG_AI_SET_GOAL_NODE, .proc/set_goal_node) + RegisterSignal(parent, COMSIG_AI_SET_GOAL_NODE, PROC_REF(set_goal_node)) /datum/component/generic_animal_patrol/Destroy(force, silent) UnregisterSignal(parent, COMSIG_AI_SET_GOAL_NODE) diff --git a/mojave/code/datums/components/movable_physics.dm b/mojave/code/datums/components/movable_physics.dm index 2ea187c66fd..21dc9493ff9 100644 --- a/mojave/code/datums/components/movable_physics.dm +++ b/mojave/code/datums/components/movable_physics.dm @@ -26,7 +26,7 @@ . = ..() if(!ismovable(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/throw_impact_ricochet, override = TRUE) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(throw_impact_ricochet), override = TRUE) horizontal_velocity = _horizontal_velocity vertical_velocity = _vertical_velocity horizontal_friction = _horizontal_friction diff --git a/mojave/code/datums/components/mumbleboops.dm b/mojave/code/datums/components/mumbleboops.dm index d1ea370c02f..79a6ff01ac6 100644 --- a/mojave/code/datums/components/mumbleboops.dm +++ b/mojave/code/datums/components/mumbleboops.dm @@ -19,7 +19,7 @@ /datum/component/mumbleboop/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_MOB_POST_SAY, .proc/after_say) + RegisterSignal(parent, COMSIG_MOB_POST_SAY, PROC_REF(after_say)) /datum/component/mumbleboop/UnregisterFromParent() . = ..() @@ -29,7 +29,7 @@ SIGNAL_HANDLER last_mumbleboop = world.time - INVOKE_ASYNC(src, .proc/handle_booping, mumblebooper, speech_args, speech_spans, speech_mods) + INVOKE_ASYNC(src, PROC_REF(handle_booping), mumblebooper, speech_args, speech_spans, speech_mods) /datum/component/mumbleboop/proc/handle_booping(mob/living/mumblebooper, list/speech_args, list/speech_spans, list/speech_mods) chosen_boop = mumblebooper?.voice_type || random_voice_type(mumblebooper?.gender) // Uses the boop chosen by the player. If it's null for whatever unholy reason, it should chose a completely random voice for every single phonetic which should be funny. @@ -133,7 +133,7 @@ current_delay -= 1 final_boop = "mojave/sound/voices/[chosen_boop]/s_[boop_letter].wav" - addtimer(CALLBACK(src, .proc/play_mumbleboop, hearers, mumblebooper, final_boop, volume, initial_mumbleboop_time, falloff_exponent), mumbleboop_delay_cumulative + current_delay) + addtimer(CALLBACK(src, PROC_REF(play_mumbleboop), hearers, mumblebooper, final_boop, volume, initial_mumbleboop_time, falloff_exponent), mumbleboop_delay_cumulative + current_delay) mumbleboop_delay_cumulative += current_delay /datum/component/mumbleboop/proc/play_mumbleboop(list/hearers, mob/mumblebooper, final_boop, volume, initial_mumbleboop_time, falloff_exponent) diff --git a/mojave/code/datums/components/nv_handler.dm b/mojave/code/datums/components/nv_handler.dm index 1357d36668f..04a169d17b7 100644 --- a/mojave/code/datums/components/nv_handler.dm +++ b/mojave/code/datums/components/nv_handler.dm @@ -129,12 +129,12 @@ GLOBAL_LIST_EMPTY(nv_fov_icons) /datum/component/nv_handler/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/update_mask) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, .proc/update_nv_size) - RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_LOGOUT, .proc/mob_logout) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, PROC_REF(update_nv_size)) + RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_LOGOUT, PROC_REF(mob_logout)) /datum/component/nv_handler/UnregisterFromParent() . = ..() diff --git a/mojave/code/datums/components/thirst.dm b/mojave/code/datums/components/thirst.dm index 23920eb6cdd..4ddb49c9af7 100644 --- a/mojave/code/datums/components/thirst.dm +++ b/mojave/code/datums/components/thirst.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(dehydration_stage_alerts, list( stage_of_dehydration = 1 var/mob/the_parent = parent modify_thirst(modify_by = start_thirst) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) START_PROCESSING(SSdcs, src) if(stage_of_dehydration == 1) //Still the same after modifying thirst? throw the alert the_parent.throw_alert("thirst", stage_to_alert[stage_of_dehydration]) diff --git a/mojave/code/datums/components/transparency.dm b/mojave/code/datums/components/transparency.dm index fd59eda1868..3f21f1ae5af 100644 --- a/mojave/code/datums/components/transparency.dm +++ b/mojave/code/datums/components/transparency.dm @@ -59,7 +59,7 @@ return ..() /datum/component/largetransparency/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/OnMove) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(OnMove)) RegisterWithTurfs() /datum/component/largetransparency/UnregisterFromParent() @@ -77,9 +77,9 @@ for(var/regist_tu in registered_turfs) if(!regist_tu) continue - RegisterSignal(regist_tu, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED), .proc/objectEnter) - RegisterSignal(regist_tu, COMSIG_ATOM_EXITED, .proc/objectLeave) - RegisterSignal(regist_tu, COMSIG_TURF_CHANGE, .proc/OnTurfChange) + RegisterSignal(regist_tu, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED), PROC_REF(objectEnter)) + RegisterSignal(regist_tu, COMSIG_ATOM_EXITED, PROC_REF(objectLeave)) + RegisterSignal(regist_tu, COMSIG_TURF_CHANGE, PROC_REF(OnTurfChange)) for(var/thing in regist_tu) var/atom/check_atom = thing if(!(check_atom.flags_1 & CRITICAL_ATOM_1)) @@ -103,7 +103,7 @@ /datum/component/largetransparency/proc/OnTurfChange() SIGNAL_HANDLER - addtimer(CALLBACK(src, .proc/OnMove), 1, TIMER_UNIQUE|TIMER_OVERRIDE) //*pain + addtimer(CALLBACK(src, PROC_REF(OnMove)), 1, TIMER_UNIQUE|TIMER_OVERRIDE) //*pain /datum/component/largetransparency/proc/objectEnter(datum/source, atom/enterer) SIGNAL_HANDLER diff --git a/mojave/code/datums/components/two_handed.dm b/mojave/code/datums/components/two_handed.dm index ae2d03e56bf..e0243a19312 100644 --- a/mojave/code/datums/components/two_handed.dm +++ b/mojave/code/datums/components/two_handed.dm @@ -4,7 +4,7 @@ /datum/component/two_handed/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_TWOHANDED_CHECK, .proc/check_wielded) + RegisterSignal(parent, COMSIG_TWOHANDED_CHECK, PROC_REF(check_wielded)) /datum/component/two_handed/UnregisterFromParent() . = ..() diff --git a/mojave/code/datums/elements/generic_patrol_animal.dm b/mojave/code/datums/elements/generic_patrol_animal.dm index 16f1c89c31b..b383d7248ab 100644 --- a/mojave/code/datums/elements/generic_patrol_animal.dm +++ b/mojave/code/datums/elements/generic_patrol_animal.dm @@ -43,7 +43,7 @@ The simple animal this is attached to should also be able to destroy obstacles s patrol_move_delay[animal] = _patrol_move_delay var/obj/effect/ai_node/linted_current_node = animal_current_node[animal] animal_target_node[animal] = linted_current_node.get_best_adj_node(animal_node_weights[animal], animal_identifier[animal]) - RegisterSignal(animal, COMSIG_AI_SET_GOAL_NODE, .proc/set_goal_node) + RegisterSignal(animal, COMSIG_AI_SET_GOAL_NODE, PROC_REF(set_goal_node)) /datum/element/generic_patrol_animal/Detach(mob/living/simple_animal/animal) attached_animals -= animal diff --git a/mojave/code/datums/elements/item_nv.dm b/mojave/code/datums/elements/item_nv.dm index f5b849948e7..82de61db0c7 100644 --- a/mojave/code/datums/elements/item_nv.dm +++ b/mojave/code/datums/elements/item_nv.dm @@ -16,8 +16,8 @@ src.fov_angle = fov_angle src.alpha = alpha src.color = color - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/element/item_nv/Detach(datum/target) UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) diff --git a/mojave/code/game/movables/follower.dm b/mojave/code/game/movables/follower.dm index cdd8b60f20e..e852abee1b8 100644 --- a/mojave/code/game/movables/follower.dm +++ b/mojave/code/game/movables/follower.dm @@ -44,9 +44,9 @@ if(!new_master) return if(ismovable(new_master)) - RegisterSignal(new_master, COMSIG_MOVABLE_MOVED, .proc/master_moved) - RegisterSignal(new_master, COMSIG_ATOM_DIR_CHANGE, .proc/master_dir_change) - RegisterSignal(new_master, COMSIG_PARENT_QDELETING, .proc/no_gods_no_masters) + RegisterSignal(new_master, COMSIG_MOVABLE_MOVED, PROC_REF(master_moved)) + RegisterSignal(new_master, COMSIG_ATOM_DIR_CHANGE, PROC_REF(master_dir_change)) + RegisterSignal(new_master, COMSIG_PARENT_QDELETING, PROC_REF(no_gods_no_masters)) return TRUE /atom/movable/follower/proc/unregister_master() diff --git a/mojave/code/game/movables/follower/density.dm b/mojave/code/game/movables/follower/density.dm index cb3bd514f32..baa92cb3540 100644 --- a/mojave/code/game/movables/follower/density.dm +++ b/mojave/code/game/movables/follower/density.dm @@ -5,7 +5,7 @@ . = ..() if(!.) return - RegisterSignal(new_master, COMSIG_ATOM_SET_DENSITY, .proc/master_density_change) + RegisterSignal(new_master, COMSIG_ATOM_SET_DENSITY, PROC_REF(master_density_change)) master_density_change(new_master, new_master.opacity) /atom/movable/follower/density/unregister_master() diff --git a/mojave/code/game/movables/follower/opacity.dm b/mojave/code/game/movables/follower/opacity.dm index aa3744739eb..aa4dde8efd5 100644 --- a/mojave/code/game/movables/follower/opacity.dm +++ b/mojave/code/game/movables/follower/opacity.dm @@ -5,7 +5,7 @@ . = ..() if(!.) return - RegisterSignal(new_master, COMSIG_ATOM_SET_OPACITY, .proc/master_opacity_change) + RegisterSignal(new_master, COMSIG_ATOM_SET_OPACITY, PROC_REF(master_opacity_change)) master_opacity_change(new_master, new_master.opacity) /atom/movable/follower/opacity/unregister_master() diff --git a/mojave/code/game/objects/effects/displacement_maps.dm b/mojave/code/game/objects/effects/displacement_maps.dm index 86cce004536..06f5a833f3e 100644 --- a/mojave/code/game/objects/effects/displacement_maps.dm +++ b/mojave/code/game/objects/effects/displacement_maps.dm @@ -53,7 +53,7 @@ return owner = new_owner LAZYSET(owner.displacement_maps, type, src) - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_qdeleted) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_qdeleted)) /// We need to be inside owner's vis_contents due to the way render_source and render_target work /// (they only work if the render_source is in view) owner.vis_contents += src diff --git a/mojave/code/game/objects/traps/mine.dm b/mojave/code/game/objects/traps/mine.dm index f1fcd8e1a47..5471248badf 100644 --- a/mojave/code/game/objects/traps/mine.dm +++ b/mojave/code/game/objects/traps/mine.dm @@ -21,9 +21,9 @@ if(arm_delay) armed = FALSE icon_state = inactive_state - addtimer(CALLBACK(src, .proc/now_armed), arm_delay) + addtimer(CALLBACK(src, PROC_REF(now_armed)), arm_delay) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/mojave/code/modules/clothing/spacesuits/power_armor.dm b/mojave/code/modules/clothing/spacesuits/power_armor.dm index d5c1a93590a..655264382b6 100644 --- a/mojave/code/modules/clothing/spacesuits/power_armor.dm +++ b/mojave/code/modules/clothing/spacesuits/power_armor.dm @@ -176,7 +176,7 @@ interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP ADD_TRAIT(src, TRAIT_NODROP, STICKY_NODROP) //Somehow it's stuck to your body, no questioning. AddElement(/datum/element/radiation_protected_clothing) - RegisterSignal(src, COMSIG_ATOM_CAN_BE_PULLED, .proc/reject_pulls) + RegisterSignal(src, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(reject_pulls)) for(var/i in module_armor) if(isnull(module_armor[i])) @@ -507,7 +507,7 @@ ADD_TRAIT(user, TRAIT_NON_FLAMMABLE, "power_armor") ADD_TRAIT(user, TRAIT_IN_POWERARMOUR, "power_armor") ADD_TRAIT(user, TRAIT_SHOVEIMMUNE, "power_armor") - RegisterSignal(user, COMSIG_ATOM_CAN_BE_PULLED, .proc/reject_pulls) + RegisterSignal(user, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(reject_pulls)) /obj/item/clothing/suit/space/hardsuit/ms13/power_armor/dropped(mob/living/carbon/human/user) . = ..() diff --git a/mojave/code/modules/locks/lockpicking.dm b/mojave/code/modules/locks/lockpicking.dm index 34f44399009..3aa0cbccafb 100644 --- a/mojave/code/modules/locks/lockpicking.dm +++ b/mojave/code/modules/locks/lockpicking.dm @@ -46,9 +46,9 @@ for(var/datum/component/storage/storage as anything in thing.GetComponents(/datum/component/storage)) storage.locked = TRUE //locks - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, .proc/check_pick) - RegisterSignal(target, COMSIG_LOCKPICK_ATTACKBY, .proc/pick_info) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(check_pick)) + RegisterSignal(target, COMSIG_LOCKPICK_ATTACKBY, PROC_REF(pick_info)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) /datum/element/lockpickable/Detach(datum/target) @@ -246,10 +246,10 @@ SIGNAL_HANDLER clicker = usercli - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down) - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, .proc/on_mouse_up) - RegisterSignal(picker,COMSIG_MOVABLE_MOVED, .proc/close_lockpick) - RegisterSignal(picker, COMSIG_PARENT_EXAMINE_MORE, .proc/mob_detection) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down)) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, PROC_REF(on_mouse_up)) + RegisterSignal(picker,COMSIG_MOVABLE_MOVED, PROC_REF(close_lockpick)) + RegisterSignal(picker, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(mob_detection)) //checks both for each just incase they switch hands for no reason mid lockpick var/obj/item/held_lockmain = picker.get_active_held_item() @@ -259,13 +259,13 @@ var/obj/item/held_wedgeother = picker.get_inactive_held_item() if(istype(held_lockmain, the_lockpick)) - RegisterSignal(the_lockpick, COMSIG_ITEM_DROPPED, .proc/close_lockpick) + RegisterSignal(the_lockpick, COMSIG_ITEM_DROPPED, PROC_REF(close_lockpick)) if(istype(held_lockother, the_lockpick)) - RegisterSignal(the_lockpick, COMSIG_ITEM_DROPPED, .proc/close_lockpick) + RegisterSignal(the_lockpick, COMSIG_ITEM_DROPPED, PROC_REF(close_lockpick)) if(istype(held_wedgemain, the_wedge)) - RegisterSignal(the_wedge, COMSIG_ITEM_DROPPED, .proc/close_lockpick) + RegisterSignal(the_wedge, COMSIG_ITEM_DROPPED, PROC_REF(close_lockpick)) if(istype(held_wedgeother, the_wedge)) - RegisterSignal(the_wedge, COMSIG_ITEM_DROPPED, .proc/close_lockpick) + RegisterSignal(the_wedge, COMSIG_ITEM_DROPPED, PROC_REF(close_lockpick)) START_PROCESSING(SSfastprocess, src) @@ -290,7 +290,7 @@ source.click_intercept_time = world.time //From this point onwards Click() will no longer be triggered. - INVOKE_ASYNC(src, .proc/move_pick_forward) + INVOKE_ASYNC(src, PROC_REF(move_pick_forward)) /atom/movable/screen/movable/snap/ms13/lockpicking/proc/mob_detection(atom/source, mob/user, list/examine_list) SIGNAL_HANDLER @@ -378,7 +378,7 @@ /atom/movable/screen/movable/snap/ms13/lockpicking/proc/play_turn_sound(timerd) playsound(picker.loc, pick(LOCKPICKING_TURN_SOUNDS), 50) - addtimer(CALLBACK(src, .proc/turn_sound_reset), 0.7 SECONDS) //stops the spam + addtimer(CALLBACK(src, PROC_REF(turn_sound_reset)), 0.7 SECONDS) //stops the spam /atom/movable/screen/movable/snap/ms13/lockpicking/proc/turn_sound_reset() playing_lock_sound = FALSE diff --git a/mojave/code/modules/mob/creatures/ms13animals.dm b/mojave/code/modules/mob/creatures/ms13animals.dm index 5456aabbfed..0525fcee70f 100644 --- a/mojave/code/modules/mob/creatures/ms13animals.dm +++ b/mojave/code/modules/mob/creatures/ms13animals.dm @@ -805,7 +805,7 @@ return prevent_goto_movement = TRUE Goto(target = src, delay = move_to_delay, minimum_distance = 0) - var/datum/cb = CALLBACK(src,.proc/reset_goto_movement) + var/datum/cb = CALLBACK(src, PROC_REF(reset_goto_movement)) addtimer(cb,2 SECONDS) charge.Trigger(target = target) @@ -885,7 +885,7 @@ //Different sound effect, no destruction /datum/action/cooldown/mob_cooldown/charge/hellpig/on_moved(atom/source) playsound(source, pick('mojave/sound/ms13effects/footsteps/ms13heavyfootstep_1.wav', 'mojave/sound/ms13effects/footsteps/ms13heavyfootstep_2.wav'), 100, TRUE, 2, TRUE) - //INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + //INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) /datum/action/cooldown/mob_cooldown/charge/hellpig/Activate(atom/target_atom) diff --git a/mojave/code/modules/mob/living/carbon/human/human.dm b/mojave/code/modules/mob/living/carbon/human/human.dm index cf0f6078e8a..8865b6cb9f8 100644 --- a/mojave/code/modules/mob/living/carbon/human/human.dm +++ b/mojave/code/modules/mob/living/carbon/human/human.dm @@ -28,9 +28,9 @@ /mob/living/carbon/human/death(gibbed) . = ..() if(stat == DEAD && !pre_spawn) - addtimer(CALLBACK(src, .proc/rot), rand(30 MINUTES, 45 MINUTES)) + addtimer(CALLBACK(src, PROC_REF(rot)), rand(30 MINUTES, 45 MINUTES)) if(stat == DEAD && pre_spawn) - addtimer(CALLBACK(src, .proc/rot), rand(75 MINUTES, 90 MINUTES)) + addtimer(CALLBACK(src, PROC_REF(rot)), rand(75 MINUTES, 90 MINUTES)) /mob/living/carbon/human/proc/rot() rotting = TRUE diff --git a/mojave/code/modules/mob/living/simple_animal/hostile/sentrybot.dm b/mojave/code/modules/mob/living/simple_animal/hostile/sentrybot.dm index 10de6b2a152..bedf350c588 100644 --- a/mojave/code/modules/mob/living/simple_animal/hostile/sentrybot.dm +++ b/mojave/code/modules/mob/living/simple_animal/hostile/sentrybot.dm @@ -119,14 +119,14 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( rocket = new /datum/action/cooldown/launch_rocket() grenade.Grant(src) rocket.Grant(src) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_move_sound, override = TRUE) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_move_sound), override = TRUE) soundloop = new(src, FALSE) /mob/living/simple_animal/hostile/ms13/robot/sentrybot/proc/play_move_sound() SIGNAL_HANDLER //playsound(src, 'sound/mecha/mechstep.ogg', 40, TRUE) last_move_done_at = world.time - addtimer(CALLBACK(src, .proc/check_if_loop_should_continue, world.time), move_to_delay + 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(check_if_loop_should_continue), world.time), move_to_delay + 0.5 SECONDS) /* if(drift_cooldown > world.time) //Special move cooldown + drifting shouldn't restart the tread sounds return @@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( var/turf_move_towards = get_step(src, src.dir) for(var/i = 1, i < 7, i++) time_til_next_move += (i * 0.1) - addtimer(CALLBACK(src, .proc/wrapped_move, turf_move_towards, src.dir), (10 * time_til_next_move)) + addtimer(CALLBACK(src, PROC_REF(wrapped_move), turf_move_towards, src.dir), (10 * time_til_next_move)) turf_move_towards = get_step(turf_move_towards, src.dir) /mob/living/simple_animal/hostile/ms13/robot/sentrybot/proc/wrapped_move(_newLoc, _Dir) @@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( SSmove_manager.move_to(src, src, min_dist = 0, delay = 0) var/the_sound = pick(GLOB.sentrybot_dying_sound) playsound(src, the_sound, 50, FALSE) - addtimer(CALLBACK(src, .proc/self_destruct), GLOB.sentrybot_dying_sound[the_sound]) + addtimer(CALLBACK(src, PROC_REF(self_destruct)), GLOB.sentrybot_dying_sound[the_sound]) ..(gibbed) /mob/living/simple_animal/hostile/ms13/robot/sentrybot/proc/self_destruct() @@ -214,11 +214,11 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( if(actually_fire) . = ..() gunfire_sound() - addtimer(CALLBACK(src, .proc/wind_down_gun), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(wind_down_gun)), 1 SECONDS) else if(!already_firing) - addtimer(CALLBACK(src, .proc/trigger_abilities, A), rand(1.5 SECONDS, 3 SECONDS)) - addtimer(CALLBACK(src, .proc/OpenFire, A, TRUE), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(trigger_abilities), A), rand(1.5 SECONDS, 3 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(OpenFire), A, TRUE), 1 SECONDS) spinup_sound() already_firing = TRUE return @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( UnregisterSignal(target, COMSIG_MOVABLE_MOVED) . = ..() if(target) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/checkLoS, override = TRUE) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(checkLoS), override = TRUE) /mob/living/simple_animal/hostile/ms13/robot/sentrybot/LoseTarget() if(target) @@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( stat_attack = HARD_CRIT FindTarget(possible_targets, HasTargetsList, IgnoreRepetiveCall = TRUE) //We'll give a grace period for the sentry bot being able to attack crit'd targets for about 1 volley - addtimer(CALLBACK(src, .proc/reset_stat_attack), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_stat_attack)), 3 SECONDS) /mob/living/simple_animal/hostile/ms13/robot/sentrybot/proc/reset_stat_attack() stat_attack = initial(stat_attack) @@ -506,7 +506,7 @@ GLOBAL_LIST_INIT(sentrybot_dying_sound, list( rocket = new /datum/action/cooldown/railgun() grenade.Grant(src) rocket.Grant(src) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_move_sound, override = TRUE) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_move_sound), override = TRUE) soundloop = new(src, FALSE) //Wind down is combined with windup sound diff --git a/mojave/code/modules/mob/ms13mobs.dm b/mojave/code/modules/mob/ms13mobs.dm index c5fd40dc0b9..206bbcd05f6 100644 --- a/mojave/code/modules/mob/ms13mobs.dm +++ b/mojave/code/modules/mob/ms13mobs.dm @@ -98,7 +98,7 @@ /mob/living/simple_animal/ms13/Initialize() . = ..() - AddComponent(/datum/component/tameable, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) icon_dead = "[icon_state]_dead" var/matrix/bambinoscale = matrix() if(is_young == TRUE) @@ -297,7 +297,7 @@ /mob/living/simple_animal/hostile/ms13/Initialize() . = ..() - AddComponent(/datum/component/tameable, tame_chance = 10, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, tame_chance = 10, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) icon_dead = "[icon_state]_dead" var/matrix/bambinoscale = matrix() if(is_young == TRUE) @@ -503,7 +503,7 @@ /mob/living/simple_animal/hostile/retaliate/ms13/Initialize() . = ..() - AddComponent(/datum/component/tameable, tame_chance = 10, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, tame_chance = 10, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) icon_dead = "[icon_state]_dead" var/matrix/bambinoscale = matrix() if(is_young == TRUE) diff --git a/mojave/code/modules/projectiles/boxes_magazines/ammo_stack.dm b/mojave/code/modules/projectiles/boxes_magazines/ammo_stack.dm index c859d457557..8bf55e97101 100644 --- a/mojave/code/modules/projectiles/boxes_magazines/ammo_stack.dm +++ b/mojave/code/modules/projectiles/boxes_magazines/ammo_stack.dm @@ -25,7 +25,7 @@ /obj/item/ammo_box/magazine/ammo_stack/Initialize(mapload) . = ..() if(world_icon) - AddElement(/datum/element/world_icon, .proc/update_icon_world) + AddElement(/datum/element/world_icon, PROC_REF(update_icon_world)) /obj/item/ammo_box/magazine/ammo_stack/update_icon(updates) icon = initial(icon) diff --git a/mojave/code/modules/reagents/drugs.dm b/mojave/code/modules/reagents/drugs.dm index 3db5bbbbf1d..42a8e812110 100644 --- a/mojave/code/modules/reagents/drugs.dm +++ b/mojave/code/modules/reagents/drugs.dm @@ -520,7 +520,7 @@ REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, type) M.throw_alert_text(/atom/movable/screen/alert/text/sad, "Ohhh shit...", override = FALSE) M.Stun(50) - addtimer(CALLBACK(src, .proc/heartsplosion, M), rand(3, 8) SECONDS) // We want to delay the actual removal of the heart a tiny bit so people can get out a "Oh damn" or something. You go ZZZzzz mode the second you don't have one. + addtimer(CALLBACK(src, PROC_REF(heartsplosion), M), rand(3, 8) SECONDS) // We want to delay the actual removal of the heart a tiny bit so people can get out a "Oh damn" or something. You go ZZZzzz mode the second you don't have one. return ..() /datum/reagent/ms13/overdrive/overdose_process(mob/living/carbon/M) diff --git a/mojave/code/modules/storage/tarkov.dm b/mojave/code/modules/storage/tarkov.dm index 100f35a1167..e9d516022d0 100644 --- a/mojave/code/modules/storage/tarkov.dm +++ b/mojave/code/modules/storage/tarkov.dm @@ -251,7 +251,7 @@ . = ..() if(.) return - RegisterSignal(parent, COMSIG_STORAGE_BLOCK_USER_TAKE, .proc/should_block_user_take) + RegisterSignal(parent, COMSIG_STORAGE_BLOCK_USER_TAKE, PROC_REF(should_block_user_take)) if(grid) var/atom/atom_parent = parent atom_parent.reset_grid_inventory() diff --git a/mojave/code/modules/surgery/organs/_organ.dm b/mojave/code/modules/surgery/organs/_organ.dm index e1095cda96a..76a5f15425f 100644 --- a/mojave/code/modules/surgery/organs/_organ.dm +++ b/mojave/code/modules/surgery/organs/_organ.dm @@ -10,7 +10,7 @@ . = ..() if((organ_flags & ORGAN_EDIBLE) && grilled_type) AddComponent(/datum/component/grillable, grilled_type, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) - RegisterSignal(src, COMSIG_GRILL_COMPLETED, .proc/on_grill_completed) + RegisterSignal(src, COMSIG_GRILL_COMPLETED, PROC_REF(on_grill_completed)) /obj/item/organ/proc/on_grill_completed(datum/source, obj/item/grill_result) SIGNAL_HANDLER diff --git a/mojave/code/modules/vapour/components/temporary_vapour_emission.dm b/mojave/code/modules/vapour/components/temporary_vapour_emission.dm index a4052b4aacf..7b82ce54e89 100644 --- a/mojave/code/modules/vapour/components/temporary_vapour_emission.dm +++ b/mojave/code/modules/vapour/components/temporary_vapour_emission.dm @@ -13,7 +13,7 @@ src.vapours_type = vapours_type src.vapours_amount = vapours_amount src.expiry_time = world.time + expiry_time - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/wash_off) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wash_off)) START_PROCESSING(SSobj, src) /datum/component/temporary_vapour_emission/Destroy() diff --git a/mojave/code/modules/vapour/components/turf_fire.dm b/mojave/code/modules/vapour/components/turf_fire.dm index 5d53af4d825..07e1fa7706b 100644 --- a/mojave/code/modules/vapour/components/turf_fire.dm +++ b/mojave/code/modules/vapour/components/turf_fire.dm @@ -55,10 +55,10 @@ if(inhabited_turf.turf_fire) return INITIALIZE_HINT_QDEL var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) - RegisterSignal(inhabited_turf, COMSIG_TURF_CHANGE, .proc/turf_changed_pre) + RegisterSignal(inhabited_turf, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre)) inhabited_turf.turf_fire = src SSturf_fire.fires[src] = TRUE if(power) @@ -77,13 +77,13 @@ SIGNAL_HANDLER //forget our old turf UnregisterSignal(inhabited_turf, COMSIG_TURF_CHANGE) - post_change_callbacks += CALLBACK(src, .proc/turf_changed_post) + post_change_callbacks += CALLBACK(src, PROC_REF(turf_changed_post)) ///sets new location /obj/effect/abstract/turf_fire/proc/turf_changed_post(turf/new_turf) inhabited_turf = new_turf //remember our new turf - RegisterSignal(inhabited_turf, COMSIG_TURF_CHANGE, .proc/turf_changed_pre) + RegisterSignal(inhabited_turf, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre)) /obj/effect/abstract/turf_fire/proc/process_waste() inhabited_turf.VapourListTurf(list(/datum/vapours/smoke = 15, /datum/vapours/carbon_air_vapour = 5), VAPOUR_ACTIVE_EMITTER_CAP) diff --git a/mojave/code/modules/wallening-temp/frill.dm b/mojave/code/modules/wallening-temp/frill.dm index 36927d58665..69f25d722ec 100644 --- a/mojave/code/modules/wallening-temp/frill.dm +++ b/mojave/code/modules/wallening-temp/frill.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(frill_objects) var/atom/atom_target = target on_junction_change(atom_target, atom_target.smoothing_junction) - RegisterSignal(target, COMSIG_ATOM_SET_SMOOTHED_ICON_STATE, .proc/on_junction_change) + RegisterSignal(target, COMSIG_ATOM_SET_SMOOTHED_ICON_STATE, PROC_REF(on_junction_change)) /datum/element/frill/Detach(turf/target) diff --git a/mojave/code/modules/wallening-temp/wall_mount.dm b/mojave/code/modules/wallening-temp/wall_mount.dm index b2b37d07d40..ea22eafb3a5 100644 --- a/mojave/code/modules/wallening-temp/wall_mount.dm +++ b/mojave/code/modules/wallening-temp/wall_mount.dm @@ -22,7 +22,7 @@ real_target.pixel_y = 16 //target.RegisterSignal(target_to_listen_to, COMSIG_TURF_CHANGE, ) - RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_changed) + RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_changed)) on_dir_changed(real_target, real_target.dir, real_target.dir) /datum/element/wall_mount/Detach(datum/source, ...) diff --git a/mojave/components/machine_washable.dm b/mojave/components/machine_washable.dm index 216c92e0585..2ba2b49949c 100644 --- a/mojave/components/machine_washable.dm +++ b/mojave/components/machine_washable.dm @@ -27,7 +27,7 @@ /datum/component/machine_washable/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/check_wash) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(check_wash)) /datum/component/machine_washable/UnregisterFromParent() . = ..() diff --git a/mojave/effects/fire.dm b/mojave/effects/fire.dm index 1d11ec6fcb0..a7dfe4ff1dd 100644 --- a/mojave/effects/fire.dm +++ b/mojave/effects/fire.dm @@ -40,7 +40,7 @@ if(C.IgniteMob()) C.visible_message("[C] bursts into flames!","You burst into flames!") var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) process() diff --git a/mojave/elements/craftable.dm b/mojave/elements/craftable.dm index 88551f6add3..ec758d98565 100644 --- a/mojave/elements/craftable.dm +++ b/mojave/elements/craftable.dm @@ -50,8 +50,8 @@ src.crafting_focus_sound = crafting_focus_sound src.c_sound = crafting_sound - RegisterSignal(target, COMSIG_CRAFTING_ATTACKBY, .proc/try_craft) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(target, COMSIG_CRAFTING_ATTACKBY, PROC_REF(try_craft)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) /datum/element/craftable/Detach(datum/target) . = ..() diff --git a/mojave/elements/rollieble.dm b/mojave/elements/rollieble.dm index 53a63579a08..0b947e8c80e 100644 --- a/mojave/elements/rollieble.dm +++ b/mojave/elements/rollieble.dm @@ -20,10 +20,10 @@ src.rollie_type_name = rollie_type_name src.rolling_time = rolling_time - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, .proc/start_filling_papers) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/start_rolling_that_shit) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF_SECONDARY, .proc/start_removing_that_shit) - RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), .proc/update_overlays) + RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(start_filling_papers)) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(start_rolling_that_shit)) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF_SECONDARY, PROC_REF(start_removing_that_shit)) + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), PROC_REF(update_overlays)) /datum/element/rollable/Detach(datum/target) . = ..() @@ -31,7 +31,7 @@ /datum/element/rollable/proc/start_filling_papers(atom/target, obj/item/filling, mob/living/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/fill_papers, target, filling, user) + INVOKE_ASYNC(src, PROC_REF(fill_papers), target, filling, user) /datum/element/rollable/proc/fill_papers(atom/target, obj/item/filling, mob/living/user) if(!isrollable(target)) @@ -80,7 +80,7 @@ /datum/element/rollable/proc/start_removing_that_shit(atom/target, mob/user, list/modifiers) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/remove_that_shit, target, user) + INVOKE_ASYNC(src, PROC_REF(remove_that_shit), target, user) /datum/element/rollable/proc/remove_that_shit(atom/target, mob/user) if(!isrollable(target)) @@ -102,7 +102,7 @@ /datum/element/rollable/proc/start_rolling_that_shit(atom/target, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/roll_that_shit, target, user) + INVOKE_ASYNC(src, PROC_REF(roll_that_shit), target, user) /datum/element/rollable/proc/roll_that_shit(atom/target, mob/user) if(!isrollable(target)) diff --git a/mojave/elements/world_icon.dm b/mojave/elements/world_icon.dm index 548711d77ca..fdb34ac23f5 100644 --- a/mojave/elements/world_icon.dm +++ b/mojave/elements/world_icon.dm @@ -35,16 +35,16 @@ src.world_icon_state = world_icon_state src.inventory_icon = inventory_icon src.inventory_icon_state = inventory_icon_state - RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/update_icon) - RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON_STATE, .proc/update_icon_state) - RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), .proc/inventory_updated) + RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, PROC_REF(update_icon)) + RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(update_icon_state)) + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED), PROC_REF(inventory_updated)) target.update_appearance(UPDATE_ICON) target.update_appearance(UPDATE_ICON_STATE) /datum/element/world_icon/Detach(obj/item/source) . = ..() UnregisterSignal(source, COMSIG_ATOM_UPDATE_ICON) - UnregisterSignal(source, COMSIG_ATOM_UPDATE_ICON_STATE, .proc/update_icon_state) + UnregisterSignal(source, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(update_icon_state)) UnregisterSignal(source, list(COMSIG_ITEM_EQUIPPED, COMSIG_STORAGE_ENTERED, COMSIG_ITEM_DROPPED, COMSIG_STORAGE_EXITED)) source.update_appearance(UPDATE_ICON) source.update_appearance(UPDATE_ICON_STATE) @@ -98,7 +98,7 @@ source.icon_state = source.icon_state return - INVOKE_ASYNC(src, .proc/check_inventory_state, source) + INVOKE_ASYNC(src, PROC_REF(check_inventory_state), source) /datum/element/world_icon/proc/default_world_icon_state(obj/item/source) SIGNAL_HANDLER @@ -107,7 +107,7 @@ source.icon_state = source.icon_state return - INVOKE_ASYNC(src, .proc/check_world_icon_state, source) + INVOKE_ASYNC(src, PROC_REF(check_world_icon_state), source) /datum/element/world_icon/proc/check_inventory_state(obj/item/source) SIGNAL_HANDLER diff --git a/mojave/flora/agriculture.dm b/mojave/flora/agriculture.dm index 0d425c38c3d..16793af1159 100644 --- a/mojave/flora/agriculture.dm +++ b/mojave/flora/agriculture.dm @@ -469,7 +469,7 @@ lastcycle = world.time var/message = span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) /** * Called after plant mutation, update the appearance of the tray content and send a visible_message() diff --git a/mojave/flora/wasteplants.dm b/mojave/flora/wasteplants.dm index 612483ce70b..1d12fb0f88e 100644 --- a/mojave/flora/wasteplants.dm +++ b/mojave/flora/wasteplants.dm @@ -54,7 +54,7 @@ name = harvested_name desc = harvested_desc harvested = TRUE - addtimer(CALLBACK(src, .proc/regrow), rand(regrowth_time_low, regrowth_time_high)) + addtimer(CALLBACK(src, PROC_REF(regrow)), rand(regrowth_time_low, regrowth_time_high)) return 1 /obj/structure/flora/ms13/forage/proc/regrow() diff --git a/mojave/items/crafting/materials.dm b/mojave/items/crafting/materials.dm index 1edbc2c6d6c..2b3ab86310f 100644 --- a/mojave/items/crafting/materials.dm +++ b/mojave/items/crafting/materials.dm @@ -161,7 +161,7 @@ AddComponent(/datum/component/edible,\ initial_reagents = food_results,\ foodtypes = GROSS,\ - after_eat = CALLBACK(src, .proc/on_bite), \ + after_eat = CALLBACK(src, PROC_REF(on_bite)), \ volume = INFINITY) /// Called when someone bites this food, subtract one from our stack diff --git a/mojave/items/creatures/butchering.dm b/mojave/items/creatures/butchering.dm index aafa709fc38..6fa67125aa7 100644 --- a/mojave/items/creatures/butchering.dm +++ b/mojave/items/creatures/butchering.dm @@ -693,7 +693,7 @@ if(_butcher_sound) butcher_sound = _butcher_sound if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/onItemAttack) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(onItemAttack)) /datum/component/itembutchering/proc/onItemAttack(obj/item/source, atom/movable/target, mob/living/user) SIGNAL_HANDLER @@ -702,7 +702,7 @@ return if(istype(target, /obj/item/ms13/carcass)) if(source.get_sharpness()) - INVOKE_ASYNC(src, .proc/startCutting, source, target, user) + INVOKE_ASYNC(src, PROC_REF(startCutting), source, target, user) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/component/itembutchering/proc/startCutting(obj/item/source, obj/item/ms13/carcass/M, mob/living/user) diff --git a/mojave/items/explosives/explosives.dm b/mojave/items/explosives/explosives.dm index b316552b1b0..b0efffb774b 100644 --- a/mojave/items/explosives/explosives.dm +++ b/mojave/items/explosives/explosives.dm @@ -104,7 +104,7 @@ icon_state = icon_state + "_active" inhand_icon_state = icon_state SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) update_icon() /obj/item/grenade/ms13/molotov/detonate(mob/living/lanced_by) diff --git a/mojave/items/food/junkfood.dm b/mojave/items/food/junkfood.dm index 75e27ff0bcf..ac46fb264ab 100644 --- a/mojave/items/food/junkfood.dm +++ b/mojave/items/food/junkfood.dm @@ -24,7 +24,7 @@ bite_consumption = bite_consumption,\ microwaved_type = microwaved_type,\ junkiness = junkiness,\ - after_eat = CALLBACK(src, .proc/after_bite)) + after_eat = CALLBACK(src, PROC_REF(after_bite))) /obj/item/food/ms13/prewar/proc/after_bite(mob/living/eater, mob/living/feeder, bitecount) emptiness += 1 // Every time a bite of the food is eaten, it gets emptier diff --git a/mojave/items/medical/containers.dm b/mojave/items/medical/containers.dm index 5acce85af1b..5a008817114 100644 --- a/mojave/items/medical/containers.dm +++ b/mojave/items/medical/containers.dm @@ -70,7 +70,7 @@ else to_chat(user, span_notice("You swallow a gulp of [src].")) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, M, user) - addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) + addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) playsound(src, "mojave/sound/ms13effects/drinking_redux.ogg", 45, TRUE, 2) /obj/item/reagent_containers/ms13/flask/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) diff --git a/mojave/items/melee/twohanded.dm b/mojave/items/melee/twohanded.dm index fd3ad76032f..0c21e62cecb 100644 --- a/mojave/items/melee/twohanded.dm +++ b/mojave/items/melee/twohanded.dm @@ -24,8 +24,8 @@ /obj/item/ms13/twohanded/Initialize() . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) AddElement(/datum/element/world_icon, null, icon, 'mojave/icons/objects/melee/melee_inventory.dmi') // triggered on wielding of a two handed item. @@ -359,8 +359,8 @@ /obj/item/ms13/twohanded/thunderstick/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) set_explosive(new /obj/item/grenade/frag/ms13/charge()) //For admin-spawned explosive lances /obj/item/ms13/twohanded/thunderstick/proc/set_explosive(obj/item/grenade/G) diff --git a/mojave/items/misc/radios.dm b/mojave/items/misc/radios.dm index 3baeabf0158..e8ae58957a6 100644 --- a/mojave/items/misc/radios.dm +++ b/mojave/items/misc/radios.dm @@ -100,7 +100,7 @@ var/area/current_area = get_area(src) if(!current_area) return - RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/AreaPowerCheck) + RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck)) register_context() /obj/item/radio/ms13/ham/broadcast diff --git a/mojave/items/stealth/stealthboy.dm b/mojave/items/stealth/stealthboy.dm index af7591baf24..c1604345b6b 100644 --- a/mojave/items/stealth/stealthboy.dm +++ b/mojave/items/stealth/stealthboy.dm @@ -38,7 +38,7 @@ if(stealthboy_on) user.alpha = 25 to_chat(user, "You activate the [src].") - addtimer(CALLBACK(src, .proc/disrupt, user), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(disrupt), user), 20 SECONDS) user.add_filter("stealthboy_ripple", 2, list("type" = "ripple", "flags" = WAVE_BOUNDED, "radius" = 0, "size" = 2)) var/filter = user.get_filter("stealthboy_ripple") animate(filter, radius = 32, time = 15, size = 0, loop = 1) diff --git a/mojave/machinery/doors/vaultdoor.dm b/mojave/machinery/doors/vaultdoor.dm index 24af609dbd2..0d455e8a7bc 100644 --- a/mojave/machinery/doors/vaultdoor.dm +++ b/mojave/machinery/doors/vaultdoor.dm @@ -69,7 +69,7 @@ operating = FALSE if(delayed_close_requested) delayed_close_requested = FALSE - addtimer(CALLBACK(src, .proc/close), 1) + addtimer(CALLBACK(src, PROC_REF(close)), 1) playsound(src, 'mojave/sound/ms13machines/vault_door/vault_steam_1.ogg', 30, TRUE) /obj/machinery/door/airlock/ms13/vault_door/close_animation(dangerous_close = FALSE) diff --git a/mojave/machinery/terminals.dm b/mojave/machinery/terminals.dm index 71b33245116..ee6a40ef75b 100644 --- a/mojave/machinery/terminals.dm +++ b/mojave/machinery/terminals.dm @@ -394,7 +394,7 @@ loaded_title = J.title loaded_content = J.content mode = 2 - addtimer(CALLBACK(src, .proc/Boom), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Boom)), 2 SECONDS) message_admins("A rigged terminal has been triggered. [ADMIN_JMP(src)].") // Return @@ -446,7 +446,7 @@ if(M.id == src.id) if(openclose == null) openclose = M.density - INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/machinery/door/poddoor, open) : TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) // freak this code for now //var/onoff diff --git a/mojave/modules/outdoor_effects/code/datums/particle_weather/weather_datum.dm b/mojave/modules/outdoor_effects/code/datums/particle_weather/weather_datum.dm index a163dd94b94..24633f92af9 100644 --- a/mojave/modules/outdoor_effects/code/datums/particle_weather/weather_datum.dm +++ b/mojave/modules/outdoor_effects/code/datums/particle_weather/weather_datum.dm @@ -107,7 +107,7 @@ return //some cheeky git has started you early weather_duration = rand(weather_duration_lower, weather_duration_upper) running = TRUE - addtimer(CALLBACK(src, .proc/wind_down), weather_duration) + addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration) if(particleEffectType) SSParticleWeather.SetparticleEffect(new particleEffectType); @@ -138,7 +138,7 @@ //Tick on if(severityStepsTaken < severitySteps) - addtimer(CALLBACK(src, .proc/ChangeSeverity), weather_duration / severitySteps) + addtimer(CALLBACK(src, PROC_REF(ChangeSeverity)), weather_duration / severitySteps) /** @@ -154,7 +154,7 @@ SSParticleWeather.particleEffect.animateSeverity(severityMod()) //Wait for the last particle to fade, then qdel yourself - addtimer(CALLBACK(src, .proc/end), SSParticleWeather.particleEffect.lifespan + SSParticleWeather.particleEffect.fade) + addtimer(CALLBACK(src, PROC_REF(end)), SSParticleWeather.particleEffect.lifespan + SSParticleWeather.particleEffect.fade) diff --git a/mojave/modules/outdoor_effects/code/modules/admin/verbs/adminevents.dm b/mojave/modules/outdoor_effects/code/modules/admin/verbs/adminevents.dm index c7c823145a4..87ab7ecf6eb 100644 --- a/mojave/modules/outdoor_effects/code/modules/admin/verbs/adminevents.dm +++ b/mojave/modules/outdoor_effects/code/modules/admin/verbs/adminevents.dm @@ -7,7 +7,7 @@ if(!holder) return - var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/particle_weather), /proc/cmp_typepaths_asc) + var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/particle_weather), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!weather_type) return diff --git a/mojave/structures/ladders.dm b/mojave/structures/ladders.dm index 18acc93d6ad..c4944f6d0ae 100644 --- a/mojave/structures/ladders.dm +++ b/mojave/structures/ladders.dm @@ -45,7 +45,7 @@ to_chat(user, span_warning("[src] doesn't seem to lead anywhere!")) return - var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user, is_ghost), require_near = !is_ghost, tooltips = TRUE) + var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user, is_ghost), require_near = !is_ghost, tooltips = TRUE) if (!is_ghost && !in_range(src, user)) return // nice try switch(result) diff --git a/mojave/structures/obstacles.dm b/mojave/structures/obstacles.dm index 718a9041f27..4ff33f7899b 100644 --- a/mojave/structures/obstacles.dm +++ b/mojave/structures/obstacles.dm @@ -68,7 +68,7 @@ /obj/structure/ms13/bars/Initialize() . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -217,7 +217,7 @@ . = ..() air_update_turf(TRUE) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -348,7 +348,7 @@ isSwitchingStates = FALSE if(close_delay != -1) - addtimer(CALLBACK(src, .proc/Close), close_delay) + addtimer(CALLBACK(src, PROC_REF(Close)), close_delay) /obj/structure/ms13/celldoor/proc/Close() if(isSwitchingStates || !door_opened) @@ -431,7 +431,7 @@ /obj/structure/ms13/fence/Initialize() . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -955,7 +955,7 @@ . = ..() register_context() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -1081,8 +1081,8 @@ AddElement(/datum/element/climbable, climb_time = 1 SECONDS, climb_stun = 0, no_stun = TRUE, jump_over = TRUE) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/mojave/structures/storage/misc.dm b/mojave/structures/storage/misc.dm index 02293827c74..eb442b3c578 100644 --- a/mojave/structures/storage/misc.dm +++ b/mojave/structures/storage/misc.dm @@ -149,7 +149,7 @@ busy = TRUE to_chat(user, span_notice("You press the on button and [src] kicks to life.")) update_overlays() - addtimer(CALLBACK(src, .proc/washed), 20 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(washed)), 20 SECONDS, TIMER_UNIQUE) soundloop.start() START_PROCESSING(SSfastprocess, src) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/mojave/structures/window.dm b/mojave/structures/window.dm index d61ae34483e..c7bf0a7c266 100644 --- a/mojave/structures/window.dm +++ b/mojave/structures/window.dm @@ -22,7 +22,7 @@ /obj/structure/ms13/frame/Initialize() . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/climbable, climb_time = 3 SECONDS, climb_stun = 0, no_stun = TRUE, jump_over = TRUE, jump_north = 10, jump_south = 15, jump_sides = 7) diff --git a/mojave/turfs/plating.dm b/mojave/turfs/plating.dm index d67c04d8c79..9b3f8c3e5c2 100644 --- a/mojave/turfs/plating.dm +++ b/mojave/turfs/plating.dm @@ -101,7 +101,7 @@ /turf/open/floor/plating/ms13/ground/desert/Initialize() . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_icon), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) //If no fences, machines (soil patches are machines), etc. try to plant grass if(!((locate(/obj/structure) in src) || (locate(/obj/machinery) in src))) plantGrass() @@ -223,7 +223,7 @@ /turf/open/floor/plating/ms13/ground/snow/Initialize() . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_icon), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) curr_area = get_area(src) if(!((locate(/obj/structure) in src) || (locate(/obj/machinery) in src) || (locate(/obj/structure/flora) in src))) plant_grass() @@ -404,7 +404,7 @@ /turf/open/floor/plating/ms13/ground/road/Initialize() . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_icon), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) /turf/open/floor/plating/ms13/ground/road/update_icon() . = ..() //Inheritance required for road decals @@ -445,7 +445,7 @@ /turf/open/floor/plating/ms13/ground/sidewalk/Initialize() . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_icon), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) /* /turf/open/floor/plating/ms13/ground/sidewalk/update_icon() @@ -552,7 +552,7 @@ /turf/open/floor/plating/ms13/ground/ice/Initialize() . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_icon), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) MakeSlippery(TURF_WET_WATER, INFINITY, 0, INFINITY, TRUE, overlay = FALSE) /turf/open/floor/plating/ms13/ground/ice/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent, overlay) @@ -780,7 +780,7 @@ GLOBAL_VAR(FishPopNextCalc) "You start lowering yourself in the deep water.") if(do_mob(user, M, 20)) M.swimming = TRUE - addtimer(CALLBACK(src, .proc/transfer_mob_layer, M), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(transfer_mob_layer), M), 0.2 SECONDS) M.forceMove(src) to_chat(user, "You lower yourself in the deep water.") //M.adjust_bodytemperature(coldness) @@ -790,7 +790,7 @@ GLOBAL_VAR(FishPopNextCalc) "You start lowering [M] in the deep water.") if(do_mob(user, M, 20)) M.swimming = TRUE - addtimer(CALLBACK(src, .proc/transfer_mob_layer, M), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(transfer_mob_layer), M), 0.2 SECONDS) M.forceMove(src) to_chat(user, "You lower [M] in the deep water.") //M.adjust_bodytemperature(coldness) @@ -816,7 +816,7 @@ GLOBAL_VAR(FishPopNextCalc) if(isliving(A)) var/mob/living/M = A var/mob/living/carbon/H = M - addtimer(CALLBACK(src, .proc/transfer_mob_layer, M), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(transfer_mob_layer), M), 0.2 SECONDS) if(!(M.swimming)) switch(depth) if(3) diff --git a/tgstation.dme b/tgstation.dme index a5ee1413940..6444e7b9171 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -14,6 +14,7 @@ // BEGIN_INCLUDE #include "_maps\_basemap.dm" +#include "code\__byond_version_compat.dm" #include "code\_compile_options.dm" #include "code\_debugger.dm" #include "code\world.dm" @@ -310,6 +311,7 @@ #include "code\__HELPERS\memory_helpers.dm" #include "code\__HELPERS\mobs.dm" #include "code\__HELPERS\mouse_control.dm" +#include "code\__HELPERS\nameof.dm" #include "code\__HELPERS\names.dm" #include "code\__HELPERS\path.dm" #include "code\__HELPERS\piping_colors_lists.dm"