diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 8a904b8b44..dd7bc02f1f 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -30,12 +30,12 @@ CALLBACK(src, .some_proc_here) when the above doesn't apply: - .proc/procname + PROC_REF(procname) Example: - CALLBACK(src, .proc/some_proc_here) + CALLBACK(src, PROC_REF(some_proc_here)) proc defined on a parent of a some type: - Example: /some/type/.proc/some_proc_here + Example: /some/type/PROC_REF(some_proc_here) Other wise you will have to do the full typepath of the proc (/type/of/thing/proc/procname) */ diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index bce02d461f..a2072aaf42 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -728,7 +728,7 @@ var/global/datum/controller/occupations/job_master to_chat(pred, "You must be within station grounds to accept.") return if(backup) - addtimer(CALLBACK(src, .proc/m_backup_client, C), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(m_backup_client), C), 5 SECONDS) log_admin("[key_name(C)] has vore spawned into [key_name(pred)]") message_admins("[key_name(C)] has vore spawned into [key_name(pred)]") to_chat(C, "You have been spawned via vore. You are free to roleplay how you got there as you please, such as teleportation or having had already been there.") @@ -880,7 +880,7 @@ var/global/datum/controller/occupations/job_master item_to_be = item item_carrier = carrier if(backup) - addtimer(CALLBACK(src, .proc/m_backup_client, C), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(m_backup_client), C), 5 SECONDS) else var/confirm = alert(C, "\The [item.name] is currently not in any character's possession! Do you still want to spawn as it?", "Confirm", "No", "Yes") if(confirm != "Yes") @@ -888,7 +888,7 @@ var/global/datum/controller/occupations/job_master log_and_message_admins("[key_name(C)] has item spawned into \a [item.name] that was not held by anyone") item_to_be = item if(backup) - addtimer(CALLBACK(src, .proc/m_backup_client, C), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(m_backup_client), C), 5 SECONDS) if(istype(item, /obj/item/capture_crystal)) var/obj/item/capture_crystal/cryst = item if(cryst.spawn_mob_type) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index b897158431..302b9643d0 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -273,7 +273,7 @@ force_open() if(autoclose && src.operating && !(stat & BROKEN || stat & NOPOWER)) - addtimer(CALLBACK(src, PROC_REF(close), 15 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(close)), 15 SECONDS) return 1 // Proc: close() diff --git a/code/game/objects/items/mail_ch.dm b/code/game/objects/items/mail_ch.dm index dfdcede56d..0b06541dfa 100644 --- a/code/game/objects/items/mail_ch.dm +++ b/code/game/objects/items/mail_ch.dm @@ -53,7 +53,7 @@ /obj/item/mail/Initialize() . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) // Icons // Add some random stamps. diff --git a/code/game/objects/items/weapons/taskmanager_ch.dm b/code/game/objects/items/weapons/taskmanager_ch.dm index f5209cacc6..e5b3174221 100644 --- a/code/game/objects/items/weapons/taskmanager_ch.dm +++ b/code/game/objects/items/weapons/taskmanager_ch.dm @@ -48,7 +48,7 @@ "Security" = radial_image_security ) - 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) diff --git a/code/modules/mining/resonator.dm b/code/modules/mining/resonator.dm index dbee1668b2..c6c5cf2ef3 100644 --- a/code/modules/mining/resonator.dm +++ b/code/modules/mining/resonator.dm @@ -63,7 +63,7 @@ transform = matrix()*0.75 animate(src, transform = matrix()*1.5, time = timetoburst) // Queue the actual bursting - addtimer(CALLBACK(src, ./proc/burst, creator), timetoburst) + addtimer(CALLBACK(src, PROC_REF(burst), creator), timetoburst) /obj/effect/resonance/proc/burst(var/creator = null) var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d11309df8f..ad310b0c23 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -828,7 +828,7 @@ playsound_local(get_turf(src), suit_inhale_sound, 100, pressure_affected = FALSE, volume_channel = VOLUME_CHANNEL_AMBIENCE) if(!exhale) // Did we fail exhale? If no, play it after inhale finishes. - addtimer(CALLBACK(src, .proc/play_exhale, M), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(play_exhale), M), 5 SECONDS) /mob/living/carbon/human/proc/play_exhale(var/mob/living/M) var/suit_exhale_sound diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index cc04791e04..1b3d5d4df9 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -360,7 +360,7 @@ . = ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("slimejelly", 1) - addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(120 SECONDS, 150 SECONDS)) /obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Grow() grown = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm index dffa998cf8..65f0fe7f6c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm @@ -146,7 +146,7 @@ /datum/ai_holder/simple_mob/armadillo/torta/on_hear_say(mob/living/speaker, message) . = ..() - addtimer(CALLBACK(src, .proc/grande, message), 1 SECOND) + addtimer(CALLBACK(src, PROC_REF(grande), message), 1 SECOND) /datum/ai_holder/simple_mob/armadillo/torta/proc/grande(var/message) var/mob/living/simple_mob/animal/passive/armadillo/bol = holder diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm index 77f16fc7f6..76b453e11c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm @@ -177,7 +177,7 @@ I think I covered everything. "Normal" ) var/eyes - + can_be_drop_prey = FALSE //CHOMP Add /// @@ -336,7 +336,7 @@ I think I covered everything. newdesc = sanitizeSafe(input(src,"Set your description. Max 4096 chars.", "Description set","") as text, MAX_MESSAGE_LEN) if(newdesc) desc = newdesc -*/ +*/ /// /// Icon generation stuff @@ -765,7 +765,7 @@ I think I covered everything. var/atom/movable/AM = am if(AM == src || AM.anchored) continue - addtimer(CALLBACK(src, .proc/yeet, am), 1) + addtimer(CALLBACK(src, PROC_REF(yeet), am), 1) playsound(src, "sound/weapons/punchmiss.ogg", 50, 1) //Split repulse into two parts so I can recycle this later @@ -798,7 +798,7 @@ I think I covered everything. do_windup_animation(A, charge_warmup) //callbacks are more reliable than byond's process scheduler - addtimer(CALLBACK(src, .proc/chargeend, A), charge_warmup) + addtimer(CALLBACK(src, PROC_REF(chargeend), A), charge_warmup) /mob/living/simple_mob/vore/bigdragon/proc/chargeend(var/atom/A, var/explicit = 0, var/gentle = 0) @@ -836,7 +836,7 @@ I think I covered everything. set_AI_busy(TRUE) flames = 1 build_icons() - addtimer(CALLBACK(src, .proc/firebreathend, A), charge_warmup) + addtimer(CALLBACK(src, PROC_REF(firebreathend), A), charge_warmup) playsound(src, "sound/magic/Fireball.ogg", 50, 1) /mob/living/simple_mob/vore/bigdragon/proc/firebreathend(var/atom/A) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm index f2f1315df6..8b17190444 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm @@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list( prey_excludes += H vore_selected.release_specific_contents(H) N = 1 - //addtimer(CALLBACK(src, .proc/removeMobFromPreyExcludes, weakref(H)), 1 MINUTES) //At the time of this PR, removeMobFromPreyExcludes breaks prey_excludes by deleting the list which causes problems with the Crossed() vore override before. This can be commented back in if that gets fixed. + //addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), weakref(H)), 1 MINUTES) //At the time of this PR, removeMobFromPreyExcludes breaks prey_excludes by deleting the list which causes problems with the Crossed() vore override before. This can be commented back in if that gets fixed. break else to_chat(user, "The victim slips from your grasp!") diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 7225c6a5a2..aff88425d4 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -156,7 +156,7 @@ "You hear a loud electrical crack!") playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. /obj/machinery/power/rtg/abductor/bullet_act(obj/item/projectile/Proj) . = ..() diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 14104790b5..8064964a8e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -182,7 +182,7 @@ exploded = 1 // CHOMPEdit Start - Looping Alarms. We want to stop the alarm here. if(stationcrystal) // Are we an on-station crystal? - addtimer(CALLBACK(src, .proc/reset_alarms), 10 SECONDS, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(reset_alarms)), 10 SECONDS, TIMER_STOPPABLE) // CHOMPEdit End sleep(pull_time) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 9440c0bdf3..c228a17841 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -148,7 +148,7 @@ if(istype(O,/obj/item/stack/material/supermatter)) var/obj/item/stack/material/supermatter/S = O set_light(l_range = max(1, S.get_amount()/10), l_power = max(1, S.get_amount()/10), l_color = "#8A8A00") - addtimer(CALLBACK(src, .proc/puny_protons), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(puny_protons)), 30 SECONDS) //CHOMPedit end return 0 diff --git a/code/modules/tgchat/_legacy.dm b/code/modules/tgchat/_legacy.dm index 2afc8ba4c8..adfef86395 100644 --- a/code/modules/tgchat/_legacy.dm +++ b/code/modules/tgchat/_legacy.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the tag results, not the icons base64 = icon2base64(A.examine_icon(), key) GLOB.bicon_cache[key] = base64 if(changes_often) - addtimer(CALLBACK(GLOBAL_PROC, .proc/expire_bicon_cache, key), 50 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(expire_bicon_cache), key), 50 SECONDS, TIMER_UNIQUE) // May add a class to the img tag created by bicon if(use_class) diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index a20f5fa1eb..8a4b35a6ff 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -316,7 +316,7 @@ GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the tag results, not the icons base64 = icon2base64(A.examine_icon(), key) GLOB.bicon_cache[key] = base64 if(changes_often) - addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(expire_bicon_cache), key), 50 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(expire_bicon_cache), key), 50 SECONDS, TIMER_UNIQUE) // May add a class to the img tag created by bicon if(use_class) diff --git a/modular_chomp/code/game/objects/items/weapons/RCD.dm b/modular_chomp/code/game/objects/items/weapons/RCD.dm index 098efd640d..9b51d2830d 100644 --- a/modular_chomp/code/game/objects/items/weapons/RCD.dm +++ b/modular_chomp/code/game/objects/items/weapons/RCD.dm @@ -119,7 +119,7 @@ rborosilicate = 12 "BAY" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "bay"), "ERIS" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "eris") ) - var/selected_girder_type = show_radial_menu(user, src, wall_types, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/selected_girder_type = show_radial_menu(user, src, wall_types, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(selected_girder_type) @@ -167,7 +167,7 @@ rborosilicate = 12 "Light Switch" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "lightswitch"), "Entertainment Monitor" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "entertainment") ) - var/selected_wall_frame_type = show_radial_menu(user, src, wall_frame_types, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/selected_wall_frame_type = show_radial_menu(user, src, wall_frame_types, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(selected_wall_frame_type) @@ -230,7 +230,7 @@ rborosilicate = 12 "HOSTILE TO ALL" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "turret1"), "HOSTILE TO ENEMIES" = image(icon = 'modular_chomp/icons/mob/radial.dmi', icon_state = "turret2") ) - var/selected_turret_faction = show_radial_menu(user, src, turret_factions, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = ranged?FALSE:TRUE, tooltips = TRUE) + var/selected_turret_faction = show_radial_menu(user, src, turret_factions, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = ranged?FALSE:TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(selected_turret_faction) @@ -292,13 +292,13 @@ rborosilicate = 12 "External" = get_airlock_image(/obj/machinery/door/airlock/glass_external), ) - var/airlockcat = show_radial_menu(user, src, solid_or_glass_choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/airlockcat = show_radial_menu(user, src, solid_or_glass_choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) return switch(airlockcat) if("Solid") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, src, solid_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/airlockpaint = show_radial_menu(user, src, solid_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) return switch(airlockpaint) @@ -337,7 +337,7 @@ rborosilicate = 12 if("Glass") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, src , glass_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/airlockpaint = show_radial_menu(user, src , glass_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) return switch(airlockpaint) @@ -1471,4 +1471,4 @@ rborosilicate = 12 to_chat(user, span("notice", "You deconstruct \the [src].")) qdel(src) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 6ff392aeef..12bc4be555 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -527,7 +527,7 @@ blob.update_icon(1) //Flip them to the protean panel - addtimer(CALLBACK(src, .proc/nano_set_panel, C), 4) + addtimer(CALLBACK(src, PROC_REF(nano_set_panel), C), 4) //Return our blob in case someone wants it return blob @@ -628,7 +628,7 @@ qdel(blob) //Flip them to the protean panel - addtimer(CALLBACK(src, .proc/nano_set_panel, C), 4) + addtimer(CALLBACK(src, PROC_REF(nano_set_panel), C), 4) //Return ourselves in case someone wants it return src @@ -777,4 +777,4 @@ eye_layer.color = S.blob_color_2 eye_layer.plane = PLANE_LIGHTING_ABOVE add_overlay(eye_layer) - qdel(eye_layer) \ No newline at end of file + qdel(eye_layer) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm index 4b1c0196f0..e4858c036b 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm @@ -50,7 +50,7 @@ var/datum/species/protean/S = P.species S.OurRig = src if(P.back) - addtimer(CALLBACK(src, .proc/AssimilateBag, P, 1, P.back), 3) + addtimer(CALLBACK(src, PROC_REF(AssimilateBag), P, 1, P.back), 3) myprotean = P else to_chat(P, "You should have spawned with a backpack to assimilate into your RIG. Try clicking it with a backpack.") @@ -273,7 +273,7 @@ playsound(src, 'sound/machines/defib_success.ogg', 50, 0) new /obj/effect/gibspawner/robot(src.loc) src.atom_say("Contact received! Reassembly nanites calibrated. Estimated time to resucitation: 1 minute 30 seconds") - addtimer(CALLBACK(src, .proc/make_alive, myprotean?:humanform), 900) + addtimer(CALLBACK(src, PROC_REF(make_alive), myprotean?:humanform), 900) return if(istype(W,/obj/item/weapon/rig)) if(!assimilated_rig) @@ -425,7 +425,7 @@ /obj/item/weapon/cell/protean/New() charge = maxcharge update_icon() - addtimer(CALLBACK(src, .proc/search_for_protean), 60) + addtimer(CALLBACK(src, PROC_REF(search_for_protean)), 60) /obj/item/weapon/cell/protean/proc/search_for_protean() if(istype(src.loc, /obj/item/weapon/rig/protean)) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm index 97e8fc607f..d8e48e63e3 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm @@ -152,7 +152,7 @@ playsound(src, "sound/weapons/punchmiss.ogg", 50, 1) // throw_at returns FALSE if it will not call it's callback - useful to prevent state jamming - if(!throw_at(T, 10, pounce_speed, callback = CALLBACK(src, .proc/pouncefinish, foundpt, foundpm, T))) + if(!throw_at(T, 10, pounce_speed, callback = CALLBACK(src, PROC_REF(pouncefinish), foundpt, foundpm, T))) if(status_flags & LEAPING) status_flags &= ~LEAPING flying = 0 @@ -328,7 +328,7 @@ var/atom/movable/AM = am if(AM == src || AM.anchored) continue - addtimer(CALLBACK(src, .proc/speen_throw, am), 1) + addtimer(CALLBACK(src, PROC_REF(speen_throw), am), 1) playsound(src, "sound/weapons/punchmiss.ogg", 50, 1) /mob/living/simple_mob/proc/speen_throw(var/atom/movable/AM, var/gentle = 0, var/damage = 10) @@ -346,4 +346,4 @@ M.adjustBruteLoss(damage) to_chat(M, "You're thrown back by [src]!") playsound(src, get_sfx("punch"), 50, 1) - AM.throw_at(throwtarget, maxthrow, 3, src) \ No newline at end of file + AM.throw_at(throwtarget, maxthrow, 3, src) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm index 75d762af48..17c4f0037b 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm @@ -358,7 +358,7 @@ /mob/living/simple_mob/vore/candy/marshmellowserpent/do_special_attack(atom/A) set_AI_busy(TRUE) do_windup_animation(A, 20) - addtimer(CALLBACK(src, .proc/chargeend, A), 20) + addtimer(CALLBACK(src, PROC_REF(chargeend), A), 20) /mob/living/simple_mob/vore/candy/marshmellowserpent/proc/chargeend(atom/A) if(stat) //you are dead @@ -729,4 +729,4 @@ B.emote_lists[DM_DIGEST] = list( "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") -v \ No newline at end of file +v diff --git a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm index a0d2166058..f3538906b3 100644 --- a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm +++ b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm @@ -604,7 +604,7 @@ step = 1 // The time between each step is the volume required by a step multiplied by the delay_modifier (in ticks/deciseconds). - addtimer(CALLBACK(src, .proc/perform_reaction, r_id, step), recipes[r_id][step + 1] * delay_modifier) + addtimer(CALLBACK(src, PROC_REF(perform_reaction), r_id, step), recipes[r_id][step + 1] * delay_modifier) // This proc carries out the actual steps in each reaction. /obj/machinery/chemical_synthesizer/proc/perform_reaction(var/r_id, var/step as num) @@ -638,7 +638,7 @@ var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] if(quantity > C.reagents.total_volume) visible_message("The [src] flashes an 'insufficient reagents' warning.") - addtimer(CALLBACK(src, .proc/perform_reaction, r_id, step), 1 MINUTE) + addtimer(CALLBACK(src, PROC_REF(perform_reaction), r_id, step), 1 MINUTE) return // After all this mess of code, we reach the line where the magic happens. @@ -662,7 +662,7 @@ var/delay = reagents.total_volume update_icon() // Update the icon first to remove underlays, then switch to the new icon_state. icon_state = "synth_finished" - addtimer(CALLBACK(src, .proc/bottle_product, r_id), delay) + addtimer(CALLBACK(src, PROC_REF(bottle_product), r_id), delay) else follow_recipe(r_id, step) diff --git a/modular_chomp/game/machinery/buttons.dm b/modular_chomp/game/machinery/buttons.dm index c99fec20c7..82af719873 100644 --- a/modular_chomp/game/machinery/buttons.dm +++ b/modular_chomp/game/machinery/buttons.dm @@ -22,7 +22,7 @@ mobspawned.init_vore() if(neutral == TRUE) mobspawned.faction = "neutral" - RegisterSignal(mobspawned, COMSIG_PARENT_QDELETING, .proc/clean_mob) + RegisterSignal(mobspawned, COMSIG_PARENT_QDELETING, PROC_REF(clean_mob)) /obj/machinery/button/mob_spawner_button/proc/clean_mob() SIGNAL_HANDLER