Skip to content

Commit 0e3713b

Browse files
committed
Last updates and fixes
1 parent 5d5dfac commit 0e3713b

File tree

100 files changed

+145
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+145
-145
lines changed

code/controllers/master.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
109109
for(var/global_var in global.vars)
110110
if (istype(global.vars[global_var], /datum/controller/subsystem))
111111
existing_subsystems += global.vars[global_var]
112-
112+
113113
//Either init a new SS or if an existing one was found use that
114114
for(var/I in subsystem_types)
115115
var/ss_idx = existing_subsystems.Find(I)
@@ -322,7 +322,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
322322
//(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)
323323
sortTim(tickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
324324
for(var/I in runlevel_sorted_subsystems)
325-
sortTim(runlevel_sorted_subsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
325+
sortTim(I, GLOBAL_PROC_REF(cmp_subsystem_priority))
326326
I += tickersubsystems
327327

328328
var/cached_runlevel = current_runlevel

code/game/objects/effects/effect_system/effects_smoke.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
//the smoke spreads rapidly but not instantly
9898
for(var/obj/effect/particle_effect/smoke/SM in newsmokes)
99-
addtimer(CALLBACK(SM, /obj/effect/particle_effect/smoke.proc/spread_smoke), 1)
99+
addtimer(CALLBACK(SM, TYPE_PROC_REF(/obj/effect/particle_effect/smoke, spread_smoke)), 1)
100100

101101

102102
/datum/effect_system/smoke_spread

code/game/objects/effects/phased_mob.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
to_chat(living_cheaterson, span_userdanger("This area has a heavy universal force occupying it, and you are scattered to the cosmos!"))
2828
if(ishuman(living_cheaterson))
2929
shake_camera(living_cheaterson, 20, 1)
30-
addtimer(CALLBACK(living_cheaterson, /mob/living/carbon.proc/vomit), 2 SECONDS)
30+
addtimer(CALLBACK(living_cheaterson, TYPE_PROC_REF(/mob/living/carbon, vomit)), 2 SECONDS)
3131
phasing_in.forceMove(find_safe_turf(z))
3232
return ..()
3333

code/game/objects/effects/temporary_visuals/miscellaneous.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
status = rcd_status
500500
delay = rcd_delay
501501
if (status == RCD_DECONSTRUCT)
502-
addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1.1 SECONDS)
502+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 1.1 SECONDS)
503503
delay -= 11
504504
icon_state = "rcd_end_reverse"
505505
else

code/game/objects/items/devices/PDA/cart.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@
619619
active1 = null
620620

621621
if("Send Signal")
622-
INVOKE_ASYNC(radio, /obj/item/integrated_signaler.proc/send_activation)
622+
INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/integrated_signaler, send_activation))
623623

624624
if("Signal Frequency")
625625
var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"]))
@@ -760,7 +760,7 @@
760760
menu += "Keep an ID inserted to upload access codes upon summoning."
761761

762762
menu += "<HR><A href='byond://?src=[REF(src)];op=botlist'>[PDAIMG(back)]Return to bot list</A>"
763-
763+
764764
return menu
765765

766766
//If the cartridge adds a special line to the top of the messaging app

code/game/objects/items/devices/transfer_valve.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203

204204
merge_gases()
205205
for(var/i in 1 to 6)
206-
addtimer(CALLBACK(src, /atom/.proc/update_appearance), 20 + (i - 1) * 10)
206+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 20 + (i - 1) * 10)
207207

208208
else if(valve_open && tank_one && tank_two)
209209
split_gases()

code/game/objects/items/grenades/antigravity.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
for(var/turf/lanced_turf in view(range, src))
1818
lanced_turf.AddElement(/datum/element/forced_gravity, forced_value)
19-
addtimer(CALLBACK(lanced_turf, /datum/.proc/_RemoveElement, list(/datum/element/forced_gravity, forced_value)), duration)
19+
addtimer(CALLBACK(lanced_turf, TYPE_PROC_REF(/datum, _RemoveElement), list(/datum/element/forced_gravity, forced_value)), duration)
2020

2121
qdel(src)

code/game/objects/items/handcuffs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@
397397
if(C.body_position == STANDING_UP)
398398
def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
399399
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.
400-
INVOKE_ASYNC(C, /mob/living/carbon.proc/equip_to_slot, src, ITEM_SLOT_LEGCUFFED)
400+
INVOKE_ASYNC(C, TYPE_PROC_REF(/mob/living/carbon, equip_to_slot), src, ITEM_SLOT_LEGCUFFED)
401401
SSblackbox.record_feedback("tally", "handcuffs", 1, type)
402402
else if(snap && isanimal(L))
403403
var/mob/living/simple_animal/SA = L

code/game/objects/structures/deployable_turret.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
/obj/machinery/deployable_turret/proc/volley(mob/user)
185185
target_turf = get_turf(target)
186186
for(var/i in 1 to number_of_shots)
187-
addtimer(CALLBACK(src, /obj/machinery/deployable_turret/.proc/fire_helper, user), i*rate_of_fire)
187+
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret, fire_helper), user), i*rate_of_fire)
188188

189189
/obj/machinery/deployable_turret/proc/fire_helper(mob/user)
190190
if(user.incapacitated() || !(user in buckled_mobs))

code/game/objects/structures/divine.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
to_chat(user, span_notice("The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards."))
4242
user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
4343
update_appearance()
44-
addtimer(CALLBACK(src, /atom/.proc/update_appearance), time_between_uses)
44+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_between_uses)
4545

4646

4747
/obj/structure/healingfountain/update_icon_state()

code/game/objects/structures/industrial_lift.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(lifts)
302302

303303
collided.throw_at()
304304
//if going EAST, will turn to the NORTHEAST or SOUTHEAST and throw the ran over guy away
305-
var/datum/callback/land_slam = new(collided, /mob/living/.proc/tram_slam_land)
305+
var/datum/callback/land_slam = new(collided, TYPE_PROC_REF(/mob/living, tram_slam_land))
306306
collided.throw_at(throw_target, 200, 4, callback = land_slam)
307307

308308
set_glide_size(gliding_amount)

code/game/turfs/turf.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
467467

468468
var/list/things = src_object.contents()
469469
var/datum/progressbar/progress = new(user, things.len, src)
470-
while (do_after(usr, 1 SECONDS, src, NONE, FALSE, CALLBACK(src_object, /datum/component/storage.proc/mass_remove_from_storage, src, things, progress)))
470+
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)))
471471
stoplag(1)
472472
progress.end_progress()
473473

code/modules/admin/verbs/debug.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
699699
var/list/queries = list()
700700
for(var/i in 1 to val)
701701
var/datum/db_query/query = SSdbcore.NewQuery("NULL")
702-
INVOKE_ASYNC(query, /datum/db_query.proc/Execute)
702+
INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/db_query, Execute))
703703
queries += query
704704

705705
for(var/datum/db_query/query as anything in queries)

code/modules/admin/verbs/highlander_datum.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller)
3636
robot.gib()
3737
continue
3838
robot.make_scottish()
39-
addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 1), 50)
39+
addtimer(CALLBACK(SSshuttle.emergency, TYPE_PROC_REF(/obj/docking_port/mobile/emergency, request), null, 1), 50)
4040

4141
/datum/highlander_controller/Destroy(force, ...)
4242
. = ..()

code/modules/admin/verbs/secrets.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
451451
log_admin("[key_name_admin(holder)] made everyone into monkeys.")
452452
for(var/i in GLOB.human_list)
453453
var/mob/living/carbon/human/H = i
454-
INVOKE_ASYNC(H, /mob/living/carbon.proc/monkeyize)
454+
INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon, monkeyize))
455455
if("traitor_all")
456456
if(!is_funmin)
457457
return

code/modules/antagonists/_common/antag_hud.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc
3434
RegisterSignal(
3535
mind,
3636
list(COMSIG_ANTAGONIST_GAINED, COMSIG_ANTAGONIST_REMOVED),
37-
.proc/update_antag_hud_images
37+
PROC_REF(update_antag_hud_images)
3838
)
3939

4040
check_processing()

code/modules/antagonists/changeling/changeling.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
if(!chosen_sting || clicked == ling || !istype(ling) || ling.stat != CONSCIOUS)
225225
return
226226

227-
INVOKE_ASYNC(chosen_sting, /datum/action/changeling/sting.proc/try_to_sting, ling, clicked)
227+
INVOKE_ASYNC(chosen_sting, TYPE_PROC_REF(/datum/action/changeling/sting, try_to_sting), ling, clicked)
228228

229229
return COMSIG_MOB_CANCEL_CLICKON
230230

code/modules/antagonists/cult/blood_magic.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50))
271271
var/image/C = image('icons/effects/cult/effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER)
272272
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
273-
addtimer(CALLBACK(H,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE)
273+
addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_alt_appearance), "cult_apoc", TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE)
274274
to_chat(ranged_ability_user,span_cult("<b>[H] has been cursed with living nightmares!</b>"))
275275
attached_action.charges--
276276
attached_action.desc = attached_action.base_desc

code/modules/antagonists/cult/cult_items.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ Striking a noncultist, however, will tear their flesh."}
10351035
playsound(src, 'sound/weapons/parry.ogg', 100, TRUE)
10361036
if(illusions > 0)
10371037
illusions--
1038-
addtimer(CALLBACK(src, /obj/item/shield/mirror.proc/readd), 450)
1038+
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/shield/mirror, readd)), 450)
10391039
if(prob(60))
10401040
var/mob/living/simple_animal/hostile/illusion/M = new(owner.loc)
10411041
M.faction = list("cult")

code/modules/antagonists/cult/runes.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -967,21 +967,21 @@ structure_check() searches for nearby cultist structures required for the invoca
967967
var/image/A = image('icons/mob/cult.dmi',M,"cultist", ABOVE_MOB_LAYER)
968968
A.override = 1
969969
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE)
970-
addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"human_apoc",TRUE), duration)
970+
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "human_apoc", TRUE), duration)
971971
images += A
972972
SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/voice/ghost_whisper.ogg'),sound('sound/misc/ghosty_wind.ogg')))
973973
else
974974
var/construct = pick("floater","artificer","behemoth")
975975
var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER)
976976
B.override = 1
977977
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE)
978-
addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"mob_apoc",TRUE), duration)
978+
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "mob_apoc", TRUE), duration)
979979
images += B
980980
if(!IS_CULTIST(M))
981981
if(M.client)
982982
var/image/C = image('icons/effects/cult/effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
983983
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
984-
addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), duration)
984+
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance), "cult_apoc", TRUE), duration)
985985
images += C
986986
else
987987
to_chat(M, span_cultlarge("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!"))

code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@
225225
sac_target.do_jitter_animation(100)
226226
log_combat(heretic_mind.current, sac_target, "sacrificed")
227227

228-
addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation, 100), SACRIFICE_SLEEP_DURATION * (1/3))
229-
addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation, 100), SACRIFICE_SLEEP_DURATION * (2/3))
228+
addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 100), SACRIFICE_SLEEP_DURATION * (1/3))
229+
addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 100), SACRIFICE_SLEEP_DURATION * (2/3))
230230

231231
// If our target is dead, try to revive them
232232
// and if we fail to revive them, don't proceede the chain

code/modules/antagonists/slaughter/slaughter.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
if(istype(loc, /obj/effect/dummy/phased_mob))
8585
bloodspell.phased = TRUE
8686
if(bloodpool)
87-
bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), /obj/effect/dummy/phased_mob/.proc/deleteself)
87+
bloodpool.RegisterSignal(src, list(COMSIG_LIVING_AFTERPHASEIN,COMSIG_PARENT_QDELETING), TYPE_PROC_REF(/obj/effect/dummy/phased_mob, deleteself))
8888

8989
/// Performs the classic slaughter demon bodyslam on the attack_target. Yeets them a screen away.
9090
/mob/living/simple_animal/hostile/imp/slaughter/proc/bodyslam(atom/attack_target)

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
398398
for(var/obj/machinery/door/D in GLOB.airlocks)
399399
if(!is_station_level(D.z))
400400
continue
401-
INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, owner)
402-
addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900)
401+
INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door, hostile_lockdown), owner)
402+
addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/door, disable_lockdown)), 900)
403403

404404
var/obj/machinery/computer/communications/C = locate() in GLOB.machines
405405
if(C)
@@ -460,7 +460,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
460460
attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining."
461461
attached_action.UpdateButtonIcon()
462462
target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!"))
463-
addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/override_machine.proc/animate_machine, target), 50) //kabeep!
463+
addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/override_machine, animate_machine), target), 50) //kabeep!
464464
remove_ranged_ability(span_danger("Sending override signal..."))
465465
return TRUE
466466

@@ -543,7 +543,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
543543
attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining."
544544
attached_action.UpdateButtonIcon()
545545
target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!"))
546-
addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/overload_machine.proc/detonate_machine, target), 50) //kaboom!
546+
addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/overload_machine, detonate_machine), target), 50) //kaboom!
547547
remove_ranged_ability(span_danger("Overcharging machine..."))
548548
return TRUE
549549

@@ -759,7 +759,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
759759
for(var/obj/machinery/light/L in GLOB.machines)
760760
if(is_station_level(L.z))
761761
L.no_emergency = TRUE
762-
INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
762+
INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE)
763763
CHECK_TICK
764764
to_chat(owner, span_notice("Emergency light connections severed."))
765765
owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE)

code/modules/assembly/doorcontrol.dm

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
if(M.id == src.id)
3030
if(openclose == null || !sync_doors)
3131
openclose = M.density
32-
INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close)
32+
INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/machinery/door/poddoor, open) : TYPE_PROC_REF(/obj/machinery/door/poddoor, close))
3333
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10)
3434

3535
/obj/item/assembly/control/curtain
@@ -50,7 +50,7 @@
5050
if(M.id == src.id)
5151
if(openclose == null || !sync_doors)
5252
openclose = M.density
53-
INVOKE_ASYNC(M, openclose ? /obj/structure/curtain/cloth/fancy/mechanical.proc/open : /obj/structure/curtain/cloth/fancy/mechanical.proc/close)
53+
INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, open) : TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, close))
5454
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5)
5555

5656

@@ -94,7 +94,7 @@
9494
D.safe = !D.safe
9595

9696
for(var/D in open_or_close)
97-
INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open)
97+
INVOKE_ASYNC(D, doors_need_closing ? TYPE_PROC_REF(/obj/machinery/door/airlock, close) : TYPE_PROC_REF(/obj/machinery/door/airlock, open))
9898

9999
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10)
100100

@@ -109,7 +109,7 @@
109109
cooldown = TRUE
110110
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
111111
if (M.id == src.id)
112-
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open)
112+
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, open))
113113

114114
sleep(10)
115115

@@ -121,7 +121,7 @@
121121

122122
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
123123
if (M.id == src.id)
124-
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close)
124+
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, close))
125125

126126
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10)
127127

@@ -136,7 +136,7 @@
136136
cooldown = TRUE
137137
for(var/obj/machinery/sparker/M in GLOB.machines)
138138
if (M.id == src.id)
139-
INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite)
139+
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/sparker, ignite))
140140

141141
for(var/obj/machinery/igniter/M in GLOB.machines)
142142
if(M.id == src.id)
@@ -156,7 +156,7 @@
156156
cooldown = TRUE
157157
for(var/obj/machinery/flasher/M in GLOB.machines)
158158
if(M.id == src.id)
159-
INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash)
159+
INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/flasher, flash))
160160

161161
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50)
162162

code/modules/assembly/flash.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
flashing = flash
5050
. = ..()
5151
if(flash)
52-
addtimer(CALLBACK(src, /atom/.proc/update_icon), 5)
52+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5)
5353
holder?.update_icon(updates)
5454

5555
/obj/item/assembly/flash/update_overlays()

code/modules/assembly/infrared.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,4 @@
241241
var/obj/item/I = AM
242242
if (I.item_flags & ABSTRACT)
243243
return
244-
INVOKE_ASYNC(master, /obj/item/assembly/infra.proc/trigger_beam, AM, get_turf(src))
244+
INVOKE_ASYNC(master, TYPE_PROC_REF(/obj/item/assembly/infra, trigger_beam), AM, get_turf(src))

code/modules/cargo/gondolapod.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
7070
opened = TRUE
7171
update_appearance()
72-
addtimer(CALLBACK(src, /atom/.proc/setClosed), 50)
72+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, setClosed)), 50)
7373

7474
/mob/living/simple_animal/pet/gondola/gondolapod/setClosed()
7575
opened = FALSE

code/modules/cargo/supplypod.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@
644644
smoke_part.pixel_y = abs(cos(rotation))*32 * i
645645
smoke_part.add_filter("smoke_blur", 1, gauss_blur_filter(size = 4))
646646
var/time = (pod.delays[POD_FALLING] / length(smoke_effects))*(length(smoke_effects)-i)
647-
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
647+
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
648648
QDEL_IN(smoke_part, pod.delays[POD_FALLING] + 35)
649649

650650
/obj/effect/pod_landingzone/proc/drawSmoke()

code/modules/client/client_procs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
968968

969969
//Precache the client with all other assets slowly, so as to not block other browse() calls
970970
if (CONFIG_GET(flag/asset_simple_preload))
971-
addtimer(CALLBACK(SSassets.transport, /datum/asset_transport.proc/send_assets_slow, src, SSassets.transport.preload), 5 SECONDS)
971+
addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS)
972972

973973
#if (PRELOAD_RSC == 0)
974974
for (var/name in GLOB.vox_sounds)

code/modules/food_and_drinks/drinks/drinks.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
return
9696
var/mob/living/silicon/robot/bro = user
9797
bro.cell.use(30)
98-
addtimer(CALLBACK(reagents, /datum/reagents.proc/add_reagent, refill, trans), 600)
98+
addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent), refill, trans), 600)
9999

100100
else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
101101
if (!is_refillable())

code/modules/holodeck/turfs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144

145145
/turf/open/floor/holofloor/carpet/Initialize(mapload)
146146
. = ..()
147-
addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1)
147+
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 1)
148148

149149
/turf/open/floor/holofloor/carpet/update_icon(updates=ALL)
150150
. = ..()

0 commit comments

Comments
 (0)