Skip to content

Commit 0a9b8d8

Browse files
committed
Fixes moment
1 parent 59e9d07 commit 0a9b8d8

File tree

17 files changed

+24
-24
lines changed

17 files changed

+24
-24
lines changed

code/controllers/subsystem/garbage.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ SUBSYSTEM_DEF(garbage)
194194
if (GC_QUEUE_CHECK)
195195
#ifdef REFERENCE_TRACKING
196196
if(reference_find_on_fail[refID])
197-
INVOKE_ASYNC(D, /datum/proc/find_references)
197+
INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
198198
ref_searching = TRUE
199199
#ifdef GC_FAILURE_HARD_LOOKUP
200200
else
201-
INVOKE_ASYNC(D, /datum/proc/find_references)
201+
INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
202202
ref_searching = TRUE
203203
#endif
204204
reference_find_on_fail -= refID

code/datums/status_effects/buffs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
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!")
156156
owner.spin(duration,1)
157157
animate(owner, color = oldcolor, time = duration, easing = EASE_IN)
158-
addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration)
158+
addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, update_atom_colour)), duration)
159159
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
160160
return ..()
161161

code/game/machinery/doors/airlock.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
if(!machine_stat)
582582
update_icon(ALL, AIRLOCK_DENY)
583583
playsound(src,doorDeni,50,FALSE,3)
584-
addtimer(CALLBACK(src, /atom/proc/update_icon, ALL, AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME)
584+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), ALL, AIRLOCK_CLOSED), AIRLOCK_DENY_ANIMATION_TIME)
585585

586586
/obj/machinery/door/airlock/examine(mob/user)
587587
. = ..()
@@ -752,7 +752,7 @@
752752

753753
/obj/machinery/door/airlock/proc/on_attack_hand(atom/source, mob/user, list/modifiers)
754754
SIGNAL_HANDLER
755-
INVOKE_ASYNC(src, /atom/proc/attack_hand, user, modifiers)
755+
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, attack_hand), user, modifiers)
756756
return COMPONENT_CANCEL_ATTACK_CHAIN
757757

758758
/obj/machinery/door/airlock/attack_hand(mob/user, list/modifiers)

code/modules/antagonists/cult/blood_magic.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@
436436
L.mob_light(_range = 2, _color = LIGHT_COLOR_HOLY_MAGIC, _duration = 10 SECONDS)
437437
var/mutable_appearance/forbearance = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)
438438
L.add_overlay(forbearance)
439-
addtimer(CALLBACK(L, /atom/proc/cut_overlay, forbearance), 100)
439+
addtimer(CALLBACK(L, TYPE_PROC_REF(/atom, cut_overlay), forbearance), 100)
440440

441441
if(istype(anti_magic_source, /obj/item))
442442
var/obj/item/ams_object = anti_magic_source

code/modules/antagonists/cult/runes.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ structure_check() searches for nearby cultist structures required for the invoca
180180
var/oldcolor = color
181181
color = rgb(255, 0, 0)
182182
animate(src, color = oldcolor, time = 5)
183-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5)
183+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
184184

185185
//Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user.
186186
/obj/effect/rune/malformed
@@ -245,7 +245,7 @@ structure_check() searches for nearby cultist structures required for the invoca
245245
..()
246246
do_sacrifice(L, invokers)
247247
animate(src, color = oldcolor, time = 5)
248-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5)
248+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
249249
Cult_team.check_size() // Triggers the eye glow or aura effects if the cult has grown large enough relative to the crew
250250
rune_in_use = FALSE
251251

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ This is here to make the tiles around the station mininuke change when it's arme
754754
user.visible_message(span_suicide("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!"))
755755
playsound(src, 'sound/machines/alarm.ogg', 50, -1, TRUE)
756756
for(var/i in 1 to 100)
757-
addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i)
757+
addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i)
758758
addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101)
759759
return MANUAL_SUICIDE
760760

code/modules/experisci/experiment/handlers/experiment_handler.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
*/
261261
/datum/component/experiment_handler/proc/configure_experiment_click(datum/source, mob/user)
262262
SIGNAL_HANDLER
263-
INVOKE_ASYNC(src, /datum/proc/ui_interact, user)
263+
INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user)
264264

265265
/**
266266
* Attempts to link this experiment_handler to a provided techweb

code/modules/mob/dead/observer/observer.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
164164
var/old_color = color
165165
color = "#960000"
166166
animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
167-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
167+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 10)
168168

169169
/mob/dead/observer/Destroy()
170170
if(data_huds_on)

code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Difficulty: Hard
230230
blinking = TRUE
231231
SLEEP_CHECK_DEATH(4 + target_slowness, src)
232232
animate(src, color = oldcolor, time = 8)
233-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
233+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8)
234234
SLEEP_CHECK_DEATH(8, src)
235235
blinking = FALSE
236236
else
@@ -251,7 +251,7 @@ Difficulty: Hard
251251
INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.diagonals)
252252
SLEEP_CHECK_DEATH(6 + target_slowness, src)
253253
animate(src, color = oldcolor, time = 8)
254-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
254+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8)
255255
SLEEP_CHECK_DEATH(8, src)
256256
blinking = FALSE
257257

@@ -279,7 +279,7 @@ Difficulty: Hard
279279
SLEEP_CHECK_DEATH(8 + target_slowness, src)
280280
update_cooldowns(list(COOLDOWN_UPDATE_SET_CHASER = chaser_cooldown_time))
281281
animate(src, color = oldcolor, time = 8)
282-
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
282+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 8)
283283
SLEEP_CHECK_DEATH(8, src)
284284
blinking = FALSE
285285

code/modules/mob/mob.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@
553553
/// our current intent, so we can go back to it after touching
554554
var/previous_combat_mode = combat_mode
555555
set_combat_mode(FALSE)
556-
INVOKE_ASYNC(examined_thing, /atom/proc/attack_hand, src)
556+
INVOKE_ASYNC(examined_thing, TYPE_PROC_REF(/atom, attack_hand), src)
557557
set_combat_mode(previous_combat_mode)
558558
return TRUE
559559

code/modules/modular_computers/computers/item/computer.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
var/mob/user = usr
427427
if(user && istype(user))
428428
//Here to prevent programs sleeping in destroy
429-
INVOKE_ASYNC(src, /datum/proc/ui_interact, user) // Re-open the UI on this computer. It should show the main screen now.
429+
INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) // Re-open the UI on this computer. It should show the main screen now.
430430
update_appearance()
431431

432432
// Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on)

code/modules/power/singularity/boh_tear.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
to_chat(jedi, span_userdanger("You don't feel like you are real anymore."))
4242
jedi.dust_animation()
4343
jedi.spawn_dust()
44-
addtimer(CALLBACK(src, /atom/proc/attack_hand, jedi), 0.5 SECONDS)
44+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, attack_hand), jedi), 0.5 SECONDS)
4545
return COMPONENT_CANCEL_ATTACK_CHAIN
4646

4747
#undef BOH_TEAR_CONSUME_RANGE

code/modules/power/singularity/narsie.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
souls_needed[player] = TRUE
8888

8989
soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
90-
INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(begin_the_end))
90+
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(begin_the_end))
9191

9292
/obj/narsie/Destroy()
9393
send_to_playing_players(span_narsie("\"<b>[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"</b>"))

code/modules/research/rdmachines.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@
121121
stack_name = S.name
122122
use_power(min(1000, (amount_inserted / 100)))
123123
add_overlay("protolathe_[stack_name]")
124-
addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
124+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), "protolathe_[stack_name]"), 10)

code/modules/spells/spell_types/rightandwrong.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list(
188188
if(GLOB.summon_magic)
189189
GLOB.summon_magic.survivor_probability = survivor_probability
190190
else
191-
GLOB.summon_magic = new /datum/summon_things_controller(/proc/give_magic, survivor_probability)
191+
GLOB.summon_magic = new /datum/summon_things_controller(GLOBAL_PROC_REF(give_magic), survivor_probability)
192192
GLOB.summon_magic.give_out_gear()
193193

194194
/*
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list(
208208
if(GLOB.summon_guns)
209209
GLOB.summon_guns.survivor_probability = survivor_probability
210210
else
211-
GLOB.summon_guns = new /datum/summon_things_controller(/proc/give_guns, survivor_probability)
211+
GLOB.summon_guns = new /datum/summon_things_controller(GLOBAL_PROC_REF(give_guns), survivor_probability)
212212
GLOB.summon_guns.give_out_gear()
213213

214214
/*

code/modules/vehicles/mecha/mech_fabricator.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@
603603
/obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(item_inserted, id_inserted, amount_inserted)
604604
var/datum/material/M = id_inserted
605605
add_overlay("fab-load-[M.name]")
606-
addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10)
606+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), "fab-load-[M.name]"), 10)
607607

608608
/obj/machinery/mecha_part_fabricator/screwdriver_act(mob/living/user, obj/item/I)
609609
if(..())

code/modules/vehicles/vehicle_key.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
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!"))
4343
user.AddElement(/datum/element/cleaning)
4444
for(var/i in 1 to 100)
45-
addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i)
45+
addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i)
4646
addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101)
4747
return MANUAL_SUICIDE
4848
if(SKILL_LEVEL_LEGENDARY to INFINITY) //Holy shit, look at that janny go!
@@ -51,7 +51,7 @@
5151
playsound(src, 'sound//magic/lightning_chargeup.ogg', 50, TRUE, -1)
5252
user.reagents.add_reagent(/datum/reagent/drug/methamphetamine, 10) //Gotta go fast!
5353
for(var/i in 1 to 150)
54-
addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i)
54+
addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i)
5555
addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 151)
5656
return MANUAL_SUICIDE
5757

0 commit comments

Comments
 (0)